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

Author: dbulatovicx32

src/i18n/en-US/messages.json

@@ -956,6 +956,7 @@
                 "enableScreenshots": "Enable Screenshots",
                 "exportPdf": "Export PDF",
                 "showExcelExport": "Enable show excel export (when available)",
+                "xlsxSheetName": "XLSX sheet name",
                 "title": "Export"
             },
             "fontawesome": "Fontawesome",

src/i18n/it-IT/messages.json

@@ -764,6 +764,7 @@
                 "enableScreenshots": "Enable Screenshots",
                 "exportPdf": "Export PDF",
                 "showExcelExport": "Enable show excel export (when available)",
+                "xlsxSheetName": "Nome foglio XLSX",
                 "title": "Export"
             },
             "fontawesome": "Fontawesome",

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

@@ -158,6 +158,7 @@ export interface IWidgetExports {
     }
     showExcelExport: boolean
     showScreenshot?: boolean
+    xlsxSheetName?: string
 }
 
 export interface ITableWidgetHeaders {

src/modules/documentExecution/dashboard/helpers/DashboardExportHelper.ts

@@ -6,6 +6,7 @@ type IDashboardExportState = Pick<IDashboard, 'configuration'> & {
     currentView?: unknown
     selections?: ISelection[]
     drivers?: IDashboardDriver[]
+    locale?: string
 }
 
 type IWidgetExportBody = IWidget & {
@@ -20,6 +21,76 @@ type IWidgetExportBody = IWidget & {
     xlsxStyleEnabled?: boolean
 }
 
+const defaultDashboardExportLocale = 'en-US'
+
+const dashboardExportLocaleAliases: Record<string, string> = {
+    ar: 'ar-EG',
+    'ar-eg': 'ar-EG',
+    ara: 'ar-EG',
+    bg: 'bg-BG',
+    'bg-bg': 'bg-BG',
+    bul: 'bg-BG',
+    da: 'da-DK',
+    'da-dk': 'da-DK',
+    dan: 'da-DK',
+    de: 'de-DE',
+    'de-de': 'de-DE',
+    deu: 'de-DE',
+    en: 'en-US',
+    'en-gb': 'en-GB',
+    'en-us': 'en-US',
+    eng: 'en-US',
+    es: 'es-ES',
+    'es-es': 'es-ES',
+    spa: 'es-ES',
+    fr: 'fr-FR',
+    'fr-fr': 'fr-FR',
+    fra: 'fr-FR',
+    he: 'he-IL',
+    'he-il': 'he-IL',
+    heb: 'he-IL',
+    hu: 'hu-HU',
+    'hu-hu': 'hu-HU',
+    hun: 'hu-HU',
+    it: 'it-IT',
+    'it-it': 'it-IT',
+    ita: 'it-IT',
+    ja: 'ja-JP',
+    'ja-jp': 'ja-JP',
+    jpn: 'ja-JP',
+    ko: 'ko-KR',
+    'ko-kr': 'ko-KR',
+    kor: 'ko-KR',
+    pt: 'pt-BR',
+    'pt-br': 'pt-BR',
+    por: 'pt-BR',
+    ru: 'ru-RU',
+    'ru-ru': 'ru-RU',
+    rus: 'ru-RU',
+    sk: 'sk-SK',
+    'sk-sk': 'sk-SK',
+    slk: 'sk-SK',
+    slo: 'sk-SK',
+    tr: 'tr-TR',
+    'tr-tr': 'tr-TR',
+    tur: 'tr-TR',
+    zh: 'zh-Hans-CN',
+    'zh-cn': 'zh-Hans-CN',
+    'zh-cn-#hans': 'zh-Hans-CN',
+    'zh-hans-cn': 'zh-Hans-CN',
+    zho: 'zh-Hans-CN'
+}
+
+const normalizeDashboardExportLocale = (locale?: string) => {
+    if (!locale) return defaultDashboardExportLocale
+
+    const normalizedLocale = locale.replaceAll('_', '-').trim().toLowerCase()
+    if (dashboardExportLocaleAliases[normalizedLocale]) return dashboardExportLocaleAliases[normalizedLocale]
+
+    const languageCode = normalizedLocale.split('-')[0]
+    return dashboardExportLocaleAliases[languageCode] ?? defaultDashboardExportLocale
+}
+
 export const getDashboardXlsxStyleEnabled = (dashboard: Pick<IDashboard, 'configuration'> | null | undefined) => {
     return dashboard?.configuration?.menuWidgets?.xlsxStyleEnabled ?? false
 }
@@ -32,10 +103,11 @@ export const getDashboardExportVariables = (dashboard: Pick<IDashboard, 'configu
     return dashboard?.configuration?.variables ?? []
 }
 
-export const createDashboardSpreadsheetExportBody = (dashboard: IDashboardExportState) => {
-    const body = deepcopy(dashboard) as IDashboardExportState & { xlsxStyleEnabled?: boolean }
+export const createDashboardSpreadsheetExportBody = (dashboard: IDashboardExportState, locale?: string) => {
+    const body = deepcopy(dashboard) as IDashboardExportState & { xlsxStyleEnabled?: boolean; locale?: string }
     delete body.currentView
     body.xlsxStyleEnabled = getDashboardXlsxStyleEnabled(dashboard)
+    body.locale = normalizeDashboardExportLocale(locale ?? body.locale)
     return body
 }
 
@@ -50,7 +122,7 @@ export const createWidgetExportBody = (type: string, widget: IWidget, dashboard:
         drivers: dashboard.drivers ?? [],
         variables: dashboard.configuration.variables ?? [],
         creationUser,
-        locale
+        locale: normalizeDashboardExportLocale(locale)
     } as IWidgetExportBody
 
     if (dataset?.drivers) body.datasetDrivers = dataset.drivers

src/modules/documentExecution/dashboard/helpers/__tests__/DashboardExportHelper.spec.ts

@@ -65,10 +65,11 @@ describe('getDashboardExportVariables', () => {
 })
 
 describe('createDashboardSpreadsheetExportBody', () => {
-    it('removes currentView and adds the top-level xlsxStyleEnabled flag', () => {
-        const body = createDashboardSpreadsheetExportBody(createDashboard())
+    it('removes currentView, adds the top-level xlsxStyleEnabled flag and normalizes locale', () => {
+        const body = createDashboardSpreadsheetExportBody(createDashboard(), 'eng')
 
         expect(body.currentView).toBeUndefined()
+        expect(body.locale).toBe('en-US')
         expect(body.xlsxStyleEnabled).toBe(true)
         expect(body.configuration.menuWidgets.exportFileName).toBe('dashboard $P{year} $V{region}')
         expect(body.configuration.menuWidgets.xlsxStyleEnabled).toBe(true)
@@ -77,7 +78,7 @@ describe('createDashboardSpreadsheetExportBody', () => {
 
 describe('createWidgetExportBody', () => {
     it('adds xlsxStyleEnabled to spreadsheet exports', () => {
-        const body = createWidgetExportBody('spreadsheet', createWidget(), createDashboard(), 'bi-user', 'en-US')
+        const body = createWidgetExportBody('spreadsheet', createWidget(), createDashboard(), 'bi-user', 'eng')
 
         expect(body.parameters).toEqual([{ name: 'country', value: 'IT' }])
         expect(body.datasetDrivers).toHaveLength(1)

src/modules/documentExecution/dashboard/widget/WidgetEditor/WidgetEditorSettingsTab/common/configuration/WidgetExport.vue

@@ -24,6 +24,9 @@
             <div class="col-12">
                 <q-toggle v-model="exportModel.showExcelExport" :label="$t('dashboard.widgetEditor.export.showExcelExport')" @update:model-value="onEnableExportChanged" dense />
             </div>
+            <div v-if="exportModel.showExcelExport" class="col-12">
+                <q-input v-model="exportModel.xlsxSheetName" :label="$t('dashboard.widgetEditor.export.xlsxSheetName')" :placeholder="getDefaultXlsxSheetName()" outlined dense @blur="onXlsxSheetNameChanged" />
+            </div>
         </div>
     </div>
 </template>
@@ -61,6 +64,9 @@ export default defineComponent({
                 this.setSelectedExport()
             }
         },
+        getDefaultXlsxSheetName() {
+            return this.widgetModel?.settings?.style?.title?.text || `${this.widgetType} ${this.widgetModel?.id ?? ''}`.trim()
+        },
         setSelectedExport() {
             if (!this.exportModel || this.widgetType !== 'table' || !this.exportModel.pdf) return
             if (this.exportModel.pdf.a4landscape) this.selectedExport = 'a4landscape'
@@ -70,6 +76,11 @@ export default defineComponent({
         exportConfigurationChanged() {
             emitter.emit('exportModelChanged', this.exportModel)
         },
+        onXlsxSheetNameChanged() {
+            if (!this.exportModel) return
+            this.exportModel.xlsxSheetName = this.exportModel.xlsxSheetName?.trim() ?? ''
+            this.exportConfigurationChanged()
+        },
         onEnableExportChanged() {
             this.exportConfigurationChanged()
         },

src/modules/documentExecution/main/DocumentExecution.vue

@@ -729,7 +729,7 @@ export default defineComponent({
             if (format.includes('xls')) {
                 format = 'spreadsheet'
                 if (currentDashboard) {
-                    body = createDashboardSpreadsheetExportBody(currentDashboard)
+                    body = createDashboardSpreadsheetExportBody(currentDashboard, this.getCurrentLocale())
                     enrichDashboardBodyWithPivotSortState(body)
                 }
             }