Merge branch 'next' into geostyler-wms

terrestris · Nov 22, 2024 · 389ab09 · 389ab09
2 parents 355573f + fe2868a
commit 389ab09
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/bootstrap.tsx b/src/bootstrap.tsx
@@ -97,7 +97,8 @@ import {
 import { setFeatureInfoActiveCopyTools } from './store/featureInfo';
 import {
   setLayerTreeActiveUploadTools,
-  setLayerTreeShowLegends
+  setLayerTreeShowLegends,
+  setMetadataVisible
 } from './store/layerTree';
 import {
   setLegal
@@ -281,6 +282,9 @@ const setApplicationToStore = async (application?: Application) => {
         if (tool.name === 'tree' && tool.config.showLegends) {
           store.dispatch(setLayerTreeShowLegends(tool.config.showLegends));
         }
+        if (tool.name === 'tree' && typeof tool.config.metadataVisible !== 'undefined') {
+          store.dispatch(setMetadataVisible(tool.config.metadataVisible));
+        }
       });
     store.dispatch(setAvailableTools(availableTools));
   }

diff --git a/src/components/ToolMenu/LayerTree/LayerTreeContextMenu/index.tsx b/src/components/ToolMenu/LayerTree/LayerTreeContextMenu/index.tsx
@@ -108,6 +108,7 @@ export const LayerTreeContextMenu: React.FC<LayerTreeContextMenuProps> = ({
   const allowedEditMode = useAppSelector(
     state => state.editFeature.userEditMode
   );
+  const metadataVisible = useAppSelector(state => state.layerTree.metadataVisible);
 
   useEffect(() => {
     if (layer) {
@@ -327,6 +328,13 @@ export const LayerTreeContextMenu: React.FC<LayerTreeContextMenuProps> = ({
     key: 'layerDetails'
   });
 
+  if (metadataVisible) {
+    dropdownMenuItems.push({
+      label: t('LayerTreeContextMenu.layerDetails'),
+      key: 'layerDetails'
+    });
+  }
+
   return (
     <div
       aria-label='layer-context'

diff --git a/src/store/layerTree/index.ts b/src/store/layerTree/index.ts
@@ -7,6 +7,7 @@ export type LayerTreeConfig = {
   enabled?: boolean;
   activeUploadTools?: UploadTools[];
   showLegends?: boolean;
+  metadataVisible?: boolean;
 };
 
 export enum UploadTools {
@@ -17,7 +18,8 @@ export enum UploadTools {
 const initialState: LayerTreeConfig = {
   enabled: false,
   activeUploadTools: [UploadTools.addWMS, UploadTools.dataUpload],
-  showLegends: false
+  showLegends: false,
+  metadataVisible: true
 };
 
 export const slice = createSlice({
@@ -35,14 +37,18 @@ export const slice = createSlice({
     },
     setLayerTreeShowLegends(state, action: PayloadAction<boolean>) {
       state.showLegends = action.payload;
+    },
+    setMetadataVisible(state, action: PayloadAction<boolean>) {
+      state.metadataVisible = action.payload;
     }
   }
 });
 
 export const {
   setLayerTreeEnabled,
   setLayerTreeActiveUploadTools,
-  setLayerTreeShowLegends
+  setLayerTreeShowLegends,
+  setMetadataVisible
 } = slice.actions;
 
 export default slice.reducer;