Bugfix KNOWAGE-8535

KnowageLabs · Jul 19, 2024 · 4b8ebd7 · 4b8ebd7
2 parents 5d605f6 + 0aee8c3
commit 4b8ebd7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/src/modules/documentExecution/dashboard/DashboardHelpers.ts b/src/modules/documentExecution/dashboard/DashboardHelpers.ts
@@ -16,6 +16,7 @@ import descriptor from './DashboardDescriptor.json'
 import { formatDashboardTableWidgetAfterLoading } from './widget/WidgetEditor/helpers/tableWidget/TableWidgetFunctions'
 import { updateWidgetThemeAndApplyStyle } from './generalSettings/themes/ThemesHelper'
 import { IDashboardTheme } from '@/modules/managers/dashboardThemeManagement/DashboardThememanagement'
+import { formatDashboardDiscoveryWidgetAfterLoading } from './widget/WidgetEditor/helpers/discoveryWidget/DiscoveryWidgetFunctions'
 
 const store = mainStore()
 
@@ -244,6 +245,9 @@ const formatWidget = (widget: IWidget) => {
         case 'table':
             formatDashboardTableWidgetAfterLoading(widget)
             break
+        case 'discovery':
+            formatDashboardDiscoveryWidgetAfterLoading(widget)
+            break
         case 'chartJS':
             formatChartJSWidget(widget)
             break
@@ -281,7 +285,7 @@ export const loadDatasets = async (dashboardModel: IDashboard | any, appStore: a
     await $http
         .get(import.meta.env.VITE_KNOWAGE_CONTEXT + url)
         .then((response: AxiosResponse<any>) => (datasets = response.data ? response.data.item : []))
-        .catch(() => { })
+        .catch(() => {})
     setAllDatasets(datasets)
     appStore.setLoading(false)
     return datasets
@@ -332,7 +336,7 @@ export const loadHtmlGallery = async ($http: any) => {
     await $http
         .get(import.meta.env.VITE_KNOWAGE_API_CONTEXT + `/api/1.0/widgetgallery/widgets/html`)
         .then((response: AxiosResponse<any>) => (galleryItems = response.data))
-        .catch(() => { })
+        .catch(() => {})
     store.setLoading(false)
     return galleryItems
 }
@@ -343,7 +347,7 @@ export const loadPythonGallery = async ($http: any) => {
     await $http
         .get(import.meta.env.VITE_KNOWAGE_API_CONTEXT + `/api/1.0/widgetgallery/widgets/python`)
         .then((response: AxiosResponse<any>) => (galleryItems = response.data))
-        .catch(() => { })
+        .catch(() => {})
     store.setLoading(false)
     return galleryItems
 }
@@ -354,7 +358,7 @@ export const loadCustomChartGallery = async ($http: any) => {
     await $http
         .get(import.meta.env.VITE_KNOWAGE_API_CONTEXT + `/api/1.0/widgetgallery/widgets/chart`)
         .then((response: AxiosResponse<any>) => (galleryItems = response.data))
-        .catch(() => { })
+        .catch(() => {})
     store.setLoading(false)
     return galleryItems
 }
diff --git a/...WidgetEditor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsAccordion.vue b/...WidgetEditor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsAccordion.vue
@@ -23,6 +23,7 @@
                 <WidgetShadowsStyle v-else-if="accordion.type === 'ShadowsStyle'" :widget-model="widgetModel" :theme-style="null" @styleChanged="onStyleChanged"></WidgetShadowsStyle>
                 <WidgetResponsive v-else-if="accordion.type === 'Responsive'" :widget-model="widgetModel"></WidgetResponsive>
                 <TableWidgetTooltips v-else-if="accordion.type === 'Tooltips'" :widget-model="widgetModel"></TableWidgetTooltips>
+                <WidgetSelection v-else-if="accordion.type === 'Selection'" :widget-model="widgetModel"></WidgetSelection>
                 <WidgetCrossNavigation v-else-if="accordion.type === 'CrossNavigation'" :widget-model="widgetModel" :datasets="datasets" :selected-datasets="selectedDatasets" :dashboard-id="dashboardId"></WidgetCrossNavigation>
                 <WidgetInteractionsLinks v-else-if="accordion.type === 'Link'" :widget-model="widgetModel" :datasets="datasets" :selected-datasets="selectedDatasets" :dashboard-id="dashboardId"></WidgetInteractionsLinks>
                 <WidgetPreview v-else-if="accordion.type === 'Preview'" :widget-model="widgetModel" :datasets="datasets" :selected-datasets="selectedDatasets" :dashboard-id="dashboardId"></WidgetPreview>
@@ -49,6 +50,7 @@ import WidgetBordersStyle from '../common/style/WidgetBordersStyle.vue'
 import WidgetShadowsStyle from '../common/style/WidgetShadowsStyle.vue'
 import WidgetResponsive from '../common/responsive/WidgetResponsive.vue'
 import TableWidgetTooltips from '../TableWidget/tooltips/TableWidgetTooltips.vue'
+import WidgetSelection from '../common/interactions/selection/WidgetSelection.vue'
 import WidgetCrossNavigation from '../common/interactions/crossNavigation/WidgetCrossNavigation.vue'
 import WidgetPreview from '../common/interactions/preview/WidgetPreview.vue'
 import TableWidgetHeaders from '../TableWidget/style/TableWidgetHeaders.vue'
@@ -80,6 +82,7 @@ export default defineComponent({
         WidgetPaddingStyle,
         WidgetBackgroundColorStyle,
         TableWidgetTooltips,
+        WidgetSelection,
         WidgetCrossNavigation,
         WidgetPreview,
         DiscoveryWidgetSettingsAccordionHeader,

diff --git a/...Editor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsAccordionHeader.vue b/...Editor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsAccordionHeader.vue
@@ -66,6 +66,8 @@ export default defineComponent({
                     return this.widgetModel.settings.style.padding
                 case 'ShadowsStyle':
                     return this.widgetModel.settings.style.shadows
+                case 'Selection':
+                    return this.widgetModel.settings.interactions.selection
                 case 'CrossNavigation':
                     return this.widgetModel.settings.interactions.crossNavigation
                 case 'Link':

diff --git a/...dgetEditor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsDescriptor.json b/...dgetEditor/WidgetEditorSettingsTab/DiscoveryWidget/DiscoveryWidgetSettingsDescriptor.json
@@ -37,6 +37,10 @@
             }
         ],
         "Interactions": [
+            {
+                "title": "dashboard.widgetEditor.interactions.selection",
+                "type": "Selection"
+            },
             {
                 "title": "dashboard.widgetEditor.interactions.crossNavigation",
                 "type": "CrossNavigation"

diff --git a/...ecution/dashboard/widget/WidgetEditor/helpers/discoveryWidget/DiscoveryWidgetFunctions.ts b/...ecution/dashboard/widget/WidgetEditor/helpers/discoveryWidget/DiscoveryWidgetFunctions.ts
@@ -1,7 +1,7 @@
-import { IWidget, IWidgetColumn } from "@/modules/documentExecution/dashboard/Dashboard"
-import { IDiscoveryWidgetSettings } from "@/modules/documentExecution/dashboard/interfaces/DashboardDiscoveryWidget"
-import * as  tableWidgetDefaultValues from '../tableWidget/TableWidgetDefaultValues'
-import * as  discoveryWidgetDefaultValues from './DiscoveryWidgetDefaultValues'
+import { IWidget, IWidgetColumn } from '@/modules/documentExecution/dashboard/Dashboard'
+import { IDiscoveryWidgetSettings } from '@/modules/documentExecution/dashboard/interfaces/DashboardDiscoveryWidget'
+import * as tableWidgetDefaultValues from '../tableWidget/TableWidgetDefaultValues'
+import * as discoveryWidgetDefaultValues from './DiscoveryWidgetDefaultValues'
 import * as widgetCommonDefaultValues from '../common/WidgetCommonDefaultValues'
 
 export const createNewDiscoveryWidgetSettings = () => {
@@ -18,6 +18,7 @@ export const createNewDiscoveryWidgetSettings = () => {
             crossNavigation: widgetCommonDefaultValues.getDefaultCrossNavigation(),
             link: widgetCommonDefaultValues.getDefaultLinks(),
             preview: widgetCommonDefaultValues.getDefaultPreview(),
+            selection: { enabled: true }
         },
         style: {
             themeName: '',
@@ -48,4 +49,10 @@ export const removeColumnFromDiscoveryWidgetModel = (widgetModel: IWidget, colum
 export const removeColumnNameFromStringArray = (array: string[], columnName: string) => {
     const index = array.findIndex((element: string) => element === columnName)
     if (index !== -1) array.splice(index, 1)
+}
+
+export const formatDashboardDiscoveryWidgetAfterLoading = (widget: IWidget) => {
+    if (!widget || !widget.settings) return
+
+    if (!widget.settings.interactions.selection) widget.settings.interactions.selection = { enabled: true }
 }