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

package/dist/index.js

@@ -1083,6 +1083,67 @@ const formatValue = (value, format, widgetType) => {
     return value?.toString() || '';
 };
 
+const apiDataSourceCache = new Map();
+const apiDataSourceInflight = new Map();
+function buildApiRequestContext(dataSource, allValues, levelId) {
+    let depValue = null;
+    if (dataSource.dependsOn) {
+        if (dataSource.dependsOn.includes('.')) {
+            depValue = getValueByPath(allValues, dataSource.dependsOn);
+        }
+        else {
+            depValue = resolveWidgetIdValue(allValues, dataSource.dependsOn);
+        }
+        if (depValue === null || depValue === undefined || depValue === '') {
+            return null;
+        }
+    }
+    const method = dataSource.method || 'GET';
+    const staticParams = { ...dataSource.params };
+    const standardFields = ['type', 'service', 'endpoint', 'url', 'method', 'dependsOn', 'valueKey', 'labelKey', 'headers', 'body', 'params', 'level_id'];
+    for (const [key, value] of Object.entries(dataSource)) {
+        if (!standardFields.includes(key) && value !== undefined && value !== null) {
+            staticParams[key] = value;
+        }
+    }
+    if (levelId) {
+        staticParams.level_id = levelId;
+    }
+    const requestParams = { ...staticParams };
+    if (dataSource.dependsOn && depValue !== null && depValue !== undefined) {
+        const parentValueId = typeof depValue === 'object' && depValue !== null
+            ? (depValue.level_value_id || depValue.id || depValue.value || depValue)
+            : depValue;
+        if (staticParams.level_id) {
+            requestParams.parent_level_value_id = parentValueId;
+        }
+        else {
+            const paramKey = dataSource.dependsOn.split('.').pop() || 'filter';
+            requestParams[paramKey] = parentValueId;
+        }
+    }
+    else if (staticParams.level_id) {
+        requestParams.parent_level_value_id = '';
+    }
+    const service = dataSource.service;
+    const endpoint = dataSource.endpoint;
+    if (!service || !endpoint) {
+        return null;
+    }
+    return { service, endpoint, method, requestParams };
+}
+function buildApiDataSourceCacheKey(service, endpoint, method, requestParams) {
+    return `${service}|${endpoint}|${method}|${JSON.stringify(requestParams)}`;
+}
+/** Return cached API options when already fetched (e.g. duplicate table cells). */
+function getCachedApiDataSource(dataSource, allValues, levelId) {
+    const context = buildApiRequestContext(dataSource, allValues, levelId);
+    if (!context) {
+        return undefined;
+    }
+    const cacheKey = buildApiDataSourceCacheKey(context.service, context.endpoint, context.method, context.requestParams);
+    return apiDataSourceCache.get(cacheKey);
+}
 /**
  * Get static data source options
  */
@@ -1100,98 +1161,33 @@ const getApiDataSource = async (dataSource, allValues, dataSourceRequestHandler,
         return [];
     }
     try {
-        // Get dependency value if exists
-        // dependsOn can be either a data path (e.g., "person.address") or a widget-id
-        let depValue = null;
-        if (dataSource.dependsOn) {
-            if (dataSource.dependsOn.includes('.')) {
-                depValue = getValueByPath(allValues, dataSource.dependsOn);
-            }
-            else {
-                depValue = resolveWidgetIdValue(allValues, dataSource.dependsOn);
-            }
-            if (depValue === null || depValue === undefined || depValue === '') {
-                // If dependency is empty, return empty array
-                return [];
-            }
-        }
-        // Build request parameters
-        const method = dataSource.method || 'GET';
-        // Extract static params from dataSource
-        // Include explicit params object and any additional fields (like level_id)
-        const staticParams = { ...dataSource.params };
-        // Extract additional fields that aren't part of the standard ApiDataSource interface
-        // These are fields like level_id that might be directly on the dataSource
-        // BUT: level_id should come from widget-geo-config.level, not from dataSource
-        const standardFields = ['type', 'service', 'endpoint', 'url', 'method', 'dependsOn', 'valueKey', 'labelKey', 'headers', 'body', 'params', 'level_id'];
-        for (const [key, value] of Object.entries(dataSource)) {
-            if (!standardFields.includes(key) && value !== undefined && value !== null) {
-                staticParams[key] = value;
-            }
-        }
-        // If levelId is provided (from widget-geo-config.level), use it instead of any level_id in dataSource
-        if (levelId) {
-            staticParams.level_id = levelId;
-        }
-        // Build request params object
-        const requestParams = { ...staticParams };
-        // Add dependency value to params
-        if (dataSource.dependsOn && depValue !== null && depValue !== undefined) {
-            // Extract the actual value ID if depValue is an object
-            const parentValueId = typeof depValue === 'object' && depValue !== null
-                ? (depValue.level_value_id || depValue.id || depValue.value || depValue)
-                : depValue;
-            // For geo APIs, use parent_level_value_id
-            if (staticParams.level_id) {
-                requestParams.parent_level_value_id = parentValueId;
-            }
-            else {
-                // For other APIs, use the dependency field name as param key
-                const paramKey = dataSource.dependsOn.split('.').pop() || 'filter';
-                requestParams[paramKey] = parentValueId;
-            }
-        }
-        else if (staticParams.level_id) {
-            // First level has no parent, send empty string as many OpenG2P APIs expect it
-            requestParams.parent_level_value_id = "";
-        }
-        // Get service mnemonic and endpoint (required)
-        const service = dataSource.service;
-        const endpoint = dataSource.endpoint;
-        if (!service) {
-            console.error('[getApiDataSource] API data source missing service mnemonic. Use "service" field instead of "url"');
-            return [];
-        }
-        if (!endpoint) {
-            console.error('[getApiDataSource] API data source missing endpoint. Use "endpoint" field to specify the operation (e.g., "get_g2p_geo_level_values")');
+        const context = buildApiRequestContext(dataSource, allValues, levelId);
+        if (!context) {
             return [];
         }
-        // Call handler — let any throw propagate to the outer catch so it is logged once
-        // by useBaseWidget rather than double-logged here (which can cascade when
-        // intercept-console-error.js converts console.error calls into thrown errors).
-        const response = await dataSourceRequestHandler(service, endpoint, method, requestParams, {
-            headers: dataSource.headers,
-        });
-        // Handle OpenG2P response format (response_body.response_payload)
-        if (response && typeof response === 'object') {
-            if (response.response_body?.response_payload && Array.isArray(response.response_body.response_payload)) {
-                return response.response_body.response_payload;
-            }
-        }
-        // Handle array response
-        if (Array.isArray(response)) {
-            return response;
+        const { service, endpoint, method, requestParams } = context;
+        const cacheKey = buildApiDataSourceCacheKey(service, endpoint, method, requestParams);
+        const cached = apiDataSourceCache.get(cacheKey);
+        if (cached) {
+            return cached;
+        }
+        const inflight = apiDataSourceInflight.get(cacheKey);
+        if (inflight) {
+            return inflight;
+        }
+        const fetchPromise = (async () => {
+            const response = await dataSourceRequestHandler(service, endpoint, method, requestParams, { headers: dataSource.headers });
+            const parsed = Array.isArray(response) ? response : [];
+            apiDataSourceCache.set(cacheKey, parsed);
+            return parsed;
+        })();
+        apiDataSourceInflight.set(cacheKey, fetchPromise);
+        try {
+            return await fetchPromise;
         }
-        // Handle object response (extract array from common keys)
-        if (response && typeof response === 'object') {
-            if (response.data && Array.isArray(response.data)) {
-                return response.data;
-            }
-            if (response.results && Array.isArray(response.results)) {
-                return response.results;
-            }
+        finally {
+            apiDataSourceInflight.delete(cacheKey);
         }
-        return [];
     }
     catch (error) {
         // Rethrow so useBaseWidget's catch can log it with full widget context
@@ -2248,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) {
@@ -2348,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();
@@ -2363,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';
@@ -2701,9 +2830,9 @@ const useBaseWidget = (options) => {
         if (!dataSource) {
             return;
         }
-        // Non-geo readonly widgets skip API loads. Geo widgets still load in readonly so
-        // labels can be resolved and translated on initial page view (not only after Edit).
-        if (dataSource.type === 'api' && isReadonly && !geoConfig) {
+        const loadApiInReadonly = !!geoConfig ||
+            ['select', 'radio', 'checkbox', 'multi-select'].includes(config.widget);
+        if (dataSource.type === 'api' && isReadonly && !loadApiInReadonly) {
             return;
         }
         // For widgets with dependencies, check if dependency value exists
@@ -2745,6 +2874,30 @@ const useBaseWidget = (options) => {
                     // React will call this effect again when the handler is ready
                     return;
                 }
+                const resolveOptionKeys = () => {
+                    if (dataSource.type === 'static') {
+                        return { valueKey: undefined, labelKey: undefined };
+                    }
+                    if (geoConfig) {
+                        return {
+                            valueKey: dataSource.valueKey || 'level_value_id',
+                            labelKey: dataSource.labelKey || 'level_value_mnemonic',
+                        };
+                    }
+                    return { valueKey: dataSource.valueKey, labelKey: dataSource.labelKey };
+                };
+                if (dataSource.type === 'api') {
+                    const levelId = geoConfig?.level;
+                    const cached = getCachedApiDataSource(dataSource, valuesRef.current, levelId);
+                    if (cached) {
+                        const { valueKey, labelKey } = resolveOptionKeys();
+                        dispatch(setDataSource({
+                            widgetId,
+                            data: transformDataSourceOptions(cached, valueKey, labelKey),
+                        }));
+                        return;
+                    }
+                }
                 dispatch(setLoading({ widgetId, loading: true }));
                 let data = [];
                 if (dataSource.type === 'static') {
@@ -2757,31 +2910,13 @@ const useBaseWidget = (options) => {
                         dispatch(setDataSource({ widgetId, data: [] }));
                         return;
                     }
-                    // Extract level_id from widget-geo-config.level if available
                     const levelId = geoConfig?.level;
                     data = await getApiDataSource(dataSource, valuesRef.current, currentHandler, levelId);
                 }
                 else if (dataSource.type === 'schema') {
                     data = getSchemaDataSource(dataSource, schemaData || {});
                 }
-                // Transform to { value, label } format
-                // For geo widgets, default to level_value_id and level_value_mnemonic
-                let valueKey;
-                let labelKey;
-                if (dataSource.type === 'static') {
-                    valueKey = undefined;
-                    labelKey = undefined;
-                }
-                else if (geoConfig) {
-                    // Geo widgets: default to level_value_id and level_value_mnemonic
-                    valueKey = dataSource.valueKey || 'level_value_id';
-                    labelKey = dataSource.labelKey || 'level_value_mnemonic';
-                }
-                else {
-                    // Non-geo widgets: use specified keys or undefined
-                    valueKey = dataSource.valueKey;
-                    labelKey = dataSource.labelKey;
-                }
+                const { valueKey, labelKey } = resolveOptionKeys();
                 const transformed = transformDataSourceOptions(data, valueKey, labelKey);
                 dispatch(setDataSource({ widgetId, data: transformed }));
             }
@@ -2885,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
@@ -2916,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') {
@@ -3016,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({
@@ -3040,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 {
@@ -4991,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;
@@ -5057,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;
@@ -8757,10 +8859,12 @@ const SelectWidget = ({ config }) => {
     if (widgetConfig['widget-readonly']) {
         const label = translateConfig(widgetConfig['widget-label']);
         // Find the selected option's label
-        const selectedOption = dataSourceOptions.find((option) => option.value === value);
+        const selectedOption = dataSourceOptions.find((option) => option.value === value || String(option.value) === String(value));
         const displayValue = selectedOption
             ? translateConfig(selectedOption.label)
-            : (geoDisplayLabel || (value != null && value !== '' ? translateConfig(String(value)) : '-'));
+            : loading
+                ? (geoDisplayLabel || '-')
+                : (geoDisplayLabel || (value != null && value !== '' ? translateConfig(String(value)) : '-'));
         return (jsxRuntimeExports.jsxs("div", { className: "mb-[10px] SelectDisplayWidget flex flex-col sm:flex-row sm:items-start", children: [label && (jsxRuntimeExports.jsxs("div", { className: "text-base text-gray-600 font-medium md:min-w-[120px] sm:pr-4 mb-1 sm:mb-0", style: { fontFamily: 'Roboto, sans-serif' }, title: label, children: [label, ":"] })), jsxRuntimeExports.jsx("div", { className: "flex-1", children: jsxRuntimeExports.jsx("div", { className: "text-base text-gray-900 font-medium", title: String(displayValue ?? ''), children: displayValue }) })] }));
     }
     return (jsxRuntimeExports.jsx("div", { className: "mb-[10px]", children: jsxRuntimeExports.jsxs("div", { className: "flex flex-col sm:flex-row sm:items-start", children: [jsxRuntimeExports.jsx(WidgetFieldLabel, { className: "text-base font-medium text-gray-700 md:min-w-[120px] sm:pr-4 sm:pt-1 mb-1 sm:mb-0", label: translateConfig(widgetConfig['widget-label']), required: isRequired }), jsxRuntimeExports.jsxs("div", { className: "flex-1 min-w-0", children: [jsxRuntimeExports.jsxs("select", { value: value || '', onChange: (e) => onChange(e.target.value === '' ? undefined : e.target.value), onBlur: onBlur, disabled: !isEnabled || loading || widgetConfig['widget-readonly'], className: `w-full sm:w-[180px] max-w-full h-[30px] px-3 border shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 ${(touched && error.length > 0) || (widgetConfig['widget-required'] && (!value || value === ''))
@@ -9259,7 +9363,7 @@ const SelectDisplayValue$1 = ({ config, value }) => {
     if (value === null || value === undefined || value === '') {
         return jsxRuntimeExports.jsx("span", { children: "-" });
     }
-    const selectedOption = dataSourceOptions.find((option) => option.value === value);
+    const selectedOption = dataSourceOptions.find((option) => option.value === value || String(option.value) === String(value));
     return jsxRuntimeExports.jsx("span", { children: selectedOption ? selectedOption.label : String(value) });
 };
 const TableCellText = ({ config, value, onValueChange }) => {
@@ -9990,7 +10094,7 @@ const SelectDisplayValue = ({ config, value }) => {
         return jsxRuntimeExports.jsx("span", { children: "-" });
     if (value === null || value === undefined || value === '')
         return jsxRuntimeExports.jsx("span", { children: "-" });
-    const selectedOption = dataSourceOptions.find((option) => option.value === value);
+    const selectedOption = dataSourceOptions.find((option) => option.value === value || String(option.value) === String(value));
     return jsxRuntimeExports.jsx("span", { children: selectedOption ? selectedOption.label : String(value) });
 };
 /**
@@ -12984,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;
@@ -12997,9 +13103,11 @@ exports.formatPhone = formatPhone;
 exports.formatValue = formatValue;
 exports.geoHierarchyBuilder = geoHierarchyBuilder;
 exports.getApiDataSource = getApiDataSource;
+exports.getCachedApiDataSource = getCachedApiDataSource;
 exports.getFormattedNumberLength = getFormattedNumberLength;
 exports.getGeoDescendantWidgetIds = getGeoDescendantWidgetIds;
 exports.getGeoGroupId = getGeoGroupId;
+exports.getGeoWidgetRegistrationsInGroup = getGeoWidgetRegistrationsInGroup;
 exports.getSchemaDataSource = getSchemaDataSource;
 exports.getStaticDataSource = getStaticDataSource;
 exports.getValueByPath = getValueByPath;
@@ -13010,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;
@@ -13038,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;