@quillsql/node 0.2.3 → 0.2.5

package/index.ts

@@ -19,6 +19,7 @@ interface QuillConfig {
   databaseConnectionString: string;
   stagingDatabaseConnectionString?: string;
 }
+
 type FieldFormat =
   | "whole_number"
   | "one_decimal_place"
@@ -79,8 +80,9 @@ module.exports = ({
       const { task, query, id } = metadata;
 
       if (task === "query") {
+        try {
         const response = await axios.post(
-          "https://quill-344421.uc.r.appspot.com/validate",
+          `${process.env.SERVER_URL}/validate`,
           { query: query },
           {
             params: {
@@ -89,10 +91,9 @@ module.exports = ({
             headers: {
               Authorization: `Bearer ${privateKey}`,
             },
-          }
+          } 
         );
         const { fieldToRemove } = response.data;
-        try {
           const queryResult = await targetPool.query(response.data.query);
           return {
             ...queryResult,
@@ -116,8 +117,9 @@ module.exports = ({
         }
       }
       if (task === "config") {
+        try {
         const response = await axios.get(
-          "https://quill-344421.uc.r.appspot.com/config",
+          `${process.env.SERVER_URL}/config`,
           {
             params: {
               orgId,
@@ -132,7 +134,8 @@ module.exports = ({
         let dashConfig = response.data;
         let newFilters = [];
         
-        if (dashConfig.filters.length) {
+       
+        if (dashConfig.filters && dashConfig.filters.length) {
           for (let i = 0; i < dashConfig.filters.length; i++) {
             const queryResult = await targetPool.query(
               dashConfig.filters[i].query
@@ -141,29 +144,45 @@ module.exports = ({
             newFilters.push({ ...dashConfig.filters[i], options: rows });
             dashConfig.filters[i].options = rows
           }
+          
         }
 
         dashConfig = { ...dashConfig, filters: newFilters };
 
         const { fieldToRemove, newQueries } = response.data;
         
+        if (newQueries) {
         for (const newQuery of newQueries) { 
           const { query } = newQuery
-          const cacheKey = `config:${orgId}:${newQuery._id}`;
+          const cacheKey = `config:${orgId}:${newQuery._id}}`;
           setCache(cacheKey, {fieldToRemove, query});
         };
+        }
+    
         return {
             ...dashConfig
           };
-        } 
 
+        }
+         catch {
+        return {
+          // @ts-ignore
+          ...err,
+          // @ts-ignore
+          errorMessage: err && err.message ? err.message : "",
+        };
+      }
+    }
+      
       if (task === "create") {
+        try {
         const response = await axios.post(
-          "https://quill-344421.uc.r.appspot.com/item",
+          `${process.env.SERVER_URL}/item`,
           { ...metadata },
           {
             params: {
               orgId,
+              query
             },
             headers: {
               Authorization: `Bearer ${privateKey}`,
@@ -172,13 +191,24 @@ module.exports = ({
         );
         return response.data;
       }
+      catch {
+        return {
+          // @ts-ignore
+          ...err,
+          // @ts-ignore
+          errorMessage: err && err.message ? err.message : "",
+        };
+      }
+    }
+
       if (task === "item") {
         try {
 
           const {filters } = metadata;
+          console.log(filters);
 
           const resp = await axios.get(
-            "https://quill-344421.uc.r.appspot.com/selfhostitem",
+            `${process.env.SERVER_URL}/selfhostitem`,
             {
               params: {
                 id,
@@ -191,36 +221,37 @@ module.exports = ({
           );
           let fieldToRemove : any, query;
 
-          if (getCache(`config:${orgId}:${id}`) && !filters) {
-            getCache(`config:${orgId}:${id}`)
-          }
-
-          if (!filters && getCache(`config:${orgId}:${id}`)) { 
-            ({fieldToRemove, query} = getCache(`config:${orgId}:${id}`)); 
+          if (false && getCache(`config:${orgId}:${id}:${JSON.stringify(filters)}`)) {             
+            ({fieldToRemove, query} = getCache(`config:${orgId}:${id}:${JSON.stringify(filters)}`)); 
           }
           else {
-          const response = await axios.post(
-            "https://quill-344421.uc.r.appspot.com/validate",
-            { query: resp.data.queryString },
-            {
-              params: {
-                orgId,
-                filters
+            const response = await axios.post(
+              `${process.env.SERVER_URL}/validate`,
+              { 
+                dashboardItemId: id,
+                query: resp.data.queryString,
+                filters: filters,
+                orgId: orgId
               },
-              headers: {
-                Authorization: `Bearer ${privateKey}`,
-              },
-            }
-          );
-          ({ fieldToRemove, query } = response.data);
+              {
+                headers: {
+                  Authorization: `Bearer ${privateKey}`
+                }
+              }
+            );
 
-          
+            
+
+          ({ fieldToRemove, query } = response.data);
 
-            const cacheKey = `config:${orgId}:${id}`; 
+            const cacheKey = `config:${orgId}:${id}:${JSON.stringify(filters)}`; 
             setCache(cacheKey, {fieldToRemove, query});
           };
-          const queryResult = await targetPool.query(query);
+
           
+          const queryResult = await targetPool.query(query);
+
+         
           return {
             ...resp.data,
             fields: queryResult.fields.filter(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Quill SDK for Node.js",
   "main": "dist/index.js",
   "scripts": {