Bugfix KNOWAGE-8373

KnowageLabs · Jan 22, 2024 · e1487f8 · e1487f8
1 parent 12868c7
commit e1487f8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/...ment/cards/LovsManagementWizardCard/LovsManagementTestDialog/LovsManagementTestDialog.vue b/...ment/cards/LovsManagementWizardCard/LovsManagementTestDialog/LovsManagementTestDialog.vue
@@ -45,6 +45,9 @@ export default defineComponent({
         },
         testLovTreeModel: {
             type: Array
+        },
+        tableModelForTest: {
+            type: Array
         }
     },
     data() {
@@ -97,7 +100,7 @@ export default defineComponent({
         },
         loadTypeModel() {
             this.treeListTypeModel = deepcopy(this.testModel)
-            removeUnusedVisibleColumnsFromModel(this.treeListTypeModel)
+            removeUnusedVisibleColumnsFromModel(this.treeListTypeModel, this.tableModelForTest ?? [])
         },
         loadModel() {
             this.model = deepcopy(this.testLovModel)

diff --git a/...ards/LovsManagementWizardCard/LovsManagementTestDialog/LovsManagementTestDialogHelpers.ts b/...ards/LovsManagementWizardCard/LovsManagementTestDialog/LovsManagementTestDialogHelpers.ts
@@ -1,6 +1,9 @@
-export const removeUnusedVisibleColumnsFromModel = (treeListTypeModel) => {
-    if (!treeListTypeModel || !treeListTypeModel['VISIBLE-COLUMNS'] || !treeListTypeModel.STMT) return
+export const removeUnusedVisibleColumnsFromModel = (treeListTypeModel: any, tableModelForTest: any[]) => {
+    if (!tableModelForTest || !treeListTypeModel || !treeListTypeModel['VISIBLE-COLUMNS'] || !treeListTypeModel.STMT) return
     const visibleColumns = treeListTypeModel['VISIBLE-COLUMNS'].split(',')
-    const filteredColumns = visibleColumns.filter((column: string) => treeListTypeModel.STMT.includes(column.trim()))
+    const filteredColumns = visibleColumns.filter((column: string) => {
+        const index = tableModelForTest.findIndex((columnFromPreviewService: any) => columnFromPreviewService.name === column)
+        return index !== -1
+    })
     treeListTypeModel['VISIBLE-COLUMNS'] = filteredColumns.join(',')
 }
diff --git a/...dules/managers/lovsManagement/cards/LovsManagementWizardCard/LovsManagementWizardCard.vue b/...dules/managers/lovsManagement/cards/LovsManagementWizardCard/LovsManagementWizardCard.vue
@@ -25,7 +25,17 @@
     <LovsManagementProfileAttributesList v-show="profileAttributesDialogVisible" :visible="profileAttributesDialogVisible" :profileAttributes="profileAttributes" @selected="setCodeInput($event)" @close="profileAttributesDialogVisible = false"></LovsManagementProfileAttributesList>
     <LovsManagementParamsDialog v-show="paramsDialogVisible" :visible="paramsDialogVisible" :dependenciesList="dependenciesList" :mode="paramsDialogMode" @preview="onPreview" @close="onParamsDialogClose" @test="onTest"></LovsManagementParamsDialog>
     <LovsManagementPreviewDialog v-show="previewDialogVisible" :visible="previewDialogVisible" :dataForPreview="dataForPreview" :pagination="pagination" @close="onPreviewClose" @pageChanged="previewLov($event, false, true)"></LovsManagementPreviewDialog>
-    <LovsManagementTestDialog v-if="testDialogVisible" :visible="testDialogVisible" :selectedLov="lov" :testModel="treeListTypeModel" :testLovModel="testLovModel" :testLovTreeModel="testLovTreeModel" @close="onTestDialogClose()" @save="onTestSave($event)"></LovsManagementTestDialog>
+    <LovsManagementTestDialog
+        v-if="testDialogVisible"
+        :visible="testDialogVisible"
+        :selectedLov="lov"
+        :testModel="treeListTypeModel"
+        :testLovModel="testLovModel"
+        :testLovTreeModel="testLovTreeModel"
+        :tableModelForTest="tableModelForTest"
+        @close="onTestDialogClose()"
+        @save="onTestSave($event)"
+    ></LovsManagementTestDialog>
 </template>
 
 <script lang="ts">
@@ -400,7 +410,7 @@ export default defineComponent({
             this.setFormatedVisibleValues()
         },
         setColumnValues() {
-            removeUnusedVisibleColumnsFromModel(this.treeListTypeModel)
+            removeUnusedVisibleColumnsFromModel(this.treeListTypeModel, this.tableModelForTest)
             if (this.lov.id || this.treeListTypeModel.LOVTYPE !== 'simple') {
                 this.formatedVisibleValues = this.treeListTypeModel['VISIBLE-COLUMNS']?.length > 0 ? this.treeListTypeModel['VISIBLE-COLUMNS'].split(',') : []
                 this.formatedInvisibleValues = []