@quillsql/react 2.13.5 → 2.13.7
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.js +1 -1
- package/dist/cjs/ChartBuilder.d.ts +1 -1
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +6 -22
- package/dist/cjs/ChartEditor.d.ts +1 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/Context.d.ts +21 -6
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +196 -18
- package/dist/cjs/Dashboard.js +7 -7
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +7 -7
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts +0 -1
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.js +0 -22
- package/dist/cjs/QuillProvider.d.ts.map +1 -1
- package/dist/cjs/QuillProvider.js +2 -1
- package/dist/cjs/ReportBuilder.d.ts +0 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +4 -182
- package/dist/cjs/SQLEditor.d.ts +1 -1
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +12 -8
- package/dist/cjs/components/Dashboard/DashboardTemplate.js +2 -2
- package/dist/cjs/components/QuillMultiSelect.js +3 -3
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +3 -3
- package/dist/cjs/components/QuillSelect.js +3 -3
- package/dist/cjs/components/QuillSelectWithCombo.js +4 -4
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +46 -44
- package/dist/cjs/components/ReportBuilder/FilterModal.js +10 -10
- package/dist/cjs/components/ReportBuilder/FilterStack.js +2 -2
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +4 -3
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +19 -5
- package/dist/cjs/hooks/useDashboard.d.ts +22 -3
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +201 -127
- package/dist/cjs/hooks/useExport.d.ts +8 -0
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +20 -11
- package/dist/cjs/hooks/useOnClickOutside.d.ts +1 -1
- package/dist/cjs/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/cjs/hooks/useOnClickOutside.js +10 -6
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +3 -3
- package/dist/cjs/lib/utils.d.ts +1 -0
- package/dist/cjs/lib/utils.d.ts.map +1 -1
- package/dist/cjs/lib/utils.js +9 -1
- package/dist/cjs/models/Dashboard.d.ts +6 -1
- package/dist/cjs/models/Dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.js +3 -3
- package/dist/cjs/utils/columnProcessing.js +4 -4
- package/dist/cjs/utils/constants.d.ts +2 -1
- package/dist/cjs/utils/constants.d.ts.map +1 -1
- package/dist/cjs/utils/constants.js +3 -2
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +1 -2
- package/dist/cjs/utils/pivotConstructor.js +1 -1
- package/dist/esm/Chart.js +1 -1
- package/dist/esm/ChartBuilder.d.ts +1 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +6 -22
- package/dist/esm/ChartEditor.d.ts +1 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/Context.d.ts +21 -6
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +193 -18
- package/dist/esm/Dashboard.js +7 -7
- package/dist/esm/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +7 -7
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts +0 -1
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/dateRangePickerUtils.js +0 -22
- package/dist/esm/QuillProvider.d.ts.map +1 -1
- package/dist/esm/QuillProvider.js +2 -1
- package/dist/esm/ReportBuilder.d.ts +0 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +3 -180
- package/dist/esm/SQLEditor.d.ts +1 -1
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +13 -9
- package/dist/esm/components/Dashboard/DashboardTemplate.js +2 -2
- package/dist/esm/components/QuillMultiSelect.js +3 -3
- package/dist/esm/components/QuillMultiSelectWithCombo.js +3 -3
- package/dist/esm/components/QuillSelect.js +3 -3
- package/dist/esm/components/QuillSelectWithCombo.js +4 -4
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +46 -44
- package/dist/esm/components/ReportBuilder/FilterModal.js +10 -10
- package/dist/esm/components/ReportBuilder/FilterStack.js +1 -1
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +4 -3
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +19 -5
- package/dist/esm/hooks/useDashboard.d.ts +22 -3
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +200 -124
- package/dist/esm/hooks/useExport.d.ts +8 -0
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +20 -11
- package/dist/esm/hooks/useOnClickOutside.d.ts +1 -1
- package/dist/esm/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/esm/hooks/useOnClickOutside.js +10 -6
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +3 -3
- package/dist/esm/lib/utils.d.ts +1 -0
- package/dist/esm/lib/utils.d.ts.map +1 -1
- package/dist/esm/lib/utils.js +7 -0
- package/dist/esm/models/Dashboard.d.ts +6 -1
- package/dist/esm/models/Dashboard.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.js +3 -3
- package/dist/esm/utils/columnProcessing.js +4 -4
- package/dist/esm/utils/constants.d.ts +2 -1
- package/dist/esm/utils/constants.d.ts.map +1 -1
- package/dist/esm/utils/constants.js +2 -1
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +1 -2
- package/dist/esm/utils/pivotConstructor.js +1 -1
- package/package.json +20 -7
- package/dist/cjs/components/BigModal/BigModal.d.ts +0 -15
- package/dist/cjs/components/BigModal/BigModal.d.ts.map +0 -1
- package/dist/cjs/components/BigModal/BigModal.js +0 -81
- package/dist/esm/components/BigModal/BigModal.d.ts +0 -15
- package/dist/esm/components/BigModal/BigModal.d.ts.map +0 -1
- package/dist/esm/components/BigModal/BigModal.js +0 -56
package/dist/cjs/Chart.js
CHANGED
|
@@ -400,7 +400,7 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
|
|
|
400
400
|
if (chartTypes.includes('column')) {
|
|
401
401
|
return ((0, jsx_runtime_1.jsx)(BarChart_1.default, { colors: chartColors, theme: overrideTheme ?? theme, isStacked: !!config?.pivot &&
|
|
402
402
|
config?.yAxisFields?.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: config?.yAxisFields || [], data: config?.rows || [], xAxisField: config?.xAxisField || '', xAxisLabel: config?.xAxisLabel || '', xAxisFormat: config?.xAxisFormat || 'string', containerStyle: containerStyle, className: className, comparison: dateFilter?.comparison &&
|
|
403
|
-
dateFilter.comparisonRange
|
|
403
|
+
dateFilter.comparisonRange?.value !== 'NO_COMPARISON', isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, colorMap: colorMap, onClickChartElement: onClickChartElement, dateFilter: dateFilter }));
|
|
404
404
|
}
|
|
405
405
|
if (chartTypes.includes('metric')) {
|
|
406
406
|
if (!config?.rows ||
|
|
@@ -205,7 +205,7 @@ export interface ChartBuilderProps {
|
|
|
205
205
|
/** A callback fired when the add to dashboard flow has been completed. */
|
|
206
206
|
onAddToDashboardComplete?: (report: QuillReportInternal) => void;
|
|
207
207
|
/** A callback fired when this chart is deleted. */
|
|
208
|
-
onDelete?: () =>
|
|
208
|
+
onDelete?: () => boolean;
|
|
209
209
|
/** A callback fired when changes are discarded. */
|
|
210
210
|
onDiscardChanges?: () => void;
|
|
211
211
|
/** The pivot info applied to this data. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAOZ,SAAS,EACT,aAAa,EACd,MAAM,OAAO,CAAC;AAkBf,OAAO,EAmBL,uBAAuB,EACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAM1D,OAAO,EAAe,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAanE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAKvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,UAAU,CAAC;KACpB,EAAE,CAAC;IACJ,QAAQ,EAAE,OAAO,CAAC;CACnB;AA2CD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,oBA0B9D;AAuJD,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/ChartBuilder.js
CHANGED
|
@@ -200,6 +200,7 @@ exports.dateFormatOptions = [
|
|
|
200
200
|
'MMM_dd_hh:mm_ap_pm',
|
|
201
201
|
'hh_ap_pm',
|
|
202
202
|
'date',
|
|
203
|
+
'timestamptz',
|
|
203
204
|
];
|
|
204
205
|
const NUMBER_OPTIONS = [
|
|
205
206
|
{ value: 'whole_number', label: 'whole number' },
|
|
@@ -412,7 +413,7 @@ function ChartBuilder({ TextInputComponent = UiComponents_1.QuillTextInput, Sele
|
|
|
412
413
|
const [dashboardOptions, setDashboardOptions] = (0, react_1.useState)([]);
|
|
413
414
|
const [defaultDashboardName, setDefaultDashboardName] = (0, react_1.useState)(destinationDashboard || report?.dashboardName || '');
|
|
414
415
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
415
|
-
const
|
|
416
|
+
const { dashboardConfig } = (0, react_1.useContext)(Context_1.DashboardConfigContext);
|
|
416
417
|
const [filtersActive, setFiltersActive] = (0, react_1.useState)(true);
|
|
417
418
|
const specificDashboardFilters = (0, react_1.useMemo)(() => {
|
|
418
419
|
return Object.values(dashboardFilters[defaultDashboardName] ?? {}).map((f) => f.filter);
|
|
@@ -498,7 +499,7 @@ function ChartBuilder({ TextInputComponent = UiComponents_1.QuillTextInput, Sele
|
|
|
498
499
|
}
|
|
499
500
|
};
|
|
500
501
|
const pivotFormData = (pivot) => {
|
|
501
|
-
const yAxisField = pivot.columnField || pivot.valueField;
|
|
502
|
+
const yAxisField = pivot.columnField || pivot.valueField || '';
|
|
502
503
|
const yAxisLabel = report?.yAxisFields && report?.yAxisFields?.length > 0
|
|
503
504
|
? // @ts-ignore
|
|
504
505
|
report.yAxisFields[0].label
|
|
@@ -910,27 +911,10 @@ function ChartBuilder({ TextInputComponent = UiComponents_1.QuillTextInput, Sele
|
|
|
910
911
|
event.preventDefault();
|
|
911
912
|
};
|
|
912
913
|
const deleteChart = async () => {
|
|
913
|
-
if (
|
|
914
|
-
|
|
915
|
-
|
|
916
|
-
const { publicKey, organizationId } = client;
|
|
917
|
-
const cloudBody = {
|
|
918
|
-
dashboardItemId: report.id,
|
|
919
|
-
};
|
|
920
|
-
const searchParams = new URLSearchParams(organizationId
|
|
921
|
-
? {
|
|
922
|
-
clientId: publicKey,
|
|
923
|
-
customerId: organizationId,
|
|
924
|
-
}
|
|
925
|
-
: { clientId: publicKey }).toString();
|
|
926
|
-
const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `deletedash/${publicKey}/${organizationId}/?${searchParams}`, cloudBody);
|
|
927
|
-
if (resp) {
|
|
928
|
-
if (onDelete) {
|
|
929
|
-
onDelete();
|
|
930
|
-
}
|
|
914
|
+
if (onDelete && onDelete()) {
|
|
915
|
+
setIsOpen(false);
|
|
916
|
+
setIsSubmitting(false);
|
|
931
917
|
}
|
|
932
|
-
setIsOpen(false);
|
|
933
|
-
setIsSubmitting(false);
|
|
934
918
|
};
|
|
935
919
|
const editChart = async () => {
|
|
936
920
|
if (!client) {
|
|
@@ -27,7 +27,7 @@ export interface ChartEditorProps {
|
|
|
27
27
|
/** A callback function triggered when the chart error button is clicked */
|
|
28
28
|
onClickChartError?: (element: any) => void;
|
|
29
29
|
/** A callback that is fired when the item is deleted. */
|
|
30
|
-
onDelete?: () =>
|
|
30
|
+
onDelete?: () => boolean;
|
|
31
31
|
/** A select component. */
|
|
32
32
|
SelectComponent?: (props: {
|
|
33
33
|
value: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,SAAS,EAMV,MAAM,OAAO,CAAC;AAoBf,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAgB9C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iCAAiC;IACjC,MAAM,EAAE,OAAO,CAAC;IAEhB,6CAA6C;IAC7C,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAErC,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IAEjB,wDAAwD;IACxD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,wCAAwC;IACxC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,2CAA2C;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,8CAA8C;IAC9C,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IAEzD,oEAAoE;IACpE,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAE7C,2EAA2E;IAC3E,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAE3C,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Context.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { QuillReportInternal } from './models/Report';
|
|
2
|
+
import { QuillReport, QuillReportInternal } from './models/Report';
|
|
3
3
|
import { QuillProviderClient } from './models/Client';
|
|
4
4
|
import { QuillTheme } from './QuillProvider';
|
|
5
5
|
import { DashboardConfig } from './models/Dashboard';
|
|
@@ -12,15 +12,30 @@ export declare const DashboardContext: React.Context<[{
|
|
|
12
12
|
[key: string]: QuillReportInternal;
|
|
13
13
|
}, any]>;
|
|
14
14
|
type DashboardConfigState = {
|
|
15
|
-
[key: string]:
|
|
15
|
+
[key: string]: {
|
|
16
|
+
config: DashboardConfig;
|
|
17
|
+
loading: boolean;
|
|
18
|
+
};
|
|
16
19
|
};
|
|
17
|
-
type DashboardConfigActionType = 'UPDATE_DASHBOARD' | 'ADD_DASHBOARD' | 'SET_DASHBOARD_DATA' | '
|
|
20
|
+
type DashboardConfigActionType = 'UPDATE_DASHBOARD' | 'UPDATE_DASHBOARDS' | 'ADD_DASHBOARD' | 'ADD_DASHBOARDS' | 'DELETE_DASHBOARD' | 'SET_DASHBOARD_DATA' | 'CLEAR_DASHBOARDS' | 'SET_DASHBOARD_LOADING';
|
|
18
21
|
type DashboardConfigAction = {
|
|
19
22
|
type: DashboardConfigActionType;
|
|
20
23
|
id?: string;
|
|
21
|
-
data?:
|
|
24
|
+
data?: {
|
|
25
|
+
config: DashboardConfig;
|
|
26
|
+
loading: boolean;
|
|
27
|
+
} | DashboardConfig | DashboardConfigState | DashboardConfig[] | boolean | undefined;
|
|
22
28
|
};
|
|
23
|
-
export declare const DashboardConfigContext: React.Context<
|
|
29
|
+
export declare const DashboardConfigContext: React.Context<{
|
|
30
|
+
dashboardConfig: DashboardConfigState;
|
|
31
|
+
dashboardConfigDispatch: React.Dispatch<DashboardConfigAction>;
|
|
32
|
+
loadDashboard: (dashboardName: string, fetchFromServer?: boolean, reportAction?: {
|
|
33
|
+
report: QuillReport | {
|
|
34
|
+
id: string;
|
|
35
|
+
};
|
|
36
|
+
action: 'upsert' | 'delete';
|
|
37
|
+
}) => Promise<DashboardConfig | undefined>;
|
|
38
|
+
}>;
|
|
24
39
|
type ReportFiltersState = {
|
|
25
40
|
[id: string]: any;
|
|
26
41
|
};
|
|
@@ -42,7 +57,7 @@ type DashboardFiltersState = {
|
|
|
42
57
|
};
|
|
43
58
|
};
|
|
44
59
|
};
|
|
45
|
-
type DashboardFiltersActionType = 'UPDATE_DASHBOARD_FILTER' | 'UPDATE_DASHBOARD_FILTERS' | 'ADD_DASHBOARD_FILTERS' | 'CLEAR_DASHBOARD_FILTERS';
|
|
60
|
+
type DashboardFiltersActionType = 'UPDATE_DASHBOARD_FILTER' | 'UPDATE_DASHBOARD_FILTERS' | 'ADD_DASHBOARD_FILTERS' | 'DELETE_DASHBOARD_FILTERS' | 'CLEAR_DASHBOARD_FILTERS';
|
|
46
61
|
type DashboardFiltersAction = {
|
|
47
62
|
type: DashboardFiltersActionType;
|
|
48
63
|
dashboardName?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Context.js
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.ContextProvider = exports.DashboardFiltersContext = exports.ReportFiltersContext = exports.DashboardConfigContext = exports.DashboardContext = exports.ClientContext = exports.ThemeContext = exports.SchemaDataContext = void 0;
|
|
4
7
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
8
|
const react_1 = require("react");
|
|
6
9
|
const schema_1 = require("./utils/schema");
|
|
7
10
|
const client_1 = require("./utils/client");
|
|
11
|
+
const dashboard_1 = require("./utils/dashboard");
|
|
12
|
+
const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
|
|
8
13
|
const dummySetter = () => { };
|
|
9
14
|
exports.SchemaDataContext = (0, react_1.createContext)([
|
|
10
15
|
{
|
|
@@ -63,20 +68,73 @@ const dashboardConfigReducer = (state = {}, action) => {
|
|
|
63
68
|
}
|
|
64
69
|
return {
|
|
65
70
|
...state,
|
|
66
|
-
[action.id]: action.data,
|
|
71
|
+
[action.id]: { config: action.data, loading: false },
|
|
72
|
+
};
|
|
73
|
+
case 'UPDATE_DASHBOARDS': {
|
|
74
|
+
if (!action.data) {
|
|
75
|
+
return state;
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
...state,
|
|
79
|
+
...action.data.reduce((acc, dashboard) => {
|
|
80
|
+
acc[dashboard.name] = {
|
|
81
|
+
config: {
|
|
82
|
+
...state[dashboard.name]?.config,
|
|
83
|
+
...dashboard,
|
|
84
|
+
},
|
|
85
|
+
loading: state[dashboard.name]?.loading ?? false,
|
|
86
|
+
};
|
|
87
|
+
return acc;
|
|
88
|
+
}, {}),
|
|
67
89
|
};
|
|
90
|
+
}
|
|
91
|
+
case 'ADD_DASHBOARDS': {
|
|
92
|
+
if (!action.data) {
|
|
93
|
+
return state;
|
|
94
|
+
}
|
|
95
|
+
return {
|
|
96
|
+
...state,
|
|
97
|
+
...action.data.reduce((acc, dashboard) => {
|
|
98
|
+
acc[dashboard.name] = { config: dashboard, loading: false };
|
|
99
|
+
return acc;
|
|
100
|
+
}, {}),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
case 'DELETE_DASHBOARD':
|
|
104
|
+
if (!action.id) {
|
|
105
|
+
return state;
|
|
106
|
+
}
|
|
107
|
+
return Object.fromEntries(Object.entries(state).filter(([key]) => key !== action.id));
|
|
68
108
|
case 'SET_DASHBOARD_DATA':
|
|
69
109
|
if (!action.data) {
|
|
70
110
|
return state;
|
|
71
111
|
}
|
|
72
|
-
return action.data
|
|
73
|
-
|
|
112
|
+
return action.data.reduce((acc, dashboard) => {
|
|
113
|
+
acc[dashboard.name] = { config: dashboard, loading: true };
|
|
114
|
+
return acc;
|
|
115
|
+
}, {});
|
|
116
|
+
case 'CLEAR_DASHBOARDS':
|
|
74
117
|
return {};
|
|
118
|
+
case 'SET_DASHBOARD_LOADING':
|
|
119
|
+
if (action.data === undefined || !action.id || !state[action.id]) {
|
|
120
|
+
return state;
|
|
121
|
+
}
|
|
122
|
+
return {
|
|
123
|
+
...state,
|
|
124
|
+
[action.id]: {
|
|
125
|
+
...state[action.id],
|
|
126
|
+
loading: action.data,
|
|
127
|
+
},
|
|
128
|
+
};
|
|
75
129
|
default:
|
|
76
130
|
return state;
|
|
77
131
|
}
|
|
78
132
|
};
|
|
79
|
-
exports.DashboardConfigContext = (0, react_1.createContext)(
|
|
133
|
+
exports.DashboardConfigContext = (0, react_1.createContext)({
|
|
134
|
+
dashboardConfig: {},
|
|
135
|
+
dashboardConfigDispatch: dummySetter,
|
|
136
|
+
loadDashboard: async () => undefined,
|
|
137
|
+
});
|
|
80
138
|
const reportFiltersReducer = (state = {}, action) => {
|
|
81
139
|
switch (action.type) {
|
|
82
140
|
case 'UPDATE_REPORT_FILTER':
|
|
@@ -123,6 +181,11 @@ const dashboardFiltersReducer = (state, action) => {
|
|
|
123
181
|
...state,
|
|
124
182
|
[action.dashboardName]: action.data,
|
|
125
183
|
};
|
|
184
|
+
case 'DELETE_DASHBOARD_FILTERS':
|
|
185
|
+
if (!action.dashboardName) {
|
|
186
|
+
return state;
|
|
187
|
+
}
|
|
188
|
+
return Object.fromEntries(Object.entries(state).filter(([key]) => key !== action.dashboardName));
|
|
126
189
|
case 'CLEAR_DASHBOARD_FILTERS':
|
|
127
190
|
return {};
|
|
128
191
|
default:
|
|
@@ -134,9 +197,12 @@ exports.DashboardFiltersContext = (0, react_1.createContext)({
|
|
|
134
197
|
dispatch: dummySetter,
|
|
135
198
|
loadFiltersForDashboard: () => { },
|
|
136
199
|
});
|
|
200
|
+
// TODO: track errors per dashboard in the same way as loading state
|
|
137
201
|
const ContextProvider = ({ children, initialTheme, publicKey, organizationId, queryEndpoint, queryHeaders, withCredentials, }) => {
|
|
138
202
|
// get client from session storage
|
|
139
|
-
const [client, setClient] = (0, react_1.useState)(
|
|
203
|
+
const [client, setClient] = (0, react_1.useState)(typeof window !== 'undefined' && sessionStorage
|
|
204
|
+
? JSON.parse(sessionStorage.getItem('quill-client') ?? 'null')
|
|
205
|
+
: null);
|
|
140
206
|
const [isClientLoading, setIsClientLoading] = (0, react_1.useState)(false);
|
|
141
207
|
const [theme, setTheme] = (0, react_1.useState)(null);
|
|
142
208
|
const [schemaData, setSchemaData] = (0, react_1.useState)({
|
|
@@ -186,10 +252,30 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
186
252
|
// For each filter, send a fetch request to get the filter options
|
|
187
253
|
// Once the options are received, update the filter in the state
|
|
188
254
|
await Promise.allSettled(filters.map(async (filter) => {
|
|
189
|
-
if (filter.filterType !== 'string')
|
|
255
|
+
if (filter.filterType !== 'string') {
|
|
256
|
+
dashboardFiltersDispatch({
|
|
257
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
258
|
+
dashboardName,
|
|
259
|
+
filterName: filter.label,
|
|
260
|
+
data: {
|
|
261
|
+
filter: filter,
|
|
262
|
+
loading: false,
|
|
263
|
+
},
|
|
264
|
+
});
|
|
190
265
|
return null;
|
|
191
|
-
|
|
266
|
+
}
|
|
267
|
+
if (filter.label === updatedFilterLabel) {
|
|
268
|
+
dashboardFiltersDispatch({
|
|
269
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
270
|
+
dashboardName,
|
|
271
|
+
filterName: filter.label,
|
|
272
|
+
data: {
|
|
273
|
+
filter: filter,
|
|
274
|
+
loading: false,
|
|
275
|
+
},
|
|
276
|
+
});
|
|
192
277
|
return null;
|
|
278
|
+
}
|
|
193
279
|
const filterOptionsAbortController = new AbortController();
|
|
194
280
|
filterOptionsAbortControllers.current.add(filterOptionsAbortController);
|
|
195
281
|
try {
|
|
@@ -251,6 +337,99 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
251
337
|
}
|
|
252
338
|
}));
|
|
253
339
|
}
|
|
340
|
+
async function loadDashboard(dashboardName, fetchFromServer = false, reportAction) {
|
|
341
|
+
let curDashboardConfig = dashboardConfig[dashboardName]?.config;
|
|
342
|
+
if (!fetchFromServer && curDashboardConfig?.sections) {
|
|
343
|
+
if (reportAction?.action === 'delete') {
|
|
344
|
+
curDashboardConfig = {
|
|
345
|
+
...curDashboardConfig,
|
|
346
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
347
|
+
sectionKey,
|
|
348
|
+
reports.filter((report) => report.id !== reportAction.report.id),
|
|
349
|
+
])),
|
|
350
|
+
};
|
|
351
|
+
}
|
|
352
|
+
else if (reportAction?.action === 'upsert') {
|
|
353
|
+
const containsReport = Object.values(curDashboardConfig?.sections ?? {})
|
|
354
|
+
.flat()
|
|
355
|
+
.some((report) => report.id === reportAction?.report.id);
|
|
356
|
+
curDashboardConfig = {
|
|
357
|
+
...curDashboardConfig,
|
|
358
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
359
|
+
sectionKey,
|
|
360
|
+
containsReport
|
|
361
|
+
? reports.map((report) => {
|
|
362
|
+
return {
|
|
363
|
+
report,
|
|
364
|
+
...(reportAction?.report.id === report.id
|
|
365
|
+
? reportAction?.report
|
|
366
|
+
: dashboard[report.id]),
|
|
367
|
+
_id: report.id,
|
|
368
|
+
id: report.id,
|
|
369
|
+
};
|
|
370
|
+
})
|
|
371
|
+
: [
|
|
372
|
+
...(reports ?? []),
|
|
373
|
+
{
|
|
374
|
+
report: reportAction?.report,
|
|
375
|
+
...dashboard[reportAction?.report.id],
|
|
376
|
+
id: reportAction?.report.id,
|
|
377
|
+
_id: reportAction?.report.id,
|
|
378
|
+
},
|
|
379
|
+
],
|
|
380
|
+
])),
|
|
381
|
+
};
|
|
382
|
+
}
|
|
383
|
+
dashboardConfigDispatch({
|
|
384
|
+
type: 'UPDATE_DASHBOARD',
|
|
385
|
+
id: dashboardName,
|
|
386
|
+
data: { config: curDashboardConfig, loading: false },
|
|
387
|
+
});
|
|
388
|
+
return curDashboardConfig;
|
|
389
|
+
}
|
|
390
|
+
if (!fetchFromServer &&
|
|
391
|
+
curDashboardConfig &&
|
|
392
|
+
curDashboardConfig.newQueries) {
|
|
393
|
+
dashboardConfigDispatch({
|
|
394
|
+
type: 'SET_DASHBOARD_LOADING',
|
|
395
|
+
id: dashboardName,
|
|
396
|
+
data: false,
|
|
397
|
+
});
|
|
398
|
+
return curDashboardConfig;
|
|
399
|
+
}
|
|
400
|
+
if (!client || !client.publicKey || !client.organizationId) {
|
|
401
|
+
return curDashboardConfig;
|
|
402
|
+
}
|
|
403
|
+
if (dashboardName === null || dashboardName === undefined)
|
|
404
|
+
return curDashboardConfig;
|
|
405
|
+
try {
|
|
406
|
+
dashboardConfigDispatch({
|
|
407
|
+
type: 'SET_DASHBOARD_LOADING',
|
|
408
|
+
id: dashboardName,
|
|
409
|
+
data: true,
|
|
410
|
+
});
|
|
411
|
+
const resp = await (0, dashboard_1.getDashboard)(dashboardName, client);
|
|
412
|
+
// if dashboard has changed
|
|
413
|
+
if (!(0, fast_deep_equal_1.default)(resp, curDashboardConfig)) {
|
|
414
|
+
dashboardConfigDispatch({
|
|
415
|
+
type: 'UPDATE_DASHBOARD',
|
|
416
|
+
id: dashboardName,
|
|
417
|
+
data: { config: { ...resp, name: dashboardName }, loading: false },
|
|
418
|
+
});
|
|
419
|
+
}
|
|
420
|
+
return resp;
|
|
421
|
+
}
|
|
422
|
+
catch (error) {
|
|
423
|
+
console.error('Error fetching data:', error);
|
|
424
|
+
}
|
|
425
|
+
finally {
|
|
426
|
+
dashboardConfigDispatch({
|
|
427
|
+
type: 'SET_DASHBOARD_LOADING',
|
|
428
|
+
id: dashboardName,
|
|
429
|
+
data: false,
|
|
430
|
+
});
|
|
431
|
+
}
|
|
432
|
+
}
|
|
254
433
|
async function fetchSchema(client, caller) {
|
|
255
434
|
// add custom fields here and also store in schema context
|
|
256
435
|
setSchemaData({ ...schemaData, isSchemaLoading: true });
|
|
@@ -290,9 +469,6 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
290
469
|
return;
|
|
291
470
|
}
|
|
292
471
|
try {
|
|
293
|
-
dashboardConfigDispatch({
|
|
294
|
-
type: 'CLEAR_DASHBOARD',
|
|
295
|
-
});
|
|
296
472
|
const response = await fetch(`${queryEndpoint}?dashboards`, {
|
|
297
473
|
method: 'POST',
|
|
298
474
|
headers: {
|
|
@@ -304,18 +480,15 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
304
480
|
clientId: publicKey,
|
|
305
481
|
publicKey: publicKey,
|
|
306
482
|
task: 'dashboards',
|
|
483
|
+
getSections: true,
|
|
307
484
|
},
|
|
308
485
|
}),
|
|
309
486
|
credentials: withCredentials ? 'include' : 'omit',
|
|
310
487
|
});
|
|
311
488
|
const result = await response.json();
|
|
312
|
-
const dashboards = result.data.dashboards.reduce((acc, dashboard) => {
|
|
313
|
-
acc[dashboard.name] = dashboard;
|
|
314
|
-
return acc;
|
|
315
|
-
}, {});
|
|
316
489
|
dashboardConfigDispatch({
|
|
317
490
|
type: 'SET_DASHBOARD_DATA',
|
|
318
|
-
data: dashboards,
|
|
491
|
+
data: result.data.dashboards,
|
|
319
492
|
});
|
|
320
493
|
}
|
|
321
494
|
catch (error) {
|
|
@@ -338,11 +511,12 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
338
511
|
if (client) {
|
|
339
512
|
fetchSchema(client, 'context');
|
|
340
513
|
}
|
|
341
|
-
|
|
514
|
+
if (typeof window !== 'undefined' && sessionStorage) {
|
|
515
|
+
sessionStorage.setItem('quill-client', JSON.stringify(client));
|
|
516
|
+
}
|
|
342
517
|
}, [client]);
|
|
343
518
|
(0, react_1.useEffect)(() => {
|
|
344
519
|
// Clear context
|
|
345
|
-
dashboardConfigDispatch({ type: 'CLEAR_DASHBOARD' });
|
|
346
520
|
dashboardFiltersDispatch({ type: 'CLEAR_DASHBOARD_FILTERS' });
|
|
347
521
|
reportFiltersDispatch({ type: 'CLEAR_REPORT_FILTERS' });
|
|
348
522
|
dispatch({ type: 'CLEAR_DASHBOARD' });
|
|
@@ -358,7 +532,11 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
358
532
|
if (!theme) {
|
|
359
533
|
return null;
|
|
360
534
|
}
|
|
361
|
-
return ((0, jsx_runtime_1.jsx)(exports.ClientContext.Provider, { value: [isClientLoading ? null : client, isClientLoading, setClient], children: (0, jsx_runtime_1.jsx)(exports.ThemeContext.Provider, { value: [theme, setTheme], children: (0, jsx_runtime_1.jsx)(exports.SchemaDataContext.Provider, { value: [schemaData, setSchemaData], children: (0, jsx_runtime_1.jsx)(exports.DashboardContext.Provider, { value: [dashboard, dispatch], children: (0, jsx_runtime_1.jsx)(exports.DashboardConfigContext.Provider, { value:
|
|
535
|
+
return ((0, jsx_runtime_1.jsx)(exports.ClientContext.Provider, { value: [isClientLoading ? null : client, isClientLoading, setClient], children: (0, jsx_runtime_1.jsx)(exports.ThemeContext.Provider, { value: [theme, setTheme], children: (0, jsx_runtime_1.jsx)(exports.SchemaDataContext.Provider, { value: [schemaData, setSchemaData], children: (0, jsx_runtime_1.jsx)(exports.DashboardContext.Provider, { value: [dashboard, dispatch], children: (0, jsx_runtime_1.jsx)(exports.DashboardConfigContext.Provider, { value: {
|
|
536
|
+
dashboardConfig,
|
|
537
|
+
dashboardConfigDispatch,
|
|
538
|
+
loadDashboard,
|
|
539
|
+
}, children: (0, jsx_runtime_1.jsx)(exports.DashboardFiltersContext.Provider, { value: {
|
|
362
540
|
dashboardFilters,
|
|
363
541
|
dispatch: dashboardFiltersDispatch,
|
|
364
542
|
loadFiltersForDashboard,
|
package/dist/cjs/Dashboard.js
CHANGED
|
@@ -154,7 +154,7 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
154
154
|
const [filterListAddFilterPopoverIsOpen, setFilterListAddFilterPopoverIsOpen,] = (0, react_1.useState)(false);
|
|
155
155
|
const presetOptions = (0, react_1.useMemo)(() => {
|
|
156
156
|
return populatedDashboardFilters?.[0]?.filterType === 'date_range'
|
|
157
|
-
? populatedDashboardFilters[0].presetRanges?.map((elem) => {
|
|
157
|
+
? (populatedDashboardFilters[0].presetRanges?.map((elem) => {
|
|
158
158
|
if (!elem.isStatic) {
|
|
159
159
|
return {
|
|
160
160
|
label: elem.label,
|
|
@@ -169,7 +169,7 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
169
169
|
startDate: new Date(elem.startDate),
|
|
170
170
|
endDate: new Date(elem.endDate),
|
|
171
171
|
};
|
|
172
|
-
}) ?? dateRangePickerUtils_1.defaultOptionsV2
|
|
172
|
+
}) ?? dateRangePickerUtils_1.defaultOptionsV2)
|
|
173
173
|
: dateRangePickerUtils_1.defaultOptionsV2;
|
|
174
174
|
}, [populatedDashboardFilters]);
|
|
175
175
|
const [userFilters, setUserFilters] = (0, react_1.useState)({});
|
|
@@ -445,7 +445,7 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
445
445
|
marginBottom: 16,
|
|
446
446
|
textAlign: 'left',
|
|
447
447
|
marginTop: 12,
|
|
448
|
-
}, children: section })] })), metrics(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "metrics", children: metrics(data.sections, section, sortByOrdering).map((item
|
|
448
|
+
}, children: section })] })), metrics(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "metrics", children: metrics(data.sections, section, sortByOrdering).map((item) => {
|
|
449
449
|
return ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, additionalProcessing: {
|
|
450
450
|
page: paginationProcessing_1.DEFAULT_PAGINATION,
|
|
451
451
|
last: additionalProcessing?.last,
|
|
@@ -454,8 +454,8 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
454
454
|
...item,
|
|
455
455
|
...data,
|
|
456
456
|
})
|
|
457
|
-
: () => { }, hoverActions: hoverActions }, item.name + '' +
|
|
458
|
-
}) })), charts(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(data.sections, section, sortByOrdering).map((item
|
|
457
|
+
: () => { }, hoverActions: hoverActions }, 'metric' + item.name + '' + item.id)) }, `metric${item.id}`));
|
|
458
|
+
}) })), charts(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(data.sections, section, sortByOrdering).map((item) => ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { item: item, dateBucket: dateBucket, additionalProcessing: {
|
|
459
459
|
page: pagination,
|
|
460
460
|
last: additionalProcessing?.last,
|
|
461
461
|
}, filters: populatedDashboardFilters, children: ({ isLoading, data, error, dateBucket, }) => ((0, jsx_runtime_1.jsx)(ChartComponent, { report: data, error: error, onClick: () => {
|
|
@@ -470,7 +470,7 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
470
470
|
height: 300,
|
|
471
471
|
} })) : ((0, jsx_runtime_1.jsx)(Chart_1.ChartDisplay, { reportId: data.id, config: data, loading: isLoading, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
|
|
472
472
|
? theme.chartColors
|
|
473
|
-
: undefined, scrollable: false, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement })) }, item.name + '' +
|
|
473
|
+
: undefined, scrollable: false, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement })) }, 'chart' + item.name + '' + item.id)) }, `chart${item.id}`))) })), tables(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "tables", children: tables(data.sections, section, sortByOrdering).map((item) => ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, additionalProcessing: {
|
|
474
474
|
page: pagination,
|
|
475
475
|
last: additionalProcessing?.last,
|
|
476
476
|
}, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => ((0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
|
|
@@ -481,7 +481,7 @@ filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors
|
|
|
481
481
|
: undefined, hoverActions: hoverActions, rowCount: rowCount ??
|
|
482
482
|
data?.rowCount ??
|
|
483
483
|
data?.rows?.length ??
|
|
484
|
-
0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) }, `${name}${
|
|
484
|
+
0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) }, `${name}${item.id}`))) }))] }, section + '' + sectionIndex));
|
|
485
485
|
})] }));
|
|
486
486
|
}
|
|
487
487
|
exports.default = Dashboard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuillDateRangePicker.d.ts","sourceRoot":"","sources":["../../../src/DateRangePicker/QuillDateRangePicker.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,WAAW,EAKZ,MAAM,OAAO,CAAC;AAmBf,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE;QAAE,SAAS,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;IAC9C,aAAa,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAClD,iBAAiB,EAAE,CAAC,EAClB,SAAS,EACT,OAAO,GACR,EAAE;QACD,SAAS,EAAE,IAAI,CAAC;QAChB,OAAO,EAAE,IAAI,CAAC;KACf,KAAK,IAAI,CAAC;IACX,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IAChE,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,MAAM,EACN,KAAK,EACL,WAAW,EACX,UAAU,GACX,EAAE,6BAA6B,
|
|
1
|
+
{"version":3,"file":"QuillDateRangePicker.d.ts","sourceRoot":"","sources":["../../../src/DateRangePicker/QuillDateRangePicker.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,WAAW,EAKZ,MAAM,OAAO,CAAC;AAmBf,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE;QAAE,SAAS,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;IAC9C,aAAa,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAClD,iBAAiB,EAAE,CAAC,EAClB,SAAS,EACT,OAAO,GACR,EAAE;QACD,SAAS,EAAE,IAAI,CAAC;QAChB,OAAO,EAAE,IAAI,CAAC;KACf,KAAK,IAAI,CAAC;IACX,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IAChE,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,MAAM,EACN,KAAK,EACL,WAAW,EACX,UAAU,GACX,EAAE,6BAA6B,2CAoJ/B"}
|
|
@@ -19,6 +19,10 @@ function QuillDateRangePicker({ dateRange, onChangeDateRange, presetOptions, onC
|
|
|
19
19
|
const [localEndDate, setLocalEndDate] = (0, react_1.useState)(dateRange.endDate);
|
|
20
20
|
const [localPreset, setLocalPreset] = (0, react_1.useState)(preset);
|
|
21
21
|
const [showModal, setShowModal] = (0, react_1.useState)(false);
|
|
22
|
+
const modalRef = (0, react_1.useRef)(null);
|
|
23
|
+
(0, hooks_1.useOnClickOutside)(modalRef, () => {
|
|
24
|
+
setShowModal(false);
|
|
25
|
+
}, showModal);
|
|
22
26
|
(0, react_1.useEffect)(() => {
|
|
23
27
|
setLocalEndDate(dateRange.endDate);
|
|
24
28
|
setLocalStartDate(dateRange.startDate);
|
|
@@ -29,7 +33,7 @@ function QuillDateRangePicker({ dateRange, onChangeDateRange, presetOptions, onC
|
|
|
29
33
|
flexDirection: 'row',
|
|
30
34
|
gap: 12,
|
|
31
35
|
alignItems: 'flex-end',
|
|
32
|
-
}, children: [(0, jsx_runtime_1.jsxs)("div", { style: { position: 'relative', width: 270 }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
36
|
+
}, children: [(0, jsx_runtime_1.jsxs)("div", { style: { position: 'relative', width: 270 }, ref: modalRef, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
33
37
|
fontSize: 14,
|
|
34
38
|
color: theme?.secondaryTextColor,
|
|
35
39
|
fontFamily: theme?.fontFamily,
|
|
@@ -71,11 +75,7 @@ function QuillDateRangePicker({ dateRange, onChangeDateRange, presetOptions, onC
|
|
|
71
75
|
}, width: selectWidth ?? 200, hideEmptyOption: true }))] }));
|
|
72
76
|
}
|
|
73
77
|
exports.QuillDateRangePicker = QuillDateRangePicker;
|
|
74
|
-
function CalendarRow({ theme, anchorStartDate, anchorEndDate, setAnchorStartDate, setAnchorEndDate, localStartDate, localEndDate, setLocalStartDate, setLocalEndDate, updateDateFilter, setLocalPreset,
|
|
75
|
-
const modalRef = (0, react_1.useRef)(null);
|
|
76
|
-
(0, hooks_1.useOnClickOutside)(modalRef, () => {
|
|
77
|
-
setShowModal(false);
|
|
78
|
-
});
|
|
78
|
+
function CalendarRow({ theme, anchorStartDate, anchorEndDate, setAnchorStartDate, setAnchorEndDate, localStartDate, localEndDate, setLocalStartDate, setLocalEndDate, updateDateFilter, setLocalPreset, }) {
|
|
79
79
|
const firstMonthDisplayedDates = (0, date_fns_1.eachDayOfInterval)({
|
|
80
80
|
start: (0, date_fns_1.startOfWeek)(anchorStartDate),
|
|
81
81
|
end: (0, date_fns_1.endOfWeek)((0, date_fns_1.endOfMonth)(anchorStartDate)),
|
|
@@ -92,7 +92,7 @@ function CalendarRow({ theme, anchorStartDate, anchorEndDate, setAnchorStartDate
|
|
|
92
92
|
setAnchorStartDate((0, date_fns_1.startOfMonth)((0, date_fns_1.subMonths)(anchorStartDate, 1)));
|
|
93
93
|
setAnchorEndDate((0, date_fns_1.endOfMonth)((0, date_fns_1.subMonths)(anchorEndDate, 1)));
|
|
94
94
|
};
|
|
95
|
-
return ((0, jsx_runtime_1.jsx)("div", {
|
|
95
|
+
return ((0, jsx_runtime_1.jsx)("div", { style: { position: 'absolute', zIndex: 100, marginTop: 12 }, children: (0, jsx_runtime_1.jsxs)("div", { style: {
|
|
96
96
|
display: 'flex',
|
|
97
97
|
flexDirection: 'row',
|
|
98
98
|
border: `1px solid ${theme.borderColor}`,
|