@quillsql/react 2.12.2 → 2.12.4

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.
Files changed (75) hide show
  1. package/dist/cjs/Chart.d.ts.map +1 -1
  2. package/dist/cjs/Chart.js +2 -0
  3. package/dist/cjs/ChartBuilder.d.ts.map +1 -1
  4. package/dist/cjs/ChartBuilder.js +21 -30
  5. package/dist/cjs/Context.d.ts +1 -0
  6. package/dist/cjs/Context.d.ts.map +1 -1
  7. package/dist/cjs/Context.js +58 -30
  8. package/dist/cjs/Dashboard.d.ts.map +1 -1
  9. package/dist/cjs/Dashboard.js +3 -3
  10. package/dist/cjs/QuillProvider.d.ts +3 -3
  11. package/dist/cjs/QuillProvider.d.ts.map +1 -1
  12. package/dist/cjs/QuillProvider.js +1 -1
  13. package/dist/cjs/ReportBuilder.d.ts.map +1 -1
  14. package/dist/cjs/ReportBuilder.js +14 -60
  15. package/dist/cjs/SQLEditor.d.ts.map +1 -1
  16. package/dist/cjs/SQLEditor.js +12 -26
  17. package/dist/cjs/Table.d.ts.map +1 -1
  18. package/dist/cjs/Table.js +2 -0
  19. package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
  20. package/dist/cjs/components/Dashboard/DataLoader.js +4 -0
  21. package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts +11 -0
  22. package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -0
  23. package/dist/cjs/components/QuillMultiSelectWithCombo.js +228 -0
  24. package/dist/cjs/components/QuillSelectWithCombo.d.ts +6 -0
  25. package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -0
  26. package/dist/cjs/components/QuillSelectWithCombo.js +186 -0
  27. package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
  28. package/dist/cjs/hooks/useQuill.js +2 -0
  29. package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
  30. package/dist/cjs/internals/ReportBuilder/PivotModal.js +2 -1
  31. package/dist/cjs/utils/schema.d.ts +6 -0
  32. package/dist/cjs/utils/schema.d.ts.map +1 -0
  33. package/dist/cjs/utils/schema.js +118 -0
  34. package/dist/cjs/utils/tableProcessing.d.ts +1 -1
  35. package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
  36. package/dist/cjs/utils/tableProcessing.js +5 -3
  37. package/dist/cjs/utils/valueFormatter.js +1 -1
  38. package/dist/esm/Chart.d.ts.map +1 -1
  39. package/dist/esm/Chart.js +3 -1
  40. package/dist/esm/ChartBuilder.d.ts.map +1 -1
  41. package/dist/esm/ChartBuilder.js +21 -30
  42. package/dist/esm/Context.d.ts +1 -0
  43. package/dist/esm/Context.d.ts.map +1 -1
  44. package/dist/esm/Context.js +57 -29
  45. package/dist/esm/Dashboard.d.ts.map +1 -1
  46. package/dist/esm/Dashboard.js +3 -3
  47. package/dist/esm/QuillProvider.d.ts +3 -3
  48. package/dist/esm/QuillProvider.d.ts.map +1 -1
  49. package/dist/esm/QuillProvider.js +1 -1
  50. package/dist/esm/ReportBuilder.d.ts.map +1 -1
  51. package/dist/esm/ReportBuilder.js +15 -61
  52. package/dist/esm/SQLEditor.d.ts.map +1 -1
  53. package/dist/esm/SQLEditor.js +13 -27
  54. package/dist/esm/Table.d.ts.map +1 -1
  55. package/dist/esm/Table.js +3 -1
  56. package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
  57. package/dist/esm/components/Dashboard/DataLoader.js +5 -1
  58. package/dist/esm/components/QuillMultiSelectWithCombo.d.ts +11 -0
  59. package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -0
  60. package/dist/esm/components/QuillMultiSelectWithCombo.js +200 -0
  61. package/dist/esm/components/QuillSelectWithCombo.d.ts +6 -0
  62. package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -0
  63. package/dist/esm/components/QuillSelectWithCombo.js +159 -0
  64. package/dist/esm/hooks/useQuill.d.ts.map +1 -1
  65. package/dist/esm/hooks/useQuill.js +3 -1
  66. package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
  67. package/dist/esm/internals/ReportBuilder/PivotModal.js +3 -2
  68. package/dist/esm/utils/schema.d.ts +6 -0
  69. package/dist/esm/utils/schema.d.ts.map +1 -0
  70. package/dist/esm/utils/schema.js +113 -0
  71. package/dist/esm/utils/tableProcessing.d.ts +1 -1
  72. package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
  73. package/dist/esm/utils/tableProcessing.js +5 -3
  74. package/dist/esm/utils/valueFormatter.js +1 -1
  75. package/package.json +1 -1
@@ -40,6 +40,7 @@ const dataFetcher_2 = require("./utils/dataFetcher");
40
40
  const columnProcessing_1 = require("./utils/columnProcessing");
41
41
  const astProcessing_1 = require("./utils/astProcessing");
42
42
  const PivotForm_1 = __importDefault(require("./internals/ReportBuilder/PivotForm"));
43
+ const schema_1 = require("./utils/schema");
43
44
  exports.QUILL_SERVER = (typeof process !== 'undefined' && process?.env?.QUILL_SERVER_HOST) ||
44
45
  'https://quill-344421.uc.r.appspot.com';
45
46
  /**
@@ -125,6 +126,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
125
126
  const [client, _setClient] = (0, react_1.useContext)(Context_1.ClientContext);
126
127
  // JANK: This is temp and stupid
127
128
  const [overrideRecommendations, setOverrideRecommendations] = (0, react_1.useState)(true);
129
+ const [customFields, setCustomFields] = (0, react_1.useContext)(Context_1.CustomFieldContext);
128
130
  (0, react_1.useEffect)(() => {
129
131
  if (client.publicKey === '663416663aa9bc716e59a89d') {
130
132
  setOverrideRecommendations(false);
@@ -368,40 +370,6 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
368
370
  result.push(valueField, rowField);
369
371
  return result.filter(Boolean);
370
372
  };
371
- const fetchDistinctStrings = async (query, table) => {
372
- try {
373
- const hostedBody = {
374
- metadata: {
375
- query,
376
- task: 'query',
377
- orgId: client.customerId || '*',
378
- clientId: client.publicKey,
379
- databaseType: client?.databaseType,
380
- },
381
- };
382
- const cloudBody = { query };
383
- const data = await (0, dataFetcher_1.getData)(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
384
- if (data.errorMessage) {
385
- return null;
386
- }
387
- const results = data.rows.map((columnInfo) => {
388
- const column = columnInfo.field;
389
- if (!columnInfo.string_values) {
390
- return { table, column, values: {} };
391
- }
392
- const values = columnInfo.string_values.reduce((result, value) => {
393
- result[value] = false;
394
- return result;
395
- }, {});
396
- return { table, column, values };
397
- });
398
- return results;
399
- }
400
- catch (e) {
401
- console.error(e);
402
- return null;
403
- }
404
- };
405
373
  const loadTable = async (tables) => {
406
374
  if (!tables)
407
375
  return;
@@ -414,7 +382,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
414
382
  })
415
383
  .map((column) => (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column));
416
384
  const stringNames = convertedStringColumns.map((column) => column.field);
417
- const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${initialTableName}`, [], client);
385
+ const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${initialTableName}`, [], client, customFields);
418
386
  const joinedUniqueValues = (0, util_1.deepCopy)(uniqueValues);
419
387
  joinedUniqueValues[initialTableName] = newUniqueValues;
420
388
  if ((0, crypto_1.hashCode)(uniqueValues) !== (0, crypto_1.hashCode)(joinedUniqueValues)) {
@@ -445,26 +413,10 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
445
413
  const fetchSchema = async () => {
446
414
  try {
447
415
  setLoadingSchema(true);
448
- const response = await fetch(`${client.queryEndpoint}`, {
449
- method: 'POST',
450
- headers: {
451
- ...client.queryHeaders,
452
- 'Content-Type': 'application/json',
453
- },
454
- body: JSON.stringify({
455
- metadata: {
456
- clientId: client.publicKey,
457
- publicKey: client.publicKey,
458
- task: 'schema',
459
- removeCustomerField: true,
460
- },
461
- }),
462
- });
463
- const results = await response.json();
464
- // Filter out hidden columns on tables back from schema2.
465
- const tables = results.data.tables || results.data.data.tables;
466
- setSchemaTables(tables ?? []);
467
- setOrderedColumnNames((tables ?? []).flatMap((table) => table.columns
416
+ const { schemaData, customFieldsByTable } = await (0, schema_1.getSchemaInfoWithCustomFields)(client, 'rb');
417
+ setCustomFields(customFieldsByTable);
418
+ setSchemaTables(schemaData ?? []);
419
+ setOrderedColumnNames((schemaData ?? []).flatMap((table) => table.columns
468
420
  .map((c) => `${table.name}.${c.name}`)
469
421
  .sort((a, b) => {
470
422
  const aIsId = a.endsWith('.id') ||
@@ -482,11 +434,11 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
482
434
  return 0;
483
435
  })));
484
436
  if (initialTableName) {
485
- await loadTable(tables);
437
+ await loadTable(schemaData);
486
438
  }
487
439
  setLoadingSchema(false);
488
440
  setInitialLoad(false);
489
- return tables;
441
+ return schemaData;
490
442
  }
491
443
  catch (error) {
492
444
  console.error(error);
@@ -528,7 +480,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
528
480
  });
529
481
  if (stringColumns.length !== 0 && tableName) {
530
482
  const stringNames = stringColumns.map((column) => column.field);
531
- const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(stringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, [], client);
483
+ const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(stringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, [], client, customFields);
532
484
  const joinedUniqueValues = (0, util_1.deepCopy)(uniqueValues);
533
485
  joinedUniqueValues[tableName] = newUniqueValues;
534
486
  setUniqueValues(joinedUniqueValues);
@@ -1814,6 +1766,8 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
1814
1766
  publicKey: client.publicKey,
1815
1767
  orgId: client.customerId,
1816
1768
  task: 'patterns',
1769
+ getCustomFields: false,
1770
+ customFields,
1817
1771
  },
1818
1772
  };
1819
1773
  const cloudBody = {};
@@ -1830,7 +1784,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
1830
1784
  })
1831
1785
  .map((column) => (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column));
1832
1786
  const stringNames = convertedStringColumns.map((column) => column.field);
1833
- const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${table}`, rows, client);
1787
+ const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${table}`, rows, client, customFields);
1834
1788
  const joinedUniqueValues = (0, util_1.deepCopy)(uniqueValues);
1835
1789
  joinedUniqueValues[table] = newUniqueValues;
1836
1790
  if ((0, crypto_1.hashCode)(uniqueValues) !== (0, crypto_1.hashCode)(joinedUniqueValues)) {
@@ -2121,7 +2075,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = (_) => void
2121
2075
  })
2122
2076
  .map((column) => (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column));
2123
2077
  const stringNames = convertedStringColumns.map((column) => column.field);
2124
- const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${table}`, rows, client);
2078
+ const newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(convertedStringColumns, `Select ${stringNames.join(', ')} from ${table}`, rows, client, customFields);
2125
2079
  currentUniqueValues[table] = newUniqueValues;
2126
2080
  if ((0, crypto_1.hashCode)(uniqueValues) !== (0, crypto_1.hashCode)(currentUniqueValues)) {
2127
2081
  setUniqueValues(currentUniqueValues);
@@ -1 +1 @@
1
- {"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ const QuillCard_1 = require("./components/QuillCard");
19
19
  const QuillSelect_1 = require("./components/QuillSelect");
20
20
  const valueFormatter_1 = require("./utils/valueFormatter");
21
21
  const columnProcessing_1 = require("./utils/columnProcessing");
22
+ const schema_1 = require("./utils/schema");
22
23
  function defineEditorTheme(monaco, theme) {
23
24
  monaco.editor.defineTheme('onedark', {
24
25
  base: theme.darkMode ? 'vs-dark' : 'vs',
@@ -77,6 +78,7 @@ function SQLEditor({ ButtonComponent = UiComponents_1.MemoizedButton, SecondaryB
77
78
  const [rows, setRows] = (0, react_1.useState)([]);
78
79
  const [columns, setColumns] = (0, react_1.useState)([]);
79
80
  const [schema, setSchema] = (0, react_1.useContext)(Context_1.SchemaContext);
81
+ const [customFields, setCustomFields] = (0, react_1.useContext)(Context_1.CustomFieldContext);
80
82
  const [errorMessage, setErrorMessage] = (0, react_1.useState)('');
81
83
  const [sqlResponseLoading, setSqlResponseLoading] = (0, react_1.useState)(false);
82
84
  const [sqlQueryLoading, setSqlQueryLoading] = (0, react_1.useState)(false);
@@ -99,38 +101,20 @@ function SQLEditor({ ButtonComponent = UiComponents_1.MemoizedButton, SecondaryB
99
101
  };
100
102
  }, []);
101
103
  const getSchema = async () => {
102
- const { queryEndpoint, queryHeaders, publicKey } = client;
103
- const response = await fetch(`${queryEndpoint}`, {
104
- method: 'POST',
105
- headers: {
106
- ...queryHeaders,
107
- 'Content-Type': 'application/json',
108
- },
109
- body: JSON.stringify({
110
- metadata: {
111
- clientId: publicKey,
112
- publicKey: publicKey,
113
- task: 'schema',
114
- removeCustomerField: true,
115
- },
116
- }),
117
- });
118
- const results = await response.json();
119
- if (results.data?.data) {
120
- setSchema(results.data.data.tables);
121
- setSchemaLoading(false);
122
- }
123
- else {
124
- setSchema(results.data.tables);
125
- setSchemaLoading(false);
126
- }
104
+ const { schemaData, customFieldsByTable } = await (0, schema_1.getSchemaInfoWithCustomFields)(client);
105
+ setSchema(schemaData);
106
+ setCustomFields(customFieldsByTable);
107
+ setSchemaLoading(false);
127
108
  };
128
109
  (0, react_1.useEffect)(() => {
129
110
  if (client && !schemaLoading) {
130
111
  setSchemaLoading(true);
131
112
  getSchema();
113
+ setRows([]);
114
+ setColumns([]);
115
+ setDisplayTable(false);
132
116
  }
133
- }, [client.publicKey]);
117
+ }, [client.publicKey, client.customerId]);
134
118
  const handleRunSqlPrompt = async () => {
135
119
  setSqlResponseLoading(true);
136
120
  const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `quillai`, {
@@ -154,6 +138,8 @@ function SQLEditor({ ButtonComponent = UiComponents_1.MemoizedButton, SecondaryB
154
138
  orgId: client.customerId || '*',
155
139
  clientId: client.publicKey,
156
140
  databaseType: client?.databaseType,
141
+ getCustomFields: !client.customerId || client.customerId === '*' ? false : true,
142
+ customFieldsByTable: customFields,
157
143
  },
158
144
  };
159
145
  const cloudBody = { query };
@@ -1 +1 @@
1
- {"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAarD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAyBD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAmC/B,CAAC;AAmGF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAcrD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAyBD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAmC/B,CAAC;AAqGF,eAAe,KAAK,CAAC"}
package/dist/cjs/Table.js CHANGED
@@ -56,6 +56,7 @@ const Table = (props) => {
56
56
  const ChartUpdater = ({ reportId, containerStyle, className, dashboard, dispatch, client, dashboardFilters, csvFilename, hideCSVDownloadButton = true, LoadingComponent, }) => {
57
57
  const { rows, loading } = (0, useFormat_1.useMemoizedRows)(reportId);
58
58
  const { downloadCSV } = (0, useExport_1.useExport)(reportId);
59
+ const [customFields] = (0, react_1.useContext)(Context_1.CustomFieldContext);
59
60
  (0, react_1.useEffect)(() => {
60
61
  let isSubscribed = true;
61
62
  async function getChartOptions() {
@@ -69,6 +70,7 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboard, dispatch
69
70
  filters: [...Object.values(dashboardFilters)],
70
71
  clientId: client.publicKey,
71
72
  databaseType: client?.databaseType,
73
+ customFields,
72
74
  },
73
75
  };
74
76
  const cloudBody = {
@@ -1 +1 @@
1
- {"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,EAAE,EACF,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACvE,GAAG,GAAG,CAAC,OAAO,CAgFd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAC;AAIF,eAAO,MAAM,eAAe;QAKtB,MAAM;;mCAGC,WAAW,UACZ,UAAU,KACf,YAAY;4CAKd,yBAAyB,KAAK,WAAW;MAC1C,WA2FH,CAAC"}
1
+ {"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,EAAE,EACF,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACvE,GAAG,GAAG,CAAC,OAAO,CAkFd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAC;AAIF,eAAO,MAAM,eAAe;QAKtB,MAAM;;mCAGC,WAAW,UACZ,UAAU,KACf,YAAY;4CAKd,yBAAyB,KAAK,WAAW;MAC1C,WA6FH,CAAC"}
@@ -13,6 +13,7 @@ function DataLoader({ id, children, }) {
13
13
  const [client, _] = (0, react_1.useContext)(Context_1.ClientContext);
14
14
  const { dispatch, dashboard } = (0, react_1.useContext)(Context_1.DashboardContext);
15
15
  const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
16
+ const [customFields] = (0, react_1.useContext)(Context_1.CustomFieldContext);
16
17
  const [isLoading, setIsLoading] = (0, react_1.useState)(true);
17
18
  const [error, setError] = (0, react_1.useState)(undefined);
18
19
  (0, react_1.useEffect)(() => {
@@ -43,6 +44,7 @@ function DataLoader({ id, children, }) {
43
44
  task: 'item',
44
45
  databaseType: client.databaseType,
45
46
  filters: minimalFilters,
47
+ customFields,
46
48
  },
47
49
  };
48
50
  const cloudBody = {
@@ -90,6 +92,7 @@ const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, }) => {
90
92
  const [error, setError] = (0, react_1.useState)(undefined);
91
93
  const [isComparison, setIsComparison] = (0, react_1.useState)(false);
92
94
  const [client, _] = (0, react_1.useContext)(Context_1.ClientContext);
95
+ const [customFields] = (0, react_1.useContext)(Context_1.CustomFieldContext);
93
96
  const theme = (0, hooks_1.useTheme)();
94
97
  (0, react_1.useEffect)(() => {
95
98
  async function getChartOptions() {
@@ -122,6 +125,7 @@ const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, }) => {
122
125
  task: 'item',
123
126
  databaseType: client.databaseType,
124
127
  filters: minimalFilters,
128
+ customFields,
125
129
  },
126
130
  };
127
131
  const cloudBody = {
@@ -0,0 +1,11 @@
1
+ import { MultiSelectComponentProps } from './UiComponents';
2
+ /**
3
+ * A robust select component that implements the new minimal Select interface.
4
+ */
5
+ export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
6
+ export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
7
+ value: string;
8
+ onChange: (e: string) => void;
9
+ placeholder: string;
10
+ }) => import("react/jsx-runtime").JSX.Element;
11
+ //# sourceMappingURL=QuillMultiSelectWithCombo.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,yBAAyB,EAE1B,MAAM,gBAAgB,CAAC;AAYxB;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,GACN,EAAE,yBAAyB,2CAoS3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAyDpB,CAAC"}
@@ -0,0 +1,228 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.ListboxTextInput = exports.QuillMultiSelectComponentWithCombo = void 0;
27
+ const jsx_runtime_1 = require("react/jsx-runtime");
28
+ const hooks_1 = require("../hooks");
29
+ const react_1 = __importStar(require("react"));
30
+ const Context_1 = require("../Context");
31
+ /**
32
+ * A robust select component that implements the new minimal Select interface.
33
+ */
34
+ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }) {
35
+ const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
36
+ const [selectedOptions, setSelectedOptions] = (0, react_1.useState)([]);
37
+ const [showModal, setShowModal] = (0, react_1.useState)(false);
38
+ const modalRef = (0, react_1.useRef)(null);
39
+ const debounceTimeoutId = (0, react_1.useRef)(null);
40
+ const [searchQuery, setSearchQuery] = react_1.default.useState('');
41
+ const [filteredItems, setFilteredItems] = react_1.default.useState(options.slice(0, 20));
42
+ (0, react_1.useEffect)(() => {
43
+ setFilteredItems(options.slice(0, 20));
44
+ }, [options]);
45
+ const handleSearchChange = (value) => {
46
+ setSearchQuery(value);
47
+ const curFilteredItems = value === ''
48
+ ? options.slice(0, 20)
49
+ : options
50
+ .filter((option) => {
51
+ if (!option) {
52
+ return false;
53
+ }
54
+ return option.value
55
+ .toLowerCase()
56
+ .replace(/\s+/g, '')
57
+ .includes(value.toLowerCase().replace(/\s+/g, ''));
58
+ })
59
+ .slice(0, 20);
60
+ setFilteredItems(curFilteredItems);
61
+ };
62
+ (0, hooks_1.useOnClickOutside)(modalRef, (e) => setShowModal(false));
63
+ (0, react_1.useEffect)(() => {
64
+ if (!value) {
65
+ setSelectedOptions([]);
66
+ }
67
+ else {
68
+ setSelectedOptions(value);
69
+ }
70
+ }, [value]);
71
+ const debounce = (updatedChangeEvent) => {
72
+ if (debounceTimeoutId.current) {
73
+ clearTimeout(debounceTimeoutId.current);
74
+ }
75
+ debounceTimeoutId.current = setTimeout(() => {
76
+ onChange(updatedChangeEvent);
77
+ }, 500);
78
+ };
79
+ // const filterOptions = (query: string) => {
80
+ // setSearchQuery(query);
81
+ // setFilteredOptions(
82
+ // options.filter((option) =>
83
+ // option.label.toLowerCase().includes(query.toLowerCase()),
84
+ // ),
85
+ // );
86
+ // };
87
+ return ((0, jsx_runtime_1.jsxs)("div", { style: {
88
+ position: 'relative',
89
+ borderRadius: '6px',
90
+ width: width,
91
+ minWidth: width,
92
+ }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
93
+ fontSize: 14,
94
+ color: theme.secondaryTextColor,
95
+ fontFamily: theme.fontFamily,
96
+ paddingBottom: 5,
97
+ fontWeight: 600,
98
+ }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
99
+ fontFamily: theme.fontFamily,
100
+ color: theme.primaryTextColor,
101
+ width: '100%',
102
+ display: 'flex',
103
+ alignItems: 'center',
104
+ justifyContent: 'space-between',
105
+ fontWeight: 'inherit',
106
+ lineHeight: 'inherit',
107
+ padding: '8px 12px',
108
+ fontSize: 14,
109
+ margin: 0,
110
+ boxSizing: 'border-box',
111
+ borderWidth: 1,
112
+ borderStyle: 'solid',
113
+ borderColor: theme.borderColor,
114
+ borderRadius: 6,
115
+ paddingTop: 9,
116
+ paddingBottom: 9,
117
+ height: 40,
118
+ minHeight: 40,
119
+ maxHeight: 40,
120
+ }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; }
121
+ .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }
122
+ ` }), (0, jsx_runtime_1.jsx)("span", { style: {
123
+ textOverflow: 'ellipsis',
124
+ whiteSpace: 'nowrap',
125
+ overflow: 'hidden',
126
+ width: '100%',
127
+ textAlign: 'left',
128
+ zIndex: 1,
129
+ }, children: value && value.length > 0 ? value.join(', ') : 'Select' }), (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && ((0, jsx_runtime_1.jsxs)("div", { ref: modalRef, style: {
130
+ position: 'absolute',
131
+ width: '100%',
132
+ display: 'flex',
133
+ flexDirection: 'column',
134
+ boxSizing: 'border-box',
135
+ borderWidth: 1,
136
+ borderStyle: 'solid',
137
+ borderColor: theme.borderColor,
138
+ borderRadius: 6,
139
+ background: 'white',
140
+ marginTop: 12,
141
+ zIndex: 100,
142
+ padding: 6,
143
+ fontFamily: theme.fontFamily,
144
+ maxHeight: '50vh',
145
+ overflow: 'scroll',
146
+ }, children: [options && options.length > 20 && ((0, jsx_runtime_1.jsx)(exports.ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
147
+ handleSearchChange(value);
148
+ } })), options && options.length > 20 && ((0, jsx_runtime_1.jsx)("div", { style: { height: 9, width: 230, borderTop: '1px solid #e7e7e7' } })), filteredItems.map((option) => ((0, jsx_runtime_1.jsxs)("button", { style: {
149
+ display: 'flex',
150
+ alignItems: 'center',
151
+ padding: 8,
152
+ margin: 0,
153
+ boxSizing: 'border-box',
154
+ borderWidth: 0,
155
+ fontSize: 14,
156
+ borderStyle: 'solid',
157
+ borderColor: theme.borderColor,
158
+ borderRadius: 4,
159
+ fontFamily: theme.fontFamily,
160
+ textOverflow: 'ellipsis',
161
+ whiteSpace: 'nowrap',
162
+ height: 34,
163
+ minHeight: 34,
164
+ gap: 6,
165
+ overflow: 'hidden',
166
+ }, className: "quill-option", onClick: () => {
167
+ // Manually create a synthetic ChangeEvent and pass it to callback
168
+ const changeEvent = { target: { value: option.value } };
169
+ let updateSelctedOptions = [...selectedOptions];
170
+ if (selectedOptions.includes(changeEvent.target.value)) {
171
+ updateSelctedOptions = selectedOptions.filter((opt) => opt !== changeEvent.target.value);
172
+ setSelectedOptions(updateSelctedOptions);
173
+ }
174
+ else {
175
+ updateSelctedOptions = [
176
+ ...updateSelctedOptions,
177
+ changeEvent.target.value,
178
+ ];
179
+ setSelectedOptions(updateSelctedOptions);
180
+ }
181
+ const updatedChangeEvent = {
182
+ target: { value: JSON.stringify(updateSelctedOptions) },
183
+ };
184
+ if (updateSelctedOptions.length === 0) {
185
+ updatedChangeEvent.target.value = '';
186
+ }
187
+ debounce(updatedChangeEvent);
188
+ }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
189
+ .quill-option {
190
+ background: white;
191
+ }
192
+ .quill-option:hover {
193
+ background: #F4F4F5;
194
+ }
195
+ ` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: { width: '14px', height: '14px', margin: 'auto 0' }, readOnly: true }), (0, jsx_runtime_1.jsx)("span", { style: {
196
+ textOverflow: 'ellipsis',
197
+ whiteSpace: 'nowrap',
198
+ overflow: 'hidden',
199
+ }, children: option.label })] }, option.value)))] }))] }));
200
+ }
201
+ exports.QuillMultiSelectComponentWithCombo = QuillMultiSelectComponentWithCombo;
202
+ const ListboxTextInput = ({ value, onChange, placeholder, }) => {
203
+ return ((0, jsx_runtime_1.jsxs)("div", { style: {
204
+ position: 'relative',
205
+ display: 'flex',
206
+ flexDirection: 'row',
207
+ alignItems: 'center',
208
+ marginTop: 2,
209
+ }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
210
+ .quill-text-input {
211
+ background-color: white;
212
+ height: 40px;
213
+ width: 180px;
214
+ z-index: 2;
215
+ color: #384151;
216
+ border-radius: 4px;
217
+ text-align: left;
218
+ padding-right: 12px;
219
+ padding-top: 0px;
220
+ padding-bottom: 0px;
221
+ box-sizing: content-box;
222
+ margin-left: 6px;
223
+ }
224
+ .quill-text-input:focus {
225
+ outline: none;
226
+ }` }), (0, jsx_runtime_1.jsx)("div", { style: { width: 6 } }), (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 16 16", fill: "rgba(56, 65, 81, 0.7)", height: "16", width: "16", children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z", clipRule: "evenodd" }) }), (0, jsx_runtime_1.jsx)("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder })] }));
227
+ };
228
+ exports.ListboxTextInput = ListboxTextInput;
@@ -0,0 +1,6 @@
1
+ import { SelectComponentProps } from './UiComponents';
2
+ /**
3
+ * A robust select component that implements the new minimal Select interface.
4
+ */
5
+ export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
6
+ //# sourceMappingURL=QuillSelectWithCombo.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA+OtB"}