Merge pull request #1189 from merico-dev/1187-should-be-able-to-force…

…-run-a-query-in-edit-mode 1187 should be able to force run a query in edit mode
merico-dev · Sep 19, 2023 · 4b62e43 · 4b62e43
2 parents 89a7500 + 94b999f
commit 4b62e43
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.34.3",
+  "version": "10.34.4",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.34.3",
+  "version": "10.34.4",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/dashboard/src/model/render-model/dashboard/content/panels/panel.ts b/dashboard/src/model/render-model/dashboard/content/panels/panel.ts
@@ -58,7 +58,7 @@ export const PanelRenderModel = PanelMeta.views((self) => ({
   }))
   .actions((self) => ({
     refreshData() {
-      self.queries.forEach((q) => q.fetchData());
+      self.queries.forEach((q) => q.fetchData(true));
     },
     downloadData() {
       // @ts-expect-error typeof getRoot

diff --git a/dashboard/src/model/render-model/dashboard/content/queries/queries.ts b/dashboard/src/model/render-model/dashboard/content/queries/queries.ts
@@ -94,7 +94,7 @@ export const QueriesRenderModel = types
           console.error(new Error(`[downloadDataByQueryID] query by ID[${queryID}] not found`));
           return;
         }
-        return query.fetchData();
+        return query.fetchData(true);
       },
     };
   });

diff --git a/dashboard/src/model/render-model/dashboard/content/queries/query.ts b/dashboard/src/model/render-model/dashboard/content/queries/query.ts
@@ -91,10 +91,6 @@ export const QueryRenderModel = types
   .actions((self) => {
     return {
       runSQL: flow(function* () {
-        if (!self.inUse) {
-          console.debug(`Skipping query[${self.name}]`);
-          return;
-        }
         if (!self.valid) {
           return;
         }
@@ -129,10 +125,6 @@ export const QueryRenderModel = types
         }
       }),
       runHTTP: flow(function* () {
-        if (!self.inUse) {
-          console.debug(`Skipping query[${self.name}]`);
-          return;
-        }
         if (!self.valid || !self.datasource) {
           return;
         }
@@ -179,9 +171,14 @@ export const QueryRenderModel = types
   })
   .actions((self) => {
     return {
-      fetchData: () => {
+      fetchData: (force: boolean) => {
+        if (!self.inUse && !force) {
+          console.debug(`Skipping query[${self.name}]`);
+          return;
+        }
         return self.typedAsHTTP ? self.runHTTP() : self.runSQL();
       },
+
       beforeDestroy() {
         self.controller?.abort();
       },
@@ -200,7 +197,7 @@ export const QueryRenderModel = types
             const deps = [self.inUse, self.id, self.key, self.formattedSQL, self.pre_process, self.post_process];
             return deps.join('--');
           },
-          self.fetchData,
+          () => self.fetchData(false),
           {
             fireImmediately: true,
             delay: 0,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.34.3",
+  "version": "10.34.4",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.34.3",
+  "version": "10.34.4",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.34.3",
+  "version": "10.34.4",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,7 @@ export const QueriesRenderModel = types @@
               console.error(new Error(`[downloadDataByQueryID] query by ID[${queryID}] not found`));
               return;
             }
-            return query.fetchData();
+            return query.fetchData(true);
           },
         };
       });
@@ Expand Down @@