@quillsql/react 2.13.39 → 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 +347 -147
- 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/QuillMultiSelectSectionList.js +5 -5
- 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 +7 -6
- 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 +352 -152
- 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/QuillMultiSelectSectionList.js +5 -5
- 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 +7 -6
- 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
|
@@ -25,14 +25,8 @@ export const useReports = () => {
|
|
|
25
25
|
// Not meant to be customer facing
|
|
26
26
|
export const useReport = (reportId) => {
|
|
27
27
|
const { loadFiltersForReport } = useContext(ReportFiltersContext);
|
|
28
|
-
const { reports
|
|
28
|
+
const { reports } = useContext(ReportsContext);
|
|
29
29
|
const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {
|
|
30
|
-
// Set loading member on the report to true
|
|
31
|
-
reportsDispatch({
|
|
32
|
-
type: 'UPDATE_REPORT',
|
|
33
|
-
id: reportId,
|
|
34
|
-
data: { loadingRows: true },
|
|
35
|
-
});
|
|
36
30
|
// Pull the date filter out of the override filters, process it, and append it to the filters
|
|
37
31
|
const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
|
|
38
32
|
loadFiltersForReport(reportId, initiator, [
|
|
@@ -7,12 +7,16 @@ export declare const useVirtualTables: () => {
|
|
|
7
7
|
};
|
|
8
8
|
reloadAll: (client: any, caller?: string) => Promise<{
|
|
9
9
|
schema: Table[];
|
|
10
|
-
customFields:
|
|
10
|
+
customFields: {
|
|
11
|
+
[tableName: string]: import("../models/Schema").CustomField[];
|
|
12
|
+
} | null;
|
|
11
13
|
isSchemaLoading: boolean;
|
|
12
14
|
}>;
|
|
13
15
|
refreshSome: (client: any, tables: Table[]) => Promise<{
|
|
14
16
|
schema: Table[];
|
|
15
|
-
customFields:
|
|
17
|
+
customFields: {
|
|
18
|
+
[tableName: string]: import("../models/Schema").CustomField[];
|
|
19
|
+
} | null;
|
|
16
20
|
isSchemaLoading: boolean;
|
|
17
21
|
}>;
|
|
18
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useVirtualTables.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVirtualTables.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;
|
|
1
|
+
{"version":3,"file":"useVirtualTables.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVirtualTables.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;wBAOS,GAAG,WAAW,MAAM;;;;;;;0BAyDf,GAAG,UAAU,KAAK,EAAE;;;;;;;CA6D9D,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { useContext, useState } from 'react';
|
|
2
|
-
import { SchemaDataContext } from '../Context';
|
|
2
|
+
import { SchemaDataContext, TenantContext } from '../Context';
|
|
3
3
|
import { getSchemaInfo } from '../utils/schema';
|
|
4
4
|
export const useVirtualTables = () => {
|
|
5
5
|
const [schemaData, setSchemaData] = useContext(SchemaDataContext);
|
|
6
|
+
const { tenants } = useContext(TenantContext);
|
|
6
7
|
const [loadingTables, setLoadingTables] = useState({});
|
|
7
8
|
const handleReload = async (client, caller) => {
|
|
8
9
|
setSchemaData({ ...schemaData, isSchemaLoading: true });
|
|
@@ -11,11 +12,12 @@ export const useVirtualTables = () => {
|
|
|
11
12
|
acc[table._id] = true;
|
|
12
13
|
return acc;
|
|
13
14
|
}, {}));
|
|
14
|
-
const { schemaData: schema, customFieldsByTable } = await getSchemaInfo(client, caller);
|
|
15
|
+
const { schemaData: schema, customFieldsByTable, schemaWithCustomFields, } = await getSchemaInfo({ client, caller, tenants });
|
|
15
16
|
setSchemaData({
|
|
16
17
|
schema,
|
|
17
18
|
customFields: customFieldsByTable,
|
|
18
19
|
isSchemaLoading: false,
|
|
20
|
+
schemaWithCustomFields,
|
|
19
21
|
});
|
|
20
22
|
setLoadingTables({});
|
|
21
23
|
return {
|
|
@@ -25,7 +27,7 @@ export const useVirtualTables = () => {
|
|
|
25
27
|
};
|
|
26
28
|
};
|
|
27
29
|
const handleReloadSome = async (client, tableIds, caller) => {
|
|
28
|
-
const { schemaData: schema, customFieldsByTable } = await getSchemaInfo(client, caller, tableIds);
|
|
30
|
+
const { schemaData: schema, customFieldsByTable, schemaWithCustomFields, } = await getSchemaInfo({ client, caller, tenants, tableIds });
|
|
29
31
|
// Only replace the tables that were reloaded
|
|
30
32
|
setSchemaData({
|
|
31
33
|
schema: schemaData.schema.map((table) => {
|
|
@@ -36,6 +38,7 @@ export const useVirtualTables = () => {
|
|
|
36
38
|
}, {}),
|
|
37
39
|
customFields: customFieldsByTable,
|
|
38
40
|
isSchemaLoading: false,
|
|
41
|
+
schemaWithCustomFields,
|
|
39
42
|
});
|
|
40
43
|
return {
|
|
41
44
|
schema,
|
|
@@ -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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"}
|
|
@@ -68,8 +68,8 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
68
68
|
}
|
|
69
69
|
let newUniqueValues = uniqueValues;
|
|
70
70
|
if (fetchDistinct || !uniqueValues) {
|
|
71
|
-
const { filteredColumns: smallStringColumns, exceededColumns } = await getCountsByColumns(stringColumns, query || '', client, tenants, schemaData.customFields ??
|
|
72
|
-
newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query || '', data.rows || [], client, tenants, schemaData.customFields ??
|
|
71
|
+
const { filteredColumns: smallStringColumns, exceededColumns } = await getCountsByColumns(stringColumns, query || '', client, tenants, schemaData.customFields ?? {}, dashboardName);
|
|
72
|
+
newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query || '', data.rows || [], client, tenants, schemaData.customFields ?? {}, undefined, dashboardName);
|
|
73
73
|
exceededColumns?.forEach((column) => {
|
|
74
74
|
if (newUniqueValues) {
|
|
75
75
|
newUniqueValues[column.field] = { EXCEEDS_LIMIT: true };
|
|
@@ -100,7 +100,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
100
100
|
if (dateColumns.length === 0) {
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
|
-
const dateRangeByColumn = await getQueryDateRangeByColumns(dateColumns, query || '', client, tenants, schemaData.customFields ??
|
|
103
|
+
const dateRangeByColumn = await getQueryDateRangeByColumns(dateColumns, query || '', client, tenants, schemaData.customFields ?? {}, dashboardName);
|
|
104
104
|
setDateRanges(dateRangeByColumn || {});
|
|
105
105
|
}
|
|
106
106
|
};
|
|
@@ -361,7 +361,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
361
361
|
!columnsToShow[pivotColumnField]) {
|
|
362
362
|
errors.push('Error in column field: undefined type');
|
|
363
363
|
}
|
|
364
|
-
if (errors.length === 0 && pivotAggregations?.every((p) => p.
|
|
364
|
+
if (errors.length === 0 && pivotAggregations?.every((p) => p.aggregationType && (p.valueField || p.aggregationType === 'count'))) {
|
|
365
365
|
const pivot = {
|
|
366
366
|
rowField: pivotRowField,
|
|
367
367
|
rowFieldType: columnTypes[pivotRowField ?? ''],
|
|
@@ -582,7 +582,6 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
582
582
|
columns,
|
|
583
583
|
]);
|
|
584
584
|
const pivotFieldChange = async (field, value) => {
|
|
585
|
-
console.log();
|
|
586
585
|
if (typeof value !== 'string' && (!value?.length || !value?.every((p) => p?.aggregationType))) {
|
|
587
586
|
return;
|
|
588
587
|
}
|
|
@@ -828,7 +827,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
828
827
|
'count',
|
|
829
828
|
'max',
|
|
830
829
|
'min',
|
|
831
|
-
|
|
830
|
+
'percentage'
|
|
832
831
|
].map((option) => {
|
|
833
832
|
return { label: option, value: option };
|
|
834
833
|
}),
|
|
@@ -868,7 +867,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
|
|
|
868
867
|
setIsOpen(false);
|
|
869
868
|
setPopUpTitle('Add pivot');
|
|
870
869
|
}, label: "Cancel" }), _jsx(ButtonComponent, { id: "custom-button", onClick: onCommitPivot, label: 'Save', disabled: !(pivotAggregations?.length > 0) ||
|
|
871
|
-
pivotAggregations.some((agg) => !agg.aggregationType || !agg.valueField) })] })] })) : (_jsx("div", { style: {
|
|
870
|
+
pivotAggregations.some((agg) => !agg.aggregationType || (!agg.valueField && agg.aggregationType !== 'count')) })] })] })) : (_jsx("div", { style: {
|
|
872
871
|
display: 'flex',
|
|
873
872
|
flexDirection: 'column',
|
|
874
873
|
fontFamily: theme?.fontFamily,
|
|
@@ -49,7 +49,7 @@ export declare enum FieldType {
|
|
|
49
49
|
Null = "null",
|
|
50
50
|
Boolean = "boolean"
|
|
51
51
|
}
|
|
52
|
-
export declare enum
|
|
52
|
+
export declare enum InternalFilterType {
|
|
53
53
|
StringFilter = "string-filter",
|
|
54
54
|
DateFilter = "date-filter",
|
|
55
55
|
DateCustomFilter = "date-custom-filter",
|
|
@@ -61,13 +61,20 @@ export declare enum FilterType {
|
|
|
61
61
|
}
|
|
62
62
|
export type Operator = StringOperator | DateOperator | NumberOperator | NullOperator | BoolOperator;
|
|
63
63
|
export interface BaseFilter {
|
|
64
|
-
filterType:
|
|
64
|
+
filterType: InternalFilterType;
|
|
65
65
|
fieldType: FieldType;
|
|
66
66
|
operator: Operator;
|
|
67
67
|
field: string;
|
|
68
68
|
value: any;
|
|
69
69
|
table?: string;
|
|
70
70
|
}
|
|
71
|
+
export declare enum FilterType {
|
|
72
|
+
String = "string",
|
|
73
|
+
Date = "date",
|
|
74
|
+
Numeric = "numeric",
|
|
75
|
+
Boolean = "boolean",
|
|
76
|
+
Null = "null"
|
|
77
|
+
}
|
|
71
78
|
export interface Filter {
|
|
72
79
|
filterType: FilterType;
|
|
73
80
|
operator?: StringOperator | DateOperator | NumberOperator | NullOperator | BoolOperator;
|
|
@@ -75,29 +82,29 @@ export interface Filter {
|
|
|
75
82
|
startDate: string;
|
|
76
83
|
endDate: string;
|
|
77
84
|
} | {
|
|
78
|
-
value
|
|
85
|
+
value?: number;
|
|
79
86
|
unit: TimeUnit;
|
|
80
87
|
} | null;
|
|
81
|
-
field
|
|
82
|
-
table
|
|
88
|
+
field?: string;
|
|
89
|
+
table?: string;
|
|
83
90
|
}
|
|
84
91
|
export interface StringFilter extends BaseFilter {
|
|
85
|
-
filterType:
|
|
92
|
+
filterType: InternalFilterType.StringFilter;
|
|
86
93
|
fieldType: FieldType.String;
|
|
87
94
|
value: string;
|
|
88
95
|
}
|
|
89
96
|
export interface StringInFilter extends BaseFilter {
|
|
90
|
-
filterType:
|
|
97
|
+
filterType: InternalFilterType.StringInFilter;
|
|
91
98
|
fieldType: FieldType.String;
|
|
92
99
|
value: string[];
|
|
93
100
|
}
|
|
94
101
|
export interface NumericFilter extends BaseFilter {
|
|
95
|
-
filterType:
|
|
102
|
+
filterType: InternalFilterType.NumericFilter;
|
|
96
103
|
fieldType: FieldType.Number;
|
|
97
104
|
value: number;
|
|
98
105
|
}
|
|
99
106
|
export interface DateFilter extends BaseFilter {
|
|
100
|
-
filterType:
|
|
107
|
+
filterType: InternalFilterType.DateFilter;
|
|
101
108
|
fieldType: FieldType.Date;
|
|
102
109
|
value: {
|
|
103
110
|
value: number;
|
|
@@ -105,7 +112,7 @@ export interface DateFilter extends BaseFilter {
|
|
|
105
112
|
};
|
|
106
113
|
}
|
|
107
114
|
export interface DateCustomFilter extends BaseFilter {
|
|
108
|
-
filterType:
|
|
115
|
+
filterType: InternalFilterType.DateCustomFilter;
|
|
109
116
|
fieldType: FieldType.Date;
|
|
110
117
|
value: {
|
|
111
118
|
startDate: string;
|
|
@@ -113,17 +120,17 @@ export interface DateCustomFilter extends BaseFilter {
|
|
|
113
120
|
};
|
|
114
121
|
}
|
|
115
122
|
export interface DateComparisonFilter extends BaseFilter {
|
|
116
|
-
filterType:
|
|
123
|
+
filterType: InternalFilterType.DateComparisonFilter;
|
|
117
124
|
fieldType: FieldType.Date;
|
|
118
125
|
value: string;
|
|
119
126
|
}
|
|
120
127
|
export interface BooleanFilter extends BaseFilter {
|
|
121
|
-
filterType:
|
|
128
|
+
filterType: InternalFilterType.BooleanFilter;
|
|
122
129
|
fieldType: FieldType.Boolean;
|
|
123
130
|
value: boolean;
|
|
124
131
|
}
|
|
125
132
|
export interface NullFilter extends BaseFilter {
|
|
126
|
-
filterType:
|
|
133
|
+
filterType: InternalFilterType.NullFilter;
|
|
127
134
|
fieldType: FieldType.Null;
|
|
128
135
|
value: null;
|
|
129
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../src/models/Filter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAoC7E,oBAAY,cAAc;IACxB,SAAS,eAAa;IACtB,YAAY,mBAAiB;IAC7B,QAAQ,aAAW;IACnB,EAAE,OAAK;IACP,KAAK,WAAS;CACf;AAED,oBAAY,YAAY;IACtB,MAAM,WAAS;IACf,SAAS,gBAAc;IACvB,aAAa,oBAAkB;IAC/B,YAAY,mBAAiB;IAC7B,OAAO,aAAW;IAClB,UAAU,iBAAe;IACzB,WAAW,iBAAe;IAC1B,QAAQ,cAAY;IACpB,oBAAoB,6BAA2B;IAC/C,iBAAiB,0BAAwB;CAC1C;AAED,oBAAY,cAAc;IACxB,OAAO,aAAW;IAClB,UAAU,iBAAe;IACzB,WAAW,iBAAe;IAC1B,QAAQ,cAAY;IACpB,oBAAoB,6BAA2B;IAC/C,iBAAiB,0BAAwB;CAC1C;AAED,oBAAY,YAAY;IACtB,SAAS,gBAAc;IACvB,MAAM,YAAU;CACjB;AAED,oBAAY,YAAY;IACtB,OAAO,aAAW;IAClB,UAAU,iBAAe;CAC1B;AAED,oBAAY,QAAQ;IAClB,IAAI,SAAO;IACX,OAAO,YAAU;IACjB,KAAK,UAAQ;IACb,IAAI,SAAO;IACX,GAAG,QAAM;IACT,IAAI,SAAO;CACZ;AAED,oBAAY,SAAS;IACnB,MAAM,WAAS;IACf,MAAM,WAAS;IACf,IAAI,SAAO;IACX,IAAI,SAAO;IACX,OAAO,YAAU;CAClB;AAED,oBAAY,
|
|
1
|
+
{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../src/models/Filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,16 +85,24 @@ export var FieldType;
|
|
|
85
85
|
FieldType["Null"] = "null";
|
|
86
86
|
FieldType["Boolean"] = "boolean";
|
|
87
87
|
})(FieldType || (FieldType = {}));
|
|
88
|
+
export var InternalFilterType;
|
|
89
|
+
(function (InternalFilterType) {
|
|
90
|
+
InternalFilterType["StringFilter"] = "string-filter";
|
|
91
|
+
InternalFilterType["DateFilter"] = "date-filter";
|
|
92
|
+
InternalFilterType["DateCustomFilter"] = "date-custom-filter";
|
|
93
|
+
InternalFilterType["DateComparisonFilter"] = "date-comparison-filter";
|
|
94
|
+
InternalFilterType["NumericFilter"] = "numeric-filter";
|
|
95
|
+
InternalFilterType["NullFilter"] = "null-filter";
|
|
96
|
+
InternalFilterType["StringInFilter"] = "string-in-filter";
|
|
97
|
+
InternalFilterType["BooleanFilter"] = "boolean-filter";
|
|
98
|
+
})(InternalFilterType || (InternalFilterType = {}));
|
|
88
99
|
export var FilterType;
|
|
89
100
|
(function (FilterType) {
|
|
90
|
-
FilterType["
|
|
91
|
-
FilterType["
|
|
92
|
-
FilterType["
|
|
93
|
-
FilterType["
|
|
94
|
-
FilterType["
|
|
95
|
-
FilterType["NullFilter"] = "null-filter";
|
|
96
|
-
FilterType["StringInFilter"] = "string-in-filter";
|
|
97
|
-
FilterType["BooleanFilter"] = "boolean-filter";
|
|
101
|
+
FilterType["String"] = "string";
|
|
102
|
+
FilterType["Date"] = "date";
|
|
103
|
+
FilterType["Numeric"] = "numeric";
|
|
104
|
+
FilterType["Boolean"] = "boolean";
|
|
105
|
+
FilterType["Null"] = "null";
|
|
98
106
|
})(FilterType || (FilterType = {}));
|
|
99
107
|
/** Dashboard filters are filters that persist with the dashboard */
|
|
100
108
|
export var DashboardFilterType;
|
|
@@ -108,43 +116,59 @@ var StringFilterType;
|
|
|
108
116
|
StringFilterType["Multiselect"] = "multiselect";
|
|
109
117
|
})(StringFilterType || (StringFilterType = {}));
|
|
110
118
|
export const convertCustomFilter = (filter) => {
|
|
119
|
+
let field;
|
|
120
|
+
let filterType;
|
|
121
|
+
let fieldType;
|
|
122
|
+
let operator;
|
|
123
|
+
let value;
|
|
124
|
+
let table;
|
|
111
125
|
switch (filter.filterType) {
|
|
112
|
-
case FilterType.
|
|
113
|
-
if (
|
|
114
|
-
throw new Error(
|
|
126
|
+
case FilterType.String:
|
|
127
|
+
if (!filter.field) {
|
|
128
|
+
throw new Error('Field is required for StringFilter');
|
|
115
129
|
}
|
|
116
|
-
if (filter.
|
|
117
|
-
|
|
130
|
+
if (typeof filter.value === 'string') {
|
|
131
|
+
filterType = InternalFilterType.StringFilter;
|
|
132
|
+
fieldType = FieldType.String;
|
|
133
|
+
operator = filter.operator;
|
|
134
|
+
field = filter.field;
|
|
135
|
+
table = filter.table;
|
|
136
|
+
value = filter.value;
|
|
118
137
|
}
|
|
119
|
-
if (
|
|
120
|
-
|
|
121
|
-
|
|
138
|
+
else if (Array.isArray(filter.value) &&
|
|
139
|
+
filter.value.every((v) => typeof v === 'string')) {
|
|
140
|
+
filterType = InternalFilterType.StringInFilter;
|
|
141
|
+
fieldType = FieldType.String;
|
|
142
|
+
operator = filter.operator;
|
|
143
|
+
field = filter.field;
|
|
144
|
+
table = filter.table;
|
|
145
|
+
value = filter.value;
|
|
122
146
|
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
operator: filter.operator,
|
|
126
|
-
fieldType: FieldType.String,
|
|
127
|
-
};
|
|
128
|
-
case FilterType.StringInFilter:
|
|
129
|
-
if (!Array.isArray(filter.value)) {
|
|
130
|
-
throw new Error(`Invalid value for StringInFilter, expected string[], got ${filter.value}`);
|
|
147
|
+
else {
|
|
148
|
+
throw new Error(`Invalid value for StringFilter, expected string, or string array, got ${filter.value}`);
|
|
131
149
|
}
|
|
132
150
|
if (filter.operator === undefined) {
|
|
133
151
|
filter.operator = StringOperator.IsExactly;
|
|
134
152
|
}
|
|
135
153
|
if (!(filter.operator in StringOperator) &&
|
|
136
154
|
!Object.values(StringOperator).includes(filter.operator)) {
|
|
137
|
-
throw new Error(`Invalid operator for
|
|
155
|
+
throw new Error(`Invalid operator for StringFilter, expected StringOperator, got ${filter.operator}`);
|
|
138
156
|
}
|
|
139
157
|
return {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
158
|
+
filterType,
|
|
159
|
+
fieldType,
|
|
160
|
+
field,
|
|
161
|
+
value,
|
|
162
|
+
table,
|
|
163
|
+
operator,
|
|
143
164
|
};
|
|
144
|
-
case FilterType.
|
|
165
|
+
case FilterType.Numeric:
|
|
145
166
|
if (typeof filter.value !== 'number') {
|
|
146
167
|
throw new Error(`Invalid value for NumericFilter, expected number, got ${filter.value}`);
|
|
147
168
|
}
|
|
169
|
+
else if (!filter.field) {
|
|
170
|
+
throw new Error('Field is required for NumericFilter');
|
|
171
|
+
}
|
|
148
172
|
if (filter.operator === undefined) {
|
|
149
173
|
filter.operator = NumberOperator.EqualTo;
|
|
150
174
|
}
|
|
@@ -152,15 +176,27 @@ export const convertCustomFilter = (filter) => {
|
|
|
152
176
|
!Object.values(NumberOperator).includes(filter.operator)) {
|
|
153
177
|
throw new Error(`Invalid operator for NumericFilter, expected NumberOperator, got ${filter.operator}`);
|
|
154
178
|
}
|
|
179
|
+
filterType = InternalFilterType.NumericFilter;
|
|
180
|
+
fieldType = FieldType.Number;
|
|
181
|
+
operator = filter.operator;
|
|
182
|
+
field = filter.field;
|
|
183
|
+
value = filter.value;
|
|
184
|
+
table = filter.table;
|
|
155
185
|
return {
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
186
|
+
filterType,
|
|
187
|
+
fieldType,
|
|
188
|
+
field,
|
|
189
|
+
value,
|
|
190
|
+
table,
|
|
191
|
+
operator,
|
|
159
192
|
};
|
|
160
|
-
case FilterType.
|
|
193
|
+
case FilterType.Null:
|
|
161
194
|
if (filter.value !== null) {
|
|
162
195
|
throw new Error(`Invalid value for NullFilter, expected null, got ${filter.value}`);
|
|
163
196
|
}
|
|
197
|
+
else if (!filter.field) {
|
|
198
|
+
throw new Error('Field is required for NullFilter');
|
|
199
|
+
}
|
|
164
200
|
if (filter.operator === undefined) {
|
|
165
201
|
filter.operator = NullOperator.IsNotNull;
|
|
166
202
|
}
|
|
@@ -168,15 +204,27 @@ export const convertCustomFilter = (filter) => {
|
|
|
168
204
|
!Object.values(NullOperator).includes(filter.operator)) {
|
|
169
205
|
throw new Error(`Invalid operator for NullFilter, expected NullOperator, got ${filter.operator}`);
|
|
170
206
|
}
|
|
207
|
+
filterType = InternalFilterType.NullFilter;
|
|
208
|
+
fieldType = FieldType.Null;
|
|
209
|
+
operator = filter.operator;
|
|
210
|
+
field = filter.field;
|
|
211
|
+
value = null;
|
|
212
|
+
table = filter.table;
|
|
171
213
|
return {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
214
|
+
filterType,
|
|
215
|
+
fieldType,
|
|
216
|
+
field,
|
|
217
|
+
value,
|
|
218
|
+
table,
|
|
219
|
+
operator,
|
|
175
220
|
};
|
|
176
|
-
case FilterType.
|
|
221
|
+
case FilterType.Boolean:
|
|
177
222
|
if (typeof filter.value !== 'boolean') {
|
|
178
223
|
throw new Error(`Invalid value for BooleanFilter, expected boolean, got ${filter.value}`);
|
|
179
224
|
}
|
|
225
|
+
else if (!filter.field) {
|
|
226
|
+
throw new Error('Field is required for BooleanFilter');
|
|
227
|
+
}
|
|
180
228
|
if (filter.operator === undefined) {
|
|
181
229
|
filter.operator = BoolOperator.EqualTo;
|
|
182
230
|
}
|
|
@@ -184,62 +232,88 @@ export const convertCustomFilter = (filter) => {
|
|
|
184
232
|
!Object.values(BoolOperator).includes(filter.operator)) {
|
|
185
233
|
throw new Error(`Invalid operator for BooleanFilter, expected BoolOperator, got ${filter.operator}`);
|
|
186
234
|
}
|
|
235
|
+
filterType = InternalFilterType.BooleanFilter;
|
|
236
|
+
fieldType = FieldType.Boolean;
|
|
237
|
+
operator = filter.operator;
|
|
238
|
+
field = filter.field;
|
|
239
|
+
value = null;
|
|
240
|
+
table = filter.table;
|
|
187
241
|
return {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
242
|
+
filterType,
|
|
243
|
+
fieldType,
|
|
244
|
+
field,
|
|
245
|
+
value,
|
|
246
|
+
table,
|
|
247
|
+
operator,
|
|
191
248
|
};
|
|
192
|
-
case FilterType.
|
|
193
|
-
if (typeof filter.value
|
|
194
|
-
filter.value
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
typeof filter.value.
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
filter.
|
|
249
|
+
case FilterType.Date:
|
|
250
|
+
if (typeof filter.value === 'object' &&
|
|
251
|
+
filter.value &&
|
|
252
|
+
'value' in filter.value &&
|
|
253
|
+
filter.value.unit) {
|
|
254
|
+
if ((filter.value.value && typeof filter.value.value !== 'number') ||
|
|
255
|
+
typeof filter.value.unit !== 'string') {
|
|
256
|
+
throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, got ${filter.value}`);
|
|
257
|
+
}
|
|
258
|
+
if (!filter.value.value) {
|
|
259
|
+
filter.value.value = 1;
|
|
260
|
+
}
|
|
261
|
+
if (filter.operator === undefined) {
|
|
262
|
+
filter.operator = DateOperator.EqualTo;
|
|
263
|
+
}
|
|
264
|
+
if (!(filter.operator in DateOperator) &&
|
|
265
|
+
!Object.values(DateOperator).includes(filter.operator)) {
|
|
266
|
+
throw new Error(`Invalid operator for DateFilter, expected DateOperator, got ${filter.operator}`);
|
|
267
|
+
}
|
|
268
|
+
filterType = InternalFilterType.DateFilter;
|
|
269
|
+
fieldType = FieldType.Date;
|
|
270
|
+
operator = filter.operator;
|
|
271
|
+
value = filter.value;
|
|
272
|
+
field = filter.field || '';
|
|
273
|
+
table = filter.table;
|
|
202
274
|
}
|
|
203
|
-
if (
|
|
204
|
-
|
|
205
|
-
|
|
275
|
+
else if (typeof filter.value === 'object' &&
|
|
276
|
+
filter.value &&
|
|
277
|
+
'startDate' in filter.value &&
|
|
278
|
+
filter.value.startDate &&
|
|
279
|
+
'endDate' in filter.value &&
|
|
280
|
+
filter.value.endDate) {
|
|
281
|
+
if (typeof filter.value.startDate !== 'string' ||
|
|
282
|
+
typeof filter.value.endDate !== 'string') {
|
|
283
|
+
throw new Error(`Invalid value for DateCustomFilter, expected { startDate: string, endDate: string }, got ${filter.value}`);
|
|
284
|
+
}
|
|
285
|
+
filterType = InternalFilterType.DateCustomFilter;
|
|
286
|
+
fieldType = FieldType.Date;
|
|
287
|
+
operator = DateOperator.Custom;
|
|
288
|
+
value = filter.value;
|
|
289
|
+
field = filter.field || '';
|
|
290
|
+
table = filter.table;
|
|
206
291
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
// Right now we're silently ignoring the operator, may want to generate error instead?
|
|
222
|
-
filter.operator = DateOperator.Custom;
|
|
223
|
-
return {
|
|
224
|
-
...filter,
|
|
225
|
-
operator: DateOperator.Custom,
|
|
226
|
-
fieldType: FieldType.Date,
|
|
227
|
-
};
|
|
228
|
-
case FilterType.DateComparisonFilter:
|
|
229
|
-
if (typeof filter.value !== 'string') {
|
|
230
|
-
throw new Error(`Invalid value for DateComparisonFilter, expected string, got ${filter.value}`);
|
|
231
|
-
}
|
|
232
|
-
if (filter.operator === undefined) {
|
|
233
|
-
filter.operator = DateOperator.EqualTo;
|
|
292
|
+
else if (typeof filter.value === 'string') {
|
|
293
|
+
if (filter.operator === undefined) {
|
|
294
|
+
filter.operator = DateOperator.EqualTo;
|
|
295
|
+
}
|
|
296
|
+
if (!(filter.operator in DateOperator) &&
|
|
297
|
+
!Object.values(DateOperator).includes(filter.operator)) {
|
|
298
|
+
throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
|
|
299
|
+
}
|
|
300
|
+
filterType = InternalFilterType.DateComparisonFilter;
|
|
301
|
+
fieldType = FieldType.Date;
|
|
302
|
+
operator = filter.operator;
|
|
303
|
+
value = filter.value;
|
|
304
|
+
field = filter.field || '';
|
|
305
|
+
table = filter.table;
|
|
234
306
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
|
|
307
|
+
else {
|
|
308
|
+
throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, { startDate: string, endDate: string}, or string, got ${filter.value}`);
|
|
238
309
|
}
|
|
239
310
|
return {
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
311
|
+
filterType,
|
|
312
|
+
fieldType,
|
|
313
|
+
field,
|
|
314
|
+
value,
|
|
315
|
+
table,
|
|
316
|
+
operator,
|
|
243
317
|
};
|
|
244
318
|
}
|
|
245
319
|
};
|
|
@@ -86,6 +86,17 @@ export interface QuillReport {
|
|
|
86
86
|
field: string;
|
|
87
87
|
};
|
|
88
88
|
};
|
|
89
|
+
referenceLines?: {
|
|
90
|
+
label: string;
|
|
91
|
+
query: [number, number] | string;
|
|
92
|
+
}[];
|
|
93
|
+
/** Resolved reference line y values */
|
|
94
|
+
referenceLineYValues?: {
|
|
95
|
+
label: string;
|
|
96
|
+
query: [number, number];
|
|
97
|
+
}[];
|
|
98
|
+
includeCustomFields?: boolean;
|
|
99
|
+
columnsWithCustomFields?: Column[];
|
|
89
100
|
}
|
|
90
101
|
export interface QuillReportInternal extends QuillReport {
|
|
91
102
|
/** The pivot row info. */
|
|
@@ -122,7 +133,7 @@ export interface QuillReportInternal extends QuillReport {
|
|
|
122
133
|
adminError?: string;
|
|
123
134
|
/** An internal flag to force a report to trigger a reload from the backend */
|
|
124
135
|
triggerReload?: boolean;
|
|
125
|
-
/**
|
|
136
|
+
/** columns as ColumnInternal */
|
|
126
137
|
columnInternal: ColumnInternal[];
|
|
127
138
|
/** Represents if the report is currently loading rows */
|
|
128
139
|
loadingRows?: boolean;
|
|
@@ -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,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,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C,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;IAGpB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"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"}
|