Merge branch 'master' of https://github.com/KnowageLabs/Knowage-Server-Frontend

Author: dbulatovicx32

src/modules/documentExecution/dashboard/Dashboard.d.ts

@@ -799,6 +799,7 @@ export interface IDashboardDriver {
     value: string
     urlName: string
     driverLabel: string
+    description?: string
 }
 
 export interface IGalleryItem {

src/modules/documentExecution/dashboard/widget/interactionsHelpers/InteractionsParserHelper.ts

@@ -1,6 +1,21 @@
 import { IDashboardDriver, IVariable } from '../../Dashboard'
 import { columnFieldRegex, parameterTextCompatibilityRegex, variableTextCompatibilityRegex } from '../../helpers/common/DashboardRegexHelper'
 
+const driverDescriptionSuffix = '_description'
+
+const getDriverValueByPlaceholder = (drivers: IDashboardDriver[], parameterName: string, key: 'urlName' | 'name') => {
+    if (!drivers?.length) return ''
+
+    const exactMatchDriver = drivers.find((driver: IDashboardDriver) => driver[key] === parameterName)
+    if (exactMatchDriver) return exactMatchDriver.value ?? ''
+
+    if (!parameterName.endsWith(driverDescriptionSuffix)) return ''
+
+    const driverName = parameterName.substring(0, parameterName.length - driverDescriptionSuffix.length)
+    const descriptionMatchDriver = drivers.find((driver: IDashboardDriver) => driver[key] === driverName)
+    return descriptionMatchDriver?.description ?? ''
+}
+
 export const replaceVariablesPlaceholdersByVariableName = (originalValue: string | number, variables: IVariable[]) => {
     if (!originalValue) return originalValue
 
@@ -35,11 +50,7 @@ export const replaceDriversPlaceholdersByDriverUrlName = (originalString: string
     if (!originalString) return originalString
 
     originalString = originalString.replace(parameterTextCompatibilityRegex, (match: string, parameterName: string) => {
-        if (drivers && drivers.length > 0) {
-            const dashboardVariable = drivers.find((driver: IDashboardDriver) => driver.urlName === parameterName)
-            if (dashboardVariable) return dashboardVariable.value ?? ''
-        }
-        return ''
+        return getDriverValueByPlaceholder(drivers, parameterName, 'urlName')
     })
     return originalString
 }
@@ -48,11 +59,7 @@ export const replaceDriversPlaceholdersByDriverName = (originalString: string, d
     if (!originalString) return originalString
 
     originalString = originalString.replace(parameterTextCompatibilityRegex, (match: string, parameterName: string) => {
-        if (drivers && drivers.length > 0) {
-            const dashboardVariable = drivers.find((driver: IDashboardDriver) => driver.name === parameterName)
-            if (dashboardVariable) return dashboardVariable.value ?? ''
-        }
-        return ''
+        return getDriverValueByPlaceholder(drivers, parameterName, 'name')
     })
     return originalString
 }

src/modules/documentExecution/dashboard/widget/interactionsHelpers/__tests__/InteractionsParserHelper.spec.ts

@@ -21,18 +21,26 @@ describe('replaceVariablesPlaceholdersByVariableName', () => {
 })
 
 describe('replaceDriversPlaceholdersByDriverUrlName', () => {
-    const drivers = [{ name: 'Country', urlName: 'country', value: 'Italy', type: 'STRING', multivalue: false, visible: true, driverLabel: 'COUNTRY' }] as any[]
+    const drivers = [{ name: 'Country', urlName: 'country', value: 'IT', description: 'Italy', type: 'STRING', multivalue: false, visible: true, driverLabel: 'COUNTRY' }] as any[]
 
     it('replaces a driver placeholder using the urlName', () => {
-        expect(replaceDriversPlaceholdersByDriverUrlName('Country: $P{country}', drivers)).toBe('Country: Italy')
+        expect(replaceDriversPlaceholdersByDriverUrlName('Country: $P{country}', drivers)).toBe('Country: IT')
+    })
+
+    it('replaces a driver description placeholder using the urlName', () => {
+        expect(replaceDriversPlaceholdersByDriverUrlName('Country: $P{country_description}', drivers)).toBe('Country: Italy')
     })
 })
 
 describe('replaceVariablesAndDriversPlaceholders', () => {
     const variables = [{ name: 'Year', value: '2024', type: 'static' }] as any[]
-    const drivers = [{ name: 'Country', urlName: 'country', value: 'Italy', type: 'STRING', multivalue: false, visible: true, driverLabel: 'COUNTRY' }] as any[]
+    const drivers = [{ name: 'Country', urlName: 'country', value: 'IT', description: 'Italy', type: 'STRING', multivalue: false, visible: true, driverLabel: 'COUNTRY' }] as any[]
 
     it('resolves mixed static text, variables and document parameters in the same title', () => {
-        expect(replaceVariablesAndDriversPlaceholders('Sales $V{Year} - $P{country}', variables, drivers)).toBe('Sales 2024 - Italy')
+        expect(replaceVariablesAndDriversPlaceholders('Sales $V{Year} - $P{country}', variables, drivers)).toBe('Sales 2024 - IT')
+    })
+
+    it('resolves parameter description placeholders in widget titles', () => {
+        expect(replaceVariablesAndDriversPlaceholders('Sales $V{Year} - $P{country_description}', variables, drivers)).toBe('Sales 2024 - Italy')
     })
 })