fix: spurious 'Invalid layer identifier' for dynamically registered OpenSPP collection layers

frontend/src/config/dynamic-layers.test.ts

@@ -0,0 +1,44 @@
+import {
+  LayerDefinitions,
+  getInvalidLayerIds,
+  registerDynamicLayer,
+} from './utils';
+
+describe('getInvalidLayerIds', () => {
+  const dynamicLayerId = 'openspp_TEST_DYNAMIC_adm0';
+
+  afterEach(() => {
+    delete (LayerDefinitions as Record<string, unknown>)[dynamicLayerId];
+  });
+
+  it('reports unknown layer ids as invalid', () => {
+    expect(getInvalidLayerIds([dynamicLayerId])).toEqual([dynamicLayerId]);
+  });
+
+  it('accepts statically configured layer ids', () => {
+    const staticId = Object.keys(LayerDefinitions)[0];
+    expect(staticId).toBeDefined();
+    expect(getInvalidLayerIds([staticId])).toEqual([]);
+  });
+
+  it('accepts layers registered at runtime via registerDynamicLayer', () => {
+    registerDynamicLayer(dynamicLayerId, {
+      id: dynamicLayerId,
+      type: 'openspp_report',
+      title: 'Test Dynamic Collection',
+      collectionId: 'TEST_DYNAMIC_adm0',
+      dataField: 'value',
+      opacity: 0.7,
+      legend: [],
+      legendText: 'Test Dynamic Collection',
+    } as any);
+    expect(getInvalidLayerIds([dynamicLayerId])).toEqual([]);
+  });
+
+  it('validates a mixed list, keeping only unknown ids', () => {
+    const staticId = Object.keys(LayerDefinitions)[0];
+    expect(getInvalidLayerIds([staticId, dynamicLayerId])).toEqual([
+      dynamicLayerId,
+    ]);
+  });
+});

frontend/src/config/utils.ts

@@ -272,6 +272,15 @@ export function registerDynamicLayer(key: string, layer: LayerType): void {
   (LayerDefinitions as Record<string, LayerType>)[key] = layer;
 }
 
+/**
+ * Return the subset of the given layer ids that are not present in
+ * LayerDefinitions. Reads the live map at call time so layers added via
+ * registerDynamicLayer are recognized as valid.
+ */
+export function getInvalidLayerIds(layerIds: string[]): string[] {
+  return layerIds.filter(layerId => !(layerId in LayerDefinitions));
+}
+
 export function getBoundaryLayers(): BoundaryLayerProps[] {
   return Object.values(LayerDefinitions)
     .filter((layer): layer is BoundaryLayerProps => layer.type === 'boundary')

frontend/src/utils/layers-utils.tsx

@@ -15,6 +15,7 @@ import {
   AALayerIds,
   LayerDefinitions,
   getBoundaryLayerSingleton,
+  getInvalidLayerIds,
   isAnticipatoryActionLayer,
   isWindowedDates,
 } from 'config/utils';
@@ -341,12 +342,12 @@ const useLayers = () => {
     [serverAvailableDates],
   );
 
-  const layerDefinitionIds = useMemo(() => Object.keys(LayerDefinitions), []);
-
-  // Check for invalid layer ids.
+  // Check for invalid layer ids against the live LayerDefinitions map, so
+  // layers registered at runtime (e.g., discovered OpenSPP collections) are
+  // recognized as valid.
   const invalidLayersIds = useMemo(
-    () => urlLayerIds.filter(layerId => !layerDefinitionIds.includes(layerId)),
-    [layerDefinitionIds, urlLayerIds],
+    () => getInvalidLayerIds(urlLayerIds),
+    [urlLayerIds],
   );
 
   // Adds missing layers to existing map instance