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

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
@@ -2701,9 +2697,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 +2741,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 +2777,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 }));
             }
@@ -8757,10 +8759,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 +9263,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 +9994,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) });
 };
 /**
@@ -12997,6 +13001,7 @@ exports.formatPhone = formatPhone;
 exports.formatValue = formatValue;
 exports.geoHierarchyBuilder = geoHierarchyBuilder;
 exports.getApiDataSource = getApiDataSource;
+exports.getCachedApiDataSource = getCachedApiDataSource;
 exports.getFormattedNumberLength = getFormattedNumberLength;
 exports.getGeoDescendantWidgetIds = getGeoDescendantWidgetIds;
 exports.getGeoGroupId = getGeoGroupId;