Merge branch 'master' into feature/dashboard-editor-rework

Author: dbulatovicx32

src/i18n/en-US/messages.json

@@ -2797,62 +2797,12 @@
     },
     "locale": {
         "dateFormat": "mm/dd/yy",
-        "dayNames": [
-            "Sunday",
-            "Monday",
-            "Tuesday",
-            "Wednesday",
-            "Thursday",
-            "Friday",
-            "Saturday"
-        ],
-        "dayNamesMin": [
-            "Su",
-            "Mo",
-            "Tu",
-            "We",
-            "Th",
-            "Fr",
-            "Sa"
-        ],
-        "dayNamesShort": [
-            "Sun",
-            "Mon",
-            "Tue",
-            "Wed",
-            "Thu",
-            "Fri",
-            "Sat"
-        ],
+        "dayNames": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+        "dayNamesMin": ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
+        "dayNamesShort": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
         "firstDayOfWeek": 0,
-        "monthNames": [
-            "January",
-            "February",
-            "March",
-            "April",
-            "May",
-            "June",
-            "July",
-            "August",
-            "September",
-            "October",
-            "November",
-            "December"
-        ],
-        "monthNamesShort": [
-            "Jan",
-            "Feb",
-            "Mar",
-            "Apr",
-            "May",
-            "Jun",
-            "Jul",
-            "Aug",
-            "Sep",
-            "Oct",
-            "Nov",
-            "Dec"
-        ],
+        "monthNames": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+        "monthNamesShort": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
         "today": "Today",
         "weekHeader": "Wk"
     },
@@ -4784,4 +4734,4 @@
             "title": "Schedulations"
         }
     }
-}
+}

src/modules/documentExecution/dashboard/widget/WidgetEditor/WidgetEditorSettingsTab/MapWidget/configuration/MapControlPanelSettings.vue

@@ -27,6 +27,17 @@
                     <div class="kn-action-handle kn-action-handle-disabled"></div>
                 </div>
             </div>
+
+            <div v-if="widgetModel?.settings?.visualizations?.length" class="p-col-12">
+                <label class="kn-material-input-label">{{ $t('common.fields') }}</label>
+
+                <div v-for="visualization in widgetModel.settings.visualizations" :key="visualization.id ?? visualization.label" class="p-grid p-ai-center p-col-12 p-px-0 p-mt-2 control-panel-visualization-row">
+                    <div class="p-col-12 p-lg-3 control-panel-visualization-label">{{ visualization.label }}</div>
+                    <div class="p-col-12 p-lg-9">
+                        <MultiSelect class="kn-width-full" :model-value="getSelectedFilterColumnNames(visualization)" :options="getAvailableFilterColumns(visualization)" option-label="alias" option-value="name" display="chip" :placeholder="$t('common.fields')" @update:model-value="(value) => onFilterColumnsChanged(value, visualization)" />
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -35,7 +46,6 @@
 import { IWidget } from '@/modules/documentExecution/dashboard/Dashboard'
 import { IMapNormalisedInteractionColumn, IMapWidgetControlPanel, IMapWidgetLayer, IMapWidgetVisualizationType } from '@/modules/documentExecution/dashboard/interfaces/mapWidget/DashboardMapWidget'
 import { defineComponent, PropType } from 'vue'
-
 import { mapActions } from 'pinia'
 import appStore from '@/App.store'
 import { getPropertiesByLayerLabel } from '../../../../MapWidget/MapWidgetDataProxy'

src/modules/documentExecution/dashboard/widget/WidgetEditor/WidgetEditorSettingsTab/MapWidget/dialog/MapDialogSettings.vue

@@ -280,4 +280,14 @@ export default defineComponent({
     border-radius: 4px;
     overflow: hidden;
 }
+
+.map-info-column-row {
+    padding: 0.5rem 0;
+    border-top: 1px solid #e5e7eb;
+}
+
+.map-info-column-label {
+    font-weight: 600;
+    overflow-wrap: anywhere;
+}
 </style>

src/modules/documentExecution/dashboard/widget/WidgetEditor/WidgetEditorSettingsTab/MapWidget/tooltips/MapTooltips.vue

@@ -261,4 +261,14 @@ export default defineComponent({
     border-radius: 4px;
     overflow: hidden;
 }
+
+.map-info-column-row {
+    padding: 0.5rem 0;
+    border-top: 1px solid #e5e7eb;
+}
+
+.map-info-column-label {
+    font-weight: 600;
+    overflow-wrap: anywhere;
+}
 </style>

src/modules/documentExecution/documentDetails/dialogs/dossierDesignerDialog/DocumentDetailDossierDesignerDialog.vue

@@ -151,7 +151,7 @@ import Divider from 'primevue/divider'
 import DashboardControllerSaveDialog from '@/modules/documentExecution/dashboard/DashboardControllerSaveDialog.vue'
 import { formatDateWithLocale } from '@/helpers/commons/localeHelper'
 import { v4 as uuidv4 } from 'uuid'
-import { getDossierDriverParameterUrlName, mergeDossierPlaceholderParameters, normalizeDossierTemplate, serializeDossierDriver } from '@/modules/documentExecution/documentDetails/dialogs/dossierDesignerDialog/DossierDesignerDriversHelper'
+import { getDossierDriverParameterUrlName, mergeDossierPlaceholderParameters, normalizeDossierTemplate, serializeDossierDriver, serializeInheritDriverForPersist } from '@/modules/documentExecution/documentDetails/dialogs/dossierDesignerDialog/DossierDesignerDriversHelper'
 
 export default defineComponent({
     name: 'document-detail-dossier-designer-dialog',
@@ -674,6 +674,7 @@ export default defineComponent({
                 .finally(() => this.setLoading(false))
         },
         async handleDrivers() {
+            this.inheritedDrivers = false
             const objToSave = normalizeDossierTemplate(this.activeTemplate)
             objToSave.placeholders = objToSave.placeholders.filter((x) => x.label)
             const tempDrivers = objToSave.placeholders.filter((x) => x.label)
@@ -713,41 +714,46 @@ export default defineComponent({
                                     dossierUrlName: existing[0].parameterUrlName
                                 }
                             } else {
-                                const newDriver = { ...placeholder.parameters[j] }
-                                newDriver.parameterUrlName = parameterUrlName
-                                newDriver.modifiable = 0
-                                delete newDriver.id
-                                newDriver.biObjectID = this.getDocument()?.id
-                                delete newDriver.type
-                                newDriver.prog = this.document?.drivers?.length ?? 1
+                                const newDriver = serializeInheritDriverForPersist(placeholder.parameters[j], this.getDocument()?.id, this.document?.drivers?.length ?? 1)
+                                if (!newDriver || !newDriver.biObjectID || !newDriver.parameterUrlName) {
+                                    this.setError({
+                                        title: this.$t('common.error.generic'),
+                                        msg: this.$t('documentExecution.dossier.designerDialog.driverNotHandled', {
+                                            driverName: placeholder.parameters[j].label,
+                                            placeholderName: placeholder.imageName
+                                        })
+                                    })
+                                    return
+                                }
 
-                                this.setLoading(true)
-                                await this.$http
-                                    .post(import.meta.env.VITE_KNOWAGE_CONTEXT + `/restful-services/2.0/documentdetails/${newDriver.biObjectID}/drivers`, newDriver, {
+                                try {
+                                    this.setLoading(true)
+                                    await this.$http.post(import.meta.env.VITE_KNOWAGE_CONTEXT + `/restful-services/2.0/documentdetails/${newDriver.biObjectID}/drivers`, newDriver, {
                                         headers: {
                                             'X-Disable-Errors': 'true'
                                         }
                                     })
-                                    .then(() => {
-                                        placeholder.parameters[j] = {
-                                            urlName: newDriver.parameterUrlName,
-                                            type: 'dynamic',
-                                            dossierUrlName: newDriver.dossierUrlName
-                                        }
+
+                                    placeholder.parameters[j] = {
+                                        urlName: newDriver.parameterUrlName,
+                                        type: 'dynamic',
+                                        dossierUrlName: newDriver.parameterUrlName
+                                    }
+                                } catch {
+                                    this.setError({
+                                        title: this.$t('common.error.generic'),
+                                        msg: this.$t('documentExecution.documentDetails.drivers.persistError')
                                     })
-                                    .catch(() =>
-                                        this.setError({
-                                            title: this.$t('common.error.generic'),
-                                            msg: this.$t('documentExecution.documentDetails.drivers.persistError')
-                                        })
-                                    )
-                                    .finally(() => this.setLoading(false))
+                                    return
+                                } finally {
+                                    this.setLoading(false)
+                                }
 
                                 this.setLoading(true)
                                 await this.$http
                                     .get(import.meta.env.VITE_KNOWAGE_CONTEXT + `/restful-services/2.0/documentdetails/${newDriver.biObjectID}/drivers`)
                                     .then((response: AxiosResponse<any>) => {
-                                        if (this.document && this.document.drivers) this.document.drivers = response.data
+                                        if (this.document) this.document.drivers = response.data
                                     })
                                     .finally(() => this.setLoading(false))
                             }

src/modules/documentExecution/documentDetails/dialogs/dossierDesignerDialog/DossierDesignerDriversHelper.ts

@@ -54,6 +54,34 @@ export function serializeDossierDriver(driver: iDossierDriver): iDossierDriver |
     }
 }
 
+export function serializeInheritDriverForPersist(driver: iDossierDriver, biObjectID?: number, prog?: number): Partial<iDriver> | null {
+    const normalizedDriver = normalizeDossierDriver(driver)
+    const parameterUrlName = getDossierDriverParameterUrlName(normalizedDriver)
+    if (!parameterUrlName) return null
+
+    const {
+        id: _id,
+        type: _type,
+        urlName: _urlName,
+        dossierUrlName: _dossierUrlName,
+        urlNameDescription: _urlNameDescription,
+        value: _value,
+        inherit: _inherit,
+        newDriver: _newDriver,
+        numberOfErrors: _numberOfErrors,
+        isChanged: _isChanged,
+        ...persistableDriver
+    } = normalizedDriver
+
+    return {
+        ...persistableDriver,
+        parameterUrlName,
+        biObjectID,
+        modifiable: 0,
+        prog
+    }
+}
+
 export function mergeDossierPlaceholderParameters(existingParameters: iDossierDriver[] = [], availableDrivers: iDriver[] = []): iDossierDriver[] {
     const normalizedExistingParameters = existingParameters.map((driver) => normalizeDossierDriver(driver))
     const mergedParameters = normalizedExistingParameters.map((driver) => {

src/modules/documentExecution/documentDetails/dialogs/dossierDesignerDialog/__tests__/DossierDesignerDriversHelper.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import type { iDriver } from '@/modules/documentExecution/documentDetails/DocumentDetails'
 import type { iDossierDriver } from '../DossierTemplate'
-import { mergeDossierPlaceholderParameters, serializeDossierDriver } from '../DossierDesignerDriversHelper'
+import { mergeDossierPlaceholderParameters, serializeDossierDriver, serializeInheritDriverForPersist } from '../DossierDesignerDriversHelper'
 
 describe('mergeDossierPlaceholderParameters', () => {
     it('preserves saved static values while backfilling parameterUrlName from driver metadata', () => {
@@ -43,3 +43,33 @@ describe('serializeDossierDriver', () => {
         })
     })
 })
+
+describe('serializeInheritDriverForPersist', () => {
+    it('removes dossier-only fields and keeps the document driver payload expected by documentdetails drivers', () => {
+        const serialized = serializeInheritDriverForPersist({
+            id: 9,
+            label: 'Family',
+            parameterUrlName: 'Family',
+            parID: 10,
+            modifiable: 1,
+            prog: 3,
+            parameter: { id: 7, type: 'STRING' } as any,
+            type: 'inherit',
+            urlName: 'Family',
+            dossierUrlName: 'DOSSIER_FAMILY',
+            urlNameDescription: 'Family description',
+            value: 'Food',
+            inherit: true
+        }, 12, 4)
+
+        expect(serialized).toEqual({
+            label: 'Family',
+            parameterUrlName: 'Family',
+            parID: 10,
+            modifiable: 0,
+            prog: 4,
+            parameter: { id: 7, type: 'STRING' },
+            biObjectID: 12
+        })
+    })
+})