@quillsql/node 0.2.3 → 0.2.4

package/index.ts

@@ -4,13 +4,13 @@ var PgError = require("pg-error");
 Connection.prototype.parseE = PgError.parse;
 Connection.prototype.parseN = PgError.parse;
 
-const cache : any = {}; //set the cache
+const cache: any = {}; //set the cache
 
-function setCache(key : any, value : any) {
+function setCache(key: any, value: any) {
   cache[key] = value;
 }
 
-function getCache(key : any) {
+function getCache(key: any) {
   return cache[key];
 }
 
@@ -131,31 +131,31 @@ 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
             );
             const { rows } = queryResult;
             newFilters.push({ ...dashConfig.filters[i], options: rows });
-            dashConfig.filters[i].options = rows
+            dashConfig.filters[i].options = rows;
           }
         }
 
         dashConfig = { ...dashConfig, filters: newFilters };
 
         const { fieldToRemove, newQueries } = response.data;
-        
-        for (const newQuery of newQueries) { 
-          const { query } = newQuery
+
+        for (const newQuery of newQueries) {
+          const { query } = newQuery;
           const cacheKey = `config:${orgId}:${newQuery._id}`;
-          setCache(cacheKey, {fieldToRemove, query});
-        };
+          setCache(cacheKey, { fieldToRemove, query });
+        }
         return {
-            ...dashConfig
-          };
-        } 
+          ...dashConfig,
+        };
+      }
 
       if (task === "create") {
         const response = await axios.post(
@@ -174,8 +174,7 @@ module.exports = ({
       }
       if (task === "item") {
         try {
-
-          const {filters } = metadata;
+          const { filters } = metadata;
 
           const resp = await axios.get(
             "https://quill-344421.uc.r.appspot.com/selfhostitem",
@@ -189,38 +188,35 @@ module.exports = ({
               },
             }
           );
-          let fieldToRemove : any, query;
+          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}`)); 
+            getCache(`config:${orgId}:${id}`);
           }
-          else {
-          const response = await axios.post(
-            "https://quill-344421.uc.r.appspot.com/validate",
-            { query: resp.data.queryString },
-            {
-              params: {
-                orgId,
-                filters
-              },
-              headers: {
-                Authorization: `Bearer ${privateKey}`,
-              },
-            }
-          );
-          ({ fieldToRemove, query } = response.data);
 
-          
+          if (!filters && getCache(`config:${orgId}:${id}`)) {
+            ({ fieldToRemove, query } = getCache(`config:${orgId}:${id}`));
+          } else {
+            const response = await axios.post(
+              "https://quill-344421.uc.r.appspot.com/validate",
+              { query: resp.data.queryString },
+              {
+                params: {
+                  orgId,
+                  filters,
+                },
+                headers: {
+                  Authorization: `Bearer ${privateKey}`,
+                },
+              }
+            );
+            ({ fieldToRemove, query } = response.data);
 
-            const cacheKey = `config:${orgId}:${id}`; 
-            setCache(cacheKey, {fieldToRemove, query});
-          };
+            const cacheKey = `config:${orgId}:${id}`;
+            setCache(cacheKey, { fieldToRemove, query });
+          }
           const queryResult = await targetPool.query(query);
-          
+
           return {
             ...resp.data,
             fields: queryResult.fields.filter(
@@ -233,7 +229,6 @@ module.exports = ({
               return row;
             }),
           };
-
         } catch (err) {
           return {
             // @ts-ignore
@@ -245,4 +240,4 @@ module.exports = ({
       }
     },
   };
-};
+};

package/package.json

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