@quillsql/react 2.13.40 → 2.13.41
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 +5 -1
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +51 -28
- package/dist/cjs/ChartBuilder.d.ts +13 -1
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +342 -138
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +11 -1
- package/dist/cjs/Context.d.ts +16 -4
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +57 -38
- package/dist/cjs/Dashboard.d.ts +6 -3
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +70 -28
- package/dist/cjs/QuillProvider.d.ts +4 -8
- package/dist/cjs/QuillProvider.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.d.ts +1 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +117 -45
- package/dist/cjs/SQLEditor.d.ts +7 -1
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +53 -9
- package/dist/cjs/Table.d.ts +21 -1
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +30 -192
- package/dist/cjs/components/Chart/BarChart.d.ts +5 -1
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +4 -3
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts +2 -0
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts.map +1 -0
- package/dist/cjs/components/Chart/CustomReferenceLine.js +26 -0
- package/dist/cjs/components/Chart/GaugeChart.d.ts +11 -0
- package/dist/cjs/components/Chart/GaugeChart.d.ts.map +1 -0
- package/dist/cjs/components/Chart/GaugeChart.js +198 -0
- package/dist/cjs/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/InternalChart.js +14 -11
- package/dist/cjs/components/Chart/LineChart.d.ts +5 -1
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +4 -3
- package/dist/cjs/components/Chart/MapChart.d.ts +36 -0
- package/dist/cjs/components/Chart/MapChart.d.ts.map +1 -0
- package/dist/cjs/components/Chart/MapChart.js +548 -0
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +114 -42
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +57 -54
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +5 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +5 -4
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +12 -11
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddColumnModal.js +2 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.js +13 -13
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts +2 -1
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/FilterStack.js +4 -4
- package/dist/cjs/components/ReportBuilder/convert.d.ts +2 -0
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +28 -7
- package/dist/cjs/components/ReportBuilder/util.d.ts +1 -1
- package/dist/cjs/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/util.js +15 -2
- package/dist/cjs/components/UiComponents.d.ts +4 -1
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +31 -5
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +11 -9
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +18 -4
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +16 -3
- package/dist/cjs/hooks/useReport.d.ts.map +1 -1
- package/dist/cjs/hooks/useReport.js +1 -7
- package/dist/cjs/hooks/useVirtualTables.d.ts +6 -2
- package/dist/cjs/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/cjs/hooks/useVirtualTables.js +5 -2
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +6 -7
- package/dist/cjs/models/Filter.d.ts +20 -13
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Filter.js +161 -87
- package/dist/cjs/models/Report.d.ts +12 -1
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/models/Schema.d.ts +12 -1
- package/dist/cjs/models/Schema.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.js +22 -22
- package/dist/cjs/utils/astProcessing.d.ts +2 -2
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.js +25 -6
- package/dist/cjs/utils/axisFormatter.d.ts.map +1 -1
- package/dist/cjs/utils/axisFormatter.js +25 -0
- package/dist/cjs/utils/color.d.ts +159 -0
- package/dist/cjs/utils/color.d.ts.map +1 -1
- package/dist/cjs/utils/color.js +14 -5
- package/dist/cjs/utils/columnProcessing.js +3 -3
- package/dist/cjs/utils/constants.d.ts +1 -0
- package/dist/cjs/utils/constants.d.ts.map +1 -1
- package/dist/cjs/utils/constants.js +2 -1
- package/dist/cjs/utils/dashboard.d.ts +13 -3
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +73 -16
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +3 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +9 -9
- package/dist/cjs/utils/getDomain.d.ts +4 -1
- package/dist/cjs/utils/getDomain.d.ts.map +1 -1
- package/dist/cjs/utils/getDomain.js +11 -1
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +5 -5
- package/dist/cjs/utils/queryConstructor.d.ts +1 -1
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +71 -43
- package/dist/cjs/utils/report.d.ts +23 -5
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +28 -8
- package/dist/cjs/utils/schema.d.ts +26 -3
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +75 -43
- package/dist/cjs/utils/tableProcessing.d.ts +10 -3
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +4 -6
- package/dist/cjs/utils/textProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/textProcessing.js +0 -1
- package/dist/esm/Chart.d.ts +5 -1
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +52 -29
- package/dist/esm/ChartBuilder.d.ts +13 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +347 -143
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +11 -1
- package/dist/esm/Context.d.ts +16 -4
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +59 -40
- package/dist/esm/Dashboard.d.ts +6 -3
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +71 -29
- package/dist/esm/QuillProvider.d.ts +4 -8
- package/dist/esm/QuillProvider.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.d.ts +1 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +119 -47
- package/dist/esm/SQLEditor.d.ts +7 -1
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +54 -10
- package/dist/esm/Table.d.ts +21 -1
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +34 -196
- package/dist/esm/components/Chart/BarChart.d.ts +5 -1
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +5 -4
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts +2 -0
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts.map +1 -0
- package/dist/esm/components/Chart/CustomReferenceLine.js +23 -0
- package/dist/esm/components/Chart/GaugeChart.d.ts +11 -0
- package/dist/esm/components/Chart/GaugeChart.d.ts.map +1 -0
- package/dist/esm/components/Chart/GaugeChart.js +195 -0
- package/dist/esm/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/InternalChart.js +14 -11
- package/dist/esm/components/Chart/LineChart.d.ts +5 -1
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +5 -4
- package/dist/esm/components/Chart/MapChart.d.ts +36 -0
- package/dist/esm/components/Chart/MapChart.d.ts.map +1 -0
- package/dist/esm/components/Chart/MapChart.js +541 -0
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +114 -42
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +57 -54
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +5 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +5 -4
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +12 -11
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddColumnModal.js +2 -1
- package/dist/esm/components/ReportBuilder/FilterModal.js +14 -14
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts +2 -1
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/FilterStack.js +4 -4
- package/dist/esm/components/ReportBuilder/convert.d.ts +2 -0
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +26 -7
- package/dist/esm/components/ReportBuilder/util.d.ts +1 -1
- package/dist/esm/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/util.js +15 -2
- package/dist/esm/components/UiComponents.d.ts +4 -1
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +29 -4
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +11 -9
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +19 -5
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +16 -3
- package/dist/esm/hooks/useReport.d.ts.map +1 -1
- package/dist/esm/hooks/useReport.js +1 -7
- package/dist/esm/hooks/useVirtualTables.d.ts +6 -2
- package/dist/esm/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/esm/hooks/useVirtualTables.js +6 -3
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +6 -7
- package/dist/esm/models/Filter.d.ts +20 -13
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Filter.js +160 -86
- package/dist/esm/models/Report.d.ts +12 -1
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/models/Schema.d.ts +12 -1
- package/dist/esm/models/Schema.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.js +23 -23
- package/dist/esm/utils/astProcessing.d.ts +2 -2
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.js +25 -6
- package/dist/esm/utils/axisFormatter.d.ts.map +1 -1
- package/dist/esm/utils/axisFormatter.js +25 -0
- package/dist/esm/utils/color.d.ts +159 -0
- package/dist/esm/utils/color.d.ts.map +1 -1
- package/dist/esm/utils/color.js +8 -2
- package/dist/esm/utils/columnProcessing.js +3 -3
- package/dist/esm/utils/constants.d.ts +1 -0
- package/dist/esm/utils/constants.d.ts.map +1 -1
- package/dist/esm/utils/constants.js +1 -0
- package/dist/esm/utils/dashboard.d.ts +13 -3
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +73 -16
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +3 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +10 -10
- package/dist/esm/utils/getDomain.d.ts +4 -1
- package/dist/esm/utils/getDomain.d.ts.map +1 -1
- package/dist/esm/utils/getDomain.js +11 -1
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +5 -5
- package/dist/esm/utils/queryConstructor.d.ts +1 -1
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +71 -43
- package/dist/esm/utils/report.d.ts +23 -5
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +29 -9
- package/dist/esm/utils/schema.d.ts +26 -3
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +74 -43
- package/dist/esm/utils/tableProcessing.d.ts +10 -3
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +4 -6
- package/dist/esm/utils/textProcessing.d.ts.map +1 -1
- package/dist/esm/utils/textProcessing.js +0 -1
- package/package.json +8 -3
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { QuillReportInternal } from '../models/Report';
|
|
2
2
|
import { QuillProviderClient } from '../models/Client';
|
|
3
3
|
import { AdditionalProcessing } from './tableProcessing';
|
|
4
|
+
import { CustomField } from '../models/Schema';
|
|
4
5
|
/**
|
|
5
6
|
* Returns a cleaned version of the dashboard item we store in state. We clean
|
|
6
7
|
* the dashboard item so that we aren't exposing unnecessary details to the
|
|
@@ -8,9 +9,18 @@ import { AdditionalProcessing } from './tableProcessing';
|
|
|
8
9
|
* interface to build amazing dashboards on top of.
|
|
9
10
|
* @param item
|
|
10
11
|
*/
|
|
11
|
-
export declare function cleanDashboardItem(item: {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
export declare function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, }: {
|
|
13
|
+
item: {
|
|
14
|
+
[key: string]: any;
|
|
15
|
+
} | undefined;
|
|
16
|
+
dashboardFilters: any;
|
|
17
|
+
client: QuillProviderClient;
|
|
18
|
+
dateBucket?: string;
|
|
19
|
+
additionalProcessing?: AdditionalProcessing;
|
|
20
|
+
customFields?: {
|
|
21
|
+
[tableName: string]: CustomField[];
|
|
22
|
+
} | null;
|
|
23
|
+
}): Promise<QuillReportInternal>;
|
|
14
24
|
export declare function getDashboard(dashboardName: string, client: QuillProviderClient, tenants?: {
|
|
15
25
|
tenantField: string;
|
|
16
26
|
tenantIds: (string | number)[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAMzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,GACb,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;CAC9D,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6J/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
|
|
@@ -34,7 +34,7 @@ const defaultDashboardItem = {
|
|
|
34
34
|
* interface to build amazing dashboards on top of.
|
|
35
35
|
* @param item
|
|
36
36
|
*/
|
|
37
|
-
async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, additionalProcessing) {
|
|
37
|
+
async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, }) {
|
|
38
38
|
if (!item)
|
|
39
39
|
return defaultDashboardItem;
|
|
40
40
|
if (!item.rows) {
|
|
@@ -44,24 +44,51 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, ad
|
|
|
44
44
|
name: item.name,
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
+
const columnsWithCustomFields = [...(item.columns ?? [])];
|
|
48
|
+
if (item.includeCustomFields && item.rows?.length > 0) {
|
|
49
|
+
const tables = item.referencedTables ?? [];
|
|
50
|
+
tables.forEach((table) => {
|
|
51
|
+
const _customFields = customFields?.[table] ?? [];
|
|
52
|
+
_customFields.forEach((field) => {
|
|
53
|
+
if (item.rows[0][field.field] !== undefined &&
|
|
54
|
+
!item.columns.some((col) => col.field === field.field)) {
|
|
55
|
+
columnsWithCustomFields.push({
|
|
56
|
+
field: field.field,
|
|
57
|
+
format: 'string',
|
|
58
|
+
label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(field.field),
|
|
59
|
+
fieldType: 'varchar',
|
|
60
|
+
dataTypeID: 1043,
|
|
61
|
+
jsType: 'string',
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
}
|
|
47
67
|
const processedColumns = item.columns.map((col) => {
|
|
48
68
|
return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
|
|
49
69
|
});
|
|
70
|
+
const columnInternal = (item.includeCustomFields ? columnsWithCustomFields : item.columns).map((col) => {
|
|
71
|
+
return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
|
|
72
|
+
});
|
|
50
73
|
let pivotTable;
|
|
51
74
|
let pivotError;
|
|
52
75
|
try {
|
|
53
76
|
pivotTable = await getPivotTable({
|
|
54
77
|
...item,
|
|
55
|
-
pivot: item.pivot
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
78
|
+
pivot: item.pivot
|
|
79
|
+
? {
|
|
80
|
+
...item.pivot,
|
|
81
|
+
aggregations: item.pivot.aggregations ?? [
|
|
82
|
+
{
|
|
83
|
+
valueField: item.pivot.valueField,
|
|
84
|
+
valueFieldType: item.pivot.valueFieldType,
|
|
85
|
+
valueField2: item.pivot.valueField2,
|
|
86
|
+
valueField2Type: item.pivot.valueField2Type,
|
|
87
|
+
aggregationType: item.pivot.aggregationType,
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
}
|
|
91
|
+
: undefined,
|
|
65
92
|
}, dashboardFilters, client, dateBucket, additionalProcessing, item.dashboardName);
|
|
66
93
|
}
|
|
67
94
|
catch (e) {
|
|
@@ -69,6 +96,29 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, ad
|
|
|
69
96
|
console.error('Error fetching pivot table', e);
|
|
70
97
|
pivotError = 'Error fetching pivot table';
|
|
71
98
|
}
|
|
99
|
+
// For each key on item that starts with "referenceLine_{field}", we want to
|
|
100
|
+
// add it to referenceLineYValues as [field]: [value, value] (we only support horizontal lines)
|
|
101
|
+
// Then for each number value in the referenceLines map, we also want to add [key]: [value, value]
|
|
102
|
+
const referenceLineYValues = [];
|
|
103
|
+
for (const key in item) {
|
|
104
|
+
if (key.startsWith('referenceLine_')) {
|
|
105
|
+
const field = key.slice(14);
|
|
106
|
+
if (!item[key] || !item[key][0])
|
|
107
|
+
continue;
|
|
108
|
+
const value = Object.values(item[key][0])[0];
|
|
109
|
+
referenceLineYValues.push({ label: field, query: [value, value] });
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
if (item.referenceLines) {
|
|
113
|
+
for (const referenceLine of item.referenceLines) {
|
|
114
|
+
if (Array.isArray(referenceLine.query)) {
|
|
115
|
+
referenceLineYValues.push({ label: referenceLine.label, query: referenceLine.query });
|
|
116
|
+
}
|
|
117
|
+
else if (referenceLine.query === '') {
|
|
118
|
+
referenceLineYValues.push({ label: referenceLine.label, query: (pivotTable?.rows ? pivotTable.rows : item.rows).map((row) => Number(row[referenceLine.label]) || 0) });
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
72
122
|
return {
|
|
73
123
|
id: item._id ?? item.id,
|
|
74
124
|
name: item.name,
|
|
@@ -84,7 +134,9 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, ad
|
|
|
84
134
|
label: column.label,
|
|
85
135
|
};
|
|
86
136
|
}),
|
|
87
|
-
|
|
137
|
+
includeCustomFields: item.includeCustomFields,
|
|
138
|
+
columnInternal,
|
|
139
|
+
columnsWithCustomFields,
|
|
88
140
|
chartType: item.chartType,
|
|
89
141
|
dateField: item.dateField,
|
|
90
142
|
pivot: pivotError
|
|
@@ -92,14 +144,16 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, ad
|
|
|
92
144
|
: item.pivot
|
|
93
145
|
? {
|
|
94
146
|
...item.pivot,
|
|
95
|
-
aggregations: item.pivot.aggregations ?? [
|
|
147
|
+
aggregations: item.pivot.aggregations ?? [
|
|
148
|
+
{
|
|
96
149
|
valueField: item.pivot.valueField,
|
|
97
150
|
valueFieldType: item.pivot.valueFieldType,
|
|
98
151
|
valueField2: item.pivot.valueField2,
|
|
99
152
|
valueField2Type: item.pivot.valueField2Type,
|
|
100
153
|
aggregationType: item.pivot.aggregationType,
|
|
101
|
-
}
|
|
102
|
-
|
|
154
|
+
},
|
|
155
|
+
],
|
|
156
|
+
columnValues: item.distinctStrings,
|
|
103
157
|
}
|
|
104
158
|
: undefined,
|
|
105
159
|
yAxisFields: pivotTable
|
|
@@ -123,6 +177,8 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, ad
|
|
|
123
177
|
referencedTables: item?.referencedTables || [],
|
|
124
178
|
referencedColumns: item?.referencedColumns || {},
|
|
125
179
|
error: item.error ?? pivotError,
|
|
180
|
+
referenceLineYValues: referenceLineYValues,
|
|
181
|
+
referenceLines: item.referenceLines,
|
|
126
182
|
};
|
|
127
183
|
}
|
|
128
184
|
/**
|
|
@@ -157,7 +213,8 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
|
|
|
157
213
|
field: agg.valueField,
|
|
158
214
|
label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(agg.valueField)),
|
|
159
215
|
//FIXME: valueFieldType is not always the same as the format
|
|
160
|
-
format: agg.valueFieldType ??
|
|
216
|
+
format: agg.valueFieldType ??
|
|
217
|
+
'whole_number',
|
|
161
218
|
jsType: agg.valueFieldType ?? 'number',
|
|
162
219
|
fieldType: agg.valueFieldType ?? 'number',
|
|
163
220
|
dataTypeID: (0, columnProcessing_1.fieldTypeToDataTypeID)(agg.valueFieldType ?? 'number'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBA4K1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}
|
|
@@ -95,7 +95,9 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
|
|
|
95
95
|
let errorMessage = 'Failed to fetch report: ' + responseJson.error;
|
|
96
96
|
if (hostedRequestBody.metadata.task === 'query' ||
|
|
97
97
|
hostedRequestBody.metadata.task === 'patterns') {
|
|
98
|
-
errorPrefix = '
|
|
98
|
+
errorPrefix = responseJson.error?.includes('Query Parsing Error')
|
|
99
|
+
? ''
|
|
100
|
+
: 'SQL Error: ';
|
|
99
101
|
errorMessage = errorPrefix + responseJson.error;
|
|
100
102
|
}
|
|
101
103
|
else if (responseJson.error?.includes('Virtual Table Error')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,
|
|
1
|
+
{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,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,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;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;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,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"}
|
|
@@ -218,7 +218,7 @@ exports.getType = getType;
|
|
|
218
218
|
*/
|
|
219
219
|
function filterSentence(filter) {
|
|
220
220
|
let value = '';
|
|
221
|
-
if (filter.filterType == Filter_1.
|
|
221
|
+
if (filter.filterType == Filter_1.InternalFilterType.NullFilter) {
|
|
222
222
|
return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}`;
|
|
223
223
|
}
|
|
224
224
|
else if (filter.value === null || filter.value === undefined) {
|
|
@@ -350,7 +350,7 @@ async function buildQueryFromFilters(baseAst, filters, endpoint, client) {
|
|
|
350
350
|
}
|
|
351
351
|
}
|
|
352
352
|
function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter) {
|
|
353
|
-
if (customDateFilter.filterType === Filter_1.FilterType.
|
|
353
|
+
if (customDateFilter.filterType === Filter_1.FilterType.Date &&
|
|
354
354
|
customDateFilter.value &&
|
|
355
355
|
typeof customDateFilter.value === 'object' &&
|
|
356
356
|
'startDate' in customDateFilter.value &&
|
|
@@ -363,14 +363,14 @@ function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter
|
|
|
363
363
|
endDate: new Date(endDate),
|
|
364
364
|
};
|
|
365
365
|
}
|
|
366
|
-
else if (customDateFilter.filterType === Filter_1.FilterType.
|
|
366
|
+
else if (customDateFilter.filterType === Filter_1.FilterType.Date &&
|
|
367
367
|
customDateFilter.value &&
|
|
368
368
|
typeof customDateFilter.value === 'object' &&
|
|
369
369
|
'value' in customDateFilter.value &&
|
|
370
370
|
'unit' in customDateFilter.value) {
|
|
371
371
|
const { value, unit } = customDateFilter.value;
|
|
372
372
|
let processedUnit;
|
|
373
|
-
let processedValue = value;
|
|
373
|
+
let processedValue = value || 1;
|
|
374
374
|
switch (unit) {
|
|
375
375
|
case Filter_1.TimeUnit.Day:
|
|
376
376
|
processedUnit = 'days';
|
|
@@ -453,7 +453,7 @@ function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter
|
|
|
453
453
|
return dashboardDateFilter;
|
|
454
454
|
}
|
|
455
455
|
}
|
|
456
|
-
else if (customDateFilter.filterType === Filter_1.FilterType.
|
|
456
|
+
else if (customDateFilter.filterType === Filter_1.FilterType.Date &&
|
|
457
457
|
customDateFilter.value &&
|
|
458
458
|
typeof customDateFilter.value === 'string') {
|
|
459
459
|
const parsedDate = (0, date_fns_1.parse)(customDateFilter.value, 'yyyy-mm-dd', new Date());
|
|
@@ -495,14 +495,14 @@ function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter
|
|
|
495
495
|
return dashboardDateFilter;
|
|
496
496
|
}
|
|
497
497
|
function mergeCustomFilters(filters, customFilters) {
|
|
498
|
-
const customDateFilters = customFilters.filter((filter) => filter.filterType === Filter_1.
|
|
499
|
-
filter.filterType === Filter_1.
|
|
500
|
-
filter.filterType === Filter_1.
|
|
498
|
+
const customDateFilters = customFilters.filter((filter) => filter.filterType === Filter_1.InternalFilterType.DateCustomFilter ||
|
|
499
|
+
filter.filterType === Filter_1.InternalFilterType.DateFilter ||
|
|
500
|
+
filter.filterType === Filter_1.InternalFilterType.DateComparisonFilter);
|
|
501
501
|
if (customDateFilters.length === 0) {
|
|
502
502
|
return filters.concat(customFilters);
|
|
503
503
|
}
|
|
504
504
|
const withoutDate = filters.filter((filter) => filter.filterType !== Filter_1.DashboardFilterType.Date);
|
|
505
|
-
const customWithoutDate = customFilters.filter((filter) => filter.filterType !== Filter_1.
|
|
505
|
+
const customWithoutDate = customFilters.filter((filter) => filter.filterType !== Filter_1.InternalFilterType.DateCustomFilter);
|
|
506
506
|
const withDate = filters.find((filter) => filter.filterType === Filter_1.DashboardFilterType.Date);
|
|
507
507
|
return withoutDate
|
|
508
508
|
.concat([
|
|
@@ -4,5 +4,8 @@
|
|
|
4
4
|
* @param fields - The fields to consider for domain calculation.
|
|
5
5
|
* @returns - An array representing the adjusted domain [min, max].
|
|
6
6
|
*/
|
|
7
|
-
export default function getDomain(data: any[], fields: any[]
|
|
7
|
+
export default function getDomain(data: any[], fields: any[], referenceLines: {
|
|
8
|
+
label: string;
|
|
9
|
+
query: number[];
|
|
10
|
+
}[] | undefined): number[];
|
|
8
11
|
//# sourceMappingURL=getDomain.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,CA6CtI"}
|
|
@@ -7,7 +7,7 @@ exports.default = getDomain;
|
|
|
7
7
|
* @param fields - The fields to consider for domain calculation.
|
|
8
8
|
* @returns - An array representing the adjusted domain [min, max].
|
|
9
9
|
*/
|
|
10
|
-
function getDomain(data, fields) {
|
|
10
|
+
function getDomain(data, fields, referenceLines) {
|
|
11
11
|
const fieldsArray = fields.map((elem) => elem.field);
|
|
12
12
|
const numericValues = [];
|
|
13
13
|
data.forEach((item) => {
|
|
@@ -23,6 +23,16 @@ function getDomain(data, fields) {
|
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
25
|
});
|
|
26
|
+
if (referenceLines) {
|
|
27
|
+
referenceLines.forEach((line) => {
|
|
28
|
+
if (typeof line.query[0] === 'number') {
|
|
29
|
+
numericValues.push(line.query[0]);
|
|
30
|
+
}
|
|
31
|
+
if (typeof line.query[line.query.length - 1] === 'number') {
|
|
32
|
+
numericValues.push(line.query[line.query.length - 1]);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
26
36
|
const [minValue, maxValue] = numericValues.reduce(([min, max], value) => [Math.min(min, value), Math.max(max, value)], [Infinity, -Infinity]);
|
|
27
37
|
if (minValue === 0 && maxValue === 0) {
|
|
28
38
|
return [0, 1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,CAuWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBASnD"}
|
|
@@ -29,13 +29,15 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
if (!pivot.aggregations?.length && pivot.aggregationType) {
|
|
32
|
-
pivot.aggregations = [
|
|
32
|
+
pivot.aggregations = [
|
|
33
|
+
{
|
|
33
34
|
aggregationType: pivot.aggregationType,
|
|
34
35
|
valueField: pivot.valueField,
|
|
35
36
|
valueFieldType: pivot.valueFieldType,
|
|
36
37
|
valueField2: pivot.valueField2,
|
|
37
38
|
valueField2Type: pivot.valueField2Type,
|
|
38
|
-
}
|
|
39
|
+
},
|
|
40
|
+
];
|
|
39
41
|
}
|
|
40
42
|
let comparisonInterval = undefined;
|
|
41
43
|
if (dateFilter && dateFilter.comparisonRange) {
|
|
@@ -88,7 +90,6 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
|
|
|
88
90
|
task: 'query',
|
|
89
91
|
clientId: client.publicKey,
|
|
90
92
|
databaseType: databaseType,
|
|
91
|
-
getCustomFields: false,
|
|
92
93
|
runQueryConfig: {
|
|
93
94
|
overridePost: true,
|
|
94
95
|
convertDatatypes: true,
|
|
@@ -147,7 +148,7 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
|
|
|
147
148
|
label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
|
|
148
149
|
format: field.name === pivot.rowField
|
|
149
150
|
? 'string'
|
|
150
|
-
:
|
|
151
|
+
: pivot.aggregations?.[index]?.aggregationType === 'percentage'
|
|
151
152
|
? 'percent'
|
|
152
153
|
: 'whole_number',
|
|
153
154
|
fieldType: field.fieldType,
|
|
@@ -263,7 +264,6 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
|
|
|
263
264
|
};
|
|
264
265
|
}
|
|
265
266
|
function disambiguatedValueField(pivot) {
|
|
266
|
-
// console.log(pivot);
|
|
267
267
|
if (pivot.aggregations && pivot.aggregations.length > 0) {
|
|
268
268
|
if (pivot.aggregations.length === 1) {
|
|
269
269
|
return pivot.aggregations[0]?.valueField ?? pivot.valueField;
|
|
@@ -2,7 +2,7 @@ import { Pivot } from '../models/Pivot';
|
|
|
2
2
|
import { AdditionalProcessing } from './tableProcessing';
|
|
3
3
|
export declare function processSingleQuotes(value: string, databaseType: string): string;
|
|
4
4
|
export declare function processAggType(aggType: string, hasColumnField?: boolean): string;
|
|
5
|
-
export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string,
|
|
5
|
+
export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isColumnFieldAlias?: boolean, isValueFieldAlias?: boolean): string;
|
|
6
6
|
export declare function replaceSpacesWithUnderscores(column: string): string;
|
|
7
7
|
export declare function processDateTrunc(dateBucket: string, rowField: string, databaseType: string, comparisonInterval?: string): string;
|
|
8
8
|
export declare function processValueField(aggType: string, databaseType: string, valueField: string): string;
|
|
@@ -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;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,
|
|
1
|
+
{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAkG5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,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,UAcrB;AAmFD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AAw2BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAuE5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}
|