@openg2p/registry-widgets 1.1.2-dev.8 → 1.1.2-dev.9

package/dist/index.js

@@ -2244,12 +2244,145 @@ const geoHierarchyBuilder = new GeoHierarchyBuilder();
 /** Sentinel written to Redux when a geo level is cleared by cascade (distinct from "never set"). */
 const GEO_LEVEL_CLEARED = null;
 const geoWidgetParentRegistry = new Map();
+const geoWidgetConfigRegistry = new Map();
 function registerGeoWidgetParent(widgetId, parentWidgetId) {
     geoWidgetParentRegistry.set(widgetId, parentWidgetId || null);
 }
 function unregisterGeoWidgetParent(widgetId) {
     geoWidgetParentRegistry.delete(widgetId);
 }
+function registerGeoWidget(widgetId, geoConfig, dataPath) {
+    if (typeof dataPath !== 'string') {
+        return;
+    }
+    const parentWidgetId = geoConfig.parentWidgetId?.trim() ? geoConfig.parentWidgetId : null;
+    registerGeoWidgetParent(widgetId, parentWidgetId);
+    geoWidgetConfigRegistry.set(widgetId, {
+        widgetId,
+        parentWidgetId,
+        level: geoConfig.level,
+        geoConfig,
+        dataPath,
+        groupId: getGeoGroupId(dataPath),
+    });
+}
+function unregisterGeoWidget(widgetId) {
+    unregisterGeoWidgetParent(widgetId);
+    geoWidgetConfigRegistry.delete(widgetId);
+}
+function orderGeoWidgetRegistrations(registrations) {
+    if (registrations.length <= 1) {
+        return registrations;
+    }
+    const roots = registrations.filter((entry) => !entry.parentWidgetId);
+    if (roots.length === 0) {
+        return registrations;
+    }
+    const ordered = [];
+    let current = roots[0];
+    const visited = new Set();
+    while (current && !visited.has(current.widgetId)) {
+        visited.add(current.widgetId);
+        ordered.push(current);
+        current = registrations.find((entry) => entry.parentWidgetId === current.widgetId);
+    }
+    return ordered.length > 0 ? ordered : registrations;
+}
+function resolveLevelValueId(rawValue) {
+    if (rawValue === null || rawValue === undefined || rawValue === '') {
+        return null;
+    }
+    if (typeof rawValue === 'string' || typeof rawValue === 'number') {
+        return String(rawValue);
+    }
+    if (typeof rawValue === 'object') {
+        const id = rawValue.level_value_id || rawValue.id || rawValue.value;
+        return id != null && id !== '' ? String(id) : null;
+    }
+    return null;
+}
+function resolveStoredMnemonic(values, registration, valueId) {
+    const stored = getWidgetValue(values, registration.dataPath, registration.widgetId);
+    const hierarchy = stored?.hierarchy || stored?.geo_code_hierarchy_json?.hierarchy;
+    if (!Array.isArray(hierarchy)) {
+        return undefined;
+    }
+    const levelData = hierarchy.find((entry) => entry.level === registration.level);
+    if (levelData && String(levelData.level_value_id) === String(valueId)) {
+        return levelData.level_value_mnemonic ? String(levelData.level_value_mnemonic) : undefined;
+    }
+    return undefined;
+}
+/** Resolve display mnemonic from cached dropdown options, then stored hierarchy. */
+function createGeoLevelMnemonicResolver(values, dataSources) {
+    return (registration, valueId) => {
+        const options = dataSources[registration.widgetId];
+        const option = options?.find((entry) => String(entry.value) === String(valueId));
+        if (option?.label) {
+            return option.label;
+        }
+        return resolveStoredMnemonic(values, registration, valueId);
+    };
+}
+/** Rebuild group hierarchy from widget values in parent→child order; stop at first missing level. */
+function rebuildGeoHierarchyFromRegistrations(groupId, values, registrations, resolveMnemonic) {
+    const ordered = orderGeoWidgetRegistrations(registrations.filter((entry) => entry.groupId === groupId));
+    geoHierarchyBuilder.clear(groupId);
+    for (const registration of ordered) {
+        const rawValue = resolveGeoWidgetLevelValue(values, registration.widgetId, registration.dataPath, registration.geoConfig);
+        const valueId = resolveLevelValueId(rawValue);
+        if (!valueId) {
+            break;
+        }
+        const mnemonic = resolveMnemonic?.(registration, valueId) ??
+            resolveStoredMnemonic(values, registration, valueId) ??
+            valueId;
+        geoHierarchyBuilder.addLevel(registration.level, valueId, mnemonic, groupId);
+    }
+    return geoHierarchyBuilder.buildHierarchyJson(groupId) !== null;
+}
+function collectGeoWidgetRegistrationsFromWidgets(widgets, namespace) {
+    return widgets
+        .filter((widget) => widget['widget-geo-config'] && typeof widget['widget-data-path'] === 'string')
+        .map((widget) => {
+        const originalWidgetId = widget['widget-id'];
+        const originalDataPath = widget['widget-data-path'];
+        const geoConfig = widget['widget-geo-config'];
+        const widgetId = namespace ? `${namespace}__${originalWidgetId}` : originalWidgetId;
+        const parentWidgetId = geoConfig.parentWidgetId?.trim()
+            ? (namespace ? `${namespace}__${geoConfig.parentWidgetId}` : geoConfig.parentWidgetId)
+            : null;
+        const dataPath = namespace ? `${namespace}.${originalDataPath}` : originalDataPath;
+        return {
+            widgetId,
+            parentWidgetId,
+            level: geoConfig.level,
+            geoConfig,
+            dataPath,
+            groupId: getGeoGroupId(dataPath),
+        };
+    });
+}
+/** Reconcile all geo groups in section values before save. */
+function reconcileGeoHierarchiesInValues(values, registrations, dataSources = {}) {
+    const groupIds = [...new Set(registrations.map((entry) => entry.groupId))];
+    let updatedValues = values;
+    const resolveMnemonic = createGeoLevelMnemonicResolver(updatedValues, dataSources);
+    for (const groupId of groupIds) {
+        const groupRegistrations = registrations.filter((entry) => entry.groupId === groupId);
+        const dataPath = groupRegistrations[0]?.dataPath;
+        const widgetId = groupRegistrations[0]?.widgetId;
+        if (!dataPath || !widgetId) {
+            continue;
+        }
+        rebuildGeoHierarchyFromRegistrations(groupId, updatedValues, groupRegistrations, resolveMnemonic);
+        updatedValues = applySharedGeoHierarchyToValues(updatedValues, groupId, dataPath, widgetId);
+    }
+    return updatedValues;
+}
+function getGeoWidgetRegistrationsInGroup(groupId) {
+    return orderGeoWidgetRegistrations([...geoWidgetConfigRegistry.values()].filter((entry) => entry.groupId === groupId));
+}
 /** True when changedWidgetId is any upstream geo parent of widgetId (not only immediate parent). */
 function isUpstreamGeoAncestor(changedWidgetId, widgetId, immediateParentWidgetId) {
     if (changedWidgetId === widgetId) {
@@ -2344,7 +2477,7 @@ function resetAndSeedGeoHierarchyFromValues(values, dataPath, widgetId, groupId)
 
 // Define stable empty arrays to avoid selector reference issues
 const EMPTY_ERRORS = [];
-const EMPTY_DATA_SOURCE$1 = [];
+const EMPTY_DATA_SOURCE = [];
 const useBaseWidget = (options) => {
     const { config, dataSourceRequestHandler: propHandler, schemaData, onValueChange } = options;
     const dispatch = reactRedux.useDispatch();
@@ -2359,7 +2492,7 @@ const useBaseWidget = (options) => {
     const errors = reactRedux.useSelector((state) => state.widget.errors[widgetId] ?? EMPTY_ERRORS);
     const touched = reactRedux.useSelector((state) => state.widget.touched[widgetId] || false);
     const loading = reactRedux.useSelector((state) => state.widget.loading[widgetId] || false);
-    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE$1);
+    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE);
     // Skip value handling for layout widgets (they don't store data values)
     // Infer layout from widget-type
     const isLayoutWidget = config['widget-type'] === 'layout';
@@ -2887,8 +3020,6 @@ const useWidgetCascade = (options) => {
     }, [cascadeConfig, eventBus, dataSource, widgetId, dispatch]);
 };
 
-// Define stable empty array to avoid selector reference issues
-const EMPTY_DATA_SOURCE = [];
 /**
  * Hook for geo widget cascade functionality
  * Handles geo hierarchy building and cascade behavior
@@ -2918,15 +3049,15 @@ const useGeoWidgetCascade = (options) => {
         ? resolveGeoWidgetLevelValue(state.widget.values, widgetId, dataPath, geoConfig)
         : state.widget.values[widgetId]);
     // Memoize selector to avoid returning new array reference
-    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE);
+    const allDataSources = reactRedux.useSelector((state) => state.widget.dataSources);
     // Register parent chain for upstream-ancestor detection (grandparent → grandchild reset)
     React.useEffect(() => {
-        if (!geoConfig) {
+        if (!geoConfig || typeof dataPath !== 'string') {
             return;
         }
-        registerGeoWidgetParent(widgetId, geoConfig.parentWidgetId);
-        return () => unregisterGeoWidgetParent(widgetId);
-    }, [widgetId, geoConfig]);
+        registerGeoWidget(widgetId, geoConfig, dataPath);
+        return () => unregisterGeoWidget(widgetId);
+    }, [widgetId, geoConfig, dataPath]);
     // Keep in-memory builder in sync with persisted hierarchy (reload, cancel→re-edit, etc.)
     React.useEffect(() => {
         if (!geoConfig || typeof dataPath !== 'string') {
@@ -3018,18 +3149,20 @@ const useGeoWidgetCascade = (options) => {
     }, [geoConfig, eventBus, dataSource, widgetId, dataPath, dispatch, groupId]);
     // Handle value changes to build hierarchy
     React.useEffect(() => {
-        if (!geoConfig) {
+        if (!geoConfig || typeof dataPath !== 'string') {
             return;
         }
-        // Skip if value is undefined (it might still be loading or rehydrating)
+        const { level, isLastLevel } = geoConfig;
+        const groupRegistrations = getGeoWidgetRegistrationsInGroup(groupId);
+        const applyGroupRebuild = () => {
+            const resolveMnemonic = createGeoLevelMnemonicResolver(valuesRef.current, allDataSources);
+            rebuildGeoHierarchyFromRegistrations(groupId, valuesRef.current, groupRegistrations, resolveMnemonic);
+            dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
+        };
         // ONLY clear hierarchy if the value is explicitly null or empty string (user action)
         if (currentValue === null || currentValue === '') {
-            const { level, isLastLevel } = geoConfig;
             geoHierarchyBuilder.removeLevelAndBelow(level, groupId);
-            // If we have a dataPath, we need to update Redux with the cleared hierarchy
-            if (dataPath) {
-                dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
-            }
+            applyGroupRebuild();
             if (!isLastLevel && eventBus && lastCascadePublishRef.current !== GEO_LEVEL_CLEARED) {
                 lastCascadePublishRef.current = GEO_LEVEL_CLEARED;
                 eventBus.publish({
@@ -3042,56 +3175,13 @@ const useGeoWidgetCascade = (options) => {
             return;
         }
         if (currentValue === undefined) {
-            return; // Skip if undefined (still initializing)
-        }
-        const { level, isLastLevel } = geoConfig;
-        // Check if hierarchy is already built to prevent endless loops
-        if (dataPath) {
-            const currentHierarchy = getWidgetValue(valuesRef.current, dataPath, widgetId);
-            // If hierarchy JSON is already set and matches current value, skip rebuilding
-            if (currentHierarchy && typeof currentHierarchy === 'object') {
-                // Check if this specific level's value matches the hierarchy
-                const hierarchyArray = currentHierarchy.hierarchy || currentHierarchy.geo_code_hierarchy_json?.hierarchy;
-                if (Array.isArray(hierarchyArray)) {
-                    const currentLevelValue = typeof currentValue === 'object'
-                        ? (currentValue.level_value_id || currentValue.id || currentValue.value)
-                        : currentValue;
-                    const levelData = hierarchyArray.find((l) => l.level === geoConfig.level);
-                    // If this level is already correctly represented in the hierarchy, skip rebuilding
-                    // String conversion ensures comparison works for mixed types
-                    if (levelData && String(levelData.level_value_id) === String(currentLevelValue)) {
-                        return;
-                    }
-                }
+            const hasOwnValue = Object.prototype.hasOwnProperty.call(valuesRef.current, widgetId);
+            if (!hasOwnValue) {
+                return;
             }
         }
-        // Extract level_value_id and level_value_mnemonic from current value
-        // The value could be the ID itself or an object with id/name
-        let level_value_id;
-        let level_value_mnemonic;
-        if (typeof currentValue === 'string' || typeof currentValue === 'number') {
-            // Value is just the ID, need to find mnemonic from data source
-            level_value_id = String(currentValue);
-            // Try to get mnemonic from data source options
-            const option = dataSourceOptions.find((opt) => opt.value === currentValue);
-            level_value_mnemonic = option?.label || String(currentValue);
-        }
-        else if (currentValue && typeof currentValue === 'object') {
-            level_value_id = currentValue.level_value_id || currentValue.id || currentValue.value;
-            level_value_mnemonic = currentValue.level_value_mnemonic || currentValue.name || currentValue.label;
-        }
-        else {
-            return;
-        }
-        // When a widget's own value changes, remove this level and all below from hierarchy first
-        geoHierarchyBuilder.removeLevelAndBelow(level, groupId);
-        // Add level to hierarchy
-        geoHierarchyBuilder.addLevel(level, level_value_id, level_value_mnemonic, groupId);
-        // Build and store hierarchy JSON on every change
-        if (dataPath && geoHierarchyBuilder.buildHierarchyJson(groupId)) {
-            dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
-        }
-    }, [geoConfig, currentValue, widgetId, dataPath, dispatch, dataSourceOptions, groupId]);
+        applyGroupRebuild();
+    }, [geoConfig, currentValue, widgetId, dataPath, dispatch, allDataSources, groupId, eventBus]);
 };
 
 class WidgetRegistry {
@@ -4993,7 +5083,12 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
         // This ensures we use the original widget IDs and data paths
         const sectionWidgets = collectWidgets(originalSection.panels);
         const currentState = store.getState().widget;
-        const currentSchemaData = currentState.values || {};
+        let currentSchemaData = currentState.values || {};
+        const geoRegistrations = collectGeoWidgetRegistrationsFromWidgets(sectionWidgets, namespace);
+        if (geoRegistrations.length > 0) {
+            currentSchemaData = reconcileGeoHierarchiesInValues(currentSchemaData, geoRegistrations, currentState.dataSources || {});
+            dispatch(setValues(currentSchemaData));
+        }
         const isSectionValid = sectionValidate(originalSection, currentSchemaData, dispatch, true);
         if (!isSectionValid) {
             return;
@@ -5059,7 +5154,12 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
         if (isDraft !== false && store && onSectionSave) {
             const sectionWidgets = collectWidgets(originalSection.panels);
             const currentState = store.getState().widget;
-            const currentSchemaData = currentState.values || {};
+            let currentSchemaData = currentState.values || {};
+            const geoRegistrations = collectGeoWidgetRegistrationsFromWidgets(sectionWidgets, namespace);
+            if (geoRegistrations.length > 0) {
+                currentSchemaData = reconcileGeoHierarchiesInValues(currentSchemaData, geoRegistrations, currentState.dataSources || {});
+                dispatch(setValues(currentSchemaData));
+            }
             const isSectionValid = sectionValidate(originalSection, currentSchemaData, dispatch, true);
             if (!isSectionValid)
                 return;
@@ -12988,6 +13088,8 @@ exports.applyCaseControl = applyCaseControl;
 exports.applyDecimalPrecision = applyDecimalPrecision;
 exports.applyMask = applyMask;
 exports.applySharedGeoHierarchyToValues = applySharedGeoHierarchyToValues;
+exports.collectGeoWidgetRegistrationsFromWidgets = collectGeoWidgetRegistrationsFromWidgets;
+exports.createGeoLevelMnemonicResolver = createGeoLevelMnemonicResolver;
 exports.createWidgetStore = createWidgetStore;
 exports.createZodSchema = createZodSchema;
 exports.defaultTheme = defaultTheme;
@@ -13005,6 +13107,7 @@ exports.getCachedApiDataSource = getCachedApiDataSource;
 exports.getFormattedNumberLength = getFormattedNumberLength;
 exports.getGeoDescendantWidgetIds = getGeoDescendantWidgetIds;
 exports.getGeoGroupId = getGeoGroupId;
+exports.getGeoWidgetRegistrationsInGroup = getGeoWidgetRegistrationsInGroup;
 exports.getSchemaDataSource = getSchemaDataSource;
 exports.getStaticDataSource = getStaticDataSource;
 exports.getValueByPath = getValueByPath;
@@ -13015,9 +13118,13 @@ exports.isAllowedKey = isAllowedKey;
 exports.isUpstreamGeoAncestor = isUpstreamGeoAncestor;
 exports.normalizeNumericDefault = normalizeNumericDefault;
 exports.normalizeOptionRules = normalizeOptionRules;
+exports.orderGeoWidgetRegistrations = orderGeoWidgetRegistrations;
 exports.parseDataPath = parseDataPath;
 exports.parseNumber = parseNumber;
+exports.rebuildGeoHierarchyFromRegistrations = rebuildGeoHierarchyFromRegistrations;
+exports.reconcileGeoHierarchiesInValues = reconcileGeoHierarchiesInValues;
 exports.registerDefaultWidgets = registerDefaultWidgets;
+exports.registerGeoWidget = registerGeoWidget;
 exports.registerGeoWidgetParent = registerGeoWidgetParent;
 exports.removeMask = removeMask;
 exports.resetAll = resetAll;
@@ -13043,6 +13150,7 @@ exports.transformDataSourceOptions = transformDataSourceOptions;
 exports.translatePanelConfig = translatePanelConfig;
 exports.translateUISchema = translateUISchema;
 exports.translateWidgetConfig = translateWidgetConfig;
+exports.unregisterGeoWidget = unregisterGeoWidget;
 exports.unregisterGeoWidgetParent = unregisterGeoWidgetParent;
 exports.useBaseWidget = useBaseWidget;
 exports.useGeoWidgetCascade = useGeoWidgetCascade;