Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor visible columns handling #2504

Merged
merged 1 commit into from
Nov 10, 2023
Merged

refactor visible columns handling #2504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions bundles/framework/featuredata/plugin/FeatureDataPluginHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,19 @@ class FeatureDataPluginUIHandler extends StateHandler {
}

createVisibleColumnsSettings (newActiveLayerId, features) {
if (!features || !features.length) {
return {
allColumns: [],
visibleColumns: [],
activeLayerPropertyLabels: null,
activeLayerPropertyTypes: null
};
}
const { activeLayerId, visibleColumnsSettings } = this.getState();
const activeLayerChanged = activeLayerId && newActiveLayerId && activeLayerId !== newActiveLayerId;
const allColumns = Object.keys(features[0].properties).filter(key => !FEATUREDATA_DEFAULT_HIDDEN_FIELDS.includes(key));
const newVisibleColumns = activeLayerChanged ? [].concat(allColumns) : visibleColumnsSettings?.visibleColumns ? visibleColumnsSettings.visibleColumns : [].concat(allColumns);

if (!activeLayerChanged && visibleColumnsSettings) {
return visibleColumnsSettings;
}

const activeLayer = this.mapModule.getSandbox().findMapLayerFromSelectedMapLayers(newActiveLayerId) || null;
const activeLayerProperties = activeLayer?.getProperties() || null;
const allColumns = activeLayerProperties?.map((property) => property.name);
const activeLayerPropertyLabels = activeLayer?.getPropertyLabels() || null;
const activeLayerPropertyTypes = activeLayer?.getPropertyTypes() || null;
const newVisibleColumns = activeLayerChanged ? [].concat(allColumns) : visibleColumnsSettings?.visibleColumns ? visibleColumnsSettings.visibleColumns : [].concat(allColumns);

return {
allColumns,
Expand Down
8 changes: 4 additions & 4 deletions bundles/framework/featuredata/view/FeatureDataContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const createFeaturedataGrid = (features, selectedFeatureIds, showSelectedFirst,
if (!features || !features.length) {
return <Message bundleKey={FEATUREDATA_BUNDLE_ID} messageKey={'layer.outOfContentArea'}/>;
};
const columnSettings = createColumnSettingsFromFeatures(features, selectedFeatureIds, showSelectedFirst, sorting, visibleColumnsSettings);
const columnSettings = createColumnSettings(selectedFeatureIds, showSelectedFirst, sorting, visibleColumnsSettings);
const dataSource = createDatasourceFromFeatures(features);
const featureTable = <FeatureDataTable>
<SelectionsContainer>
Expand Down Expand Up @@ -97,9 +97,9 @@ const createFeaturedataGrid = (features, selectedFeatureIds, showSelectedFirst,
return featureTable;
};

const createColumnSettingsFromFeatures = (features, selectedFeatureIds, showSelectedFirst, sorting, visibleColumnsSettings) => {
const { visibleColumns, activeLayerPropertyLabels } = visibleColumnsSettings;
return Object.keys(features[0].properties)
const createColumnSettings = (selectedFeatureIds, showSelectedFirst, sorting, visibleColumnsSettings) => {
const { allColumns, visibleColumns, activeLayerPropertyLabels } = visibleColumnsSettings;
return allColumns
.filter(key => !FEATUREDATA_DEFAULT_HIDDEN_FIELDS.includes(key) && visibleColumns.includes(key))
.map(key => {
return {
Expand Down