@openg2p/registry-widgets 1.1.0-dev.3 → 1.1.0-dev.5

package/dist/components/SectionRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SectionRenderer.d.ts","sourceRoot":"","sources":["../../src/components/SectionRenderer.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AA0ClD,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,aAAa,CAAC;IACvB,wBAAwB,CAAC,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;IAC5E,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAClC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAGjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2GAA2G;IAC3G,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAErE,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sFAAsF;IACtF,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oGAAoG;IACpG,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,4FAA4F;IAC5F,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,0HAA0H;IAC1H,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACjE,iGAAiG;IACjG,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAGD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAI,wZAwB7B,oBAAoB,4CAs9CtB,CAAC"}
+{"version":3,"file":"SectionRenderer.d.ts","sourceRoot":"","sources":["../../src/components/SectionRenderer.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AA2ClD,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,aAAa,CAAC;IACvB,wBAAwB,CAAC,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;IAC5E,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAClC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAGjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2GAA2G;IAC3G,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAErE,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sFAAsF;IACtF,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oGAAoG;IACpG,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,4FAA4F;IAC5F,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,0HAA0H;IAC1H,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACjE,iGAAiG;IACjG,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAGD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAI,wZAwB7B,oBAAoB,4CA68CtB,CAAC"}

package/dist/components/SectionsContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SectionsContainer.d.ts","sourceRoot":"","sources":["../../src/components/SectionsContainer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAmB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOpE,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;AAEnE,uHAAuH;AACvH,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,qEAAqE;IACrE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,qFAAqF;IACrF,kBAAkB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAClD;;;OAGG;IACD,iBAAiB,IAAI,cAAc,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IAEpE,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACrE,0JAA0J;IAC1J,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACpD;AA4ED;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAAI,yMAa/B,sBAAsB,4CAwSxB,CAAC"}
+{"version":3,"file":"SectionsContainer.d.ts","sourceRoot":"","sources":["../../src/components/SectionsContainer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAmB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOpE,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;AAEnE,uHAAuH;AACvH,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,qEAAqE;IACrE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,qFAAqF;IACrF,kBAAkB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAClD;;;OAGG;IACD,iBAAiB,IAAI,cAAc,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IAEpE,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACrE,0JAA0J;IAC1J,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACpD;AAoFD;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAAI,yMAa/B,sBAAsB,4CAwSxB,CAAC"}

package/dist/index.esm.js

@@ -3848,6 +3848,52 @@ const sectionValidate = (section, currentSchemaData, dispatch) => {
     return isValid;
 };
 
+/** Table-style widgets that bind to an array path in the store / schema. */
+function isTableLikeWidget(widget) {
+    const w = widget.widget;
+    /** widget-type union in types omits legacy values like simple-table still used at runtime */
+    const t = widget['widget-type'];
+    return (w === 'table' ||
+        w === 'dialog-table' ||
+        w === 'simple-table' ||
+        t === 'table' ||
+        t === 'simple-table');
+}
+/**
+ * Resolve `records` for section save payloads.
+ * - Back-compat: path ending in `.records` (e.g. `regId.records`)
+ * - Else: first array snapshot at a string `widget-data-path` on a table-like widget
+ *   (e.g. `household.members` for dialog-table)
+ */
+function extractTableRecordsFromSnapshot(snapshot, sectionWidgets) {
+    const convention = Object.entries(snapshot).find(([key, value]) => key.endsWith('.records') && Array.isArray(value));
+    if (convention) {
+        return convention[1];
+    }
+    const tablePaths = [];
+    sectionWidgets.forEach((widget) => {
+        if (!isTableLikeWidget(widget))
+            return;
+        const p = widget['widget-data-path'];
+        if (typeof p === 'string' && p.length > 0) {
+            tablePaths.push(p);
+        }
+        else if (p && typeof p === 'object') {
+            Object.values(p).forEach((sub) => {
+                if (typeof sub === 'string' && sub.length > 0)
+                    tablePaths.push(sub);
+            });
+        }
+    });
+    for (const path of tablePaths) {
+        const val = snapshot[path];
+        if (Array.isArray(val)) {
+            return val;
+        }
+    }
+    return [];
+}
+
 /** Root class on readonly label/value rows; SectionRenderer scopes overflow/ellipsis rules here. */
 const READONLY_VALUE_ROW_ROOT_CLASSES = [
     'TextDisplayWidget',
@@ -4213,9 +4259,7 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
             const widgetPath = widget['widget-data-path'];
             if (!widgetPath)
                 return;
-            if (widget['widget-type'] === 'table' ||
-                widget['widget-type'] === 'simple-table' ||
-                widget['widget'] === 'table') {
+            if (isTableLikeWidget(widget)) {
                 hasTable = true;
             }
             if (typeof widgetPath === 'object') {
@@ -4250,8 +4294,7 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
                 },
             ];
         }
-        const tableEntry = Object.entries(snapshot).find(([key, value]) => key.endsWith('.records') && Array.isArray(value));
-        return tableEntry ? tableEntry[1] : [];
+        return extractTableRecordsFromSnapshot(snapshot, widgets);
     };
     // Get original section (without namespace) for building snapshots
     // This ensures we use the original data paths when saving
@@ -4961,10 +5004,7 @@ function buildSectionChanges(section, storeValues, namespace, options) {
         const widgetPath = widget['widget-data-path'];
         if (!widgetPath)
             return;
-        const widgetType = widget['widget-type'];
-        if (widgetType === 'table' ||
-            widgetType === 'simple-table' ||
-            widget.widget === 'table') {
+        if (isTableLikeWidget(widget)) {
             hasTable = true;
         }
         if (typeof widgetPath === 'object') {
@@ -5002,8 +5042,7 @@ function buildSectionChanges(section, storeValues, namespace, options) {
         ];
     }
     else {
-        const tableEntry = Object.entries(snapshot).find(([key, value]) => key.endsWith('.records') && Array.isArray(value));
-        records = tableEntry ? tableEntry[1] : [];
+        records = extractTableRecordsFromSnapshot(snapshot, sectionWidgets);
     }
     const files = [];
     const supportingDocs = section['section-supporting-documents'] || [];
@@ -5029,7 +5068,9 @@ const hasTableWidget = (panels) => {
         // Check widgets in this panel
         if (panel.widgets) {
             for (const widget of panel.widgets) {
-                if (widget.widget === 'table' || widget['widget-type'] === 'table') {
+                if (widget.widget === 'table' ||
+                    widget.widget === 'dialog-table' ||
+                    widget['widget-type'] === 'table') {
                     return true;
                 }
             }
@@ -5051,7 +5092,9 @@ const getTableWidgetColumnSpan = (panels) => {
         // Check widgets in this panel
         if (panel.widgets) {
             for (const widget of panel.widgets) {
-                if (widget.widget === 'table' || widget['widget-type'] === 'table') {
+                if (widget.widget === 'table' ||
+                    widget.widget === 'dialog-table' ||
+                    widget['widget-type'] === 'table') {
                     // Return the widget's column span if specified, otherwise null
                     return widget['widget-column-span'] || null;
                 }
@@ -9188,6 +9231,8 @@ const SelectDisplayValue = ({ config, value }) => {
 const DialogTableWidget = ({ config }) => {
     const { value, error, touched, isEnabled, onChange, config: widgetConfig } = useBaseWidget({ config });
     const { translate, translateConfig } = useWidgetTranslation();
+    const dispatch = useDispatch();
+    const storeValues = useSelector((state) => state.widget?.values ?? {});
     const rows = Array.isArray(value) ? value : [];
     const columns = widgetConfig['widget-data-columns'] || [];
     const operations = widgetConfig['widget-data-operations'] || {};
@@ -9206,6 +9251,9 @@ const DialogTableWidget = ({ config }) => {
     const [dialogMode, setDialogMode] = useState('add');
     const [activeRowIndex, setActiveRowIndex] = useState(null);
     const [formData, setFormData] = useState({});
+    /** Unique per dialog open so Redux widget ids don't reuse stale values across rows/add sessions */
+    const dialogSessionRef = useRef(0);
+    const [dialogSessionId, setDialogSessionId] = useState(0);
     const addDialogTitle = translateConfig(widgetConfig['widget-data-dialog-title-add']) ||
         translate('table.addRecordDialog') ||
         'Add record';
@@ -9220,13 +9268,32 @@ const DialogTableWidget = ({ config }) => {
         });
         return emptyRow;
     }, [columns]);
+    const dialogFieldWidgetId = useCallback((columnKey) => `${widgetConfig['widget-id']}-dlg-${dialogSessionId}-${columnKey}`, [widgetConfig, dialogSessionId]);
+    const resetDialogWidgets = useCallback((sessionId) => {
+        if (sessionId <= 0)
+            return;
+        columns.forEach((col) => {
+            const wid = `${widgetConfig['widget-id']}-dlg-${sessionId}-${col['column-key']}`;
+            dispatch(resetWidget(wid));
+        });
+    }, [columns, widgetConfig, dispatch]);
+    const beginDialogSession = useCallback(() => {
+        dialogSessionRef.current += 1;
+        const nextSession = dialogSessionRef.current;
+        setDialogSessionId(nextSession);
+        return nextSession;
+    }, []);
     const openAddDialog = useCallback(() => {
+        resetDialogWidgets(dialogSessionId);
+        beginDialogSession();
         setDialogMode('add');
         setActiveRowIndex(null);
         setFormData(buildEmptyRow());
         setDialogOpen(true);
-    }, [buildEmptyRow]);
+    }, [buildEmptyRow, beginDialogSession, resetDialogWidgets, dialogSessionId]);
     const openEditDialog = useCallback((rowIndex) => {
+        resetDialogWidgets(dialogSessionId);
+        beginDialogSession();
         const row = rows[rowIndex] || {};
         const nextFormData = buildEmptyRow();
         columns.forEach((col) => {
@@ -9238,18 +9305,33 @@ const DialogTableWidget = ({ config }) => {
         setActiveRowIndex(rowIndex);
         setFormData(nextFormData);
         setDialogOpen(true);
-    }, [rows, columns, buildEmptyRow]);
+    }, [rows, columns, buildEmptyRow, resetDialogWidgets, dialogSessionId, beginDialogSession]);
     const closeDialog = useCallback(() => {
+        const sessionToClear = dialogSessionId;
         setDialogOpen(false);
         setActiveRowIndex(null);
         setFormData({});
-    }, []);
+        resetDialogWidgets(sessionToClear);
+        setDialogSessionId(0);
+    }, [dialogSessionId, resetDialogWidgets]);
     const updateField = useCallback((columnKey, newValue) => {
         setFormData((prev) => ({ ...prev, [columnKey]: newValue }));
     }, []);
+    const collectMergedRowPayload = useCallback(() => {
+        const merged = { ...formData };
+        columns.forEach((col) => {
+            const k = col['column-key'];
+            const wid = dialogFieldWidgetId(k);
+            const fromStore = storeValues[wid];
+            if (fromStore !== undefined)
+                merged[k] = fromStore;
+        });
+        return merged;
+    }, [formData, columns, storeValues, dialogFieldWidgetId]);
     const saveDialog = useCallback(() => {
+        const payload = collectMergedRowPayload();
         if (dialogMode === 'add') {
-            const savedRow = { ...formData, edit_action: 'ADD' };
+            const savedRow = { ...payload, edit_action: 'ADD' };
             onChange([...rows, savedRow]);
             closeDialog();
             return;
@@ -9259,11 +9341,11 @@ const DialogTableWidget = ({ config }) => {
             const currentRow = newRows[activeRowIndex] || {};
             const wasDeleted = currentRow.edit_action === 'DELETE';
             const editAction = wasDeleted ? 'UPDATE' : (currentRow.edit_action ?? 'UPDATE');
-            newRows[activeRowIndex] = { ...currentRow, ...formData, edit_action: editAction };
+            newRows[activeRowIndex] = { ...currentRow, ...payload, edit_action: editAction };
             onChange(newRows);
             closeDialog();
         }
-    }, [dialogMode, formData, onChange, rows, closeDialog, activeRowIndex]);
+    }, [collectMergedRowPayload, dialogMode, onChange, rows, closeDialog, activeRowIndex]);
     const deleteRow = useCallback((rowIndex) => {
         const newRows = rows.filter((_, i) => i !== rowIndex);
         onChange(newRows);
@@ -9351,7 +9433,8 @@ const DialogTableWidget = ({ config }) => {
                                     }, "aria-label": "Close", children: "\u00D7" })] }), jsxRuntimeExports.jsx("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4", style: { maxHeight: '70vh', overflow: 'auto' }, children: columns.map((col) => {
                                 const key = col['column-key'];
                                 const widgetType = col.widget || 'text';
-                                const cellWidgetId = `${widgetConfig['widget-id']}-dialog-${dialogMode}-${key}`;
+                                const cellWidgetId = dialogFieldWidgetId(key);
+                                const initialValue = formData[key] ?? col['widget-data-default'] ?? '';
                                 const fieldConfig = {
                                     ...col,
                                     widget: widgetType,
@@ -9360,10 +9443,10 @@ const DialogTableWidget = ({ config }) => {
                                     'widget-label': col['widget-label'],
                                     'widget-readonly': isReadonly || col['widget-readonly'] === true,
                                     'widget-data-path': undefined,
-                                    'widget-data-default': formData[key] ?? col['widget-data-default'] ?? '',
+                                    'widget-data-default': initialValue,
                                 };
-                                return (jsxRuntimeExports.jsx("div", { className: "min-w-0", children: jsxRuntimeExports.jsx(WidgetRenderer, { config: fieldConfig, schemaData: { [cellWidgetId]: formData[key] ?? col['widget-data-default'] ?? '' }, onValueChange: (_widgetId, newValue) => updateField(key, newValue) }) }, key));
-                            }) }), jsxRuntimeExports.jsxs("div", { className: "flex justify-end gap-3 mt-6", children: [jsxRuntimeExports.jsx("button", { type: "button", onClick: closeDialog, className: "px-4 py-2 text-sm font-medium", style: {
+                                return (jsxRuntimeExports.jsx("div", { className: "min-w-0", children: jsxRuntimeExports.jsx(WidgetRenderer, { config: fieldConfig, schemaData: { [cellWidgetId]: initialValue }, onValueChange: (_widgetId, newValue) => updateField(key, newValue) }) }, `${dialogSessionId}-${key}`));
+                            }) }, `dialog-fields-${dialogSessionId}`), jsxRuntimeExports.jsxs("div", { className: "flex justify-end gap-3 mt-6", children: [jsxRuntimeExports.jsx("button", { type: "button", onClick: closeDialog, className: "px-4 py-2 text-sm font-medium", style: {
                                         borderRadius: 'var(--owt-btn-border-radius, 10px)',
                                         border: '1px solid var(--owt-btn-secondary-border, #C4C4C4)',
                                         backgroundColor: 'var(--owt-btn-secondary-bg, #FFFFFF)',
@@ -9864,7 +9947,9 @@ const HeaderSectionWidget = ({ config }) => {
             return null;
         const ratio = completion / ideal;
         const percent = Math.max(0, Math.min(100, Math.round(ratio * 100)));
-        return { completion, ideal, percent };
+        const completionDisplay = Number.isInteger(completion) ? completion : Math.round(completion);
+        const idealDisplay = Number.isInteger(ideal) ? ideal : Math.round(ideal);
+        return { completion, ideal, completionDisplay, idealDisplay, percent };
     }, [completionScoreRaw, idealScoreRaw]);
     // ── Format options ────────────────────────────────────────────
     const format = (widgetConfig['widget-data-format'] || {});
@@ -10195,7 +10280,7 @@ const HeaderSectionWidget = ({ config }) => {
                                                             if (showReasonRequired && String(e.target.value || '').trim().length > 0) {
                                                                 setShowReasonRequired(false);
                                                             }
-                                                        } }), !isReadonly && (showReasonRequired || isReasonMissing) && isReasonMissing ? (jsxRuntimeExports.jsx("div", { className: "hdr-error-text", children: getLabel('enterReason') })) : null] }))] })] })] }), jsxRuntimeExports.jsx("div", { className: "hdr-right", children: jsxRuntimeExports.jsxs("div", { className: "hdr-right-top", children: [jsxRuntimeExports.jsxs("div", { className: "hdr-meta-col", children: [jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('createdBy'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: createdBy || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('createdAt'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: createdAt || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('lastApprovedBy'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: lastApprovedBy || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('lastApprovedAt'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: lastApprovedAt || '-' })] })] }), score ? (jsxRuntimeExports.jsx("div", { className: "hdr-score-ring", style: { ['--pct']: score.percent }, "aria-label": `Completion score ${score.completion} of ${score.ideal} (${score.percent}%)`, title: `${score.completion} / ${score.ideal} (${score.percent}%)`, children: jsxRuntimeExports.jsx("div", { className: "hdr-score-value", children: String(score.completion) }) })) : null] }) })] })] }));
+                                                        } }), !isReadonly && (showReasonRequired || isReasonMissing) && isReasonMissing ? (jsxRuntimeExports.jsx("div", { className: "hdr-error-text", children: getLabel('enterReason') })) : null] }))] })] })] }), jsxRuntimeExports.jsx("div", { className: "hdr-right", children: jsxRuntimeExports.jsxs("div", { className: "hdr-right-top", children: [jsxRuntimeExports.jsxs("div", { className: "hdr-meta-col", children: [jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('createdBy'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: createdBy || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('createdAt'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: createdAt || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('lastApprovedBy'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: lastApprovedBy || '-' })] }), jsxRuntimeExports.jsxs("div", { className: "hdr-meta-row", children: [jsxRuntimeExports.jsxs("span", { className: "hdr-meta-label", children: [getLabel('lastApprovedAt'), " :"] }), jsxRuntimeExports.jsx("span", { className: "hdr-meta-value", children: lastApprovedAt || '-' })] })] }), score ? (jsxRuntimeExports.jsx("div", { className: "hdr-score-ring", style: { ['--pct']: score.percent }, "aria-label": `Completion score ${score.completionDisplay} of ${score.idealDisplay} (${score.percent}%)`, title: `${score.completionDisplay} / ${score.idealDisplay} (${score.percent}%)`, children: jsxRuntimeExports.jsx("div", { className: "hdr-score-value", children: String(score.completionDisplay) }) })) : null] }) })] })] }));
 };
 
 function getValueByPathOrKey(obj, path) {