Merge branch 'master' into feature/KNOWAGE-9909

Author: dbulatovicx32

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

@@ -1,5 +1,6 @@
 import deepcopy from 'deepcopy'
-import { IDashboard, IDashboardDatasetDriver, IDashboardDriver, ISelection, IVariable, IWidget } from '../Dashboard'
+import { IDashboard, IDashboardDataset, IDashboardDatasetDriver, IDashboardDriver, ISelection, IVariable, IWidget, IWidgetSearch } from '../Dashboard'
+import { getTableWidgetLikeSelections } from './tableWidget/TableWidgetSearchHelper'
 
 type IDashboardExportState = Pick<IDashboard, 'configuration'> & {
     currentView?: unknown
@@ -15,6 +16,7 @@ type IWidgetExportBody = IWidget & {
     creationUser: string | undefined
     locale: string
     datasetDrivers?: IDashboardDatasetDriver[]
+    likeSelections?: Record<string, Record<string, string>>
     xlsxStyleEnabled?: boolean
 }
 
@@ -37,7 +39,9 @@ export const createDashboardSpreadsheetExportBody = (dashboard: IDashboardExport
     return body
 }
 
-export const createWidgetExportBody = (type: string, widget: IWidget, dashboard: IDashboardExportState, creationUser: string | undefined, locale: string) => {
+const getDashboardDatasetLabel = (dataset: IDashboardDataset | undefined) => dataset?.dsLabel ?? dataset?.label
+
+export const createWidgetExportBody = (type: string, widget: IWidget, dashboard: IDashboardExportState, creationUser: string | undefined, locale: string, widgetSearch?: IWidgetSearch) => {
     const dataset = dashboard.configuration.datasets.find((dashboardDataset) => dashboardDataset.id === widget.dataset)
     const body = {
         ...deepcopy(widget),
@@ -51,6 +55,14 @@ export const createWidgetExportBody = (type: string, widget: IWidget, dashboard:
 
     if (dataset?.drivers) body.datasetDrivers = dataset.drivers
     if (type === 'spreadsheet') body.xlsxStyleEnabled = getDashboardXlsxStyleEnabled(dashboard)
+    const likeSelections =
+        widget.type === 'table'
+            ? getTableWidgetLikeSelections(
+                  widgetSearch ?? (widget.search as IWidgetSearch | undefined),
+                  getDashboardDatasetLabel(dataset)
+              )
+            : null
+    if (likeSelections) body.likeSelections = likeSelections
 
     return body
 }

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

@@ -87,6 +87,12 @@ describe('createWidgetExportBody', () => {
         expect(body.xlsxStyleEnabled).toBe(true)
     })
 
+    it('adds likeSelections when the widget export includes an active search', () => {
+        const body = createWidgetExportBody('pdf', createWidget(), createDashboard(), 'bi-user', 'en-US', { searchText: 'it', searchColumns: ['COUNTRY', 'REGION'] })
+
+        expect(body.likeSelections).toEqual({ Sales: { 'COUNTRY,REGION': 'it' } })
+    })
+
     it('does not add xlsxStyleEnabled to non-spreadsheet exports', () => {
         const body = createWidgetExportBody('pdf', createWidget(), createDashboard(), 'bi-user', 'en-US')
 

src/modules/documentExecution/dashboard/helpers/tableWidget/TableWidgetSearchHelper.ts

@@ -0,0 +1,8 @@
+import { IWidgetSearch } from '../../Dashboard'
+
+export const getTableWidgetLikeSelections = (searchParams: IWidgetSearch | undefined, datasetLabel?: string) => {
+    if (!datasetLabel || !searchParams || searchParams.searchText === '' || !searchParams.searchColumns?.length) return null
+
+    const formattedLikeSelections = searchParams.searchColumns.toString()
+    return { [datasetLabel]: { [formattedLikeSelections]: searchParams.searchText } }
+}

src/modules/documentExecution/dashboard/widget/TableWidget/TableWidgetDataProxy.ts

@@ -5,6 +5,7 @@ import { indexedDB } from '@/idb'
 import { md5 } from 'js-md5'
 import deepcopy from 'deepcopy'
 import dashboardStore from '@/modules/documentExecution/dashboard/Dashboard.store'
+import { getTableWidgetLikeSelections } from '../../helpers/tableWidget/TableWidgetSearchHelper'
 
 export const getTableWidgetData = async (dashboardId: any, dashboardConfig: IDashboardConfiguration, widget: IWidget, datasets: IDashboardDataset[], $http: any, initialCall: boolean, selections: ISelection[], searchParams: IWidgetSearch, associativeResponseSelections?: any, resetPagination?: boolean) => {
     const dashStore = dashboardStore()
@@ -21,7 +22,7 @@ export const getTableWidgetData = async (dashboardId: any, dashboardConfig: IDas
         else url = `/restful-services/2.0/datasets/${selectedDataset.dsLabel}/data?offset=-1&size=-1&nearRealtime=${!selectedDataset.cache}`
 
         const postData = formatTableWidgetModelForService(dashboardId, dashboardConfig, widget, selectedDataset, initialCall, selections, associativeResponseSelections)
-        const formattedSelections = getLikeSelections(searchParams, datasetLabel)
+        const formattedSelections = getTableWidgetLikeSelections(searchParams, datasetLabel)
         if (formattedSelections != null) postData.likeSelections = formattedSelections
         let tempResponse = null as any
 
@@ -155,10 +156,3 @@ const getSummaryRow = (widget: IWidget, dashboardConfig: IDashboardConfiguration
 
     return summaryArray
 }
-
-const getLikeSelections = (searchParams: IWidgetSearch, datasetLabel: string) => {
-    if (searchParams && searchParams?.searchText != '' && searchParams?.searchColumns?.length > 0) {
-        const formattedLikeSelections = searchParams.searchColumns.toString()
-        return { [datasetLabel]: { [formattedLikeSelections]: searchParams.searchText } }
-    } else return null
-}

src/modules/documentExecution/dashboard/widget/WidgetController.vue

@@ -355,7 +355,7 @@ export default defineComponent({
         async widgetExport(type: string) {
             this.setLoading(true)
             const widgetToExport = this.widgetModel.type === 'static-pivot-table' ? enrichPivotWidgetWithSortState(this.widgetModel) : this.widgetModel
-            const body = createWidgetExportBody(type, widgetToExport, this.dashStore.$state.dashboards[this.dashboardId], this.document?.creationUser, this.locale)
+            const body = createWidgetExportBody(type, widgetToExport, this.dashStore.$state.dashboards[this.dashboardId], this.document?.creationUser, this.locale, this.search)
             await this.$http
                 .post(import.meta.env.VITE_KNOWAGE_CONTEXT + `/restful-services/1.0/dashboardExport/${type}`, body, {
                     responseType: 'blob',