@quillsql/react 2.13.17 → 2.13.19
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.
- package/dist/cjs/Chart.d.ts +2 -2
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +53 -175
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +3 -3
- package/dist/cjs/Context.d.ts +24 -3
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +323 -7
- package/dist/cjs/Dashboard.js +1 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +0 -2
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +1 -4
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +34 -32
- package/dist/cjs/components/Dashboard/DashboardFilter.js +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +4 -2
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +141 -57
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +2 -49
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +66 -42
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +0 -1
- package/dist/cjs/models/Report.d.ts +4 -3
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.d.ts +2 -1
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +2 -2
- package/dist/cjs/utils/dashboard.js +1 -1
- package/dist/cjs/utils/dataProcessing.js +2 -2
- package/dist/cjs/utils/filterProcessing.d.ts +6 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +81 -3
- package/dist/cjs/utils/pivotConstructor.js +4 -4
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +0 -1
- package/dist/cjs/utils/report.d.ts +13 -1
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +81 -51
- package/dist/esm/Chart.d.ts +2 -2
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +66 -179
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +3 -3
- package/dist/esm/Context.d.ts +24 -3
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +322 -6
- package/dist/esm/Dashboard.js +1 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +0 -2
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +1 -4
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +34 -32
- package/dist/esm/components/Dashboard/DashboardFilter.js +1 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts +4 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +142 -58
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +3 -50
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +68 -44
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +0 -1
- package/dist/esm/models/Report.d.ts +4 -3
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.d.ts +2 -1
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +2 -2
- package/dist/esm/utils/dashboard.js +1 -1
- package/dist/esm/utils/dataProcessing.js +2 -2
- package/dist/esm/utils/filterProcessing.d.ts +6 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +78 -2
- package/dist/esm/utils/pivotConstructor.js +4 -4
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +0 -1
- package/dist/esm/utils/report.d.ts +13 -1
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +79 -51
- package/package.json +1 -1
|
@@ -110,7 +110,7 @@ export declare function getDateString(value: string, dateRange?: {
|
|
|
110
110
|
start: Date;
|
|
111
111
|
end: Date;
|
|
112
112
|
}, dateBucket?: string): string;
|
|
113
|
-
export declare function isDateField(fieldType: string): fieldType is "MMM_dd" | "MMM_yyyy" | "MMM_dd_yyyy" | "hh_ap_pm" | "MMM_dd_hh:mm_ap_pm" | "
|
|
113
|
+
export declare function isDateField(fieldType: string): fieldType is "date" | "MMM_dd" | "MMM_yyyy" | "MMM_dd_yyyy" | "hh_ap_pm" | "MMM_dd_hh:mm_ap_pm" | "datetime" | "timestamp" | "timestamptz";
|
|
114
114
|
export declare function generatePivotTable({ pivot, rowLimit, dateBucket, report, client, uniqueValues, }: {
|
|
115
115
|
pivot: Pivot;
|
|
116
116
|
rowLimit?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -486,7 +486,6 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
|
|
|
486
486
|
}
|
|
487
487
|
setTimeout(async () => {
|
|
488
488
|
try {
|
|
489
|
-
console.log('HELP: ', pivot);
|
|
490
489
|
const { rows, columns } = await generatePivotTable({
|
|
491
490
|
pivot,
|
|
492
491
|
rowLimit: 6, // limit previews
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AxisFormat } from '../Dashboard';
|
|
2
2
|
import { Column, ColumnInternal } from './Columns';
|
|
3
|
+
import { InternalFilter } from './Filter';
|
|
3
4
|
import { Pagination } from './Pagination';
|
|
4
5
|
import { Pivot } from './Pivot';
|
|
5
6
|
/**
|
|
@@ -71,9 +72,7 @@ export interface QuillReport {
|
|
|
71
72
|
[key: string]: string;
|
|
72
73
|
}[];
|
|
73
74
|
/** An array filters that have been applied to this query. */
|
|
74
|
-
filtersApplied
|
|
75
|
-
[key: string]: any;
|
|
76
|
-
}[];
|
|
75
|
+
filtersApplied?: InternalFilter[];
|
|
77
76
|
pagination?: Pagination;
|
|
78
77
|
sort?: {
|
|
79
78
|
field: string;
|
|
@@ -107,5 +106,7 @@ export interface QuillReportInternal extends QuillReport {
|
|
|
107
106
|
triggerReload?: boolean;
|
|
108
107
|
/** An internal flag to force a report to trigger a reload from the backend */
|
|
109
108
|
columnInternal: ColumnInternal[];
|
|
109
|
+
/** Represents if the report is currently loading rows */
|
|
110
|
+
loadingRows?: boolean;
|
|
110
111
|
}
|
|
111
112
|
//# sourceMappingURL=Report.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,wDAAwD;IACxD,aAAa,EAAE,MAAM,CAAC;IAEtB,0DAA0D;IAC1D,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAElC,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAElB,uEAAuE;IACvE,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnD,4CAA4C;IAC5C,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,8BAA8B;IAC9B,UAAU,EAAE,MAAM,CAAC;IAEnB,gDAAgD;IAChD,UAAU,EAAE,MAAM,CAAC;IAEnB,0CAA0C;IAC1C,WAAW,EAAE,UAAU,CAAC;IAExB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE;QACX,gCAAgC;QAChC,KAAK,EAAE,MAAM,CAAC;QAEd,uCAAuC;QACvC,KAAK,EAAE,MAAM,CAAC;QAEd,4CAA4C;QAC5C,MAAM,EAAE,UAAU,CAAC;KACpB,EAAE,CAAC;IAEJ;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAEzC,6DAA6D;IAC7D,cAAc,
|
|
1
|
+
{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,wDAAwD;IACxD,aAAa,EAAE,MAAM,CAAC;IAEtB,0DAA0D;IAC1D,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAElC,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAElB,uEAAuE;IACvE,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnD,4CAA4C;IAC5C,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,8BAA8B;IAC9B,UAAU,EAAE,MAAM,CAAC;IAEnB,gDAAgD;IAChD,UAAU,EAAE,MAAM,CAAC;IAEnB,0CAA0C;IAC1C,WAAW,EAAE,UAAU,CAAC;IAExB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE;QACX,gCAAgC;QAChC,KAAK,EAAE,MAAM,CAAC;QAEd,uCAAuC;QACvC,KAAK,EAAE,MAAM,CAAC;QAEd,4CAA4C;QAC5C,MAAM,EAAE,UAAU,CAAC;KACpB,EAAE,CAAC;IAEJ;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAEzC,6DAA6D;IAC7D,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;IAGlC,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAG5C,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,0BAA0B;IAC1B,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAExC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,uGAAuG;IACvG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAErB,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B,kEAAkE;IAClE,iBAAiB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IAElD,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,8EAA8E;IAC9E,cAAc,EAAE,cAAc,EAAE,CAAC;IAEjC,yDAAyD;IACzD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ColumnInfo } from '../components/ReportBuilder/schema';
|
|
2
2
|
import { Column, ColumnInternal } from '../models/Columns';
|
|
3
|
+
import { DashboardFilter } from '../models/Filter';
|
|
3
4
|
import { QuillReportInternal } from '../models/Report';
|
|
4
5
|
interface ConvertPostgresColumnParamsWithColumnInternal {
|
|
5
6
|
field: string;
|
|
@@ -15,6 +16,6 @@ export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo
|
|
|
15
16
|
export declare function convertFieldTypeToJSType(fieldType: string): string;
|
|
16
17
|
export declare function convertFormatToJsType(column: Column): string;
|
|
17
18
|
export declare function processColumnName(columnName: string): string;
|
|
18
|
-
export declare const getYAxisFields: (report: QuillReportInternal) => any[];
|
|
19
|
+
export declare const getYAxisFields: (report: QuillReportInternal, dashboardFilters: DashboardFilter[]) => any[];
|
|
19
20
|
export {};
|
|
20
21
|
//# sourceMappingURL=columnProcessing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAgJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAsED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAgJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAsED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WACjB,mBAAmB,oBACT,eAAe,EAAE,UAqDpC,CAAC"}
|
|
@@ -298,9 +298,9 @@ function convertFormatToJsType(column) {
|
|
|
298
298
|
function processColumnName(columnName) {
|
|
299
299
|
return removeBigQuerySpecialChars(columnName);
|
|
300
300
|
}
|
|
301
|
-
const getYAxisFields = (report) => {
|
|
301
|
+
const getYAxisFields = (report, dashboardFilters) => {
|
|
302
302
|
try {
|
|
303
|
-
const curDateFilter = (0, filterProcessing_1.findAndProcessDateFilter)(
|
|
303
|
+
const curDateFilter = (0, filterProcessing_1.findAndProcessDateFilter)(dashboardFilters);
|
|
304
304
|
if (report.pivot && report.pivotColumns && report.pivot.columnField) {
|
|
305
305
|
return (report.pivotColumns
|
|
306
306
|
.slice(1)
|
|
@@ -102,7 +102,7 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
|
|
|
102
102
|
async function getPivotTable(report, dashboardFilters, client, dateBucketInitial) {
|
|
103
103
|
if (!report)
|
|
104
104
|
return undefined;
|
|
105
|
-
const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.
|
|
105
|
+
const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.operator === 'BETWEEN');
|
|
106
106
|
if (dateFilter?.operator === 'BETWEEN') {
|
|
107
107
|
dateFilter.startDate = dateFilter.value[0];
|
|
108
108
|
dateFilter.endDate = dateFilter.value[1];
|
|
@@ -98,8 +98,8 @@ const getPointToPointPercentageChange = (data) => {
|
|
|
98
98
|
start: minDate,
|
|
99
99
|
end: maxDate,
|
|
100
100
|
});
|
|
101
|
-
const minDateBucket = (0, PivotModal_1.getDateString)(minDate.
|
|
102
|
-
const maxDateBucket = (0, PivotModal_1.getDateString)(maxDate.
|
|
101
|
+
const minDateBucket = (0, PivotModal_1.getDateString)(minDate.toISOString().split('T')[0], undefined, dateBucket);
|
|
102
|
+
const maxDateBucket = (0, PivotModal_1.getDateString)(maxDate.toISOString().split('T')[0], undefined, dateBucket);
|
|
103
103
|
const minDateRows = data.rows.filter((row) => {
|
|
104
104
|
const rowValue = row[dateField];
|
|
105
105
|
if (rowValue) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { FieldType, InternalFilter, DashboardFilter } from '../models/Filter';
|
|
1
|
+
import { FieldType, InternalFilter, DashboardFilter, DashboardDateFilter } from '../models/Filter';
|
|
2
|
+
import { QuillReport } from '../models/Report';
|
|
2
3
|
import { UniqueValuesByColumn } from '../models/Tables';
|
|
3
4
|
import { FilterTreeNode } from './astFilterProcessing';
|
|
4
5
|
export declare function findAndProcessDateFilter(filters: any[]): any;
|
|
@@ -27,10 +28,14 @@ export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeN
|
|
|
27
28
|
error?: string;
|
|
28
29
|
}>;
|
|
29
30
|
export declare function mergeCustomFilters(filters: DashboardFilter[], customFilters: InternalFilter[]): any[];
|
|
31
|
+
export declare function filtersAreEquivalent(filters1?: InternalFilter[], filters2?: InternalFilter[]): boolean;
|
|
30
32
|
/**
|
|
31
33
|
* Helper function that converts a UniqueValuesByColumn interface to a string map
|
|
32
34
|
*/
|
|
33
35
|
export declare function uniqueValuesToStringMap(uniqueValues: UniqueValuesByColumn): {
|
|
34
36
|
[key: string]: string[];
|
|
35
37
|
};
|
|
38
|
+
export declare const createDefaultDateFilter: (filter: DashboardDateFilter, reports: QuillReport[], dashboardName: string) => (DashboardDateFilter & {
|
|
39
|
+
dateField: string[];
|
|
40
|
+
}) | undefined;
|
|
36
41
|
//# sourceMappingURL=filterProcessing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,eAAe,
|
|
1
|
+
{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,eAAe,EAEf,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAsCP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getType = void 0;
|
|
3
|
+
exports.createDefaultDateFilter = exports.getType = void 0;
|
|
4
4
|
exports.findAndProcessDateFilter = findAndProcessDateFilter;
|
|
5
5
|
exports.processFilterFromBackend = processFilterFromBackend;
|
|
6
6
|
exports.updateFilter = updateFilter;
|
|
@@ -9,6 +9,7 @@ exports.generateFilterStack = generateFilterStack;
|
|
|
9
9
|
exports.filterStackToFilterTree = filterStackToFilterTree;
|
|
10
10
|
exports.buildQueryFromFilters = buildQueryFromFilters;
|
|
11
11
|
exports.mergeCustomFilters = mergeCustomFilters;
|
|
12
|
+
exports.filtersAreEquivalent = filtersAreEquivalent;
|
|
12
13
|
exports.uniqueValuesToStringMap = uniqueValuesToStringMap;
|
|
13
14
|
const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
|
|
14
15
|
// import { Client, QuillProviderClient } from '../models/Client';
|
|
@@ -351,6 +352,8 @@ function mergeCustomFilters(filters, customFilters) {
|
|
|
351
352
|
}
|
|
352
353
|
const withoutDate = filters.filter((filter) => filter.filterType !== Filter_1.DashboardFilterType.Date);
|
|
353
354
|
const customWithoutDate = customFilters.filter((filter) => filter.filterType !== Filter_1.FilterType.DateCustomFilter);
|
|
355
|
+
const startDate = customDateFilters[0]?.value.startDate;
|
|
356
|
+
const endDate = customDateFilters[0]?.value.endDate;
|
|
354
357
|
return withoutDate
|
|
355
358
|
.concat([
|
|
356
359
|
{
|
|
@@ -369,12 +372,36 @@ function mergeCustomFilters(filters, customFilters) {
|
|
|
369
372
|
label: 'Custom',
|
|
370
373
|
value: 'custom',
|
|
371
374
|
},
|
|
372
|
-
startDate:
|
|
373
|
-
endDate:
|
|
375
|
+
startDate: new Date(startDate),
|
|
376
|
+
endDate: new Date(endDate),
|
|
374
377
|
},
|
|
375
378
|
])
|
|
376
379
|
.concat(customWithoutDate);
|
|
377
380
|
}
|
|
381
|
+
function filtersAreEquivalent(filters1, filters2) {
|
|
382
|
+
if (!filters1 && !filters2) {
|
|
383
|
+
return true;
|
|
384
|
+
}
|
|
385
|
+
if (!filters1 || !filters2) {
|
|
386
|
+
return false;
|
|
387
|
+
}
|
|
388
|
+
if (filters1.length !== filters2.length) {
|
|
389
|
+
return false;
|
|
390
|
+
}
|
|
391
|
+
const sortedFilters1 = [...filters1].sort((a, b) => `${a.table ?? ''}.${a.field}`.localeCompare(`${b.table ?? ''}.${b.field}`));
|
|
392
|
+
const sortedFilters2 = [...filters2].sort((a, b) => `${a.table ?? ''}.${a.field}`.localeCompare(`${b.table ?? ''}.${b.field}`));
|
|
393
|
+
for (let i = 0; i < sortedFilters1.length; i++) {
|
|
394
|
+
if (sortedFilters1[i]?.field !== sortedFilters2[i]?.field ||
|
|
395
|
+
sortedFilters1[i]?.filterType !== sortedFilters2[i]?.filterType ||
|
|
396
|
+
sortedFilters1[i]?.fieldType !== sortedFilters2[i]?.fieldType ||
|
|
397
|
+
sortedFilters1[i]?.operator !== sortedFilters2[i]?.operator ||
|
|
398
|
+
sortedFilters1[i]?.value !== sortedFilters2[i]?.value ||
|
|
399
|
+
sortedFilters1[i]?.table !== sortedFilters2[i]?.table) {
|
|
400
|
+
return false;
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
return true;
|
|
404
|
+
}
|
|
378
405
|
/**
|
|
379
406
|
* Helper function that converts a UniqueValuesByColumn interface to a string map
|
|
380
407
|
*/
|
|
@@ -388,3 +415,54 @@ function uniqueValuesToStringMap(uniqueValues) {
|
|
|
388
415
|
}
|
|
389
416
|
return fieldValues;
|
|
390
417
|
}
|
|
418
|
+
const createDefaultDateFilter = (filter, reports, dashboardName) => {
|
|
419
|
+
const comparisonRangeStart = getComparisonRange(filter, 'startDate');
|
|
420
|
+
const comparisonRangeEnd = getComparisonRange(filter, 'endDate');
|
|
421
|
+
const range = filter?.presetRanges?.find((range) => range.value === filter.primaryRange?.value) ??
|
|
422
|
+
dateRangePickerUtils_1.PRIMARY_RANGE[filter.primaryRange?.value ?? 'LAST_30_DAYS'] ??
|
|
423
|
+
dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS'];
|
|
424
|
+
return filter
|
|
425
|
+
? {
|
|
426
|
+
...filter,
|
|
427
|
+
startDate: !range.startDate || range.startDate instanceof Date
|
|
428
|
+
? range.startDate
|
|
429
|
+
: new Date(range.startDate), // when range.startDate is a string
|
|
430
|
+
endDate: !range.endDate || range.endDate instanceof Date
|
|
431
|
+
? range.endDate
|
|
432
|
+
: new Date(range.endDate), // when range.endDate is a string
|
|
433
|
+
filterType: Filter_1.DashboardFilterType.Date,
|
|
434
|
+
dateField: [
|
|
435
|
+
...new Map(reports.map((report) => {
|
|
436
|
+
const key = JSON.stringify(report.dateField);
|
|
437
|
+
return [key, report.dateField];
|
|
438
|
+
})).values(),
|
|
439
|
+
],
|
|
440
|
+
options: dateRangePickerUtils_1.defaultOptionsV2,
|
|
441
|
+
preset: filter.primaryRange,
|
|
442
|
+
dashboardName: dashboardName,
|
|
443
|
+
comparisonRange: filter.comparison && comparisonRangeStart && comparisonRangeEnd
|
|
444
|
+
? {
|
|
445
|
+
startDate: comparisonRangeStart,
|
|
446
|
+
endDate: comparisonRangeEnd,
|
|
447
|
+
value: filter.comparisonRange?.value ??
|
|
448
|
+
filter?.defaultComparisonRange ??
|
|
449
|
+
'NO_COMPARISON',
|
|
450
|
+
}
|
|
451
|
+
: undefined,
|
|
452
|
+
}
|
|
453
|
+
: undefined;
|
|
454
|
+
};
|
|
455
|
+
exports.createDefaultDateFilter = createDefaultDateFilter;
|
|
456
|
+
const getComparisonRange = (dateFilter, rangeType) => {
|
|
457
|
+
const range = dateFilter?.presetRanges?.find((range) => range.value === dateFilter?.primaryRange?.value) ?? dateRangePickerUtils_1.PRIMARY_RANGE[dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'];
|
|
458
|
+
return (dateFilter?.comparisonRange?.[rangeType] ??
|
|
459
|
+
dateRangePickerUtils_1.COMPARISON_RANGE[dateFilter?.defaultComparisonRange ??
|
|
460
|
+
'NO_COMPARISON']({
|
|
461
|
+
startDate: !range.startDate || range.startDate instanceof Date
|
|
462
|
+
? range.startDate
|
|
463
|
+
: new Date(range.startDate), // when range.startDate is a string
|
|
464
|
+
endDate: !range.endDate || range.endDate instanceof Date
|
|
465
|
+
? range.endDate
|
|
466
|
+
: new Date(range.endDate), // when range.endDate is a string
|
|
467
|
+
})?.[rangeType]);
|
|
468
|
+
};
|
|
@@ -100,7 +100,7 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
|
|
|
100
100
|
const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
|
|
101
101
|
// create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
|
|
102
102
|
for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
|
|
103
|
-
const formattedDate = (0, PivotModal_1.getDateString)(date.
|
|
103
|
+
const formattedDate = (0, PivotModal_1.getDateString)(date.toISOString().split('T')[0], undefined, dateBucket);
|
|
104
104
|
if (!dateSet.has(formattedDate)) {
|
|
105
105
|
const newRow = {};
|
|
106
106
|
newRow[pivot.rowField] = formattedDate;
|
|
@@ -108,9 +108,9 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
|
|
|
108
108
|
dateSet.add(formattedDate);
|
|
109
109
|
}
|
|
110
110
|
// order the rows by the date field
|
|
111
|
-
rows.sort((a, b) => {
|
|
112
|
-
|
|
113
|
-
});
|
|
111
|
+
// rows.sort((a: any, b: any) => {
|
|
112
|
+
// return compareValues(a, b, pivot.rowField ?? '');
|
|
113
|
+
// });
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}
|
|
@@ -205,7 +205,6 @@ function generatePivotQuery(pivot, itemQueries, databaseType, comparisonInterval
|
|
|
205
205
|
return undefined;
|
|
206
206
|
}
|
|
207
207
|
if (pivot.columnField) {
|
|
208
|
-
console.log('1');
|
|
209
208
|
return create2DPivotQuery(pivot, itemQueries, databaseType, dateBucket, comparisonInterval, distinctStrings, rowLimit);
|
|
210
209
|
}
|
|
211
210
|
if (pivot.rowField) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { QuillProviderClient } from '../models/Client';
|
|
2
2
|
import { ColumnInternal } from '../models/Columns';
|
|
3
|
+
import { DashboardFilter, InternalFilter } from '../models/Filter';
|
|
3
4
|
import { Pivot } from '../models/Pivot';
|
|
4
5
|
import { QuillReport, QuillReportInternal } from '../models/Report';
|
|
5
6
|
import { DateRangesByColumn, Table, UniqueValuesByTable } from '../models/Tables';
|
|
@@ -27,6 +28,17 @@ export declare function fetchReport(reportId: string, client: QuillProviderClien
|
|
|
27
28
|
report: QuillReportInternal;
|
|
28
29
|
error?: string;
|
|
29
30
|
}>;
|
|
31
|
+
export declare function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }: {
|
|
32
|
+
resp: any;
|
|
33
|
+
client: QuillProviderClient;
|
|
34
|
+
filters?: (DashboardFilter | InternalFilter)[];
|
|
35
|
+
dateBucket?: string;
|
|
36
|
+
additionalProcessing?: AdditionalProcessing;
|
|
37
|
+
}): Promise<QuillReportInternal>;
|
|
38
|
+
export declare function fetchReportInfo(reportId: string, client: QuillProviderClient): Promise<{
|
|
39
|
+
report: any;
|
|
40
|
+
filters: any;
|
|
41
|
+
}>;
|
|
30
42
|
export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any, abortSignal?: AbortSignal): Promise<number | undefined>;
|
|
31
43
|
export declare function saveReport({ report, dashboardItemId, client, }: {
|
|
32
44
|
report: any;
|
|
@@ -34,7 +46,7 @@ export declare function saveReport({ report, dashboardItemId, client, }: {
|
|
|
34
46
|
client: QuillProviderClient;
|
|
35
47
|
}): Promise<any>;
|
|
36
48
|
export declare const formatRowsFromReport: (report: any) => any;
|
|
37
|
-
export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
|
|
49
|
+
export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[]): QuillReport;
|
|
38
50
|
export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: QuillProviderClient, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
|
|
39
51
|
uniqueStrings: UniqueValuesByTable;
|
|
40
52
|
dateRanges: DateRangesByColumn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/utils/report.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchReportBuilderDataFromAST = exports.formatRowsFromReport = exports.EMPTY_INTERNAL_REPORT = exports.EMPTY_REPORT = void 0;
|
|
4
4
|
exports.fetchReport = fetchReport;
|
|
5
|
+
exports.processReportResponse = processReportResponse;
|
|
6
|
+
exports.fetchReportInfo = fetchReportInfo;
|
|
5
7
|
exports.fetchReportRowCount = fetchReportRowCount;
|
|
6
8
|
exports.saveReport = saveReport;
|
|
7
9
|
exports.convertInternalReportToReport = convertInternalReportToReport;
|
|
@@ -15,7 +17,6 @@ const dataFetcher_1 = require("./dataFetcher");
|
|
|
15
17
|
const dataProcessing_1 = require("./dataProcessing");
|
|
16
18
|
const dates_1 = require("./dates");
|
|
17
19
|
const error_1 = require("./error");
|
|
18
|
-
const errorProcessing_1 = require("./errorProcessing");
|
|
19
20
|
const logging_1 = require("./logging");
|
|
20
21
|
const paginationProcessing_1 = require("./paginationProcessing");
|
|
21
22
|
const pivotProcessing_1 = require("./pivotProcessing");
|
|
@@ -96,59 +97,20 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
|
|
|
96
97
|
useNewNodeSql: true,
|
|
97
98
|
};
|
|
98
99
|
const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data', abortSignal);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
...resp,
|
|
107
|
-
useReportTask,
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
if (client.databaseType &&
|
|
111
|
-
client.databaseType.toLowerCase() === 'bigquery') {
|
|
112
|
-
(0, dataProcessing_1.parseValueFromBigQueryDates)(dashboardItem.rows, resp.fields);
|
|
113
|
-
}
|
|
114
|
-
if (dashboardItem.compareRows) {
|
|
115
|
-
if (client.databaseType &&
|
|
116
|
-
client.databaseType.toLowerCase() === 'bigquery') {
|
|
117
|
-
(0, dataProcessing_1.parseValueFromBigQueryDates)(dashboardItem.compareRows, resp.fields);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
reportInfo = await (0, dashboard_1.cleanDashboardItem)(dashboardItem, filters, client, dateBucket);
|
|
121
|
-
if (additionalProcessing) {
|
|
122
|
-
reportInfo.pagination = additionalProcessing.page;
|
|
123
|
-
reportInfo.sort = additionalProcessing.sort;
|
|
124
|
-
}
|
|
125
|
-
// Ensure the report columns don't reference any columns that aren't present in the rows
|
|
126
|
-
const observedColumns = reportInfo?.rows[0]
|
|
127
|
-
? Object.keys(reportInfo.rows[0])
|
|
128
|
-
: null;
|
|
129
|
-
if (observedColumns &&
|
|
130
|
-
reportInfo &&
|
|
131
|
-
!reportInfo.pivot &&
|
|
132
|
-
!reportInfo.pivotColumns &&
|
|
133
|
-
!reportInfo.error &&
|
|
134
|
-
useReportTask &&
|
|
135
|
-
reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
|
|
136
|
-
?.length > 0) {
|
|
137
|
-
reportInfo.columns = reportInfo.columns.filter((col) => observedColumns.includes(col.field));
|
|
138
|
-
reportInfo.columnInternal = reportInfo.columnInternal.filter((col) => observedColumns.includes(col.field));
|
|
139
|
-
await saveReport({
|
|
140
|
-
report: { ...dashboardItem, query: reportInfo.queryString },
|
|
141
|
-
dashboardItemId: reportId,
|
|
142
|
-
client,
|
|
143
|
-
});
|
|
144
|
-
}
|
|
100
|
+
reportInfo = await processReportResponse({
|
|
101
|
+
resp,
|
|
102
|
+
client,
|
|
103
|
+
filters,
|
|
104
|
+
dateBucket,
|
|
105
|
+
additionalProcessing,
|
|
106
|
+
});
|
|
145
107
|
}
|
|
146
108
|
catch (error) {
|
|
147
109
|
if (error instanceof Error && error.name === 'AbortError') {
|
|
148
110
|
throw error;
|
|
149
111
|
}
|
|
150
112
|
if (error instanceof error_1.DataLoadError) {
|
|
151
|
-
if (
|
|
113
|
+
if (useReportTask) {
|
|
152
114
|
(0, logging_1.internalLog)('USING ITEM AS BACKUP');
|
|
153
115
|
const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly);
|
|
154
116
|
reportInfo = report;
|
|
@@ -177,6 +139,74 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
|
|
|
177
139
|
}
|
|
178
140
|
return { report: reportInfo || exports.EMPTY_INTERNAL_REPORT, error: errorMessage };
|
|
179
141
|
}
|
|
142
|
+
async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }) {
|
|
143
|
+
const dashboardItem = {
|
|
144
|
+
...resp,
|
|
145
|
+
filtersApplied: filters,
|
|
146
|
+
};
|
|
147
|
+
if (resp.errorMessage) {
|
|
148
|
+
throw new error_1.DataLoadError(resp?.errorMessage, {
|
|
149
|
+
...resp,
|
|
150
|
+
useReportTask: true,
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
if (client.databaseType && client.databaseType.toLowerCase() === 'bigquery') {
|
|
154
|
+
(0, dataProcessing_1.parseValueFromBigQueryDates)(dashboardItem.rows, resp.fields);
|
|
155
|
+
}
|
|
156
|
+
if (dashboardItem.compareRows) {
|
|
157
|
+
if (client.databaseType &&
|
|
158
|
+
client.databaseType.toLowerCase() === 'bigquery') {
|
|
159
|
+
(0, dataProcessing_1.parseValueFromBigQueryDates)(dashboardItem.compareRows, resp.fields);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
console.log('dashboardItem', dashboardItem);
|
|
163
|
+
console.log('filters', filters);
|
|
164
|
+
const reportInfo = await (0, dashboard_1.cleanDashboardItem)(dashboardItem, filters, client, dateBucket);
|
|
165
|
+
console.log('reportInfo', reportInfo);
|
|
166
|
+
if (additionalProcessing) {
|
|
167
|
+
reportInfo.pagination = additionalProcessing.page;
|
|
168
|
+
reportInfo.sort = additionalProcessing.sort;
|
|
169
|
+
}
|
|
170
|
+
//TODO: Revisit this code
|
|
171
|
+
// It's purpose is to filter out columns that are not present in the rows
|
|
172
|
+
// But it appears to be confusing dashboardItem and reportInfo
|
|
173
|
+
// Ensure the report columns don't reference any columns that aren't present in the rows
|
|
174
|
+
const observedColumns = reportInfo?.rows[0]
|
|
175
|
+
? Object.keys(reportInfo.rows[0])
|
|
176
|
+
: null;
|
|
177
|
+
if (observedColumns &&
|
|
178
|
+
reportInfo &&
|
|
179
|
+
!reportInfo.pivot &&
|
|
180
|
+
!reportInfo.pivotColumns &&
|
|
181
|
+
!reportInfo.error &&
|
|
182
|
+
reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
|
|
183
|
+
?.length > 0) {
|
|
184
|
+
reportInfo.columns = reportInfo.columns.filter((col) => observedColumns.includes(col.field));
|
|
185
|
+
reportInfo.columnInternal = reportInfo.columnInternal.filter((col) => observedColumns.includes(col.field));
|
|
186
|
+
await saveReport({
|
|
187
|
+
report: { ...reportInfo, query: reportInfo.queryString },
|
|
188
|
+
dashboardItemId: reportInfo.id,
|
|
189
|
+
client,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
return reportInfo;
|
|
193
|
+
}
|
|
194
|
+
async function fetchReportInfo(reportId, client) {
|
|
195
|
+
const hostedBody = {
|
|
196
|
+
metadata: {
|
|
197
|
+
reportId,
|
|
198
|
+
clientId: client.publicKey,
|
|
199
|
+
task: 'report-info',
|
|
200
|
+
orgId: client.organizationId || '*',
|
|
201
|
+
},
|
|
202
|
+
};
|
|
203
|
+
const cloudBody = {
|
|
204
|
+
id: reportId,
|
|
205
|
+
useNewNodeSql: true,
|
|
206
|
+
};
|
|
207
|
+
const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
|
|
208
|
+
return { report: resp.report, filters: resp.filters };
|
|
209
|
+
}
|
|
180
210
|
async function fetchReportRowCount(reportId, client, useReportTask = true, filters = [], additionalProcessing, customFields, abortSignal) {
|
|
181
211
|
// Remove extra fields on each filter so we don't confuse the backend.
|
|
182
212
|
const hostedBody = {
|
|
@@ -254,7 +284,7 @@ const formatRowsFromReport = (report) => {
|
|
|
254
284
|
});
|
|
255
285
|
};
|
|
256
286
|
exports.formatRowsFromReport = formatRowsFromReport;
|
|
257
|
-
function convertInternalReportToReport(report) {
|
|
287
|
+
function convertInternalReportToReport(report, dashboardFilters) {
|
|
258
288
|
try {
|
|
259
289
|
if (!report) {
|
|
260
290
|
return exports.EMPTY_REPORT;
|
|
@@ -291,7 +321,7 @@ function convertInternalReportToReport(report) {
|
|
|
291
321
|
return {
|
|
292
322
|
...extractAllReportValuesFromQuillInternalReport(formattedReport),
|
|
293
323
|
rows: rows,
|
|
294
|
-
yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
|
|
324
|
+
yAxisFields: (0, columnProcessing_1.getYAxisFields)(report, dashboardFilters),
|
|
295
325
|
columns: columns,
|
|
296
326
|
rowCount: rows ? rows.length : 0,
|
|
297
327
|
};
|
|
@@ -303,7 +333,7 @@ function convertInternalReportToReport(report) {
|
|
|
303
333
|
return {
|
|
304
334
|
...extractAllReportValuesFromQuillInternalReport(formattedReport),
|
|
305
335
|
rows: rows,
|
|
306
|
-
yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
|
|
336
|
+
yAxisFields: (0, columnProcessing_1.getYAxisFields)(report, dashboardFilters),
|
|
307
337
|
};
|
|
308
338
|
}
|
|
309
339
|
catch (error) {
|
package/dist/esm/Chart.d.ts
CHANGED
|
@@ -92,6 +92,7 @@ export interface ChartProps {
|
|
|
92
92
|
*/
|
|
93
93
|
hideDateRangeFilter?: boolean;
|
|
94
94
|
/** Whether to hide the table filters component, deafulted to true */
|
|
95
|
+
hideFilters?: boolean;
|
|
95
96
|
/**
|
|
96
97
|
* Whether the comparison range shows as dashed for date comparison line
|
|
97
98
|
* charts (as opposed to the default solid line).
|
|
@@ -206,7 +207,6 @@ export interface ChartProps {
|
|
|
206
207
|
export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter, mapColorsToFields, LoadingComponent, TableComponent, MetricComponent, filters, onClickChartElement, dateBucket, }: ChartProps): import("react/jsx-runtime").JSX.Element;
|
|
207
208
|
interface ChartDisplayProps extends WithConfig {
|
|
208
209
|
loading: boolean;
|
|
209
|
-
paginating?: boolean;
|
|
210
210
|
ErrorComponent?: ({ errorMessage }: {
|
|
211
211
|
errorMessage: string;
|
|
212
212
|
}) => JSX.Element;
|
|
@@ -221,6 +221,6 @@ interface ChartDisplayProps extends WithConfig {
|
|
|
221
221
|
scrollable?: boolean;
|
|
222
222
|
overrideTheme?: QuillTheme;
|
|
223
223
|
}
|
|
224
|
-
export declare const ChartDisplay: ({ reportId, config, colors, className, containerStyle, hideXAxis, hideYAxis, hideCartesianGrid, hideDateRangeFilter, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, isAnimationActive, scrollable, loading,
|
|
224
|
+
export declare const ChartDisplay: ({ reportId, config, colors, className, containerStyle, hideXAxis, hideYAxis, hideCartesianGrid, hideDateRangeFilter, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, isAnimationActive, scrollable, loading, ErrorComponent, colorMap, LoadingComponent, onPageChange, onSortChange, onClickChartElement, overrideTheme, }: ChartDisplayProps) => import("react/jsx-runtime").JSX.Element;
|
|
225
225
|
export {};
|
|
226
226
|
//# sourceMappingURL=Chart.d.ts.map
|
package/dist/esm/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACT,WAAW,EACZ,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"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"}
|