@quillsql/react 2.13.47 → 2.13.49
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 +56 -49
- package/dist/cjs/ChartBuilder.d.ts +3 -2
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +172 -138
- package/dist/cjs/ChartEditor.d.ts +2 -2
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +5 -2
- package/dist/cjs/Context.d.ts +121 -41
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +449 -261
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +26 -25
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +0 -3
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts +24 -10
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.js +472 -96
- package/dist/cjs/QuillProvider.d.ts +3 -1
- package/dist/cjs/QuillProvider.d.ts.map +1 -1
- package/dist/cjs/QuillProvider.js +2 -2
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +25 -14
- package/dist/cjs/SQLEditor.d.ts +1 -1
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +51 -16
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +85 -14
- package/dist/cjs/assets/ExclamationFilledIcon.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +2 -1
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts +1 -1
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts.map +1 -1
- package/dist/cjs/components/Chart/CustomReferenceLine.js +7 -6
- package/dist/cjs/components/Chart/GaugeChart.d.ts +1 -1
- package/dist/cjs/components/Chart/GaugeChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/GaugeChart.js +63 -36
- package/dist/cjs/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/InternalChart.js +30 -33
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +3 -1
- package/dist/cjs/components/Chart/MapChart.d.ts +3 -3
- package/dist/cjs/components/Chart/MapChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/MapChart.js +62 -34
- package/dist/cjs/components/Chart/PieChart.d.ts +3 -1
- package/dist/cjs/components/Chart/PieChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/PieChart.js +80 -39
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +4 -20
- package/dist/cjs/components/Dashboard/DashboardTemplate.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardTemplate.js +2 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +4 -4
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +101 -65
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +2 -2
- package/dist/cjs/components/Dashboard/util.d.ts +1 -1
- package/dist/cjs/components/Dashboard/util.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/util.js +7 -6
- package/dist/cjs/components/QuillMultiSelectSectionList.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectSectionList.js +32 -22
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +186 -159
- package/dist/cjs/components/QuillSelect.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelect.js +83 -75
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +18 -11
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +59 -61
- 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 +3 -4
- package/dist/cjs/components/ReportBuilder/ui.d.ts +2 -2
- package/dist/cjs/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/ui.js +4 -7
- package/dist/cjs/components/UiComponents.d.ts +1 -1
- package/dist/cjs/hooks/useAskQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useAskQuill.js +5 -1
- package/dist/cjs/hooks/useDashboard.d.ts +2 -2
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +160 -69
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +29 -15
- package/dist/cjs/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.d.ts +1 -0
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +22 -12
- package/dist/cjs/hooks/useReport.d.ts +2 -2
- package/dist/cjs/hooks/useReport.d.ts.map +1 -1
- package/dist/cjs/hooks/useReport.js +3 -4
- package/dist/cjs/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/cjs/hooks/useVirtualTables.js +16 -22
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +2 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +19 -7
- package/dist/cjs/models/Client.d.ts +0 -1
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/models/Data.d.ts +20 -0
- package/dist/cjs/models/Data.d.ts.map +1 -0
- package/dist/cjs/models/Data.js +2 -0
- package/dist/cjs/models/Filter.d.ts +42 -4
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Pivot.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.d.ts +3 -2
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.js +28 -37
- package/dist/cjs/utils/client.d.ts +3 -2
- package/dist/cjs/utils/client.d.ts.map +1 -1
- package/dist/cjs/utils/client.js +38 -39
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +14 -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 +3 -2
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +30 -12
- package/dist/cjs/utils/dataFetcher.d.ts +8 -5
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +189 -65
- package/dist/cjs/utils/filterProcessing.d.ts +2 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +24 -38
- package/dist/cjs/utils/getDomain.d.ts.map +1 -1
- package/dist/cjs/utils/paginationProcessing.d.ts +1 -0
- package/dist/cjs/utils/paginationProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/paginationProcessing.js +6 -1
- package/dist/cjs/utils/pivotConstructor.d.ts +2 -1
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +15 -9
- package/dist/cjs/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/pivotProcessing.js +3 -5
- package/dist/cjs/utils/queryConstructor.js +1 -1
- package/dist/cjs/utils/report.d.ts +10 -7
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +52 -60
- package/dist/cjs/utils/schema.d.ts +4 -3
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +30 -44
- package/dist/cjs/utils/tableProcessing.d.ts +16 -10
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +92 -90
- package/dist/cjs/utils/textProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/textProcessing.js +2 -1
- package/dist/cjs/utils/ui.d.ts.map +1 -1
- package/dist/esm/Chart.d.ts +2 -2
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +60 -53
- package/dist/esm/ChartBuilder.d.ts +3 -2
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +173 -139
- package/dist/esm/ChartEditor.d.ts +2 -2
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +6 -3
- package/dist/esm/Context.d.ts +121 -41
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +450 -262
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +28 -27
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +0 -3
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts +24 -10
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/dateRangePickerUtils.js +471 -95
- package/dist/esm/QuillProvider.d.ts +3 -1
- package/dist/esm/QuillProvider.d.ts.map +1 -1
- package/dist/esm/QuillProvider.js +2 -2
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +28 -17
- package/dist/esm/SQLEditor.d.ts +1 -1
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +54 -19
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +88 -17
- package/dist/esm/assets/ExclamationFilledIcon.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +2 -1
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts +1 -1
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts.map +1 -1
- package/dist/esm/components/Chart/CustomReferenceLine.js +8 -7
- package/dist/esm/components/Chart/GaugeChart.d.ts +1 -1
- package/dist/esm/components/Chart/GaugeChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/GaugeChart.js +65 -38
- package/dist/esm/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/InternalChart.js +32 -35
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +3 -1
- package/dist/esm/components/Chart/MapChart.d.ts +3 -3
- package/dist/esm/components/Chart/MapChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/MapChart.js +67 -39
- package/dist/esm/components/Chart/PieChart.d.ts +3 -1
- package/dist/esm/components/Chart/PieChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/PieChart.js +80 -39
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +5 -21
- package/dist/esm/components/Dashboard/DashboardSection.js +2 -2
- package/dist/esm/components/Dashboard/DashboardTemplate.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardTemplate.js +3 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts +4 -4
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +102 -66
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +2 -2
- package/dist/esm/components/Dashboard/util.d.ts +1 -1
- package/dist/esm/components/Dashboard/util.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/util.js +8 -7
- package/dist/esm/components/QuillMultiSelectSectionList.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectSectionList.js +32 -22
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +187 -160
- package/dist/esm/components/QuillSelect.d.ts.map +1 -1
- package/dist/esm/components/QuillSelect.js +85 -77
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +18 -11
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +59 -61
- 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 +3 -4
- package/dist/esm/components/ReportBuilder/ui.d.ts +2 -2
- package/dist/esm/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/ui.js +4 -7
- package/dist/esm/components/UiComponents.d.ts +1 -1
- package/dist/esm/hooks/useAskQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useAskQuill.js +6 -2
- package/dist/esm/hooks/useDashboard.d.ts +2 -2
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +162 -71
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +31 -17
- package/dist/esm/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.d.ts +1 -0
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +23 -13
- package/dist/esm/hooks/useReport.d.ts +2 -2
- package/dist/esm/hooks/useReport.d.ts.map +1 -1
- package/dist/esm/hooks/useReport.js +4 -5
- package/dist/esm/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/esm/hooks/useVirtualTables.js +17 -23
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +2 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +20 -8
- package/dist/esm/models/Client.d.ts +0 -1
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/models/Data.d.ts +20 -0
- package/dist/esm/models/Data.d.ts.map +1 -0
- package/dist/esm/models/Data.js +1 -0
- package/dist/esm/models/Filter.d.ts +42 -4
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Pivot.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.d.ts +3 -2
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.js +28 -37
- package/dist/esm/utils/client.d.ts +3 -2
- package/dist/esm/utils/client.d.ts.map +1 -1
- package/dist/esm/utils/client.js +38 -39
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +14 -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 +3 -2
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +31 -13
- package/dist/esm/utils/dataFetcher.d.ts +8 -5
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +187 -65
- package/dist/esm/utils/filterProcessing.d.ts +2 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +25 -39
- package/dist/esm/utils/getDomain.d.ts.map +1 -1
- package/dist/esm/utils/paginationProcessing.d.ts +1 -0
- package/dist/esm/utils/paginationProcessing.d.ts.map +1 -1
- package/dist/esm/utils/paginationProcessing.js +5 -0
- package/dist/esm/utils/pivotConstructor.d.ts +2 -1
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +16 -10
- package/dist/esm/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/esm/utils/pivotProcessing.js +5 -7
- package/dist/esm/utils/queryConstructor.js +1 -1
- package/dist/esm/utils/report.d.ts +10 -7
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +53 -61
- package/dist/esm/utils/schema.d.ts +4 -3
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +30 -44
- package/dist/esm/utils/tableProcessing.d.ts +16 -10
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +94 -92
- package/dist/esm/utils/textProcessing.d.ts.map +1 -1
- package/dist/esm/utils/textProcessing.js +2 -1
- package/dist/esm/utils/ui.d.ts.map +1 -1
- package/package.json +2 -1
|
@@ -40,9 +40,13 @@ function filterValuesEquivalent(filters1, filters2) {
|
|
|
40
40
|
// Find the odd filters out and return false ONLY if they have a selected value or are a date filter
|
|
41
41
|
const filters1Labels = filters1.map((f) => f.label);
|
|
42
42
|
const filters2Labels = filters2.map((f) => f.label);
|
|
43
|
-
const oddFilters = filters1Labels.length > filters2Labels.length
|
|
43
|
+
const oddFilters = filters1Labels.length > filters2Labels.length
|
|
44
|
+
? filters1Labels.filter((label) => !filters2Labels.includes(label))
|
|
45
|
+
: filters2Labels.filter((label) => !filters1Labels.includes(label));
|
|
44
46
|
for (const filter of oddFilters) {
|
|
45
|
-
const filter1 = filters1Labels.length > filters2Labels.length
|
|
47
|
+
const filter1 = filters1Labels.length > filters2Labels.length
|
|
48
|
+
? filters1.find((f) => f.label === filter)
|
|
49
|
+
: filters2.find((f) => f.label === filter);
|
|
46
50
|
if (filter1?.selectedValue || filter1?.startDate || filter1?.endDate) {
|
|
47
51
|
return false;
|
|
48
52
|
}
|
|
@@ -104,52 +108,74 @@ function userFilterValuesEquivalent(filters1, filters2) {
|
|
|
104
108
|
}
|
|
105
109
|
return true;
|
|
106
110
|
}
|
|
107
|
-
function tenantsEquivalent(
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
111
|
+
// function tenantsEquivalent(
|
|
112
|
+
// tenants1:
|
|
113
|
+
// | { tenantField: string; tenantIds: (string | number)[] }[]
|
|
114
|
+
// | (string | number)[],
|
|
115
|
+
// tenants2:
|
|
116
|
+
// | { tenantField: string; tenantIds: (string | number)[] }[]
|
|
117
|
+
// | (string | number)[],
|
|
118
|
+
// ): boolean {
|
|
119
|
+
// if (!tenants1 && !tenants2) {
|
|
120
|
+
// return true;
|
|
121
|
+
// }
|
|
122
|
+
// if (tenants1?.length !== tenants2?.length) {
|
|
123
|
+
// return false;
|
|
124
|
+
// }
|
|
125
|
+
// if (!tenants1 || !tenants2) {
|
|
126
|
+
// return false;
|
|
127
|
+
// }
|
|
128
|
+
// // The two tenant arrays aren't necessarily in the same order
|
|
129
|
+
// // we can build two dictionaries of [foreignKey, tenantIds] and compare them
|
|
130
|
+
// // if they are arrays of strings or numbers, we can just compare them directly
|
|
131
|
+
// if (
|
|
132
|
+
// (typeof tenants1[0] === 'string' && typeof tenants2[0] === 'string') ||
|
|
133
|
+
// (typeof tenants1[0] === 'number' && typeof tenants2[0] === 'number')
|
|
134
|
+
// ) {
|
|
135
|
+
// return equal(tenants1, tenants2);
|
|
136
|
+
// }
|
|
137
|
+
// if (
|
|
138
|
+
// (typeof tenants1[0] === 'string' && typeof tenants2[0] !== 'string') ||
|
|
139
|
+
// (typeof tenants1[0] === 'number' && typeof tenants2[0] !== 'number')
|
|
140
|
+
// ) {
|
|
141
|
+
// return false;
|
|
142
|
+
// }
|
|
143
|
+
// const mappedTenants1 = (
|
|
144
|
+
// tenants1 as { tenantField: string; tenantIds: (string | number)[] }[]
|
|
145
|
+
// ).reduce(
|
|
146
|
+
// (acc, tenant) => {
|
|
147
|
+
// acc[tenant.tenantField] = tenant.tenantIds;
|
|
148
|
+
// return acc;
|
|
149
|
+
// },
|
|
150
|
+
// {} as { [key: string]: (string | number)[] },
|
|
151
|
+
// );
|
|
152
|
+
// const mappedTenants2 = (
|
|
153
|
+
// tenants2 as { tenantField: string; tenantIds: (string | number)[] }[]
|
|
154
|
+
// ).reduce(
|
|
155
|
+
// (acc, tenant) => {
|
|
156
|
+
// acc[tenant.tenantField] = tenant.tenantIds;
|
|
157
|
+
// return acc;
|
|
158
|
+
// },
|
|
159
|
+
// {} as { [key: string]: (string | number)[] },
|
|
160
|
+
// );
|
|
161
|
+
// for (const key in mappedTenants1) {
|
|
162
|
+
// if (!equal(mappedTenants1[key], mappedTenants2[key])) {
|
|
163
|
+
// return false;
|
|
164
|
+
// }
|
|
165
|
+
// }
|
|
166
|
+
// return true;
|
|
167
|
+
// }
|
|
143
168
|
function customFieldsEquivalent(customFields1, customFields2) {
|
|
144
169
|
return (0, fast_deep_equal_1.default)(customFields1, customFields2);
|
|
145
170
|
}
|
|
146
|
-
function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, dashboardName,
|
|
171
|
+
function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, dashboardName, propagateChanges, }) {
|
|
147
172
|
const [client] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
148
|
-
const { dashboardReports: dashboard, addReport, updateReport } = (0, useDashboard_1.useDashboardReports)(dashboardName);
|
|
173
|
+
const { dashboardReports: dashboard, addReport, updateReport, } = (0, useDashboard_1.useDashboardReports)(dashboardName);
|
|
149
174
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
150
175
|
const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
|
|
151
176
|
const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
|
|
152
177
|
const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
|
|
178
|
+
const { getToken } = (0, react_1.useContext)(Context_1.FetchContext);
|
|
153
179
|
const contextFilters = (0, react_1.useMemo)(() => {
|
|
154
180
|
return dashboardName
|
|
155
181
|
? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
|
|
@@ -196,7 +222,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
196
222
|
rowCountAbortController.current?.abort();
|
|
197
223
|
rowCountAbortController.current = new AbortController();
|
|
198
224
|
try {
|
|
199
|
-
const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, tenants, flags, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
|
|
225
|
+
const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, getToken, tenants, flags, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
|
|
200
226
|
rowCountAbortController.current = null;
|
|
201
227
|
if (rowCount) {
|
|
202
228
|
if (dashboardName) {
|
|
@@ -267,8 +293,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
267
293
|
const updatedProcessing = { ...additionalProcessing, ...processing };
|
|
268
294
|
const pivotQuery = (dashboardName ? dashboard : reports)[item.id]
|
|
269
295
|
?.pivotQuery;
|
|
270
|
-
const comparisonPivotQuery = (dashboardName ? dashboard : reports)[item.id]
|
|
271
|
-
?.comparisonPivotQuery;
|
|
296
|
+
const comparisonPivotQuery = (dashboardName ? dashboard : reports)[item.id]?.comparisonPivotQuery;
|
|
272
297
|
const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)({
|
|
273
298
|
reportId: item.id,
|
|
274
299
|
client,
|
|
@@ -282,6 +307,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
282
307
|
pivotQuery,
|
|
283
308
|
comparisonPivotQuery,
|
|
284
309
|
getPivotRowCount: false,
|
|
310
|
+
getToken,
|
|
285
311
|
});
|
|
286
312
|
updateTableRowsAbortController.current = null;
|
|
287
313
|
if (paginatedRows.error) {
|
|
@@ -304,17 +330,15 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
304
330
|
});
|
|
305
331
|
}
|
|
306
332
|
else {
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
});
|
|
317
|
-
}
|
|
333
|
+
reportsDispatch({
|
|
334
|
+
type: 'UPDATE_REPORT',
|
|
335
|
+
id: item.id,
|
|
336
|
+
data: {
|
|
337
|
+
[isPivotPagination ? 'pivotRows' : 'rows']: updatedRows,
|
|
338
|
+
loadingRows: false,
|
|
339
|
+
filtersApplied: userFilters,
|
|
340
|
+
},
|
|
341
|
+
});
|
|
318
342
|
}
|
|
319
343
|
setAdditionalProcessing(updatedProcessing);
|
|
320
344
|
}
|
|
@@ -355,6 +379,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
355
379
|
rowsOnly: true,
|
|
356
380
|
rowCountOnly: false,
|
|
357
381
|
abortSignal: rowsAbortController.current.signal,
|
|
382
|
+
getToken,
|
|
358
383
|
});
|
|
359
384
|
addReport({
|
|
360
385
|
...fetchedReport,
|
|
@@ -378,7 +403,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
378
403
|
additionalProcessing: processing,
|
|
379
404
|
reportAbortController: rowsAbortController.current,
|
|
380
405
|
customFields: schemaData.customFields,
|
|
381
|
-
|
|
406
|
+
propagateChanges,
|
|
382
407
|
});
|
|
383
408
|
rowsAbortController.current = null;
|
|
384
409
|
setError(undefined);
|
|
@@ -411,9 +436,10 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
411
436
|
if (schemaData.isSchemaLoading ||
|
|
412
437
|
(filterValuesEquivalent(previousFilters.current ?? contextFilters, filters) &&
|
|
413
438
|
userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
|
|
414
|
-
tenantsEquivalent(previousTenants.current ?? [], tenants ?? []) &&
|
|
439
|
+
// tenantsEquivalent(previousTenants.current ?? [], tenants ?? []) &&
|
|
415
440
|
customFieldsEquivalent(previousCustomFields.current, schemaData.customFields) &&
|
|
416
|
-
((dashboardName ? dashboard : reports)[item.id]?.rows
|
|
441
|
+
((dashboardName ? dashboard : reports)[item.id]?.rows !== undefined ||
|
|
442
|
+
rowsAbortController.current))) {
|
|
417
443
|
if (!rowsAbortController.current && !schemaData.isSchemaLoading)
|
|
418
444
|
setLoading(false);
|
|
419
445
|
return;
|
|
@@ -428,7 +454,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
428
454
|
filters,
|
|
429
455
|
userFilters,
|
|
430
456
|
item.id,
|
|
431
|
-
tenants,
|
|
457
|
+
// tenants,
|
|
432
458
|
schemaData.customFields,
|
|
433
459
|
schemaData.isSchemaLoading,
|
|
434
460
|
]);
|
|
@@ -440,7 +466,10 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
440
466
|
else if (tempReport?.error) {
|
|
441
467
|
setError(tempReport.error);
|
|
442
468
|
}
|
|
443
|
-
}, [
|
|
469
|
+
}, [
|
|
470
|
+
(dashboardName ? dashboard : reports)[item.id]?.triggerReload,
|
|
471
|
+
(dashboardName ? dashboard : reports)[item.id]?.error,
|
|
472
|
+
]);
|
|
444
473
|
return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
|
|
445
474
|
isLoading: loading,
|
|
446
475
|
error,
|
|
@@ -453,10 +482,11 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
453
482
|
}
|
|
454
483
|
// The same data-loader pattern as above, but with special logic for charts
|
|
455
484
|
// At some point these may be able to get merged into one function.
|
|
456
|
-
const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, filters, userFilters, dashboardName,
|
|
485
|
+
const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, filters, userFilters, dashboardName, propagateChanges, }) => {
|
|
457
486
|
const { dashboardReports: dashboard, addReport } = (0, useDashboard_1.useDashboardReports)(dashboardName);
|
|
458
487
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
459
488
|
const { reports, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
|
|
489
|
+
const { getToken } = (0, react_1.useContext)(Context_1.FetchContext);
|
|
460
490
|
const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
|
|
461
491
|
const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
|
|
462
492
|
const contextFilters = (0, react_1.useMemo)(() => {
|
|
@@ -515,6 +545,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
515
545
|
dateBucket,
|
|
516
546
|
customFields: schemaData.customFields,
|
|
517
547
|
abortSignal: fetchReportAbortController.current.signal,
|
|
548
|
+
getToken,
|
|
518
549
|
});
|
|
519
550
|
addReport({
|
|
520
551
|
...report,
|
|
@@ -540,7 +571,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
540
571
|
dateBucket,
|
|
541
572
|
reportAbortController: fetchReportAbortController.current,
|
|
542
573
|
customFields: schemaData.customFields,
|
|
543
|
-
|
|
574
|
+
propagateChanges,
|
|
544
575
|
});
|
|
545
576
|
setError(undefined);
|
|
546
577
|
}
|
|
@@ -571,10 +602,12 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
571
602
|
// previousFilters.current ?? contextFilters,
|
|
572
603
|
previousFilters.current ?? [], filters) &&
|
|
573
604
|
userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
|
|
574
|
-
tenantsEquivalent(tenants ?? [], previousTenants.current ?? []) &&
|
|
605
|
+
// tenantsEquivalent(tenants ?? [], previousTenants.current ?? []) &&
|
|
575
606
|
previousDateBucket.current === dateBucket &&
|
|
576
607
|
customFieldsEquivalent(previousCustomFields.current, schemaData.customFields) &&
|
|
577
|
-
((dashboardName ? dashboard : reports)[item.id]?.rows?.length
|
|
608
|
+
((dashboardName ? dashboard : reports)[item.id]?.rows?.length !==
|
|
609
|
+
undefined ||
|
|
610
|
+
fetchReportAbortController.current))) {
|
|
578
611
|
if (!fetchReportAbortController.current && !schemaData.isSchemaLoading)
|
|
579
612
|
setLoading(false);
|
|
580
613
|
return;
|
|
@@ -590,7 +623,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
590
623
|
userFilters,
|
|
591
624
|
item.id,
|
|
592
625
|
dateBucket,
|
|
593
|
-
tenants,
|
|
626
|
+
// tenants,
|
|
594
627
|
schemaData.customFields,
|
|
595
628
|
schemaData.isSchemaLoading,
|
|
596
629
|
]);
|
|
@@ -602,7 +635,10 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
602
635
|
else if (tempReport?.error) {
|
|
603
636
|
setError(tempReport.error);
|
|
604
637
|
}
|
|
605
|
-
}, [
|
|
638
|
+
}, [
|
|
639
|
+
(dashboardName ? dashboard : reports)[item.id]?.triggerReload,
|
|
640
|
+
(dashboardName ? dashboard : reports)[item.id]?.error,
|
|
641
|
+
]);
|
|
606
642
|
return children({
|
|
607
643
|
isLoading: !chartReport || loading,
|
|
608
644
|
data: chartReport,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMnD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,MAAM,EACN,OAAO,EACP,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMnD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,MAAM,EACN,OAAO,EACP,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,CA4HhC"}
|
|
@@ -80,7 +80,7 @@ function QuillMetricComponent({ report, onClick, error, isLoading, children, })
|
|
|
80
80
|
}, children: "No results" })) : ((0, jsx_runtime_1.jsx)(MetricDisplay, { dateFilter: dateFilter, primaryMetricLabel: primaryMetricLabel, comparisonLabel: comparisonLabel, theme: theme, children: children }))] }) }) }, report?.name));
|
|
81
81
|
}
|
|
82
82
|
const MetricDisplay = ({ children, dateFilter, primaryMetricLabel, comparisonLabel, theme, }) => {
|
|
83
|
-
return (0, jsx_runtime_1.jsx)("div", { style: {
|
|
83
|
+
return ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
84
84
|
padding: 0,
|
|
85
85
|
height: '100%',
|
|
86
86
|
width: '100%',
|
|
@@ -133,5 +133,5 @@ const MetricDisplay = ({ children, dateFilter, primaryMetricLabel, comparisonLab
|
|
|
133
133
|
marginLeft: 2,
|
|
134
134
|
}, children: comparisonLabel
|
|
135
135
|
? 'in ' + comparisonLabel.toLowerCase()
|
|
136
|
-
: 'previous period' })] }))] }) });
|
|
136
|
+
: 'previous period' })] }))] }) }));
|
|
137
137
|
};
|
|
@@ -3,5 +3,5 @@ export declare function validateTemplatesAgainstFilters(filters: any[], template
|
|
|
3
3
|
valid: boolean;
|
|
4
4
|
error: string;
|
|
5
5
|
};
|
|
6
|
-
export declare function addTemplatesToDashboard(name: any, newTemplates: any[], client: QuillProviderClient, dashboardData: any): Promise<any>;
|
|
6
|
+
export declare function addTemplatesToDashboard(name: any, newTemplates: any[], client: QuillProviderClient, dashboardData: any, getToken: () => Promise<string>): Promise<any>;
|
|
7
7
|
//# sourceMappingURL=util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAK1D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAK1D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;AAGD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,GAAG,EAAE,EACnB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,EAAE,GAAG,EAClB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,GAAG,CAAC,CA8Cd"}
|
|
@@ -39,23 +39,24 @@ function validateTemplatesAgainstFilters(filters, templates) {
|
|
|
39
39
|
return { valid: false, error };
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
|
|
42
|
+
// TODO: Outdated, revisit and retest
|
|
43
|
+
async function addTemplatesToDashboard(name, newTemplates, client, dashboardData, getToken) {
|
|
43
44
|
try {
|
|
44
45
|
const { publicKey, tenants } = client;
|
|
45
46
|
if (tenants) {
|
|
46
47
|
// need to implement a way to specify report tenant id
|
|
47
48
|
throw new Error('Adding from template not yet supported for tenants');
|
|
48
49
|
}
|
|
49
|
-
const
|
|
50
|
+
const { data: resp } = await (0, dataFetcher_1.quillFetch)({
|
|
51
|
+
client,
|
|
52
|
+
task: 'add-from-template',
|
|
50
53
|
metadata: {
|
|
51
54
|
dashboardName: name,
|
|
52
|
-
task: 'add-from-template',
|
|
53
55
|
clientId: publicKey,
|
|
54
56
|
templateReportIds: newTemplates.map((template) => template._id),
|
|
55
57
|
},
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
'omit', hostedBody, null);
|
|
58
|
+
getToken,
|
|
59
|
+
});
|
|
59
60
|
if (resp.success && resp.newItems && resp.newItems.length > 0) {
|
|
60
61
|
const newData = {
|
|
61
62
|
newQueries: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuillMultiSelectSectionList.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectSectionList.tsx"],"names":[],"mappings":"AAEA,OAAc,EACZ,aAAa,EAKd,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,EAC1C,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,KAAK,GACN,EAAE;IACD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"QuillMultiSelectSectionList.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectSectionList.tsx"],"names":[],"mappings":"AAEA,OAAc,EACZ,aAAa,EAKd,MAAM,OAAO,CAAC;AAGf;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,EAC1C,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,KAAK,GACN,EAAE;IACD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IAC3C,OAAO,EAAE;QACP,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;SACf,EAAE,CAAC;KACL,CAAC;IACF,gBAAgB,CAAC,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACrD,QAAQ,EAAE,CAAC,KAAK,EAAE;QAChB,MAAM,EAAE;YAAE,KAAK,EAAE;gBAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;aAAE,CAAA;SAAE,CAAC;KACxD,KAAK,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,2CA8bA;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CAwDA,CAAC"}
|
|
@@ -75,19 +75,23 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
75
75
|
const isUuid = sample.value?.match(uuidRegex);
|
|
76
76
|
const isNumber = !isNaN(parseInt(sample.value));
|
|
77
77
|
const filteredOptions = Object.keys(options).reduce((acc, key) => {
|
|
78
|
-
acc[key] =
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
78
|
+
acc[key] =
|
|
79
|
+
options[key]?.filter((option) => {
|
|
80
|
+
if (!option) {
|
|
81
|
+
return false;
|
|
82
|
+
}
|
|
83
|
+
return (searchQuery === '' ||
|
|
84
|
+
option.label
|
|
85
|
+
.toLowerCase()
|
|
86
|
+
.replace(/\s+/g, '')
|
|
87
|
+
.includes(searchQuery.toLowerCase().replace(/\s+/g, '')) ||
|
|
88
|
+
(isNumber || isUuid
|
|
89
|
+
? option.value
|
|
90
|
+
.toLowerCase()
|
|
91
|
+
.replace(/\s+/g, '')
|
|
92
|
+
.includes(searchQuery.toLowerCase().replace(/\s+/g, ''))
|
|
93
|
+
: false));
|
|
94
|
+
}) ?? [];
|
|
91
95
|
return acc;
|
|
92
96
|
}, {});
|
|
93
97
|
const sliceSize = Math.ceil(20 / Object.keys(filteredOptions).length);
|
|
@@ -96,7 +100,9 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
96
100
|
filteredOptions[key] = filteredOptions[key].slice(0, sliceSize);
|
|
97
101
|
}
|
|
98
102
|
});
|
|
99
|
-
return Object.fromEntries(Object.entries(filteredOptions)
|
|
103
|
+
return Object.fromEntries(Object.entries(filteredOptions)
|
|
104
|
+
.filter(([, value]) => !!value?.length)
|
|
105
|
+
.sort(([key]) => (key === owner ? -1 : 1)));
|
|
100
106
|
}, [options, searchQuery]);
|
|
101
107
|
const filteredLength = react_1.default.useMemo(() => {
|
|
102
108
|
return Object.values(filteredItems).reduce((a, b) => a + b.length, 0);
|
|
@@ -128,7 +134,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
128
134
|
borderRadius: '6px',
|
|
129
135
|
width: width,
|
|
130
136
|
minWidth: width,
|
|
131
|
-
...style
|
|
137
|
+
...style,
|
|
132
138
|
}, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
133
139
|
fontSize: 14,
|
|
134
140
|
color: theme?.secondaryTextColor,
|
|
@@ -194,8 +200,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
194
200
|
height: 9,
|
|
195
201
|
width: 230,
|
|
196
202
|
borderTop: '1px solid #e7e7e7',
|
|
197
|
-
} })] })), !isLoading &&
|
|
198
|
-
(!filteredItems || filteredLength === 0) && ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
203
|
+
} })] })), !isLoading && (!filteredItems || filteredLength === 0) && ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
199
204
|
display: 'flex',
|
|
200
205
|
alignItems: 'center',
|
|
201
206
|
padding: 8,
|
|
@@ -225,7 +230,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
225
230
|
whiteSpace: 'nowrap',
|
|
226
231
|
overflow: 'hidden',
|
|
227
232
|
cursor: 'default',
|
|
228
|
-
}, children: emptyLabel ?? 'No options available' })] })), !isLoading ? Object.keys(filteredItems).map((key) => ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("button", { style: {
|
|
233
|
+
}, children: emptyLabel ?? 'No options available' })] })), !isLoading ? (Object.keys(filteredItems).map((key) => ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("button", { style: {
|
|
229
234
|
display: 'flex',
|
|
230
235
|
alignItems: 'center',
|
|
231
236
|
padding: 8,
|
|
@@ -245,7 +250,8 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
245
250
|
overflow: 'hidden',
|
|
246
251
|
}, className: "quill-option", onClick: () => {
|
|
247
252
|
const updatedValue = options[key]?.length === value[key]?.length
|
|
248
|
-
? []
|
|
253
|
+
? []
|
|
254
|
+
: (options[key]?.map((option) => option.value) ?? []);
|
|
249
255
|
const updatedChangeEvent = {
|
|
250
256
|
target: {
|
|
251
257
|
value: {
|
|
@@ -268,7 +274,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
268
274
|
whiteSpace: 'nowrap',
|
|
269
275
|
overflow: 'hidden',
|
|
270
276
|
fontWeight: 600,
|
|
271
|
-
}, children: sectionHeaderMap?.[key] ?? key })] },
|
|
277
|
+
}, children: sectionHeaderMap?.[key] ?? key })] }, 'sh-' + key), (0, jsx_runtime_1.jsx)("div", { style: {
|
|
272
278
|
height: 1,
|
|
273
279
|
borderTop: '1px solid #e7e7e7',
|
|
274
280
|
marginTop: 2,
|
|
@@ -313,11 +319,15 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
|
|
|
313
319
|
.quill-option:hover {
|
|
314
320
|
background: #F4F4F5;
|
|
315
321
|
}
|
|
316
|
-
` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: value[key]?.includes(option.value) ?? false, style: {
|
|
322
|
+
` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: value[key]?.includes(option.value) ?? false, style: {
|
|
323
|
+
width: '14px',
|
|
324
|
+
height: '14px',
|
|
325
|
+
margin: 'auto 0',
|
|
326
|
+
}, readOnly: true }), (0, jsx_runtime_1.jsx)("span", { style: {
|
|
317
327
|
textOverflow: 'ellipsis',
|
|
318
328
|
whiteSpace: 'nowrap',
|
|
319
329
|
overflow: 'hidden',
|
|
320
|
-
}, children: option.label })] },
|
|
330
|
+
}, children: option.label })] }, 'v-' + key + '-' + option.value)))] }, 'sp-' + key)))) : ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) }))] }))] }));
|
|
321
331
|
}
|
|
322
332
|
const ListboxTextInput = ({ value, onChange, placeholder, }) => {
|
|
323
333
|
return ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAc,EAEZ,aAAa,EAMd,MAAM,OAAO,CAAC;AAKf;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,KAAK,GACN,EAAE,yBAAyB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,2CAwmBA;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CAwDA,CAAC"}
|