Added await to crossNavigation method

This reverts commit 72cd4e1. Reapply "[KNOWAGE-8574] Using same value for manual input parameter description" This reverts commit 1ce4f63. Reapply "[KNOWAGE-8570] Changed multivalue condition" This reverts commit 0da16dc. Added await to crossNavigation method
KnowageLabs · Aug 9, 2024 · 1365b54 · 1365b54
1 parent 6b7bdab
commit 1365b54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/knowage-vue/src/modules/documentExecution/main/DocumentExecution.vue b/knowage-vue/src/modules/documentExecution/main/DocumentExecution.vue
@@ -359,7 +359,7 @@ export default defineComponent({
             if (this.filtersData?.filterStatus.length > 0) {
                 let tempDrivers = {} as any
                 this.filtersData.filterStatus.forEach((i) => {
-                    tempDrivers[i.urlName] = i.parameterValue.length > 1 ? i.parameterValue.map((p) => p.value) : i.parameterValue[0].value
+                    tempDrivers[i.urlName] = i.multivalue ? i.parameterValue.map((p) => p.value) : i.parameterValue[0].value
                 })
                 tempObj.drivers = tempDrivers
             }
@@ -378,7 +378,7 @@ export default defineComponent({
         },
         async iframeEventsListener(event) {
             if (event.data.type === 'crossNavigation') {
-                this.executeCrossNavigation(event)
+                await this.executeCrossNavigation(event)
             } else if (event.data.type === 'preview') {
                 await this.$http
                     .get(process.env.VUE_APP_HOST_URL + `/knowage/restful-services/1.0/datasets/${event.data.dsLabel}`)
@@ -1033,7 +1033,7 @@ export default defineComponent({
                     } else if (parameter.valueSelection === 'man_in') {
                         if (!parameter.parameterValue[0]) parameter.parameterValue[0] = { value: '', description: '' }
                         parameters[parameter.urlName] = parameter.type === 'NUM' && parameter.parameterValue[0].value ? +parameter.parameterValue[0].value : parameter.parameterValue[0].value
-                        parameters[parameter.urlName + '_field_visible_description'] = parameter.type === 'NUM' && parameter.parameterValue[0].description ? +parameter.parameterValue[0].description : parameter.parameterValue[0].description
+                        parameters[parameter.urlName + '_field_visible_description'] = parameter.parameterValue[0].value
                     } else if (parameter.selectionType === 'TREE' || parameter.selectionType === 'LOOKUP' || parameter.multivalue) {
                         parameters[parameter.urlName] = parameter.parameterValue.map((el: any) => {
                             if(typeof el.value === "object") return el.value[0]

diff --git a/knowage/src/main/webapp/package.json b/knowage/src/main/webapp/package.json
@@ -45,7 +45,7 @@
     "angularjs-slider": "^7.1.0",
     "bootstrap": "4.3.1",
     "canvg": "1.5.3",
-    "codemirror": "5.32.0",
+    "codemirror": "5.65.17",
     "file-saver": "2.0.0",
     "font-awesome": "4.7.0",
     "html2canvas": "1.4.1",