From 45e04aeadfea25584b8cdd47c468a595f5f3f64e Mon Sep 17 00:00:00 2001
From: BojanSovticEngIT <81489218+BojanSovticEngIT@users.noreply.github.com>
Date: Thu, 7 Sep 2023 16:28:23 +0200
Subject: [PATCH 1/2] Possible bugfix KNOWAGE-8182
---
src/modules/documentExecution/main/DocumentExecution.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/documentExecution/main/DocumentExecution.vue b/src/modules/documentExecution/main/DocumentExecution.vue
index e5f57794a..42b57bdfe 100644
--- a/src/modules/documentExecution/main/DocumentExecution.vue
+++ b/src/modules/documentExecution/main/DocumentExecution.vue
@@ -76,7 +76,7 @@
:reload-trigger="reloadTrigger"
:hidden-form-data="document.hiddenFormData"
:mode="'dashboard-popup'"
- :filters-data="document.filtersData"
+ :filters-data="filtersData"
:new-dashboard-mode="false"
>
From 85ed0c8ebb75dfad7a9576d7515a305742ed2d3a Mon Sep 17 00:00:00 2001
From: BojanSovticEngIT <81489218+BojanSovticEngIT@users.noreply.github.com>
Date: Fri, 8 Sep 2023 11:44:06 +0200
Subject: [PATCH 2/2] Bugfix KNOWAGE-8182
---
.../documentExecution/dashboard/DashboardController.vue | 2 +-
src/modules/documentExecution/main/DocumentExecution.vue | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/modules/documentExecution/dashboard/DashboardController.vue b/src/modules/documentExecution/dashboard/DashboardController.vue
index 758128fa3..4be3608ae 100644
--- a/src/modules/documentExecution/dashboard/DashboardController.vue
+++ b/src/modules/documentExecution/dashboard/DashboardController.vue
@@ -217,7 +217,7 @@ export default defineComponent({
},
async getData() {
this.loading = true
- this.dashboardId = cryptoRandomString({ length: 16, type: 'base64' })
+ if (!this.dashboardId) this.dashboardId = cryptoRandomString({ length: 16, type: 'base64' })
this.$emit('dashboardIdSet', this.dashboardId)
if (this.filtersData) {
this.drivers = loadDrivers(this.filtersData, this.model)
diff --git a/src/modules/documentExecution/main/DocumentExecution.vue b/src/modules/documentExecution/main/DocumentExecution.vue
index 42b57bdfe..c82f0e27a 100644
--- a/src/modules/documentExecution/main/DocumentExecution.vue
+++ b/src/modules/documentExecution/main/DocumentExecution.vue
@@ -744,8 +744,7 @@ export default defineComponent({
}
}
this.hiddenFormData.append('documentMode', this.documentMode)
-
- this.document.typeCode === 'DATAMART' || this.document.typeCode === 'DOSSIER' || this.document.typeCode === 'OLAP' || (this.document.typeCode === 'DOCUMENT_COMPOSITE' && this.mode === 'dashboard') ? await this.sendHiddenFormData() : postForm.submit()
+ this.document.typeCode === 'DATAMART' || this.document.typeCode === 'DOSSIER' || this.document.typeCode === 'OLAP' || (['DOCUMENT_COMPOSITE', 'DASHBOARD'].includes(this.document.typeCode) && this.mode === 'dashboard') ? await this.sendHiddenFormData() : postForm.submit()
const index = this.breadcrumbs.findIndex((el: any) => el.label === this.document.name)
if (index !== -1) this.breadcrumbs[index].hiddenFormData = this.hiddenFormData
},