@deephaven/iris-grid 0.11.6-beta.8 → 0.11.7-beta.1

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.
@@ -1,4 +1,5 @@
1
1
  import type { FormattingRule } from './Formatter';
2
+ import Formatter from './Formatter';
2
3
  import { DateTimeColumnFormatter } from './formatters';
3
4
  declare class FormatterUtils {
4
5
  static getColumnFormats(settings: {
@@ -10,6 +11,14 @@ declare class FormatterUtils {
10
11
  showTimeZone: boolean;
11
12
  showTSeparator: boolean;
12
13
  }): Required<ConstructorParameters<typeof DateTimeColumnFormatter>[0]>;
14
+ /**
15
+ * Check if the formatter has a custom format defined for the column name and type
16
+ * @param formatter Formatter to check
17
+ * @param columnName Column name
18
+ * @param columnType Column type
19
+ * @returns True, if a custom format is defined
20
+ */
21
+ static isCustomColumnFormatDefined(formatter: Formatter, columnName: string, columnType: string): boolean;
13
22
  }
14
23
  export default FormatterUtils;
15
24
  //# sourceMappingURL=FormatterUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FormatterUtils.d.ts","sourceRoot":"","sources":["../src/FormatterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,cAAM,cAAc;IAClB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE;QAChC,SAAS,EAAE,cAAc,EAAE,CAAC;KAC7B,GAAG,cAAc,EAAE;IAKpB,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE;QAC3C,QAAQ,EAAE,MAAM,CAAC;QACjB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;KACzB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;CAcvE;AAED,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"FormatterUtils.d.ts","sourceRoot":"","sources":["../src/FormatterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAwB,MAAM,cAAc,CAAC;AAE7E,cAAM,cAAc;IAClB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE;QAChC,SAAS,EAAE,cAAc,EAAE,CAAC;KAC7B,GAAG,cAAc,EAAE;IAKpB,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE;QAC3C,QAAQ,EAAE,MAAM,CAAC;QACjB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;KACzB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;IAetE;;;;;;OAMG;IACH,MAAM,CAAC,2BAA2B,CAChC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO;CAQX;AAED,eAAe,cAAc,CAAC"}
@@ -1,3 +1,5 @@
1
+ import { TableColumnFormatter } from "./formatters/index.js";
2
+
1
3
  class FormatterUtils {
2
4
  static getColumnFormats(settings) {
3
5
  var {
@@ -20,6 +22,19 @@ class FormatterUtils {
20
22
  showTSeparator
21
23
  };
22
24
  }
25
+ /**
26
+ * Check if the formatter has a custom format defined for the column name and type
27
+ * @param formatter Formatter to check
28
+ * @param columnName Column name
29
+ * @param columnType Column type
30
+ * @returns True, if a custom format is defined
31
+ */
32
+
33
+
34
+ static isCustomColumnFormatDefined(formatter, columnName, columnType) {
35
+ var columnFormat = formatter.getColumnFormat(columnType, columnName);
36
+ return columnFormat != null && (columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_PRESET || columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_CUSTOM);
37
+ }
23
38
 
24
39
  }
25
40
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/FormatterUtils.ts"],"names":["FormatterUtils","getColumnFormats","settings","formatter","getDateTimeFormatterOptions","timeZone","defaultDateTimeFormat","showTimeZone","showTSeparator","defaultDateTimeFormatString"],"mappings":"AAGA,MAAMA,cAAN,CAAqB;AACI,SAAhBC,gBAAgB,CAACC,QAAD,EAEF;AACnB,QAAM;AAAEC,MAAAA;AAAF,QAAgBD,QAAtB;AACA,WAAOC,SAAP;AACD;;AAEiC,SAA3BC,2BAA2B,CAACF,QAAD,EAKqC;AACrE,QAAM;AACJG,MAAAA,QADI;AAEJC,MAAAA,qBAFI;AAGJC,MAAAA,YAHI;AAIJC,MAAAA;AAJI,QAKFN,QALJ;AAMA,WAAO;AACLG,MAAAA,QADK;AAELI,MAAAA,2BAA2B,EAAEH,qBAFxB;AAGLC,MAAAA,YAHK;AAILC,MAAAA;AAJK,KAAP;AAMD;;AA1BkB;;AA6BrB,eAAeR,cAAf","sourcesContent":["import type { FormattingRule } from './Formatter';\nimport { DateTimeColumnFormatter } from './formatters';\n\nclass FormatterUtils {\n static getColumnFormats(settings: {\n formatter: FormattingRule[];\n }): FormattingRule[] {\n const { formatter } = settings;\n return formatter;\n }\n\n static getDateTimeFormatterOptions(settings: {\n timeZone: string;\n defaultDateTimeFormat: string;\n showTimeZone: boolean;\n showTSeparator: boolean;\n }): Required<ConstructorParameters<typeof DateTimeColumnFormatter>[0]> {\n const {\n timeZone,\n defaultDateTimeFormat,\n showTimeZone,\n showTSeparator,\n } = settings;\n return {\n timeZone,\n defaultDateTimeFormatString: defaultDateTimeFormat,\n showTimeZone,\n showTSeparator,\n };\n }\n}\n\nexport default FormatterUtils;\n"],"file":"FormatterUtils.js"}
1
+ {"version":3,"sources":["../src/FormatterUtils.ts"],"names":["TableColumnFormatter","FormatterUtils","getColumnFormats","settings","formatter","getDateTimeFormatterOptions","timeZone","defaultDateTimeFormat","showTimeZone","showTSeparator","defaultDateTimeFormatString","isCustomColumnFormatDefined","columnName","columnType","columnFormat","getColumnFormat","type","TYPE_CONTEXT_PRESET","TYPE_CONTEXT_CUSTOM"],"mappings":"SAEkCA,oB;;AAElC,MAAMC,cAAN,CAAqB;AACI,SAAhBC,gBAAgB,CAACC,QAAD,EAEF;AACnB,QAAM;AAAEC,MAAAA;AAAF,QAAgBD,QAAtB;AACA,WAAOC,SAAP;AACD;;AAEiC,SAA3BC,2BAA2B,CAACF,QAAD,EAKqC;AACrE,QAAM;AACJG,MAAAA,QADI;AAEJC,MAAAA,qBAFI;AAGJC,MAAAA,YAHI;AAIJC,MAAAA;AAJI,QAKFN,QALJ;AAMA,WAAO;AACLG,MAAAA,QADK;AAELI,MAAAA,2BAA2B,EAAEH,qBAFxB;AAGLC,MAAAA,YAHK;AAILC,MAAAA;AAJK,KAAP;AAMD;AAED;AACF;AACA;AACA;AACA;AACA;AACA;;;AACoC,SAA3BE,2BAA2B,CAChCP,SADgC,EAEhCQ,UAFgC,EAGhCC,UAHgC,EAIvB;AACT,QAAMC,YAAY,GAAGV,SAAS,CAACW,eAAV,CAA0BF,UAA1B,EAAsCD,UAAtC,CAArB;AACA,WACEE,YAAY,IAAI,IAAhB,KACCA,YAAY,CAACE,IAAb,KAAsBhB,oBAAoB,CAACiB,mBAA3C,IACCH,YAAY,CAACE,IAAb,KAAsBhB,oBAAoB,CAACkB,mBAF7C,CADF;AAKD;;AA9CkB;;AAiDrB,eAAejB,cAAf","sourcesContent":["import type { FormattingRule } from './Formatter';\nimport Formatter from './Formatter';\nimport { DateTimeColumnFormatter, TableColumnFormatter } from './formatters';\n\nclass FormatterUtils {\n static getColumnFormats(settings: {\n formatter: FormattingRule[];\n }): FormattingRule[] {\n const { formatter } = settings;\n return formatter;\n }\n\n static getDateTimeFormatterOptions(settings: {\n timeZone: string;\n defaultDateTimeFormat: string;\n showTimeZone: boolean;\n showTSeparator: boolean;\n }): Required<ConstructorParameters<typeof DateTimeColumnFormatter>[0]> {\n const {\n timeZone,\n defaultDateTimeFormat,\n showTimeZone,\n showTSeparator,\n } = settings;\n return {\n timeZone,\n defaultDateTimeFormatString: defaultDateTimeFormat,\n showTimeZone,\n showTSeparator,\n };\n }\n\n /**\n * Check if the formatter has a custom format defined for the column name and type\n * @param formatter Formatter to check\n * @param columnName Column name\n * @param columnType Column type\n * @returns True, if a custom format is defined\n */\n static isCustomColumnFormatDefined(\n formatter: Formatter,\n columnName: string,\n columnType: string\n ): boolean {\n const columnFormat = formatter.getColumnFormat(columnType, columnName);\n return (\n columnFormat != null &&\n (columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_PRESET ||\n columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_CUSTOM)\n );\n }\n}\n\nexport default FormatterUtils;\n"],"file":"FormatterUtils.js"}
@@ -77,10 +77,13 @@ export class IrisGrid extends React.Component<any, any, any> {
77
77
  lastFocusedFilterBarColumn: any;
78
78
  lastLoadedConfig: {
79
79
  advancedFilters: Map<any, any>;
80
+ aggregationSettings: any;
80
81
  customColumns: never[];
81
- reverseType: "none";
82
82
  quickFilters: Map<any, any>;
83
+ reverseType: "none";
84
+ rollupConfig: any;
83
85
  searchFilter: import("@deephaven/jsapi-shim").FilterCondition | null;
86
+ selectDistinctColumns: any;
84
87
  sorts: never[];
85
88
  } | null;
86
89
  tooltip: any;
@@ -452,11 +455,7 @@ export namespace IrisGrid {
452
455
  export { reverseType_1 as reverseType };
453
456
  const customColumns_1: never[];
454
457
  export { customColumns_1 as customColumns };
455
- export namespace aggregationSettings_1 {
456
- const aggregations: never[];
457
- const showOnTop: boolean;
458
- }
459
- export { aggregationSettings_1 as aggregationSettings };
458
+ export { DEFAULT_AGGREGATION_SETTINGS as aggregationSettings };
460
459
  const rollupConfig_1: null;
461
460
  export { rollupConfig_1 as rollupConfig };
462
461
  const userColumnWidths_1: Map<any, any>;
@@ -534,4 +533,8 @@ import memoize from "memoizee";
534
533
  import { OptionType } from "./sidebar";
535
534
  import { GridRange } from "packages/grid/src/GridRange";
536
535
  import PropTypes from "prop-types";
536
+ declare const DEFAULT_AGGREGATION_SETTINGS: Readonly<{
537
+ aggregations: never[];
538
+ showOnTop: boolean;
539
+ }>;
537
540
  //# sourceMappingURL=IrisGrid.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}
package/dist/IrisGrid.js CHANGED
@@ -58,17 +58,24 @@ var log = Log.module('IrisGrid');
58
58
  var UPDATE_DOWNLOAD_THROTTLE = 500;
59
59
  var SET_FILTER_DEBOUNCE = 250;
60
60
  var SET_CONDITIONAL_FORMAT_DEBOUNCE = 250;
61
+ var DEFAULT_AGGREGATION_SETTINGS = Object.freeze({
62
+ aggregations: [],
63
+ showOnTop: false
64
+ });
61
65
 
62
66
  function isEmptyConfig(_ref) {
63
67
  var {
64
68
  advancedFilters,
65
- quickFilters,
66
- sorts,
69
+ aggregationSettings,
67
70
  customColumns,
71
+ quickFilters,
68
72
  reverseType,
69
- searchFilter
73
+ rollupConfig,
74
+ searchFilter,
75
+ selectDistinctColumns,
76
+ sorts
70
77
  } = _ref;
71
- return advancedFilters.size === 0 && quickFilters.size === 0 && sorts.length === 0 && customColumns.length === 0 && reverseType === TableUtils.REVERSE_TYPE.NONE && searchFilter == null;
78
+ return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && reverseType === TableUtils.REVERSE_TYPE.NONE && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
72
79
  }
73
80
 
74
81
  export class IrisGrid extends Component {
@@ -1307,29 +1314,38 @@ export class IrisGrid extends Component {
1307
1314
  log.debug('loading last loading config', this.lastLoadedConfig);
1308
1315
  var {
1309
1316
  advancedFilters,
1317
+ aggregationSettings,
1310
1318
  customColumns,
1311
1319
  quickFilters,
1312
1320
  reverseType,
1321
+ rollupConfig,
1313
1322
  searchFilter,
1323
+ selectDistinctColumns,
1314
1324
  sorts
1315
1325
  } = this.lastLoadedConfig;
1316
1326
  this.lastLoadedConfig = null;
1317
1327
  this.setState({
1318
1328
  advancedFilters,
1329
+ aggregationSettings,
1319
1330
  customColumns,
1320
1331
  quickFilters,
1321
1332
  reverseType,
1333
+ rollupConfig,
1322
1334
  searchFilter,
1335
+ selectDistinctColumns,
1323
1336
  sorts
1324
1337
  });
1325
1338
  } else {
1326
1339
  log.debug('remove all sorts, filters, and custom columns');
1327
1340
  this.setState({
1328
1341
  advancedFilters: new Map(),
1329
- quickFilters: new Map(),
1330
- sorts: [],
1342
+ aggregationSettings: DEFAULT_AGGREGATION_SETTINGS,
1331
1343
  customColumns: [],
1332
- reverseType: TableUtils.REVERSE_TYPE.NONE
1344
+ quickFilters: new Map(),
1345
+ reverseType: TableUtils.REVERSE_TYPE.NONE,
1346
+ rollupConfig: null,
1347
+ selectDistinctColumns: [],
1348
+ sorts: []
1333
1349
  });
1334
1350
  }
1335
1351
  }
@@ -2045,18 +2061,24 @@ export class IrisGrid extends Component {
2045
2061
  log.debug2('Received model update');
2046
2062
  var {
2047
2063
  advancedFilters,
2064
+ aggregationSettings,
2048
2065
  customColumns,
2049
2066
  quickFilters,
2050
2067
  reverseType,
2068
+ rollupConfig,
2051
2069
  searchFilter,
2070
+ selectDistinctColumns,
2052
2071
  sorts
2053
2072
  } = this.state;
2054
2073
  var config = {
2055
2074
  advancedFilters,
2075
+ aggregationSettings,
2056
2076
  customColumns,
2057
- reverseType,
2058
2077
  quickFilters,
2078
+ reverseType,
2079
+ rollupConfig,
2059
2080
  searchFilter,
2081
+ selectDistinctColumns,
2060
2082
  sorts
2061
2083
  };
2062
2084
 
@@ -3423,10 +3445,7 @@ IrisGrid.defaultProps = {
3423
3445
  sorts: [],
3424
3446
  reverseType: TableUtils.REVERSE_TYPE.NONE,
3425
3447
  customColumns: [],
3426
- aggregationSettings: {
3427
- aggregations: [],
3428
- showOnTop: false
3429
- },
3448
+ aggregationSettings: DEFAULT_AGGREGATION_SETTINGS,
3430
3449
  rollupConfig: null,
3431
3450
  userColumnWidths: new Map(),
3432
3451
  userRowHeights: new Map(),