From 0eef96ad5146a926a5fd3be0c3dab2bf2e1e8089 Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Mon, 1 Apr 2024 17:00:04 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9C=D0=BD=D0=BE=D0=B6=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B2=D1=8B=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BF=D0=B5=D1=81=D0=BE=D1=87=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B5=20jsonata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/components/JSONata/DevTool.vue | 42 +++++++++++++--------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/frontend/components/JSONata/DevTool.vue b/src/frontend/components/JSONata/DevTool.vue
index 7053b8b5..b8bcfd8f 100644
--- a/src/frontend/components/JSONata/DevTool.vue
+++ b/src/frontend/components/JSONata/DevTool.vue
@@ -14,6 +14,7 @@
             <v-autocomplete
               v-if="isOriginAvailable"
               v-model="origin"
+              multiple
               hide-details
               clearable
               v-bind:items="origins"
@@ -28,20 +29,10 @@
                   close
                   v-bind="data.attrs"
                   v-bind:input-value="data.selected"
-                  v-on:click:close="clearOrigin()">
+                  v-on:click:close="() => deleteOrigin(data.item.id)">
                   {{ data.item.id }}
                 </v-chip>
               </template>
-              <template #item="data">
-                <v-list-item-content>
-                  <v-list-item-title>
-                    {{ data.item.id }}
-                  </v-list-item-title>
-                  <v-list-item-subtitle v-if="data.item.title">
-                    {{ data.item.title }}
-                  </v-list-item-subtitle>
-                </v-list-item-content>
-              </template>
             </v-autocomplete>
             <v-menu offset-y>
               <template #activator="{ on, attrs }">
@@ -190,6 +181,9 @@
       this.loadJsonataQuery();
     },
     methods: {
+      deleteOrigin(originId) {
+        this.origin = this.origin.filter(id => id !== originId);
+      },
       clearOrigin() {
         this.origin = null;
         this.doAutoExecute();
@@ -207,7 +201,7 @@
       loadJsonataQuery(param_id) {
         const src = param_id || this.jsonataSource;
         if (!src) return;
-        
+
         const srcSplitPos = src.search(':');
         const jType = src.substring(0, srcSplitPos);
         const jSource = src.substring(srcSplitPos + 1);
@@ -256,12 +250,18 @@
       onExecute(force) {
         this.observer && clearTimeout(this.observer);
         if (this.autoExec || force) {
-          this.observer = setTimeout(() => {
+          this.observer = setTimeout(async() => {
             this.observer = null;
             if (this.origin && this.isOriginAvailable) {
-              datasets().releaseData(`/datasets/${this.origin}`)
-                .then((data) => this.doExecute(data))
-                .catch((e) => this.error = e);
+              this.origin.length > 1 ?
+                this.doExecute(
+                  await Promise.all(this.origin.map(async(origin) => {
+                    return await datasets().releaseData(`/datasets/${origin}`);
+                  })).catch((e) => this.error = e)
+                )
+                : this.doExecute(
+                  await datasets().releaseData(`/datasets/${this.origin[0]}`)
+                ).catch((e) => this.error = e);
             } else this.doExecute();
           }, force ? 10 : 500);
         }
@@ -388,4 +388,14 @@
   background-color: rgb(52, 149, 219) !important;
 }
 
+.console .v-select__selections {
+  flex-wrap: nowrap;
+  width: 270px;
+  overflow-y: scroll;
+}
+
+.console .v-select__selections .v-chip {
+  min-width: fit-content;
+}
+
 </style>

From 610c3d2cfd43ce103c958d7abef0b4da086e89c7 Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Thu, 4 Apr 2024 10:05:59 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/components/JSONata/DevTool.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/components/JSONata/DevTool.vue b/src/frontend/components/JSONata/DevTool.vue
index b8bcfd8f..06576cb5 100644
--- a/src/frontend/components/JSONata/DevTool.vue
+++ b/src/frontend/components/JSONata/DevTool.vue
@@ -256,7 +256,7 @@
               this.origin.length > 1 ?
                 this.doExecute(
                   await Promise.all(this.origin.map(async(origin) => {
-                    return await datasets().releaseData(`/datasets/${origin}`);
+                    return {[ origin ]: await datasets().releaseData(`/datasets/${origin}`) };
                   })).catch((e) => this.error = e)
                 )
                 : this.doExecute(