KNOWAGE-9921

- persist ID through saving the dashboard, do not re-generate when opening the dashboard again

Author: dbulatovicx32

src/modules/documentExecution/dashboard/widget/WidgetEditor/helpers/tableWidget/TableWidgetBackendSaveHelper.ts

@@ -1,30 +1,25 @@
-import { ITableWidgetColumnGroups, ITableWidgetConditionalStyles, ITableWidgetConfiguration, IWidgetCrossNavigation, ITableWidgetHeaders, IWidgetInteractions, IWidgetSelection, ITableWidgetSettings, ITableWidgetVisualization, IWidget, IWidgetColumn, ITableWidgetTooltipStyle, ITableWidgetColumnStyles } from '../../../../Dashboard'
-
-const columnIdNameMap = {}
+import { ITableWidgetColumnGroups, ITableWidgetConditionalStyles, ITableWidgetConfiguration, IWidgetCrossNavigation, ITableWidgetHeaders, IWidgetInteractions, IWidgetSelection, ITableWidgetSettings, ITableWidgetVisualization, IWidget, ITableWidgetTooltipStyle, ITableWidgetColumnStyles } from '../../../../Dashboard'
 
 export function formatTableWidgetForSave(widget: IWidget) {
     if (!widget) return
 
-    loadColumnIdNameMap(widget)
-    formatTableSelectedColumns(widget.columns)
+    // Per-column settings (styles, precision, alignment, visualization types, tooltips,
+    // column groups, header rules, sorting, selection, cross navigation) are persisted
+    // using the column's stable `id`, NOT its physical field name (`columnName`).
+    //
+    // The id is what keeps two columns built from the SAME field distinct — e.g. the same
+    // UNIT_SALES field used as two measures with different aggregations/aliases. Collapsing
+    // targets to columnName merged those columns together on reload, so styles were shared
+    // and one alias overwrote the other. We therefore keep `column.id` on the saved model
+    // (see addColumnIdsToWidgetColumns / formatDashboardTableWidgetAfterLoading on load).
     formatTableSettings(widget.settings)
 }
 
-function formatTableSelectedColumns(columns: IWidgetColumn[]) {
-    if (!columns) return
-    columns.forEach((column: IWidgetColumn) => {
-        delete column.id
-    })
-}
-
-const loadColumnIdNameMap = (widget: IWidget) => {
-    widget.columns?.forEach((column: IWidgetColumn) => {
-        if (column.id) columnIdNameMap[column.id] = column.columnName
-    })
-}
-
+// Targets already reference the column `id` in the in-memory model, so persistence is an
+// identity mapping. Kept as a single indirection point so the save/load token format stays
+// symmetric with getColumnId() in TableWidgetFunctions.ts.
 const getColumnName = (columnId: string) => {
-    return columnId ? columnIdNameMap[columnId] : ''
+    return columnId || ''
 }
 
 const formatTableSettings = (widgetSettings: ITableWidgetSettings) => {

src/modules/documentExecution/dashboard/widget/WidgetEditor/helpers/tableWidget/TableWidgetFunctions.ts

@@ -115,7 +115,12 @@ export const removeColumnGroupFromModel = (widgetModel: IWidget, columnGroup: IT
 
 export default removeColumnFromTableWidgetModel
 
+// Legacy fallback map: dashboards saved before per-column settings were persisted by `id`
+// stored their targets as `columnName`. That key is not unique when the same field is reused,
+// which is exactly the bug this replaces — so it is only consulted for tokens that are not
+// already ids. Reset per widget because it is module-level and must not leak between widgets.
 const columnNameIdMap = {}
+const columnIdSet = new Set<string>()
 
 export function formatDashboardTableWidgetAfterLoading(widget: IWidget) {
     if (!widget) return
@@ -125,13 +130,21 @@ export function formatDashboardTableWidgetAfterLoading(widget: IWidget) {
 }
 
 const loadColumnNameIdMap = (widget: IWidget) => {
+    for (const key in columnNameIdMap) delete columnNameIdMap[key]
+    columnIdSet.clear()
     widget.columns?.forEach((column: IWidgetColumn) => {
-        if (column.columnName) columnNameIdMap[column.columnName] = column.id
+        if (column.id) columnIdSet.add(column.id)
+        // First occurrence wins: duplicate columnNames were already ambiguous in the legacy format.
+        if (column.columnName && columnNameIdMap[column.columnName] === undefined) columnNameIdMap[column.columnName] = column.id
     })
 }
 
-const getColumnId = (columnName: string) => {
-    return columnName ? columnNameIdMap[columnName] : ''
+const getColumnId = (token: string) => {
+    if (!token) return ''
+    // Current format: the token is already the column's stable id.
+    if (columnIdSet.has(token)) return token
+    // Legacy format: the token is a columnName that needs mapping to an id.
+    return columnNameIdMap[token] ?? ''
 }
 
 const formatTableSettings = (widgetSettings: ITableWidgetSettings) => {