@quillsql/react 1.5.3 → 1.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,14 @@
1
+ var __assign = (this && this.__assign) || function () {
2
+ __assign = Object.assign || function(t) {
3
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
4
+ s = arguments[i];
5
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
6
+ t[p] = s[p];
7
+ }
8
+ return t;
9
+ };
10
+ return __assign.apply(this, arguments);
11
+ };
1
12
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
13
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
14
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -48,36 +59,55 @@ export var useQuill = function (chartId) {
48
59
  var isSubscribed = true;
49
60
  function getChartOptions(id) {
50
61
  return __awaiter(this, void 0, void 0, function () {
51
- var publicKey, customerId, environment, resp, e_1;
62
+ var publicKey, customerId, environment, queryEndpoint, queryHeaders, resp, resp1, resp, e_1;
52
63
  return __generator(this, function (_a) {
53
64
  switch (_a.label) {
54
65
  case 0:
55
- if (!isSubscribed) return [3 /*break*/, 4];
66
+ if (!isSubscribed) return [3 /*break*/, 8];
56
67
  if (dashboard[id]) {
57
68
  setData(dashboard[id]);
58
69
  return [2 /*return*/];
59
70
  }
60
- publicKey = client.publicKey, customerId = client.customerId, environment = client.environment;
71
+ publicKey = client.publicKey, customerId = client.customerId, environment = client.environment, queryEndpoint = client.queryEndpoint, queryHeaders = client.queryHeaders;
61
72
  _a.label = 1;
62
73
  case 1:
63
- _a.trys.push([1, 3, , 4]);
64
- return [4 /*yield*/, axios.get('https://quill-344421.uc.r.appspot.com/item', {
74
+ _a.trys.push([1, 7, , 8]);
75
+ if (!queryEndpoint) return [3 /*break*/, 4];
76
+ return [4 /*yield*/, axios.get('https://quill-344421.uc.r.appspot.com/selfhostitem', {
65
77
  params: {
66
78
  id: chartId,
67
79
  orgId: customerId,
68
80
  publicKey: publicKey,
69
81
  },
70
- headers: {
71
- environment: environment || undefined,
72
- },
82
+ environment: environment || undefined,
73
83
  })];
74
84
  case 2:
85
+ resp = _a.sent();
86
+ return [4 /*yield*/, axios.post(queryEndpoint, { query: resp.data.queryString }, { headers: queryHeaders })];
87
+ case 3:
88
+ resp1 = _a.sent();
89
+ setLoading(false);
90
+ setData(__assign(__assign({}, resp.data), { rows: resp1.data.rows, fields: resp1.data.fields }));
91
+ dispatch({ type: 'UPDATE_DASHBOARD_ITEM', id: id, data: resp.data });
92
+ return [3 /*break*/, 6];
93
+ case 4: return [4 /*yield*/, axios.get('https://quill-344421.uc.r.appspot.com/item', {
94
+ params: {
95
+ id: chartId,
96
+ orgId: customerId,
97
+ publicKey: publicKey,
98
+ },
99
+ headers: {
100
+ environment: environment || undefined,
101
+ },
102
+ })];
103
+ case 5:
75
104
  resp = _a.sent();
76
105
  setLoading(false);
77
106
  setData(resp.data);
78
107
  dispatch({ type: 'UPDATE_DASHBOARD_ITEM', id: id, data: resp.data });
79
- return [3 /*break*/, 4];
80
- case 3:
108
+ _a.label = 6;
109
+ case 6: return [3 /*break*/, 8];
110
+ case 7:
81
111
  e_1 = _a.sent();
82
112
  if (typeof e_1 === 'string' || (typeof e_1 === 'object' && e_1 !== null)) {
83
113
  setError(stringifyIfObject(e_1));
@@ -85,8 +115,8 @@ export var useQuill = function (chartId) {
85
115
  else {
86
116
  setError('error');
87
117
  }
88
- return [3 /*break*/, 4];
89
- case 4: return [2 /*return*/];
118
+ return [3 /*break*/, 8];
119
+ case 8: return [2 /*return*/];
90
120
  }
91
121
  });
92
122
  });
@@ -1 +1 @@
1
- {"version":3,"file":"useQuill.js","sourceRoot":"","sources":["../../src/hooks/useQuill.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AA6C1B,MAAM,CAAC,IAAM,QAAQ,GAAG,UACtB,OAAe;IAMf,aAAa;IACP,IAAA,KAA0B,UAAU,CAAC,gBAAgB,CAAC,EAApD,SAAS,eAAA,EAAE,QAAQ,cAAiC,CAAC;IACtD,IAAA,MAAM,GAAI,UAAU,CAAC,aAAa,CAAC,GAA7B,CAA8B;IACrC,IAAA,KAAkB,QAAQ,CAAgB,IAAI,CAAC,EAA9C,IAAI,QAAA,EAAE,OAAO,QAAiC,CAAC;IAChD,IAAA,KAAwB,QAAQ,CAAC,IAAI,CAAC,EAArC,OAAO,QAAA,EAAE,UAAU,QAAkB,CAAC;IACvC,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IAExD,SAAS,CAAC;QACR,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,SAAe,eAAe,CAAC,EAAU;;;;;;iCACnC,YAAY,EAAZ,wBAAY;4BACd,IAAI,SAAS,CAAC,EAAE,CAAC,EAAE;gCACjB,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;gCACvB,sBAAO;6BACR;4BAEO,SAAS,GAA8B,MAAM,UAApC,EAAE,UAAU,GAAkB,MAAM,WAAxB,EAAE,WAAW,GAAK,MAAM,YAAX,CAAY;;;;4BAEvC,qBAAM,KAAK,CAAC,GAAG,CAC1B,4CAA4C,EAC5C;oCACE,MAAM,EAAE;wCACN,EAAE,EAAE,OAAO;wCACX,KAAK,EAAE,UAAU;wCACjB,SAAS,EAAE,SAAS;qCACrB;oCACD,OAAO,EAAE;wCACP,WAAW,EAAE,WAAW,IAAI,SAAS;qCACtC;iCACF,CACF,EAAA;;4BAZK,IAAI,GAAG,SAYZ;4BACD,UAAU,CAAC,KAAK,CAAC,CAAC;4BAClB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BACnB,QAAQ,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE,IAAA,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;;;;4BAEjE,IAAI,OAAO,GAAC,KAAK,QAAQ,IAAI,CAAC,OAAO,GAAC,KAAK,QAAQ,IAAI,GAAC,KAAK,IAAI,CAAC,EAAE;gCAClE,QAAQ,CAAC,iBAAiB,CAAC,GAAC,CAAC,CAAC,CAAC;6BAChC;iCAAM;gCACL,QAAQ,CAAC,OAAO,CAAC,CAAC;6BACnB;;;;;;SAGN;QACD,IAAI,OAAO,IAAI,CAAC,IAAI,EAAE;YACpB,eAAe,CAAC,OAAO,CAAC,CAAC;SAC1B;QACD,OAAO;YACL,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAEzB,OAAO,EAAE,IAAI,MAAA,EAAE,OAAO,SAAA,EAAE,KAAK,OAAA,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,SAAS,iBAAiB,CAAC,CAAkB;IAC3C,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QACzB,8BAA8B;QAC9B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,EAAE;QAC9C,gCAAgC;QAChC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,CAAC,CAAC,CAAC,0CAA0C;AACtD,CAAC"}
1
+ {"version":3,"file":"useQuill.js","sourceRoot":"","sources":["../../src/hooks/useQuill.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -2,4 +2,6 @@ export { default as Dashboard } from './Dashboard';
2
2
  export { default as QuillProvider } from './QuillProvider';
3
3
  export { default as Chart } from './Chart';
4
4
  export { default as Table } from './Table';
5
+ export { default as SQLEditor } from './SQLEditor';
6
+ export { default as ReportBuilder } from './ReportBuilder';
5
7
  export { useQuill } from './hooks/useQuill';
package/lib/index.js CHANGED
@@ -3,5 +3,7 @@ export { default as Dashboard } from './Dashboard';
3
3
  export { default as QuillProvider } from './QuillProvider';
4
4
  export { default as Chart } from './Chart';
5
5
  export { default as Table } from './Table';
6
+ export { default as SQLEditor } from './SQLEditor';
7
+ export { default as ReportBuilder } from './ReportBuilder';
6
8
  export { useQuill } from './hooks/useQuill';
7
9
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quillsql/react",
3
- "version": "1.5.3",
3
+ "version": "1.5.5",
4
4
  "access": "public",
5
5
  "description": "Quill React components for building dashboards and reporting.",
6
6
  "main": "lib/index.js",
@@ -13,13 +13,15 @@
13
13
  "prettier:fix": "prettier --write 'src/**/*.{ts,tsx}'",
14
14
  "prefix-classnames": "node ./prefix-classnames.js"
15
15
  },
16
- "keywords": [],
17
16
  "author": "",
18
17
  "license": "ISC",
19
18
  "dependencies": {
19
+ "@heroicons/react": "^2.0.18",
20
+ "@monaco-editor/react": "^4.5.1",
20
21
  "axios": "^1.3.5",
21
22
  "date-fns": "^2.29.3",
22
23
  "date-fns-tz": "^2.0.0",
24
+ "react-loader-spinner": "^5.3.4",
23
25
  "react-loading-skeleton": "^3.2.1",
24
26
  "recharts": "^2.5.0",
25
27
  "tslib": "^2.5.0",
package/src/Chart.tsx CHANGED
@@ -530,6 +530,7 @@ interface ChartProps {
530
530
  dateFilter?: any;
531
531
  theme: any;
532
532
  isDateFilter?: boolean;
533
+ query?: string;
533
534
  }
534
535
 
535
536
  // @ts-ignore
@@ -547,12 +548,14 @@ const Chart = ({
547
548
  colors,
548
549
  containerStyle,
549
550
  dateFilter,
551
+ query,
550
552
  }: {
551
553
  chartId: string;
552
554
  config?: any;
553
555
  colors?: string[];
554
556
  containerStyle?: React.CSSProperties;
555
557
  dateFilter?: boolean;
558
+ query?: string;
556
559
  }) => {
557
560
  const { dispatch, dashboard } = useContext(DashboardContext);
558
561
  const { dateFilterObj } = useContext(DateFilterContext);
@@ -575,6 +578,7 @@ const Chart = ({
575
578
  theme={theme}
576
579
  isDateFilter={dateFilter}
577
580
  dashboardFilters={dashboardFilters}
581
+ query={query}
578
582
  />
579
583
  );
580
584
  };
@@ -649,6 +653,7 @@ const ChartUpdater: React.FC<ChartProps> = ({
649
653
  theme,
650
654
  isDateFilter,
651
655
  dashboardFilters,
656
+ query,
652
657
  }) => {
653
658
  const [chartConfig, setChartConfig] = useState<any>(config || null);
654
659
  const [loading, setLoading] = useState(true);
@@ -700,63 +705,133 @@ const ChartUpdater: React.FC<ChartProps> = ({
700
705
  setLoading(false);
701
706
  return;
702
707
  }
703
- const { publicKey, customerId, environment } = client;
708
+ const {
709
+ publicKey,
710
+ customerId,
711
+ environment,
712
+ queryEndpoint,
713
+ queryHeaders,
714
+ } = client;
704
715
 
705
716
  setLoading(true);
706
717
  try {
707
- const resp = await axios.get(
708
- 'https://quill-344421.uc.r.appspot.com/item',
709
- {
710
- params: {
711
- id: chartId,
712
- orgId: customerId,
713
- publicKey: publicKey,
714
- filters: Object.keys(dashboardFilters).map(
715
- key => dashboardFilters[key]
716
- ),
717
- // startDate:
718
- // dateFilter &&
719
- // dateFilter.startDate &&
720
- // dateFilter.startDate.toISOString(),
721
- // endDate:
722
- // dateFilter &&
723
- // dateFilter.endDate &&
724
- // dateFilter.endDate.toISOString(),
725
- },
726
- headers: {
718
+ // if self-hosting option, only get metadata and query
719
+ if (queryEndpoint) {
720
+ const resp = await axios.get(
721
+ 'https://quill-344421.uc.r.appspot.com/selfhostitem',
722
+ {
723
+ params: {
724
+ id: chartId,
725
+ orgId: customerId,
726
+ publicKey: publicKey,
727
+ },
727
728
  environment: environment || undefined,
728
- },
729
+ }
730
+ );
731
+ const resp1 = await axios.post(
732
+ queryEndpoint,
733
+ { query: resp.data.queryString },
734
+ { headers: queryHeaders }
735
+ );
736
+
737
+ // const [resp1, resp] = await Promise.all([
738
+ // axios.post(queryEndpoint, { query }, { headers: queryHeaders }),
739
+ // axios.get('https://quill-344421.uc.r.appspot.com/selfhostitem', {
740
+ // params: {
741
+ // id: chartId,
742
+ // orgId: customerId,
743
+ // publicKey: publicKey,
744
+ // },
745
+ // environment: environment || undefined,
746
+ // }),
747
+ // ]);
748
+ // console.log('RESP: ', resp.data);
749
+ if (resp.data) {
750
+ const {
751
+ xAxisField,
752
+ yAxisFields,
753
+ xAxisLabel,
754
+ yAxisLabel,
755
+ xAxisFormat,
756
+ chartType,
757
+ } = resp.data;
758
+ setChartConfig({
759
+ xAxisField,
760
+ yAxisFields,
761
+ xAxisLabel,
762
+ yAxisLabel,
763
+ xAxisFormat,
764
+ chartType,
765
+ rows: resp1.data.rows,
766
+ filters: dashboardFilters,
767
+ });
768
+ setLoading(false);
769
+ dispatch({
770
+ type: 'UPDATE_DASHBOARD_ITEM',
771
+ id,
772
+ data: {
773
+ ...resp.data,
774
+ rows: resp1.data.rows,
775
+ fields: resp1.data.fields,
776
+ filters: dashboardFilters,
777
+ },
778
+ });
779
+ }
780
+ } else {
781
+ const resp = await axios.get(
782
+ 'https://quill-344421.uc.r.appspot.com/item',
783
+ {
784
+ params: {
785
+ id: chartId,
786
+ orgId: customerId,
787
+ publicKey: publicKey,
788
+ filters: Object.keys(dashboardFilters).map(
789
+ key => dashboardFilters[key]
790
+ ),
791
+ // startDate:
792
+ // dateFilter &&
793
+ // dateFilter.startDate &&
794
+ // dateFilter.startDate.toISOString(),
795
+ // endDate:
796
+ // dateFilter &&
797
+ // dateFilter.endDate &&
798
+ // dateFilter.endDate.toISOString(),
799
+ },
800
+ headers: {
801
+ environment: environment || undefined,
802
+ },
803
+ }
804
+ );
805
+ // console.log('RESP: ', resp.data);
806
+ if (resp.data) {
807
+ const {
808
+ xAxisField,
809
+ yAxisFields,
810
+ xAxisLabel,
811
+ yAxisLabel,
812
+ xAxisFormat,
813
+ chartType,
814
+ rows,
815
+ } = resp.data;
816
+ setChartConfig({
817
+ xAxisField,
818
+ yAxisFields,
819
+ xAxisLabel,
820
+ yAxisLabel,
821
+ xAxisFormat,
822
+ chartType,
823
+ rows,
824
+ startDate: dateFilter && dateFilter.startDate,
825
+ endDate: dateFilter && dateFilter.endDate,
826
+ filters: dashboardFilters,
827
+ });
828
+ setLoading(false);
829
+ dispatch({
830
+ type: 'UPDATE_DASHBOARD_ITEM',
831
+ id,
832
+ data: { ...resp.data, filters: dashboardFilters },
833
+ });
729
834
  }
730
- );
731
- // console.log('RESP: ', resp.data);
732
- if (resp.data) {
733
- const {
734
- xAxisField,
735
- yAxisFields,
736
- xAxisLabel,
737
- yAxisLabel,
738
- xAxisFormat,
739
- chartType,
740
- rows,
741
- } = resp.data;
742
- setChartConfig({
743
- xAxisField,
744
- yAxisFields,
745
- xAxisLabel,
746
- yAxisLabel,
747
- xAxisFormat,
748
- chartType,
749
- rows,
750
- startDate: dateFilter && dateFilter.startDate,
751
- endDate: dateFilter && dateFilter.endDate,
752
- filters: dashboardFilters,
753
- });
754
- setLoading(false);
755
- dispatch({
756
- type: 'UPDATE_DASHBOARD_ITEM',
757
- id,
758
- data: { ...resp.data, filters: dashboardFilters },
759
- });
760
835
  }
761
836
  } catch (e) {
762
837
  console.log('Error fetching chart: ', e);
package/src/Context.tsx CHANGED
@@ -98,6 +98,8 @@ export const ContextProvider = ({
98
98
  authToken,
99
99
  customerId,
100
100
  userId,
101
+ queryEndpoint,
102
+ queryHeaders,
101
103
  }) => {
102
104
  const [client, setClient] = useState(null);
103
105
  const [theme, setTheme] = useState(null);
@@ -141,9 +143,20 @@ export const ContextProvider = ({
141
143
  authToken,
142
144
  publicKey,
143
145
  environment,
146
+ queryEndpoint,
147
+ queryHeaders,
144
148
  });
145
149
  }
146
- }, [customerId, userId, authToken, publicKey, client, environment]);
150
+ }, [
151
+ customerId,
152
+ userId,
153
+ authToken,
154
+ publicKey,
155
+ client,
156
+ environment,
157
+ queryEndpoint,
158
+ queryHeaders,
159
+ ]);
147
160
 
148
161
  // DYNAMICALLY CHANGE ORG
149
162
  useEffect(() => {
package/src/Dashboard.tsx CHANGED
@@ -366,6 +366,7 @@ export default function Dashboard({
366
366
  }}
367
367
  isDateFilter={true}
368
368
  chartId={elem._id}
369
+ query={elem.queryString}
369
370
  // colors={theme.chartColors}
370
371
  // updateDashboard={updateDashboard}
371
372
  />
@@ -12,6 +12,8 @@ const QuillProvider = ({
12
12
  runQueryButton,
13
13
  saveQueryButton,
14
14
  exportQueryButton,
15
+ queryEndpoint,
16
+ queryHeaders,
15
17
  children,
16
18
  }) => {
17
19
  return (
@@ -22,6 +24,8 @@ const QuillProvider = ({
22
24
  publicKey={publicKey}
23
25
  environment={environment}
24
26
  customerId={organizationId}
27
+ queryEndpoint={queryEndpoint}
28
+ queryHeaders={queryHeaders}
25
29
  >
26
30
  {children}
27
31
  </ContextProvider>