@quillsql/react 2.6.2 → 2.6.3

package/lib/AddToDashboardModal.js

@@ -31,6 +31,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 // @ts-nocheck
 const react_1 = __importStar(require("react"));
 const date_fns_1 = require("date-fns");
+const dataFetcher_1 = require("./utils/dataFetcher");
 const Context_1 = require("./Context");
 const date_fns_2 = require("date-fns");
 const Chart_1 = __importDefault(require("./Chart"));
@@ -144,39 +145,16 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
     const [schema, setSchema] = (0, react_1.useContext)(Context_1.SchemaContext);
     // const [organization, setOrganization] = useState([]);
     const { dispatch } = (0, react_1.useContext)(Context_1.DashboardContext);
-    const { publicKey, environment } = client;
     // showTableFormatOptions = false;
     // showDateFieldOptions = false;
     // showAccessControlOptions = false;3
     (0, react_1.useEffect)(() => {
         let isSubscribed = true;
         async function getSchema() {
-            const { publicKey, environment } = client;
-            if (!schema.length) {
-                // const response3 = await axios.get(
-                //   `https://quill-344421.uc.r.appspot.com/schema2/${publicKey}/`,
-                //   {
-                //     headers: {
-                //       Authorization: `Bearer `,
-                //       environment: environment || undefined,
-                //     },
-                //   }
-                // );
-                const url = `https://quill-344421.uc.r.appspot.com/schema2/${publicKey}/`;
-                const headers = {
-                    'Content-Type': 'application/json',
-                    Authorization: 'Bearer ',
-                };
-                if (environment) {
-                    headers['environment'] = environment;
-                }
-                const response = await fetch(url, {
-                    method: 'GET',
-                    headers: headers,
-                });
-                const response3 = await response.json();
+            if (!schema || !schema.length) {
+                const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `schema2/${client.publicKey}/`, null, 'GET');
                 if (isSubscribed) {
-                    setSchema(response3.tables);
+                    setSchema(resp.tables);
                 }
             }
         }
@@ -188,7 +166,7 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
         };
     }, [schema]);
     const editChart = async ({ report, setIsSubmitting, values, yAxisFields, columns, query, buckets, showTableFormatOptions, }) => {
-        const { publicKey, customerId, authToken, queryEndpoint, queryHeaders, withCredentials, environment, databaseType, } = client;
+        const { publicKey, customerId } = client;
         const { xAxisLabel, chartName, chartType, xAxisField, xAxisFormat, dashboardName, dateFieldTable, dateField, template, } = values;
         if (!chartName) {
             alert('Please enter a chart name');
@@ -224,71 +202,17 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
         }
         let defaultDateField;
         if (!showDateFieldOptions) {
-            const result = await getReferencedTables(query, databaseType, schema);
+            const result = await getReferencedTables(client, query, schema);
             defaultDateField = {
                 table: result[0].name,
                 field: result[0].columns[0].name,
             };
         }
-        let responseData;
-        if (queryEndpoint) {
-            const url = queryEndpoint;
-            const headers = {
-                'Content-Type': 'application/json',
-                ...queryHeaders,
-            };
-            const body = JSON.stringify({
-                metadata: customerId
-                    ? report
-                        ? {
-                            dashboardItemId: report._id,
-                            name: chartName,
-                            xAxisField,
-                            yAxisFields,
-                            xAxisLabel,
-                            xAxisFormat,
-                            chartType,
-                            dashboardName,
-                            columns: showTableFormatOptions && chartType !== 'table'
-                                ? columns
-                                : [
-                                    ...yAxisFields,
-                                    {
-                                        field: xAxisField,
-                                        label: xAxisLabel,
-                                        format: xAxisFormat,
-                                    },
-                                ],
-                            dateField: showDateFieldOptions
-                                ? { table: dateFieldTable, field: dateField }
-                                : defaultDateField,
-                            query: query,
-                            task: 'create',
-                            orgId: customerId,
-                            template: template,
-                            buckets,
-                        }
-                        : {
-                            name: chartName,
-                            xAxisField,
-                            yAxisFields,
-                            xAxisLabel,
-                            xAxisFormat,
-                            chartType,
-                            dashboardName,
-                            columns: showTableFormatOptions && chartType !== 'table'
-                                ? columns
-                                : [...yAxisFields],
-                            dateField: showDateFieldOptions
-                                ? { table: dateFieldTable, field: dateField }
-                                : defaultDateField,
-                            query: query,
-                            task: 'create',
-                            orgId: customerId,
-                            template: template,
-                            buckets,
-                        }
-                    : {
+        const hostedBody = {
+            metadata: customerId
+                ? report
+                    ? {
+                        dashboardItemId: report._id,
                         name: chartName,
                         xAxisField,
                         yAxisFields,
@@ -311,76 +235,31 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
                             : defaultDateField,
                         query: query,
                         task: 'create',
+                        orgId: customerId,
                         template: template,
                         buckets,
-                    },
-            });
-            const response = await fetch(url, {
-                method: 'POST',
-                headers: headers,
-                body: body,
-                credentials: withCredentials ? 'include' : 'same-origin',
-            });
-            responseData = await response.json();
-            dispatch({
-                type: 'UPDATE_DASHBOARD_ITEM',
-                id: responseData._id,
-                data: {
-                    ...responseData,
-                    rows,
-                    fields,
-                },
-            });
-            setIsOpen(false);
-            if (onAddToDashboardComplete) {
-                onAddToDashboardComplete();
-            }
-        }
-        else {
-            const url = new URL('https://quill-344421.uc.r.appspot.com/dashedit2');
-            url.search = new URLSearchParams(customerId
-                ? {
-                    clientId: publicKey,
-                    customerId: customerId,
-                }
-                : { clientId: publicKey }).toString();
-            const headers = {
-                'Content-Type': 'application/json',
-            };
-            if (environment) {
-                headers['environment'] = environment;
-            }
-            let body2;
-            if (report) {
-                body2 = JSON.stringify({
-                    dashboardItemId: report._id,
-                    name: chartName,
-                    xAxisField,
-                    yAxisFields,
-                    xAxisLabel,
-                    xAxisFormat,
-                    chartType,
-                    dashboardName,
-                    columns: showTableFormatOptions
-                        ? columns
-                        : [
-                            ...yAxisFields,
-                            {
-                                field: xAxisField,
-                                label: xAxisLabel,
-                                format: xAxisFormat,
-                            },
-                        ],
-                    dateField: showDateFieldOptions
-                        ? { table: dateFieldTable, field: dateField }
-                        : defaultDateField,
-                    query: query,
-                    template: template,
-                    buckets,
-                });
-            }
-            else {
-                body2 = JSON.stringify({
+                    }
+                    : {
+                        name: chartName,
+                        xAxisField,
+                        yAxisFields,
+                        xAxisLabel,
+                        xAxisFormat,
+                        chartType,
+                        dashboardName,
+                        columns: showTableFormatOptions && chartType !== 'table'
+                            ? columns
+                            : [...yAxisFields],
+                        dateField: showDateFieldOptions
+                            ? { table: dateFieldTable, field: dateField }
+                            : defaultDateField,
+                        query: query,
+                        task: 'create',
+                        orgId: customerId,
+                        template: template,
+                        buckets,
+                    }
+                : {
                     name: chartName,
                     xAxisField,
                     yAxisFields,
@@ -388,7 +267,7 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
                     xAxisFormat,
                     chartType,
                     dashboardName,
-                    columns: showTableFormatOptions
+                    columns: showTableFormatOptions && chartType !== 'table'
                         ? columns
                         : [
                             ...yAxisFields,
@@ -402,36 +281,86 @@ function AddToDashboardModal({ isOpen, setIsOpen, SelectComponent, TextInputComp
                         ? { table: dateFieldTable, field: dateField }
                         : defaultDateField,
                     query: query,
+                    task: 'create',
                     template: template,
                     buckets,
-                });
-            }
-            try {
-                const response = await fetch(url, {
-                    method: 'POST',
-                    headers: headers,
-                    body: body2,
-                });
-                responseData = await response.json();
-                dispatch({
-                    type: 'UPDATE_DASHBOARD_ITEM',
-                    id: responseData._id,
-                    data: {
-                        ...responseData,
-                        rows,
-                        fields,
-                    },
-                });
-                setIsOpen(false);
-                if (onAddToDashboardComplete) {
-                    onAddToDashboardComplete();
-                }
+                },
+        };
+        const cloudBody = report
+            ? {
+                dashboardItemId: report._id,
+                name: chartName,
+                xAxisField,
+                yAxisFields,
+                xAxisLabel,
+                xAxisFormat,
+                chartType,
+                dashboardName,
+                columns: showTableFormatOptions
+                    ? columns
+                    : [
+                        ...yAxisFields,
+                        {
+                            field: xAxisField,
+                            label: xAxisLabel,
+                            format: xAxisFormat,
+                        },
+                    ],
+                dateField: showDateFieldOptions
+                    ? { table: dateFieldTable, field: dateField }
+                    : defaultDateField,
+                query: query,
+                template: template,
+                buckets,
             }
-            catch (error) {
-                console.error('Failed to parse JSON:', error);
+            : {
+                name: chartName,
+                xAxisField,
+                yAxisFields,
+                xAxisLabel,
+                xAxisFormat,
+                chartType,
+                dashboardName,
+                columns: showTableFormatOptions
+                    ? columns
+                    : [
+                        ...yAxisFields,
+                        {
+                            field: xAxisField,
+                            label: xAxisLabel,
+                            format: xAxisFormat,
+                        },
+                    ],
+                dateField: showDateFieldOptions
+                    ? { table: dateFieldTable, field: dateField }
+                    : defaultDateField,
+                query: query,
+                template: template,
+                buckets,
+            };
+        const searchParams = new URLSearchParams(customerId
+            ? {
+                clientId: publicKey,
+                customerId: customerId,
             }
+            : { clientId: publicKey }).toString();
+        const resp = await (0, dataFetcher_1.getData)(client, `dashedit2?${searchParams}`, 'same-origin', hostedBody, cloudBody);
+        if (resp) {
+            dispatch({
+                type: 'UPDATE_DASHBOARD_ITEM',
+                id: resp._id,
+                data: {
+                    ...resp,
+                    rows,
+                    fields,
+                },
+            });
+        }
+        setIsOpen(false);
+        if (onAddToDashboardComplete) {
+            onAddToDashboardComplete();
         }
-        if (!responseData) {
+        if (!resp) {
             return;
         }
     };
@@ -566,7 +495,7 @@ function ChartForm({ data, fields, theme, saveVisualization, report, editChart,
             if (!query) {
                 return;
             }
-            const result = await getReferencedTables(query, 'PostgresQL', schema);
+            const result = await getReferencedTables(client, query, schema);
             setDateFieldOptions(result);
         };
         fetchReferencedTables();
@@ -691,19 +620,12 @@ const POSTGRES_DATE_TYPES = [
     'time',
     'timetz',
 ];
-async function getReferencedTables(sqlQuery, databaseType, dbTables) {
+async function getReferencedTables(client, sqlQuery, dbTables) {
     //   const parser = new Parser();
     const tables = [];
     const withAliases = [];
-    const response = await fetch('https://quill-344421.uc.r.appspot.com/astify', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ query: sqlQuery }),
-    });
-    const data = await response.json();
-    let ast = data.ast;
+    const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `astify`, { query: sqlQuery });
+    let ast = resp.ast;
     ast = ast.length ? ast[0] : ast;
     if (ast.with && ast.with.length) {
         for (let i = 0; i < ast.with.length; i++) {
@@ -779,7 +701,6 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
     const { dashboardFilters, dashboardFiltersDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const [rows, setRows] = (0, react_1.useState)(null);
     const [isSubmitting, setIsSubmitting] = (0, react_1.useState)(false);
-    const { environment } = client;
     const [xAxisField, setXAxisField] = (0, react_1.useState)(report?.xAxisField ||
         (xAxisOptions && xAxisOptions.length && xAxisOptions[0].value) ||
         '');
@@ -900,46 +821,25 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
     const [selectedTabIndex, setSelectedTabIndex] = (0, react_1.useState)(report && report.template ? 1 : 0);
     react_1.default.useEffect(() => {
         async function getDashboards() {
-            const { publicKey, customerId, environment, queryEndpoint, queryHeaders, withCredentials, } = client;
+            const { publicKey, customerId, queryEndpoint } = client;
             if (customerId || queryEndpoint) {
                 try {
                     let responseData;
-                    if (queryEndpoint) {
-                        const response = await fetch(queryEndpoint, {
-                            method: 'POST',
-                            headers: {
-                                ...queryHeaders,
-                                'Content-Type': 'application/json',
-                            },
-                            body: JSON.stringify({
-                                metadata: customerId
-                                    ? { orgId: customerId, name, task: 'config' }
-                                    : { name: dashboardName, task: 'config' },
-                            }),
-                            credentials: withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
-                        });
-                        responseData = await response.json(); // If the server returns JSON data
-                    }
-                    else {
-                        const url = new URL('https://quill-344421.uc.r.appspot.com/dashconfig');
-                        // Add query parameters to the URL
-                        url.search = new URLSearchParams({
-                            publicKey: publicKey,
-                            orgId: customerId,
-                            name: dashboardName,
-                        }).toString();
-                        const response = await fetch(url, {
-                            method: 'GET',
-                            headers: {
-                                environment: environment || undefined,
-                            },
-                        });
-                        responseData = await response.json();
-                    }
+                    // Add query parameters to the URL
+                    const searchParams = new URLSearchParams({
+                        publicKey: publicKey,
+                        orgId: customerId,
+                        name: name,
+                    }).toString();
+                    const hostedBody = {
+                        metadata: customerId
+                            ? { orgId: customerId, name, task: 'config' }
+                            : { name: dashboardName, task: 'config' },
+                    };
+                    const resp = await (0, dataFetcher_1.getData)(client, `dashconfig?${searchParams}`, 'omit', hostedBody, null, 'GET');
                     const bigFilterObj = {};
-                    if (responseData.dateFilter &&
-                        Object.keys(responseData.dateFilter).length) {
-                        if (responseData.dateFilter.initialRange === 'LAST_90_DAYS') {
+                    if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
+                        if (resp.dateFilter.initialRange === 'LAST_90_DAYS') {
                             const filter = {
                                 startDate: (0, date_fns_1.sub)((0, date_fns_1.startOfToday)(), { days: 90 }),
                                 endDate: new Date(),
@@ -962,7 +862,7 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
                             setDateFilter(filter);
                             bigFilterObj[filter.field] = filter;
                         }
-                        else if (responseData.dateFilter.initialRange === 'LAST_30_DAYS') {
+                        else if (resp.dateFilter.initialRange === 'LAST_30_DAYS') {
                             const filter = {
                                 startDate: (0, date_fns_1.sub)((0, date_fns_1.startOfToday)(), { days: 30 }),
                                 endDate: new Date(),
@@ -987,7 +887,7 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
                             bigFilterObj[filter.field] = filter;
                             // return;
                         }
-                        else if (responseData.dateFilter.initialRange === 'CURRENT_MONTH') {
+                        else if (resp.dateFilter.initialRange === 'CURRENT_MONTH') {
                             const filter = {
                                 startDate: (0, date_fns_2.startOfMonth)(new Date()),
                                 endDate: new Date(),
@@ -1032,8 +932,8 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
                             bigFilterObj[filter.field] = filter;
                         }
                     }
-                    if (responseData.filters && responseData.filters.length) {
-                        Object.values(responseData.filters)
+                    if (resp.filters && resp.filters.length) {
+                        Object.values(resp.filters)
                             .filter(filter => filter.filterType !== 'date')
                             .forEach(filter => {
                             // processFilter(filter);
@@ -1045,7 +945,7 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
                         id: 'tons',
                         data: bigFilterObj,
                     });
-                    if (!responseData.dateFilter) {
+                    if (!resp.dateFilter) {
                         setDateFilter(null);
                     }
                 }
@@ -1058,15 +958,8 @@ function FormikForm({ data, xAxisOptions, yAxisOptions, fieldOptions, dateFieldO
     }, [dashboardName, client]);
     (0, react_1.useEffect)(() => {
         async function getDashNames() {
-            const response2 = await fetch(`https://quill-344421.uc.r.appspot.com/dashnames/${client.publicKey}/`, {
-                method: 'GET',
-                headers: {
-                    Authorization: `Bearer `,
-                    environment: environment,
-                },
-            });
-            const response2Data = await response2.json();
-            setDashboardOptions(response2Data.dashboardNames
+            const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `dashnames/${client.publicKey}/`, null, 'GET');
+            setDashboardOptions(resp.dashboardNames
                 .filter(elem => elem !== null)
                 .map(key => ({ label: key, value: key })));
         }