@quillsql/node 0.1.7 → 0.1.8

package/index.ts

@@ -11,13 +11,52 @@ interface QuillConfig {
   stagingDatabaseConnectionString?: string;
 }
 
+type FieldFormat =
+  | "whole_number"
+  | "one_decimal_place"
+  | "two_decimal_places"
+  | "dollar_amount"
+  | "MMM_yyyy"
+  | "MMM_dd_yyyy"
+  | "MMM_dd-MMM_dd"
+  | "MMM_dd_hh:mm_ap_pm"
+  | "hh_ap_pm"
+  | "percent"
+  | "string";
+
+interface FormattedColumn {
+  label: string;
+  field: string;
+  chartType: string;
+  format: FieldFormat;
+}
+
+interface QuillRequestMetadata {
+  task: string;
+  // a query to be run
+  query?: string;
+  // a report to be fetched
+  id?: string;
+  filters?: any[];
+  // dashboard item fields
+  name?: string;
+  xAxisField?: string;
+  yAxisFields?: FormattedColumn[];
+  xAxisLabel?: string;
+  xAxisFormat?: FieldFormat;
+  yAxisLabel?: string;
+  chartType?: string;
+  dashboardName?: string;
+  columns?: FormattedColumn[];
+  dateField?: { table: string; field: string };
+}
+
 interface QuillQueryParams {
   orgId: string;
-  task: string;
   query?: string;
   filters?: any[];
   id?: string;
-  data?: object;
+  metadata: QuillRequestMetadata;
   environment?: string;
 }
 
@@ -39,17 +78,17 @@ module.exports = ({
       orgId,
       query,
       filters,
-      task,
       id,
-      data,
+      metadata,
       environment,
     }: QuillQueryParams) => {
       const targetPool = environment === "STAGING" ? stagingPool : pool;
+      const { task } = metadata;
 
       if (task === "query") {
         const response = await axios.post(
           "https://quill-344421.uc.r.appspot.com/validate",
-          { query },
+          { query: metadata?.query },
           {
             params: {
               publicKey,
@@ -75,26 +114,38 @@ module.exports = ({
 
       if (task === "config") {
         const response = await axios.get(
-          "https://quill-344421.uc.r.appspot.com/dashconfig",
+          "https://quill-344421.uc.r.appspot.com/config",
           {
             params: {
               publicKey,
               orgId,
               // @ts-ignore
-              name: data?.name,
+              name: metadata?.name,
             },
             headers: {
               Authorization: `Bearer ${privateKey}`,
             },
           }
         );
-        return response.data;
+        let dashConfig = response.data;
+        if (dashConfig.filters.length) {
+          for (let i = 0; i < dashConfig.filters.length; i++) {
+            // parse query
+            // run query
+            const queryResult = await targetPool.query(
+              dashConfig.filters[i].query
+            );
+            const { rows } = queryResult;
+            dashConfig = { options: rows };
+          }
+        }
+        return dashConfig;
       }
 
       if (task === "create") {
         const response = await axios.post(
           "https://quill-344421.uc.r.appspot.com/item",
-          { data },
+          { ...metadata },
           {
             params: {
               publicKey,
@@ -109,41 +160,47 @@ module.exports = ({
       }
 
       if (task === "item") {
-        const response = await axios.get(
-          "https://quill-344421.uc.r.appspot.com/validateitem",
-          {
-            params:
-              filters && filters.length
-                ? {
-                    publicKey,
-                    orgId,
-                    filters,
-                  }
-                : { publicKey, orgId },
-            headers: {
-              Authorization: `Bearer ${privateKey}`,
-            },
-          }
-        );
-        const queryResult = await targetPool.query(response.data.query);
-        const resp = await axios.get(
-          "https://quill-344421.uc.r.appspot.com/selfhostitem",
+        const response = await axios.post(
+          "https://quill-344421.uc.r.appspot.com/validate",
+          { query: metadata?.query },
           {
             params: {
-              id,
-              orgId,
               publicKey,
+              orgId,
             },
             headers: {
               Authorization: `Bearer ${privateKey}`,
             },
           }
         );
-        return {
-          ...resp.data,
-          rows: queryResult.rows,
-          fields: queryResult.fields,
-        };
+        try {
+          const queryResult = await targetPool.query(response.data.query);
+          const resp = await axios.get(
+            "https://quill-344421.uc.r.appspot.com/selfhostitem",
+            {
+              params: {
+                id,
+                orgId,
+                publicKey,
+              },
+              headers: {
+                Authorization: `Bearer ${privateKey}`,
+              },
+            }
+          );
+          return {
+            ...resp.data,
+            rows: queryResult.rows,
+            fields: queryResult.fields,
+          };
+        } catch (err) {
+          return {
+            // @ts-ignore
+            ...err,
+            // @ts-ignore
+            errorMessage: err && err.message ? err.message : "",
+          };
+        }
       }
     },
   };

package/package.json

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