Fix for the config > metadata rule

Better legends-layer-set.ts vs store sync
Canadian-Geospatial-Platform · May 25, 2024 · c929e71 · c929e71
1 parent 9713288
commit c929e71
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/esri-layer-common.ts b/packages/geoview-core/src/geo/layer/geoview-layers/esri-layer-common.ts
@@ -112,12 +112,20 @@ export function commonValidateListOfLayerEntryConfig(
       const newListOfLayerEntryConfig: TypeLayerEntryConfig[] = [];
       const switchToGroupLayer = Cast<GroupLayerEntryConfig>(cloneDeep(layerConfig));
       switchToGroupLayer.entryType = CONST_LAYER_ENTRY_TYPES.GROUP;
-      switchToGroupLayer.layerName = {
-        en: layer.metadata!.layers[esriIndex].name as string,
-        fr: layer.metadata!.layers[esriIndex].name as string,
-      };
+
+      // Only switch the layer name by the metadata if there were none pre-set (config wins over metadata rule?)
+      if (!switchToGroupLayer.layerName) {
+        switchToGroupLayer.layerName = {
+          en: layer.metadata!.layers[esriIndex].name as string,
+          fr: layer.metadata!.layers[esriIndex].name as string,
+        };
+      } else {
+        if (!switchToGroupLayer.layerName.en) switchToGroupLayer.layerName.en = layer.metadata!.layers[esriIndex].name as string;
+        if (!switchToGroupLayer.layerName.fr) switchToGroupLayer.layerName.fr = layer.metadata!.layers[esriIndex].name as string;
+      }
       switchToGroupLayer.isMetadataLayerGroup = true;
       switchToGroupLayer.listOfLayerEntryConfig = newListOfLayerEntryConfig;
+
       const groupLayerConfig = new GroupLayerEntryConfig(switchToGroupLayer as GroupLayerEntryConfig);
       // Replace the old version of the layer with the new layer group
       listOfLayerEntryConfig[i] = groupLayerConfig;

diff --git a/packages/geoview-core/src/geo/layer/layer-sets/abstract-layer-set.ts b/packages/geoview-core/src/geo/layer/layer-sets/abstract-layer-set.ts
@@ -97,7 +97,7 @@ export abstract class AbstractLayerSet {
     // Override this function to perform further registration logic in the inherited classes
     this.resultSet[layerConfig.layerPath] = {
       data: undefined,
-      layerStatus: 'newInstance',
+      layerStatus: layerConfig.layerStatus,
       layerName: getLocalizedValue(layerConfig.layerName, AppEventProcessor.getDisplayLanguage(this.mapId)),
     };
   }

diff --git a/packages/geoview-core/src/geo/layer/layer-sets/legends-layer-set.ts b/packages/geoview-core/src/geo/layer/layer-sets/legends-layer-set.ts
@@ -27,8 +27,8 @@ export class LegendsLayerSet extends AbstractLayerSet {
     // Call parent
     super.onRegisterLayer(layerConfig);
 
-    // Leaving this here for now, likely can be refactored later
-    this.resultSet[layerConfig.layerPath].data = undefined;
+    // Propagate to store immediately
+    LegendEventProcessor.propagateLegendToStore(this.mapId, layerConfig.layerPath, this.resultSet[layerConfig.layerPath]);
   }
 
   /**