@quillsql/react 2.13.45 → 2.13.47
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 +3 -1
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +27 -30
- package/dist/cjs/ChartBuilder.d.ts +1 -2
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +46 -26
- package/dist/cjs/ChartEditor.d.ts +1 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +6 -8
- package/dist/cjs/Context.d.ts +18 -6
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +98 -54
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +67 -17
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +201 -76
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +3 -3
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +1 -2
- package/dist/cjs/components/Chart/GaugeChart.js +1 -1
- package/dist/cjs/components/Chart/LineChart.js +1 -1
- package/dist/cjs/components/Chart/MapChart.js +1 -1
- package/dist/cjs/components/Chart/PieChart.js +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +6 -4
- package/dist/cjs/components/Dashboard/DashboardSection.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardSection.js +0 -1
- package/dist/cjs/components/Dashboard/DashboardSectionContainer.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardSectionContainer.js +0 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +6 -4
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +108 -139
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +61 -59
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts +4 -1
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddColumnModal.js +59 -63
- package/dist/cjs/components/ReportBuilder/schema.d.ts +7 -0
- package/dist/cjs/components/ReportBuilder/schema.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +11 -3
- package/dist/cjs/hooks/useDashboard.d.ts +23 -2
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +133 -3
- package/dist/cjs/hooks/useExport.js +3 -3
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +8 -7
- package/dist/cjs/hooks/useReport.d.ts.map +1 -1
- package/dist/cjs/hooks/useReport.js +13 -12
- 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/models/Client.d.ts +1 -0
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/models/Dashboard.d.ts +5 -1
- package/dist/cjs/models/Dashboard.d.ts.map +1 -1
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Filter.js +0 -2
- package/dist/cjs/models/Report.d.ts +1 -2
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/utils/client.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +1 -1
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +2 -2
- package/dist/cjs/utils/reportBuilder.d.ts +11 -2
- package/dist/cjs/utils/reportBuilder.d.ts.map +1 -1
- package/dist/cjs/utils/reportBuilder.js +127 -1
- package/dist/cjs/utils/schema.d.ts +2 -7
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +4 -0
- package/dist/esm/Chart.d.ts +3 -1
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +28 -31
- package/dist/esm/ChartBuilder.d.ts +1 -2
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +47 -27
- package/dist/esm/ChartEditor.d.ts +1 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +7 -9
- package/dist/esm/Context.d.ts +18 -6
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +100 -56
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +67 -17
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +206 -81
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +3 -3
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +1 -2
- package/dist/esm/components/Chart/GaugeChart.js +1 -1
- package/dist/esm/components/Chart/LineChart.js +1 -1
- package/dist/esm/components/Chart/MapChart.js +1 -1
- package/dist/esm/components/Chart/PieChart.js +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +6 -4
- package/dist/esm/components/Dashboard/DashboardSection.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardSection.js +0 -1
- package/dist/esm/components/Dashboard/DashboardSectionContainer.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardSectionContainer.js +0 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts +6 -4
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +109 -140
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +61 -59
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts +4 -1
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddColumnModal.js +59 -63
- package/dist/esm/components/ReportBuilder/schema.d.ts +7 -0
- package/dist/esm/components/ReportBuilder/schema.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +11 -3
- package/dist/esm/hooks/useDashboard.d.ts +23 -2
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +131 -3
- package/dist/esm/hooks/useExport.js +4 -4
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +9 -8
- package/dist/esm/hooks/useReport.d.ts.map +1 -1
- package/dist/esm/hooks/useReport.js +14 -13
- 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/models/Client.d.ts +1 -0
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/models/Dashboard.d.ts +5 -1
- package/dist/esm/models/Dashboard.d.ts.map +1 -1
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Filter.js +0 -2
- package/dist/esm/models/Report.d.ts +1 -2
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/utils/client.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +1 -1
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +2 -2
- package/dist/esm/utils/reportBuilder.d.ts +11 -2
- package/dist/esm/utils/reportBuilder.d.ts.map +1 -1
- package/dist/esm/utils/reportBuilder.js +124 -0
- package/dist/esm/utils/schema.d.ts +2 -7
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +4 -0
- package/package.json +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setTypesOnPivot = exports.formatRows = exports.makePivotValid = exports.isValidPivotForReport = exports.astToReportBuilderState = exports.reportBuilderStateToAst = void 0;
|
|
3
|
+
exports.validatedReportBuilderState = exports.orderTablesByBestPrimaryTable = exports.setTypesOnPivot = exports.formatRows = exports.makePivotValid = exports.isValidPivotForReport = exports.astToReportBuilderState = exports.reportBuilderStateToAst = void 0;
|
|
4
4
|
const convert_1 = require("../components/ReportBuilder/convert");
|
|
5
5
|
const util_1 = require("../components/ReportBuilder/util");
|
|
6
|
+
const ReportBuilder_1 = require("../models/ReportBuilder");
|
|
6
7
|
const astFilterProcessing_1 = require("./astFilterProcessing");
|
|
7
8
|
const dates_1 = require("./dates");
|
|
8
9
|
const filterProcessing_1 = require("./filterProcessing");
|
|
@@ -393,3 +394,128 @@ const setTypesOnPivot = (newPivot, searchColumns) => ({
|
|
|
393
394
|
valueField2Type: searchColumns.find((c) => c.field === newPivot.aggregations?.[0]?.valueField2)?.jsType,
|
|
394
395
|
});
|
|
395
396
|
exports.setTypesOnPivot = setTypesOnPivot;
|
|
397
|
+
const orderTablesByBestPrimaryTable = (tables, foreignKeyMap) => {
|
|
398
|
+
const getPrimaryTableMappings = (table) => {
|
|
399
|
+
const tablesMappedByPrimaryTable = [{ ...table }];
|
|
400
|
+
foreignKeyMap[table.name]?.forEach((mapping) => {
|
|
401
|
+
if (tables.some((t) => t.name === mapping.foreignTable)) {
|
|
402
|
+
tablesMappedByPrimaryTable.push({
|
|
403
|
+
name: mapping.foreignTable,
|
|
404
|
+
join: {
|
|
405
|
+
type: ReportBuilder_1.JoinType.INNER,
|
|
406
|
+
condition: {
|
|
407
|
+
operator: '=',
|
|
408
|
+
left: { field: mapping.foreignKey, table: table.name },
|
|
409
|
+
right: {
|
|
410
|
+
field: mapping.foreignTablePrimaryKey,
|
|
411
|
+
table: mapping.foreignTable,
|
|
412
|
+
},
|
|
413
|
+
},
|
|
414
|
+
},
|
|
415
|
+
});
|
|
416
|
+
}
|
|
417
|
+
});
|
|
418
|
+
return tablesMappedByPrimaryTable;
|
|
419
|
+
};
|
|
420
|
+
if (tables.length === 0) {
|
|
421
|
+
return [];
|
|
422
|
+
}
|
|
423
|
+
let primaryTableMappings = [];
|
|
424
|
+
tables.forEach((table) => {
|
|
425
|
+
const mappedByTable = getPrimaryTableMappings(table);
|
|
426
|
+
if (mappedByTable.length > primaryTableMappings.length) {
|
|
427
|
+
primaryTableMappings = mappedByTable;
|
|
428
|
+
}
|
|
429
|
+
});
|
|
430
|
+
return primaryTableMappings;
|
|
431
|
+
};
|
|
432
|
+
exports.orderTablesByBestPrimaryTable = orderTablesByBestPrimaryTable;
|
|
433
|
+
const validatedReportBuilderState = (state, foreignKeyMap) => {
|
|
434
|
+
let { tables, columns, filterStack, sort } = state;
|
|
435
|
+
const { pivot, limit } = state;
|
|
436
|
+
if (columns.length === 0) {
|
|
437
|
+
return {
|
|
438
|
+
tables: [],
|
|
439
|
+
columns: [],
|
|
440
|
+
filterStack: [],
|
|
441
|
+
pivot: null,
|
|
442
|
+
sort: [],
|
|
443
|
+
limit: null,
|
|
444
|
+
};
|
|
445
|
+
}
|
|
446
|
+
const tablesReferencedInColumns = tables.filter((table) => {
|
|
447
|
+
return columns.some((col) => col.table === table.name);
|
|
448
|
+
});
|
|
449
|
+
tables = columns.some((col) => col.table === tables[0]?.name)
|
|
450
|
+
? tablesReferencedInColumns
|
|
451
|
+
: (0, exports.orderTablesByBestPrimaryTable)(tablesReferencedInColumns, foreignKeyMap);
|
|
452
|
+
columns = columns.filter((col) => {
|
|
453
|
+
return tables.some((table) => table.name === col.table);
|
|
454
|
+
});
|
|
455
|
+
filterStack = filterStack.filter((filter, index) => {
|
|
456
|
+
if (!filter.value) {
|
|
457
|
+
let prevFilterValid = true;
|
|
458
|
+
let nextFilterValid = true;
|
|
459
|
+
if (index === 1) {
|
|
460
|
+
const prevFilter = filterStack[0];
|
|
461
|
+
prevFilterValid =
|
|
462
|
+
!!prevFilter.value &&
|
|
463
|
+
columns.some((col) => col.field === prevFilter.value?.field) &&
|
|
464
|
+
tables.some((table) => table.name === prevFilter.value?.table);
|
|
465
|
+
}
|
|
466
|
+
const nextFilter = filterStack[index + 1];
|
|
467
|
+
if (nextFilter) {
|
|
468
|
+
nextFilterValid =
|
|
469
|
+
!!nextFilter.value &&
|
|
470
|
+
columns.some((col) => col.field === nextFilter.value?.field) &&
|
|
471
|
+
tables.some((table) => table.name === nextFilter.value?.table);
|
|
472
|
+
}
|
|
473
|
+
return prevFilterValid && nextFilterValid;
|
|
474
|
+
}
|
|
475
|
+
else {
|
|
476
|
+
return (columns.some((col) => col.field === filter.value?.field) &&
|
|
477
|
+
tables.some((table) => table.name === filter.value?.table));
|
|
478
|
+
}
|
|
479
|
+
});
|
|
480
|
+
sort = sort.filter((sort) => {
|
|
481
|
+
return columns.some((col) => (col.alias ?? col.field) === sort.field);
|
|
482
|
+
});
|
|
483
|
+
// If pivot is using removed columns, remove pivot
|
|
484
|
+
let removePivot = false;
|
|
485
|
+
if (pivot) {
|
|
486
|
+
const referencedColumns = [];
|
|
487
|
+
if (pivot.rowField) {
|
|
488
|
+
referencedColumns.push(pivot.rowField);
|
|
489
|
+
}
|
|
490
|
+
if (pivot.columnField) {
|
|
491
|
+
referencedColumns.push(pivot.columnField);
|
|
492
|
+
}
|
|
493
|
+
if (pivot.aggregations) {
|
|
494
|
+
pivot.aggregations.forEach((agg) => {
|
|
495
|
+
if (agg.valueField) {
|
|
496
|
+
referencedColumns.push(agg.valueField);
|
|
497
|
+
}
|
|
498
|
+
if (agg.valueField2) {
|
|
499
|
+
referencedColumns.push(agg.valueField2);
|
|
500
|
+
}
|
|
501
|
+
});
|
|
502
|
+
}
|
|
503
|
+
const columnMapping = referencedColumns
|
|
504
|
+
.map((col) => {
|
|
505
|
+
const column = columns.find((c) => (c.alias || c.field) === col);
|
|
506
|
+
return column;
|
|
507
|
+
})
|
|
508
|
+
.filter((c) => c !== undefined);
|
|
509
|
+
removePivot = !columnMapping.every((col) => columns.some((c) => (c.alias || c.field) === (col.alias || col.field) &&
|
|
510
|
+
c.table === col.table));
|
|
511
|
+
}
|
|
512
|
+
return {
|
|
513
|
+
tables,
|
|
514
|
+
columns,
|
|
515
|
+
filterStack,
|
|
516
|
+
pivot: removePivot ? null : pivot,
|
|
517
|
+
sort,
|
|
518
|
+
limit,
|
|
519
|
+
};
|
|
520
|
+
};
|
|
521
|
+
exports.validatedReportBuilderState = validatedReportBuilderState;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ForeignKeyMap } from '../components/ReportBuilder/schema';
|
|
1
2
|
import { QuillProviderClient } from '../models/Client';
|
|
2
3
|
import { ColumnInternal } from '../models/Columns';
|
|
3
4
|
import { CustomField } from '../models/Schema';
|
|
@@ -30,11 +31,5 @@ export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortS
|
|
|
30
31
|
schemaWithCustomFields: Table[];
|
|
31
32
|
}>;
|
|
32
33
|
export declare const customFieldToColumnInternal: (customField: CustomField) => ColumnInternal;
|
|
33
|
-
export declare const getSchemaForeignKeyMapping: (schema: Table[]) =>
|
|
34
|
-
[table: string]: {
|
|
35
|
-
foreignTable: string;
|
|
36
|
-
foreignTablePrimaryKey: string;
|
|
37
|
-
foreignKey: string;
|
|
38
|
-
}[];
|
|
39
|
-
};
|
|
34
|
+
export declare const getSchemaForeignKeyMapping: (schema: Table[]) => ForeignKeyMap;
|
|
40
35
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAEd,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA8BzC,eAAO,MAAM,kBAAkB,8CAK5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAwFxD,CAAC;AAEF,eAAO,MAAM,aAAa,wDAMvB;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IACV,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAgEA,CAAC;AA2BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC;AAIF,eAAO,MAAM,0BAA0B,WAAY,KAAK,EAAE,KAAG,aA8B5D,CAAC"}
|
package/dist/cjs/utils/schema.js
CHANGED
|
@@ -209,6 +209,10 @@ const getSchemaForeignKeyMapping = (schema) => {
|
|
|
209
209
|
table.columns.forEach((column) => {
|
|
210
210
|
if (column.field.toLowerCase().endsWith('_id')) {
|
|
211
211
|
const foreignTableName = `${column.field.slice(0, -3)}s`;
|
|
212
|
+
if (foreignTableName === table.name) {
|
|
213
|
+
// avoid self-referential foreign keys
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
212
216
|
const foreignTable = schema.find((t) => t.name === foreignTableName);
|
|
213
217
|
if (foreignTable &&
|
|
214
218
|
foreignTable.columns.some((c) => c.field === 'id')) {
|
package/dist/esm/Chart.d.ts
CHANGED
|
@@ -203,8 +203,10 @@ export interface ChartProps {
|
|
|
203
203
|
onClickChartElement?: (data: any) => void;
|
|
204
204
|
/** An override for the pivot date bucketing. */
|
|
205
205
|
dateBucket?: string;
|
|
206
|
+
/** Whether to send updated data in the chart to its owning dashboard */
|
|
207
|
+
propogateChanges?: boolean;
|
|
206
208
|
}
|
|
207
|
-
export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter, hideFilters, mapColorsToFields, LoadingComponent, SelectComponent, MultiSelectComponent, DateRangePickerComponent, FilterContainerComponent, TableComponent, MetricComponent, filters, onClickChartElement, dateBucket, }: ChartProps): import("react/jsx-runtime").JSX.Element;
|
|
209
|
+
export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter, hideFilters, mapColorsToFields, LoadingComponent, SelectComponent, MultiSelectComponent, DateRangePickerComponent, FilterContainerComponent, TableComponent, MetricComponent, filters, onClickChartElement, dateBucket, propogateChanges, }: ChartProps): import("react/jsx-runtime").JSX.Element;
|
|
208
210
|
interface ChartDisplayProps extends WithConfig {
|
|
209
211
|
loading: boolean;
|
|
210
212
|
ErrorComponent?: ({ errorMessage }: {
|
package/dist/esm/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACT,WAAW,EAEZ,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/Chart.js
CHANGED
|
@@ -4,7 +4,7 @@ import { useExport } from './hooks/useExport';
|
|
|
4
4
|
import { differenceInHours } from 'date-fns';
|
|
5
5
|
import BarList from './components/Chart/BarList';
|
|
6
6
|
import PieChart from './components/Chart/PieChart';
|
|
7
|
-
import { ClientContext,
|
|
7
|
+
import { ClientContext, DashboardFiltersContext, ReportFiltersContext, ReportsContext, SchemaDataContext, ThemeContext, } from './Context';
|
|
8
8
|
import QuillTable from './components/QuillTable';
|
|
9
9
|
import LineChart from './components/Chart/LineChart';
|
|
10
10
|
import BarChart from './components/Chart/BarChart';
|
|
@@ -27,6 +27,7 @@ import equal from 'fast-deep-equal';
|
|
|
27
27
|
import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
|
|
28
28
|
import { USMap, WorldMap } from './components/Chart/MapChart';
|
|
29
29
|
import GaugeChart from './components/Chart/GaugeChart';
|
|
30
|
+
import { useAllReports } from './hooks/useDashboard';
|
|
30
31
|
const MAX_ROWS_FOR_GENERIC_TABLE = 500;
|
|
31
32
|
// @ts-ignore
|
|
32
33
|
function sumByKey(arr, key) {
|
|
@@ -128,19 +129,21 @@ export function isEquivalent(filters1, filters2) {
|
|
|
128
129
|
}
|
|
129
130
|
return true;
|
|
130
131
|
}
|
|
131
|
-
export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter = false, hideFilters = false, mapColorsToFields, LoadingComponent = QuillLoadingSkeleton, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, DateRangePickerComponent = QuillDateRangePicker, FilterContainerComponent = QuillFilterContainerComponent, TableComponent = QuillTableComponent, MetricComponent = QuillMetricComponent, filters, onClickChartElement, dateBucket, }) {
|
|
132
|
-
const [dashboard] = useContext(DashboardContext);
|
|
132
|
+
export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter = false, hideFilters = false, mapColorsToFields, LoadingComponent = QuillLoadingSkeleton, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, DateRangePickerComponent = QuillDateRangePicker, FilterContainerComponent = QuillFilterContainerComponent, TableComponent = QuillTableComponent, MetricComponent = QuillMetricComponent, filters, onClickChartElement, dateBucket, propogateChanges, }) {
|
|
133
133
|
const [schemaData] = useContext(SchemaDataContext);
|
|
134
134
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
135
135
|
const { reload } = useReport(reportId);
|
|
136
136
|
const { reports, reportsDispatch, fetchIndividualReport } = useContext(ReportsContext);
|
|
137
137
|
const { reportFiltersDispatch, reportFilters } = useContext(ReportFiltersContext);
|
|
138
|
+
const { allReportsById } = useAllReports();
|
|
138
139
|
const specificReportFilters = useMemo(() => {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
140
|
+
const reportFilterValues = reportFilters[reportId];
|
|
141
|
+
if (reportFilterValues)
|
|
142
|
+
return Object.values(reportFilterValues ?? {}).map((f) => f.filter);
|
|
143
|
+
const dashboardReport = allReportsById[reportId];
|
|
144
|
+
if (dashboardReport)
|
|
145
|
+
return Object.values(dashboardFilters[dashboardReport.dashboardName] ?? {}).map((f) => f.filter) ?? [];
|
|
146
|
+
return [];
|
|
144
147
|
}, [reportFilters[reportId]]);
|
|
145
148
|
const reportDateFilter = useMemo(() => {
|
|
146
149
|
return specificReportFilters.find((f) => f.filterType === 'date_range');
|
|
@@ -222,6 +225,7 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
|
|
|
222
225
|
});
|
|
223
226
|
}
|
|
224
227
|
}, [previousFilters.current]);
|
|
228
|
+
const dashboardReport = useMemo(() => allReportsById[reportId], [reportId, allReportsById]);
|
|
225
229
|
const report = useMemo(() => reports[reportId], [reports, reportId]);
|
|
226
230
|
const [loading, setLoading] = useState(true);
|
|
227
231
|
const [theme] = useContext(ThemeContext);
|
|
@@ -323,6 +327,7 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
|
|
|
323
327
|
customFilters: filters?.map(convertCustomFilter),
|
|
324
328
|
dateBucket,
|
|
325
329
|
customFields: schemaData.customFields,
|
|
330
|
+
propogateChanges,
|
|
326
331
|
});
|
|
327
332
|
}
|
|
328
333
|
catch (error) {
|
|
@@ -332,30 +337,23 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
|
|
|
332
337
|
setLoading(false);
|
|
333
338
|
}
|
|
334
339
|
};
|
|
335
|
-
//
|
|
336
|
-
// return () => {
|
|
337
|
-
// // Clear all data out of the report store when the component unmounts
|
|
338
|
-
// reportsDispatch({ type: 'REMOVE_REPORT', id: reportId });
|
|
339
|
-
// reportFiltersDispatch({ type: 'CLEAR_REPORT_FILTERS', id: reportId });
|
|
340
|
-
// };
|
|
341
|
-
// }, []);
|
|
340
|
+
// TODO: move this into a hook for all report scope operations
|
|
342
341
|
useEffect(() => {
|
|
343
342
|
if (reportId === undefined || reportId === '' || clientLoading) {
|
|
344
343
|
return;
|
|
345
344
|
}
|
|
346
|
-
if (
|
|
347
|
-
dashboardFilters[
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
if (dashboard[reportId]) {
|
|
345
|
+
if (dashboardReport) {
|
|
346
|
+
if (dashboardFilters[dashboardReport.dashboardName]) {
|
|
347
|
+
reportFiltersDispatch({
|
|
348
|
+
type: 'ADD_REPORT_FILTERS',
|
|
349
|
+
id: reportId,
|
|
350
|
+
data: Object.values(dashboardFilters[dashboardReport.dashboardName] ?? {}),
|
|
351
|
+
});
|
|
352
|
+
}
|
|
355
353
|
reportsDispatch({
|
|
356
354
|
type: 'ADD_REPORT',
|
|
357
355
|
id: reportId,
|
|
358
|
-
data:
|
|
356
|
+
data: dashboardReport,
|
|
359
357
|
});
|
|
360
358
|
setLoading(false);
|
|
361
359
|
}
|
|
@@ -365,8 +363,8 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
|
|
|
365
363
|
}
|
|
366
364
|
setLoading(false);
|
|
367
365
|
}, [
|
|
368
|
-
|
|
369
|
-
dashboardFilters[
|
|
366
|
+
!!dashboardReport,
|
|
367
|
+
dashboardFilters[dashboardReport?.dashboardName ?? ''],
|
|
370
368
|
clientLoading,
|
|
371
369
|
]);
|
|
372
370
|
if (report?.error || error) {
|
|
@@ -385,9 +383,9 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
|
|
|
385
383
|
...filterValues[filter.label],
|
|
386
384
|
}, isLoading: reportFilters[reportId]?.[filter.label]?.loading, onChangeFilter: updateFilter, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), loading || !report ? (_jsx(LoadingComponent, {})) : (_jsxs(_Fragment, { children: [('table' === report.chartType || 'metric' === report.chartType) && (_jsx(DataLoader, { item: report, filters: specificReportFilters, userFilters: userFilters?.map(convertCustomFilter), additionalProcessing: {
|
|
387
385
|
page: DEFAULT_PAGINATION,
|
|
388
|
-
},
|
|
386
|
+
}, propogateChanges: propogateChanges, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => 'metric' === report.chartType ? (_jsx(MetricComponent, { error: error, isLoading: isLoading, report: data, children: data?.rows?.[0]?.[data.xAxisField] })) : (_jsx(TableComponent, { report: data, isLoading: isLoading, error: error, rowCount: rowCount ?? data?.rowCount ?? data?.rows?.length ?? 0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort), hideName: true })) })), report.chartType !== 'table' && report.chartType !== 'metric' && (_jsx(ChartDataLoader, { item: report, dateBucket: dateBucket, userFilters: userFilters?.map(convertCustomFilter), additionalProcessing: {
|
|
389
387
|
page: DEFAULT_PAGINATION,
|
|
390
|
-
}, filters: specificReportFilters,
|
|
388
|
+
}, filters: specificReportFilters, propogateChanges: propogateChanges, children: ({ isLoading, data, error }) => error ? (_jsx(ChartError, { errorMessage: error })) : (_jsx(ChartDisplay, { config: data, containerStyle: {
|
|
391
389
|
width: '100%',
|
|
392
390
|
height: '100%',
|
|
393
391
|
flexGrow: 1,
|
|
@@ -397,7 +395,6 @@ export const ChartDisplay = ({ reportId, config, colors, className, containerSty
|
|
|
397
395
|
const { downloadCSV } = useExport(reportId);
|
|
398
396
|
const [theme] = useContext(ThemeContext);
|
|
399
397
|
const { reports } = useContext(ReportsContext);
|
|
400
|
-
const [dashboard] = useContext(DashboardContext);
|
|
401
398
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
402
399
|
const { reportFilters } = useContext(ReportFiltersContext);
|
|
403
400
|
const specificDashboardFilters = useMemo(() => {
|
|
@@ -407,7 +404,7 @@ export const ChartDisplay = ({ reportId, config, colors, className, containerSty
|
|
|
407
404
|
if (!dashboardName)
|
|
408
405
|
return [];
|
|
409
406
|
return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
|
|
410
|
-
}, [dashboardFilters, reportId,
|
|
407
|
+
}, [dashboardFilters, reportId, reports]);
|
|
411
408
|
const specificReportFilters = useMemo(() => {
|
|
412
409
|
if (!reportId)
|
|
413
410
|
return [];
|
|
@@ -34,7 +34,6 @@ export interface ChartBuilderData {
|
|
|
34
34
|
y2: number | string | undefined;
|
|
35
35
|
}[];
|
|
36
36
|
template?: boolean;
|
|
37
|
-
section?: string;
|
|
38
37
|
}
|
|
39
38
|
export declare function createInitialFormData(columns: ColumnInternal[]): ChartBuilderData;
|
|
40
39
|
export declare function createReportFromForm(formData: ChartBuilderData, report: QuillReportInternal, selectedPivotTable?: PivotData, rows?: any[], filtersApplied?: DashboardFilter[], referenceLineQueryResults?: number[][]): QuillReport;
|
|
@@ -257,7 +256,7 @@ export interface ChartBuilderProps {
|
|
|
257
256
|
isSavedQueryModal?: boolean;
|
|
258
257
|
/** The date column to use for the ChartBuilder. */
|
|
259
258
|
dateColumn?: string;
|
|
260
|
-
destinationDashboard
|
|
259
|
+
destinationDashboard: string;
|
|
261
260
|
/** The name of the current organization. */
|
|
262
261
|
organizationName?: string;
|
|
263
262
|
/** Whether to hide the delete button. */
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/ChartBuilder.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect, useRef, useState, useContext, useMemo, } from 'react';
|
|
3
|
-
import { ClientContext, DashboardConfigContext,
|
|
3
|
+
import { ClientContext, DashboardConfigContext, DashboardFiltersContext, ReportFiltersContext, ReportsContext, SchemaDataContext, TenantContext, ThemeContext, } from './Context';
|
|
4
4
|
import { PivotModal, generatePivotTable, isDateField, } from './internals/ReportBuilder/PivotModal';
|
|
5
5
|
import { PivotCard } from './internals/ReportBuilder/PivotList';
|
|
6
6
|
import { MemoizedModal, QuillTextInput, MemoizedButton, MemoizedSecondaryButton, MemoizedHeader, MemoizedLabel, MemoizedDeleteButton, MemoizedText, MemoizedPopover, QuillTableComponent, QuillChartBuilderInputRowContainer, QuillChartBuilderInputColumnContainer, MemoizedSubHeader, QuillErrorMessageComponent, QuillPivotRowContainer, QuillPivotColumnContainer, QuillChartBuilderFormContainer, QuillLoadingComponent, QuillToolTip, QuillChartBuilderCheckboxComponent, } from './components/UiComponents';
|
|
@@ -27,6 +27,7 @@ import { useQuillCloud } from './utils/dataFetcher';
|
|
|
27
27
|
import { QuillMultiSelectSectionList } from './components/QuillMultiSelectSectionList';
|
|
28
28
|
import { ALL_TENANTS, REFERENCE_LINE, SINGLE_TENANT } from './utils/constants';
|
|
29
29
|
import { disambiguatedValueField } from './utils/pivotConstructor';
|
|
30
|
+
import { useAllReports, useDashboardReports } from './hooks/useDashboard';
|
|
30
31
|
const CHART_TYPES = [
|
|
31
32
|
'column',
|
|
32
33
|
'line',
|
|
@@ -78,13 +79,26 @@ function getPivotMetricOptions(pivot, selectedPivotTable, chartType) {
|
|
|
78
79
|
}
|
|
79
80
|
export function createInitialFormData(columns) {
|
|
80
81
|
const firstNumberColumn = columns?.find((col) => numberFormatOptions.includes(col.format));
|
|
82
|
+
const firstStringColumn = columns?.find((col) => !numberFormatOptions.includes(col.format) &&
|
|
83
|
+
!dateFormatOptions.includes(col.format));
|
|
84
|
+
const firstDateColumn = columns?.find((col) => dateFormatOptions.includes(col.format));
|
|
85
|
+
const xAxisField = firstStringColumn?.field ||
|
|
86
|
+
firstNumberColumn?.field ||
|
|
87
|
+
firstDateColumn?.field ||
|
|
88
|
+
columns?.[0]?.field ||
|
|
89
|
+
'';
|
|
90
|
+
const xAxisFormat = firstStringColumn?.format ||
|
|
91
|
+
firstNumberColumn?.format ||
|
|
92
|
+
firstDateColumn?.format ||
|
|
93
|
+
columns?.[0]?.format ||
|
|
94
|
+
'string';
|
|
81
95
|
const formEmptyState = {
|
|
82
96
|
name: '',
|
|
83
97
|
columns: columns.map((col) => {
|
|
84
98
|
return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
|
|
85
99
|
}),
|
|
86
|
-
xAxisField
|
|
87
|
-
xAxisFormat
|
|
100
|
+
xAxisField,
|
|
101
|
+
xAxisFormat,
|
|
88
102
|
yAxisFields: [
|
|
89
103
|
{
|
|
90
104
|
field: firstNumberColumn?.field || columns?.[0]?.field || '',
|
|
@@ -233,7 +247,7 @@ export function ChartBuilderWithModal(props) {
|
|
|
233
247
|
const [modalHeight, setModalHeight] = useState(200);
|
|
234
248
|
const { isOpen, setIsOpen, title, isHorizontalView } = props;
|
|
235
249
|
const Modal = props.ModalComponent ?? MemoizedModal;
|
|
236
|
-
const
|
|
250
|
+
const { dashboardReports: dashboard } = useDashboardReports(props.destinationDashboard);
|
|
237
251
|
useEffect(() => {
|
|
238
252
|
function handleResize() {
|
|
239
253
|
const screenSize = window.innerWidth;
|
|
@@ -288,12 +302,13 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
288
302
|
const [client] = useContext(ClientContext);
|
|
289
303
|
const [theme] = useContext(ThemeContext);
|
|
290
304
|
const [schemaData] = useContext(SchemaDataContext);
|
|
291
|
-
const
|
|
305
|
+
const { addReport } = useDashboardReports(destinationDashboard);
|
|
306
|
+
const { allReportsById } = useAllReports();
|
|
292
307
|
const { dashboardConfig } = useContext(DashboardConfigContext);
|
|
293
308
|
const { tenants, flags } = useContext(TenantContext);
|
|
294
309
|
const { getDataFromCloud } = useQuillCloud();
|
|
295
310
|
const report = useMemo(() => {
|
|
296
|
-
return reportId && !tempReport ?
|
|
311
|
+
return reportId && !tempReport ? allReportsById[reportId] : tempReport;
|
|
297
312
|
}, [reportId]);
|
|
298
313
|
const [windowWidth, setWindowWidth] = useState(1200);
|
|
299
314
|
const [rows, setRows] = useState(report?.rows ?? []);
|
|
@@ -343,7 +358,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
343
358
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
344
359
|
const specificDashboardFilters = useMemo(() => {
|
|
345
360
|
return Object.values(dashboardFilters[report?.dashboardName ?? ''] ?? {}).map((f) => f.filter);
|
|
346
|
-
}, [
|
|
361
|
+
}, [dashboardFilters, report?.dashboardName]);
|
|
347
362
|
const validationHelper = (formData, dashboard, dateField, tables) => {
|
|
348
363
|
const issues = validateReport(formData, dashboard, dateField || defaultDateField, tables || allTables);
|
|
349
364
|
if (issues.length > 0) {
|
|
@@ -380,15 +395,22 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
380
395
|
};
|
|
381
396
|
}, [isOpen]);
|
|
382
397
|
const [dashboardOptions, setDashboardOptions] = useState([]);
|
|
383
|
-
const { reportFilters, reportFiltersDispatch,
|
|
398
|
+
const { reportFilters, loadFiltersForReport, reportFiltersDispatch, abortLoadingFilters } = useContext(ReportFiltersContext);
|
|
384
399
|
const { reportsDispatch } = useContext(ReportsContext);
|
|
400
|
+
const initialFilters = useRef(reportFilters[report?.id ?? TEMP_REPORT_ID]);
|
|
385
401
|
useEffect(() => {
|
|
386
|
-
|
|
402
|
+
if (!reportFilters[report?.id ?? TEMP_REPORT_ID]) {
|
|
403
|
+
loadFiltersForReport(report?.id ?? TEMP_REPORT_ID, 'ChartBuilder', specificDashboardFilters, undefined, undefined, canonicalFilterMap, report?.dashboardName);
|
|
404
|
+
}
|
|
387
405
|
return () => {
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
406
|
+
abortLoadingFilters(report?.id ?? tempReport?.id ?? TEMP_REPORT_ID);
|
|
407
|
+
if (initialFilters.current) {
|
|
408
|
+
reportFiltersDispatch({
|
|
409
|
+
type: 'ADD_REPORT_FILTERS',
|
|
410
|
+
id: report?.id ?? TEMP_REPORT_ID,
|
|
411
|
+
data: Object.values(initialFilters.current),
|
|
412
|
+
});
|
|
413
|
+
}
|
|
392
414
|
};
|
|
393
415
|
}, []);
|
|
394
416
|
const currentDashboardFilters = useMemo(() => {
|
|
@@ -471,7 +493,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
471
493
|
? Object.fromEntries(Object.entries(report.flags).map(([key, value]) => {
|
|
472
494
|
if (value === ALL_TENANTS) {
|
|
473
495
|
const tenantType = client?.allTenantTypes?.find((t) => t.tenantField === key);
|
|
474
|
-
return [key, tenantType?.flags ?? []];
|
|
496
|
+
return [key, tenantType?.tenantField === SINGLE_TENANT ? tenantType?.flags ?? [] : tenantType?.tenantIds?.map((id) => id.flag) ?? []];
|
|
475
497
|
}
|
|
476
498
|
else {
|
|
477
499
|
return [key, value];
|
|
@@ -1065,7 +1087,9 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1065
1087
|
setPivotError(e.message);
|
|
1066
1088
|
}
|
|
1067
1089
|
}
|
|
1068
|
-
|
|
1090
|
+
setTimeout(() => {
|
|
1091
|
+
setIsLoading(false);
|
|
1092
|
+
}, 500);
|
|
1069
1093
|
}
|
|
1070
1094
|
catch (e) {
|
|
1071
1095
|
console.log(e);
|
|
@@ -1148,7 +1172,9 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1148
1172
|
console.log(e);
|
|
1149
1173
|
}
|
|
1150
1174
|
finally {
|
|
1151
|
-
|
|
1175
|
+
setTimeout(() => {
|
|
1176
|
+
setIsLoading(false);
|
|
1177
|
+
}, 500);
|
|
1152
1178
|
}
|
|
1153
1179
|
}
|
|
1154
1180
|
};
|
|
@@ -1466,11 +1492,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1466
1492
|
triggerReload: true,
|
|
1467
1493
|
error: undefined,
|
|
1468
1494
|
};
|
|
1469
|
-
|
|
1470
|
-
type: 'ADD_DASHBOARD_ITEM',
|
|
1471
|
-
id: resp.id,
|
|
1472
|
-
data,
|
|
1473
|
-
});
|
|
1495
|
+
addReport(data);
|
|
1474
1496
|
reportsDispatch({
|
|
1475
1497
|
type: 'ADD_REPORT',
|
|
1476
1498
|
id: resp.id,
|
|
@@ -1524,7 +1546,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1524
1546
|
...(!isHorizontalView && isOpen && { width: formWidth }),
|
|
1525
1547
|
}, children: [!isEditingMode && (report?.adminError || report?.error) ? (_jsx(ErrorComponent, { label: report.adminError || report.error, onClick: onClickChartError })) : ((isHorizontalView || (!isOpen && windowWidth > 1200)) && (_jsx(InternalChart, { report: chartData, filtersEnabled: filtersEnabled, setFiltersEnabled: (hide) => {
|
|
1526
1548
|
onFiltersEnabledChanged(hide);
|
|
1527
|
-
}, colors: theme?.chartColors, loading:
|
|
1549
|
+
}, colors: theme?.chartColors, loading: isLoading, hideDateRangeFilter: hideDateRangeFilter, isAdmin: isAdmin, containerStyle: {
|
|
1528
1550
|
width: '100%',
|
|
1529
1551
|
// height:
|
|
1530
1552
|
// formData.chartType === 'metric'
|
|
@@ -1548,7 +1570,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1548
1570
|
gap: 8,
|
|
1549
1571
|
}, children: [windowWidth < 1200 && (_jsx(InternalChart, { report: chartData, filtersEnabled: filtersEnabled, setFiltersEnabled: (hide) => {
|
|
1550
1572
|
onFiltersEnabledChanged(hide);
|
|
1551
|
-
}, colors: theme?.chartColors, loading:
|
|
1573
|
+
}, colors: theme?.chartColors, loading: isLoading, hideDateRangeFilter: hideDateRangeFilter, isAdmin: isAdmin, containerStyle: {
|
|
1552
1574
|
width: '100%',
|
|
1553
1575
|
height: formData.chartType === 'table'
|
|
1554
1576
|
? 200
|
|
@@ -1593,7 +1615,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1593
1615
|
: (formData.pivot || formData.chartType !== 'table') &&
|
|
1594
1616
|
windowWidth < 1200 && (_jsx(InternalChart, { report: chartData, filtersEnabled: filtersEnabled, setFiltersEnabled: (hide) => {
|
|
1595
1617
|
onFiltersEnabledChanged(hide);
|
|
1596
|
-
}, colors: theme?.chartColors, loading:
|
|
1618
|
+
}, colors: theme?.chartColors, loading: isLoading, hideDateRangeFilter: hideDateRangeFilter, isAdmin: isAdmin, containerStyle: {
|
|
1597
1619
|
width: '100%',
|
|
1598
1620
|
height: formData.chartType === 'table'
|
|
1599
1621
|
? 200
|
|
@@ -1616,9 +1638,7 @@ destinationDashboard, onClickChartElement, isEditingMode = false, disableSort =
|
|
|
1616
1638
|
}, options: dashboardOptions.map((elem) => ({
|
|
1617
1639
|
label: elem.label,
|
|
1618
1640
|
value: elem.label,
|
|
1619
|
-
})), width: 200 }) })), hideChartType ? (_jsx("div", { style: { width: 200 } })) : (_jsx("div", { ref: selectRef, style: { display: 'flex', flexDirection: 'column' }, children: _jsx(SelectComponent, { label: "Chart type", value: formData.chartType, onChange: (e) => handleChange(e.target.value, 'chartType'), options: chartTypes, width: 200 }) }))
|
|
1620
|
-
handleChange(e.target.value, 'section');
|
|
1621
|
-
}, width: 200 }) })] }), hidePivotForm ? null : (_jsxs("div", { style: {
|
|
1641
|
+
})), width: 200 }) })), hideChartType ? (_jsx("div", { style: { width: 200 } })) : (_jsx("div", { ref: selectRef, style: { display: 'flex', flexDirection: 'column' }, children: _jsx(SelectComponent, { label: "Chart type", value: formData.chartType, onChange: (e) => handleChange(e.target.value, 'chartType'), options: chartTypes, width: 200 }) }))] }), hidePivotForm ? null : (_jsxs("div", { style: {
|
|
1622
1642
|
display: 'flex',
|
|
1623
1643
|
flexDirection: 'column',
|
|
1624
1644
|
gap: 6,
|
|
@@ -171,7 +171,7 @@ export interface ChartEditorProps {
|
|
|
171
171
|
ButtonComponent?: React.ComponentType<any>;
|
|
172
172
|
}) => JSX.Element;
|
|
173
173
|
/** The default dashboard to add the item to. */
|
|
174
|
-
destinationDashboard
|
|
174
|
+
destinationDashboard: string;
|
|
175
175
|
/** The name of the current organization. */
|
|
176
176
|
organizationName?: string;
|
|
177
177
|
/** Whether the ChartBuilder is in horizontal view mode. */
|