@adaptabletools/adaptable 12.1.3 → 12.1.6

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 (107) hide show
  1. package/bundle.cjs.js +116 -143
  2. package/package.json +1 -1
  3. package/publishTimestamp.d.ts +1 -1
  4. package/publishTimestamp.js +1 -1
  5. package/src/AdaptableInterfaces/IAdaptable.d.ts +10 -4
  6. package/src/AdaptableOptions/FilterOptions.d.ts +7 -0
  7. package/src/AdaptableOptions/UserInterfaceOptions.d.ts +31 -24
  8. package/src/Api/ColumnApi.d.ts +7 -1
  9. package/src/Api/Events/SearchChanged.d.ts +1 -0
  10. package/src/Api/FilterApi.d.ts +6 -0
  11. package/src/Api/FormatColumnApi.d.ts +5 -3
  12. package/src/Api/Implementation/ColumnApiImpl.d.ts +3 -1
  13. package/src/Api/Implementation/ColumnApiImpl.js +17 -2
  14. package/src/Api/Implementation/DataSetApiImpl.js +1 -1
  15. package/src/Api/Implementation/FilterApiImpl.d.ts +1 -0
  16. package/src/Api/Implementation/FilterApiImpl.js +10 -1
  17. package/src/Api/Implementation/FormatColumnApiImpl.d.ts +5 -3
  18. package/src/Api/Implementation/FormatColumnApiImpl.js +40 -11
  19. package/src/Api/Implementation/GridApiImpl.js +4 -4
  20. package/src/Api/Implementation/LayoutApiImpl.d.ts +1 -1
  21. package/src/Api/Implementation/LayoutApiImpl.js +4 -3
  22. package/src/Api/Implementation/QueryApiImpl.js +1 -1
  23. package/src/Api/Implementation/TeamSharingApiImpl.js +1 -1
  24. package/src/Api/LayoutApi.d.ts +1 -1
  25. package/src/PredefinedConfig/AlertState.d.ts +2 -2
  26. package/src/PredefinedConfig/Common/AdaptableColumn.js +3 -2
  27. package/src/PredefinedConfig/Common/AdaptablePredicate.js +9 -1
  28. package/src/PredefinedConfig/Common/Types.d.ts +1 -0
  29. package/src/PredefinedConfig/Common/Types.js +38 -1
  30. package/src/PredefinedConfig/FlashingCellState.d.ts +1 -1
  31. package/src/PredefinedConfig/FormatColumnState.d.ts +2 -2
  32. package/src/Redux/Store/AdaptableStore.js +18 -10
  33. package/src/Strategy/AlertModule.js +1 -1
  34. package/src/Strategy/BulkUpdateModule.js +1 -1
  35. package/src/Strategy/CalculatedColumnModule.js +1 -1
  36. package/src/Strategy/CellSummaryModule.js +1 -1
  37. package/src/Strategy/ChartingModule.js +1 -1
  38. package/src/Strategy/ConditionalStyleModule.js +1 -1
  39. package/src/Strategy/CustomSortModule.js +1 -1
  40. package/src/Strategy/DashboardModule.js +1 -1
  41. package/src/Strategy/DataChangeHistoryModule.js +1 -1
  42. package/src/Strategy/DataSetModule.js +1 -1
  43. package/src/Strategy/ExportModule.js +1 -1
  44. package/src/Strategy/FilterModule.js +1 -1
  45. package/src/Strategy/FlashingCellModule.js +1 -1
  46. package/src/Strategy/FormatColumnModule.js +1 -1
  47. package/src/Strategy/FreeTextColumnModule.js +1 -1
  48. package/src/Strategy/GridInfoModule.js +1 -1
  49. package/src/Strategy/LayoutModule.js +3 -3
  50. package/src/Strategy/PlusMinusModule.js +1 -1
  51. package/src/Strategy/QueryModule.js +1 -1
  52. package/src/Strategy/QuickSearchModule.js +1 -1
  53. package/src/Strategy/ScheduleModule.js +1 -1
  54. package/src/Strategy/ShortcutModule.js +1 -1
  55. package/src/Strategy/SmartEditModule.js +1 -1
  56. package/src/Strategy/StateManagementModule.js +1 -1
  57. package/src/Strategy/StatusBarModule.js +1 -1
  58. package/src/Strategy/SystemStatusModule.js +1 -1
  59. package/src/Strategy/TeamSharingModule.js +1 -1
  60. package/src/Strategy/ThemeModule.js +1 -1
  61. package/src/Strategy/ToolPanelModule.js +1 -1
  62. package/src/Utilities/Constants/ModuleConstants.d.ts +68 -0
  63. package/src/Utilities/Constants/ModuleConstants.js +70 -1
  64. package/src/Utilities/Defaults/DefaultAdaptableOptions.js +3 -1
  65. package/src/Utilities/Extensions/ArrayExtensions.js +6 -0
  66. package/src/Utilities/Services/Interface/IMetamodelService.d.ts +5 -0
  67. package/src/Utilities/Services/MetamodelService.d.ts +4 -4
  68. package/src/Utilities/Services/MetamodelService.js +19 -12
  69. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js +193 -135
  70. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js +23 -15
  71. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizardColumnsStep.js +3 -7
  72. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.d.ts +2 -2
  73. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.js +148 -8
  74. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/GridOptionsForm.js +0 -7
  75. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsActionColumnsForm.d.ts +6 -0
  76. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsActionColumnsForm.js +33 -0
  77. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.d.ts +6 -0
  78. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js +82 -0
  79. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.d.ts +6 -0
  80. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js +109 -0
  81. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.d.ts +8 -0
  82. package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.js +16 -0
  83. package/src/View/AdaptableWizardView/Wizard.js +2 -1
  84. package/src/View/AdaptableWizardView/helper.d.ts +1 -1
  85. package/src/View/AdaptableWizardView/helper.js +3 -10
  86. package/src/View/Components/FilterForm/FilterForm.js +4 -2
  87. package/src/View/Components/FilterForm/QuickFilterForm.js +2 -1
  88. package/src/View/Components/RangesComponent.js +1 -1
  89. package/src/View/Layout/Wizard/sections/AggregationsSection.js +1 -1
  90. package/src/View/Layout/Wizard/sections/ColumnsSection.js +8 -4
  91. package/src/View/Layout/Wizard/sections/PivotColumnsSection.js +3 -2
  92. package/src/View/Layout/Wizard/sections/RowGroupingSection.js +1 -1
  93. package/src/View/Layout/Wizard/sections/SettingsSection.js +2 -2
  94. package/src/View/Layout/Wizard/sections/SortSection.js +1 -1
  95. package/src/agGrid/Adaptable.d.ts +2 -1
  96. package/src/agGrid/Adaptable.js +19 -12
  97. package/src/agGrid/PercentBarRenderer.d.ts +2 -1
  98. package/src/agGrid/PercentBarRenderer.js +3 -3
  99. package/src/agGrid/agGridHelper.d.ts +1 -1
  100. package/src/agGrid/agGridHelper.js +2 -2
  101. package/src/components/ProgressIndicator/ProgressIndicator.js +10 -12
  102. package/src/metamodel/adaptable.metamodel.d.ts +74 -6
  103. package/src/metamodel/adaptable.metamodel.js +1 -1
  104. package/src/parser/src/types.d.ts +1 -1
  105. package/src/types.d.ts +1 -1
  106. package/version.d.ts +1 -1
  107. package/version.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable",
3
- "version": "12.1.3",
3
+ "version": "12.1.6",
4
4
  "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
5
5
  "keywords": [
6
6
  "web-components",
@@ -1,2 +1,2 @@
1
- declare const _default: 1658938470568;
1
+ declare const _default: 1659973452141;
2
2
  export default _default;
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = 1658938470568;
3
+ exports.default = 1659973452141;
@@ -49,14 +49,20 @@ export interface IAdaptable {
49
49
  * Avoid unnecessary store calls and rendering
50
50
  */
51
51
  isInitialised: boolean;
52
- /**
53
- * TRUE if the Adaptable custom tool panel (side-bar) is displayed
54
- */
55
- hasAdaptableToolPanel: boolean;
56
52
  /**
57
53
  * Set to true when adaptable is destroyed.
58
54
  */
59
55
  isDestroyed: boolean;
56
+ /**
57
+ * TRUE iff:
58
+ * 1. isInitialised = TRUE
59
+ * 2. isDestroyed = FALSE
60
+ */
61
+ isLive: boolean;
62
+ /**
63
+ * TRUE if the Adaptable custom tool panel (side-bar) is displayed
64
+ */
65
+ hasAdaptableToolPanel: boolean;
60
66
  /**
61
67
  * Adaptable contains a number of 'Services' which are created at Startup
62
68
  *
@@ -150,4 +150,11 @@ export interface FilterOptions {
150
150
  * @defaultValue true
151
151
  */
152
152
  showQuickFilter?: boolean;
153
+ /**
154
+ * Display only currently filtered distinct values in Filter controls
155
+ *
156
+ * @defaultValue false
157
+ * @gridInfoItem
158
+ */
159
+ showDistinctFilteredValuesOnly?: boolean;
153
160
  }
@@ -105,7 +105,7 @@ export interface BasePermittedValues {
105
105
  */
106
106
  export interface PermittedValues extends BasePermittedValues {
107
107
  /**
108
- * Values to display: either hardcoded list or a function
108
+ * Values to display: either hardcoded list or a function that returns a list
109
109
  */
110
110
  values?: any[] | ((context: PermittedValuesContext) => any[]);
111
111
  }
@@ -113,6 +113,9 @@ export interface PermittedValues extends BasePermittedValues {
113
113
  * Used to define permitted values for inline column editor
114
114
  */
115
115
  export interface EditLookUpPermittedValues extends BasePermittedValues {
116
+ /**
117
+ * Values to display in Edit Look Up: either hardcoded list or a function that returns a list
118
+ */
116
119
  values?: any[] | ((context: EditLookUpContext) => any[]);
117
120
  }
118
121
  /**
@@ -124,56 +127,60 @@ export interface FilterPermittedValues extends BasePermittedValues {
124
127
  * @defaultValue false
125
128
  */
126
129
  suppressFilterSearchBar?: boolean;
130
+ /**
131
+ * Values to display in 'IN' Filter: either hardcoded list or a function that returns a list
132
+ */
127
133
  values: (context: FilterPermittedValuesContext) => any[] | Promise<any[]>;
128
134
  }
129
135
  /**
130
- * Custom column values for custom sort.
136
+ * Custom column values for Custom Sort
131
137
  */
132
138
  export interface CustomSortPermittedValues extends BasePermittedValues {
139
+ /**
140
+ * Values to display in Custom Sort Wizard: either hardcoded list or a function that returns a list
141
+ */
133
142
  values: (context: PermittedValuesContext) => any[] | Promise<any[]>;
134
143
  }
135
144
  /**
136
145
  * User to define permitted values when updating cells via bulk update
137
146
  */
138
147
  export interface BulkUpdatePermittedValues extends BasePermittedValues {
148
+ /**
149
+ * Values to display in Bulk Update Wizard: either hardcoded list or a function that returns a list
150
+ */
139
151
  values: (context: BulkUpdatePermittedValuesContext) => any[] | Promise<any[]>;
140
152
  }
141
153
  /**
142
- * Use PermittedValues instead
143
- * @deprecated use PermittedValues instead
154
+ * Context used when getting PermittedValues via a function
144
155
  */
145
- export declare type CellValuesList = PermittedValues;
146
- export interface EditLookUpContext extends BaseContext {
147
- /**
148
- * Column displaying the Edit LookUp
149
- */
150
- column: AdaptableColumn;
151
- /**
152
- * Cell being edited
153
- */
154
- gridCell?: GridCell;
155
- }
156
156
  export interface PermittedValuesContext extends BaseContext {
157
157
  /**
158
158
  * Column whose values are being displayed
159
159
  */
160
160
  column: AdaptableColumn;
161
161
  }
162
- export interface FilterPermittedValuesContext extends BaseContext {
162
+ /**
163
+ * Context used when getting EditLookUpPermittedValues via a function
164
+ */
165
+ export interface EditLookUpContext extends PermittedValuesContext {
163
166
  /**
164
- * Column hosting the filter form
167
+ * Cell being edited
165
168
  */
166
- column: AdaptableColumn;
169
+ gridCell?: GridCell;
170
+ }
171
+ /**
172
+ * Context used when getting FilterPermittedValues via a function
173
+ */
174
+ export interface FilterPermittedValuesContext extends PermittedValuesContext {
167
175
  /**
168
176
  * A search string
169
177
  */
170
- filter: string;
178
+ searchFilter: string;
171
179
  }
172
- export interface BulkUpdatePermittedValuesContext extends BaseContext {
173
- /**
174
- * Column being edited via Bulk Update
175
- */
176
- column: AdaptableColumn;
180
+ /**
181
+ * Context used when getting BulkUpdatePermittedValues via a function
182
+ */
183
+ export interface BulkUpdatePermittedValuesContext extends PermittedValuesContext {
177
184
  /**
178
185
  * Cells which will be modified in the Bulk Update
179
186
  */
@@ -229,7 +229,7 @@ export interface ColumnApi {
229
229
  * @param columnId Column to check
230
230
  * @param columnFilter Current applied filter
231
231
  */
232
- getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
232
+ getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{
233
233
  values: {
234
234
  value: any;
235
235
  label: string;
@@ -303,5 +303,11 @@ export interface ColumnApi {
303
303
  * @param columnId Column to Check
304
304
  */
305
305
  isActionRowButtonColumn(columnId: string): boolean;
306
+ /**
307
+ * Returns the default Aggregation Function for a Column
308
+ * @param columnId Column to Check
309
+ */
306
310
  getDefaultAggFunc(columnId: string): string;
311
+ getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
312
+ getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
307
313
  }
@@ -2,6 +2,7 @@ import { BaseEventInfo } from './BaseEventInfo';
2
2
  import { AdaptableSortState } from '../../types';
3
3
  import { AdaptableSearchState } from './AdaptableSearchState';
4
4
  /**
5
+ * Deprecated Search Changed Event - use `QueryRun` or `FilterApplied` instead
5
6
  * @deprecated Use QueryRun and or FilterApplied
6
7
  */
7
8
  export interface SearchChangedInfo extends BaseEventInfo {
@@ -138,4 +138,10 @@ export interface FilterApi {
138
138
  * Fires Filter Applied Event - typically used to enable filtering on the server
139
139
  */
140
140
  fireFilterAppliedEvent(): void;
141
+ /**
142
+ * Compares to sets of Column Filters to see if they are identical
143
+ * @param filters1
144
+ * @param filters2
145
+ */
146
+ areColumnFiltersDifferent(filters1: ColumnFilter[], filters2: ColumnFilter[]): boolean;
141
147
  }
@@ -1,4 +1,4 @@
1
- import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../PredefinedConfig/FormatColumnState';
1
+ import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
2
2
  import { AdaptableColumn, AdaptableFormat } from '../types';
3
3
  import { RowNode } from '@ag-grid-community/all-modules';
4
4
  /**
@@ -156,14 +156,16 @@ export interface FormatColumnApi {
156
156
  * @param rowNode current Row Node
157
157
  * @param cellValue current Cell Value
158
158
  */
159
- getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
159
+ getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
160
160
  /**
161
161
  * Gets the Maximum Value to display for a Numeric Style
162
162
  * @param numericStyle Numeric Style to check
163
163
  * @param rowNode current Row Node
164
164
  * @param cellValue current Cell Value
165
165
  */
166
- getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
166
+ getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
167
+ getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
168
+ getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
167
169
  /**
168
170
  * Returns first Format Column that contains checkbox style
169
171
  * @param columnId column to check
@@ -53,7 +53,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
53
53
  getQueryableColumns(): AdaptableColumn[];
54
54
  private LogMissingColumnWarning;
55
55
  getDistinctDisplayValuesForColumn(columnId: string): any[];
56
- getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
56
+ getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{
57
57
  values: any[];
58
58
  suppressClientSideFilter: boolean;
59
59
  }>;
@@ -70,4 +70,6 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
70
70
  isColumnReferencedInExpression(columnId: string, expression: string): boolean;
71
71
  isActionRowButtonColumn(columnId: string): boolean;
72
72
  getDefaultAggFunc(columnId: string): string;
73
+ getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
74
+ getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
73
75
  }
@@ -289,15 +289,16 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
289
289
  return cv.normalisedValue;
290
290
  });
291
291
  }
292
- async getDistinctFilterDisplayValuesForColumn(columnId, filter) {
292
+ async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
293
293
  const abColumn = this.getColumnFromId(columnId);
294
+ console.log('getting for ', columnId);
294
295
  if (abColumn == undefined) {
295
296
  return {
296
297
  values: [],
297
298
  suppressClientSideFilter: false,
298
299
  };
299
300
  }
300
- const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
301
+ const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
301
302
  return {
302
303
  values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
303
304
  return {
@@ -420,5 +421,19 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
420
421
  const agColumn = (_b = (_a = this.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
421
422
  return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
422
423
  }
424
+ getMinValueForNumericColumn(column) {
425
+ if (column.dataType !== 'Number') {
426
+ return undefined;
427
+ }
428
+ // can we cache this in some way?
429
+ return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
430
+ }
431
+ getMaxValueForNumericColumn(column) {
432
+ if (column.dataType !== 'Number') {
433
+ return undefined;
434
+ }
435
+ // can we cache this in some way?
436
+ return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
437
+ }
423
438
  }
424
439
  exports.ColumnApiImpl = ColumnApiImpl;
@@ -30,7 +30,7 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
30
30
  this.showModulePopup(ModuleConstants.DataSetModuleId);
31
31
  }
32
32
  fireDataSetSelectedEvent(dataSet) {
33
- if (this.adaptable.isInitialised) {
33
+ if (this.adaptable.isLive) {
34
34
  const dataSetSelectedInfo = {
35
35
  adaptableApi: this.adaptable.api,
36
36
  dataSet,
@@ -42,5 +42,6 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
42
42
  */
43
43
  isFilterActive(filter: ColumnFilter): boolean;
44
44
  shouldNewColumnFilterTriggerGridFiltering(action: LayoutRedux.LayoutColumnFilterAction | Redux.Action): boolean;
45
+ areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
45
46
  fireFilterAppliedEvent(): void;
46
47
  }
@@ -208,6 +208,9 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
208
208
  * @param filter
209
209
  */
210
210
  isFilterActive(filter) {
211
+ if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
212
+ return false;
213
+ }
211
214
  const predicateDef = this.adaptable.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
212
215
  if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
213
216
  // values predicates have no inputs in the definition
@@ -267,8 +270,14 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
267
270
  isEditTrigger ||
268
271
  isSetAndActive);
269
272
  }
273
+ areColumnFiltersDifferent(oldFilters, newFilters) {
274
+ if (ArrayExtensions_1.default.IsNullOrEmpty(oldFilters) && ArrayExtensions_1.default.IsNullOrEmpty(newFilters)) {
275
+ return false;
276
+ }
277
+ return ArrayExtensions_1.default.areArraysNotEqual(oldFilters, newFilters);
278
+ }
270
279
  fireFilterAppliedEvent() {
271
- if (this.adaptable.isInitialised) {
280
+ if (this.adaptable.isLive) {
272
281
  const filterAppliedInfo = {
273
282
  columnFilters: this.getColumnFilters(),
274
283
  adaptableApi: this.getAdaptableApi(),
@@ -1,7 +1,7 @@
1
1
  import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
2
2
  import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
3
3
  import { FormatColumnApi } from '../FormatColumnApi';
4
- import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
4
+ import { FormatColumnState, FormatColumn, ColumnStyle, CellColorRange, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
5
5
  import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
6
6
  import { RowNode } from '@ag-grid-community/all-modules';
7
7
  import { AdaptableFormat } from '../../types';
@@ -39,8 +39,10 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
39
39
  getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
40
40
  getFormatColumnsWithDataTypeScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
41
41
  getFormatColumnsWithColumnScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
42
- getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
43
- getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number | undefined;
42
+ getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
43
+ getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
44
+ getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
45
+ getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
44
46
  getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
45
47
  isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
46
48
  fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
@@ -180,7 +180,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
180
180
  getFormatColumnsWithColumnScope(formatColumns) {
181
181
  return formatColumns.filter((fc) => this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope));
182
182
  }
183
- getNumericStyleMinValue(numericStyle, rowNode, cellValue) {
183
+ getNumericStyleMinValue(numericStyle, column, rowNode, cellValue) {
184
184
  var _a, _b;
185
185
  const columnComparison = numericStyle.GradientStyle
186
186
  ? numericStyle.GradientStyle.ColumnComparison
@@ -199,24 +199,28 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
199
199
  }
200
200
  }
201
201
  }
202
- // for percentbar we want to get the whole Ranges, for Gradident Column just range that contains cell value
202
+ // for Gradient Column we want just the range that contains cell value
203
203
  if (numericStyle.GradientStyle) {
204
204
  let range;
205
205
  numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
206
- if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
207
- range = cellRange;
206
+ if (!range) {
207
+ if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
208
+ (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
209
+ range = cellRange;
210
+ }
208
211
  }
209
212
  });
210
- return range ? range.Min : undefined;
213
+ return this.getCellColorRangeMinValue(range, column);
211
214
  }
215
+ // for percentbar we want to get the whole Ranges
212
216
  if (numericStyle.PercentBarStyle) {
213
217
  const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
214
218
  if (ranges) {
215
- return ranges[0].Min;
219
+ return this.getCellColorRangeMinValue(ranges[0], column);
216
220
  }
217
221
  }
218
222
  }
219
- getNumericStyleMaxValue(numericStyle, rowNode, cellValue) {
223
+ getNumericStyleMaxValue(numericStyle, column, rowNode, cellValue) {
220
224
  var _a, _b;
221
225
  const columnComparison = numericStyle.GradientStyle
222
226
  ? numericStyle.GradientStyle.ColumnComparison
@@ -238,19 +242,44 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
238
242
  if (numericStyle.GradientStyle) {
239
243
  let range;
240
244
  numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
241
- if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
242
- range = cellRange;
245
+ if (!range) {
246
+ if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
247
+ (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
248
+ range = cellRange;
249
+ }
243
250
  }
244
251
  });
245
- return range ? range.Max : undefined;
252
+ return this.getCellColorRangeMaxValue(range, column);
246
253
  }
247
254
  if (numericStyle.PercentBarStyle) {
248
255
  const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
249
256
  if (ranges) {
250
- return ranges[ranges.length - 1].Max;
257
+ return this.getCellColorRangeMaxValue(ranges[ranges.length - 1], column);
251
258
  }
252
259
  }
253
260
  }
261
+ getCellColorRangeMinValue(range, column) {
262
+ if (!range) {
263
+ return undefined;
264
+ }
265
+ if (range.Min == undefined) {
266
+ return undefined;
267
+ }
268
+ return range.Min == 'Col-Min'
269
+ ? this.getAdaptableApi().columnApi.getMinValueForNumericColumn(column)
270
+ : range.Min;
271
+ }
272
+ getCellColorRangeMaxValue(range, column) {
273
+ if (!range) {
274
+ return undefined;
275
+ }
276
+ if (range.Max == undefined) {
277
+ return undefined;
278
+ }
279
+ return range.Max == 'Col-Max'
280
+ ? this.getAdaptableApi().columnApi.getMaxValueForNumericColumn(column)
281
+ : range.Max;
282
+ }
254
283
  getCheckBoxStyleFormatColumn(column) {
255
284
  var _a;
256
285
  if (column.dataType != 'Boolean') {
@@ -260,7 +260,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
260
260
  this.adaptable.redrawHeader();
261
261
  }
262
262
  fireSearchChangedEvent(searchChangedTrigger) {
263
- if (this.adaptable.isInitialised) {
263
+ if (this.adaptable.isLive) {
264
264
  const adaptableSearchState = this.adaptable.api.configApi.getAdaptableSearchState();
265
265
  const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
266
266
  const searchChangedInfo = {
@@ -273,7 +273,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
273
273
  }
274
274
  }
275
275
  fireGridSortedEvent() {
276
- if (this.adaptable.isInitialised) {
276
+ if (this.adaptable.isLive) {
277
277
  const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
278
278
  const adaptableApi = this.getAdaptableApi();
279
279
  const gridSortedInfo = {
@@ -284,7 +284,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
284
284
  }
285
285
  }
286
286
  fireCellChangedEvent(cellDataChangedInfo) {
287
- if (this.adaptable.isInitialised) {
287
+ if (this.adaptable.isLive) {
288
288
  const cellChangedInfo = {
289
289
  adaptableApi: this.adaptable.api,
290
290
  cellChange: cellDataChangedInfo,
@@ -293,7 +293,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
293
293
  }
294
294
  }
295
295
  fireGridDataChangedEvent(dataRows, rowNodes = [], rowTrigger) {
296
- if (this.adaptable.isInitialised) {
296
+ if (this.adaptable.isLive) {
297
297
  const gridDataChangedInfo = {
298
298
  changedAt: Date.now(),
299
299
  adaptableApi: this.adaptable.api,
@@ -12,7 +12,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
12
12
  };
13
13
  getCurrentVisibleColumnIds(): string[];
14
14
  setLayout(layoutName: string): void;
15
- fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
15
+ fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
16
16
  getCurrentLayout(): Layout;
17
17
  getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
18
18
  areDraftAndCurrentLayoutEqual(): boolean;
@@ -50,16 +50,17 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
50
50
  }
51
51
  }
52
52
  }
53
- fireLayoutChangedEvent(trigger, oldSate, newState) {
53
+ fireLayoutChangedEvent(trigger, oldSate, newState, skipEqualityCheck) {
54
54
  const layoutChangedInfo = {
55
55
  adaptableApi: this.adaptable.api,
56
56
  actionName: trigger,
57
57
  oldLayoutState: oldSate,
58
58
  newLayoutState: newState,
59
59
  };
60
- if (!isEqual_1.default(oldSate, newState)) {
61
- this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
60
+ if (!skipEqualityCheck && isEqual_1.default(oldSate, newState)) {
61
+ return;
62
62
  }
63
+ this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
63
64
  }
64
65
  getCurrentLayout() {
65
66
  const state = this.getAdaptableState();
@@ -89,7 +89,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
89
89
  }));
90
90
  }
91
91
  fireQueryRunEvent() {
92
- if (this.adaptable.isInitialised) {
92
+ if (this.adaptable.isLive) {
93
93
  const currentQuery = this.adaptable.api.queryApi.getCurrentQuery();
94
94
  const adaptableApi = this.getAdaptableApi();
95
95
  const queryRunInfo = {
@@ -47,7 +47,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
47
47
  this.showModulePopup(ModuleConstants.TeamSharingModuleId);
48
48
  }
49
49
  fireTeamSharingEntityChangedEvent(sharedEntity) {
50
- if (this.adaptable.isInitialised) {
50
+ if (this.adaptable.isLive) {
51
51
  const teamSharingEntityChangedInfo = {
52
52
  adaptableApi: this.adaptable.api,
53
53
  sharedEntity: sharedEntity,
@@ -113,7 +113,7 @@ export interface LayoutApi {
113
113
  * @param oldSate Layout State before change
114
114
  * @param newState Layout State after change
115
115
  */
116
- fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
116
+ fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState, skipEqualityCheck?: boolean): void;
117
117
  /**
118
118
  * Compares 2 Layouts for equality
119
119
  * @param layout1 First Layout
@@ -37,7 +37,7 @@ export interface AlertDefinition extends SuspendableObject {
37
37
  */
38
38
  MessageType: AdaptableMessageType;
39
39
  /**
40
- * Alert Message - can be string or function; if not provided AdapTable creates dynamically using Rule & Scope
40
+ * Alert Message; if not provided AdapTable creates dynamically using Rule & Scope (Note: can be provided as a function in AlertOptions)
41
41
  */
42
42
  MessageText?: string;
43
43
  /**
@@ -126,4 +126,4 @@ export interface AlertProperties {
126
126
  */
127
127
  PreventEdit?: boolean;
128
128
  }
129
- export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';
129
+ export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';
@@ -8,14 +8,15 @@ const isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
8
8
  let count = 0;
9
9
  columns.forEach((column) => {
10
10
  var _a, _b;
11
- if (column.columnGroup &&
11
+ if (column &&
12
+ column.columnGroup &&
12
13
  column.columnGroup.groupCount > 1 &&
13
14
  !column.columnGroup.allowGroupSplit) {
14
15
  if (prevGroup !== column.columnGroup.columnGroupId) {
15
16
  count++;
16
17
  }
17
18
  }
18
- prevGroup = (_b = (_a = column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
19
+ prevGroup = (_b = (_a = column === null || column === void 0 ? void 0 : column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
19
20
  });
20
21
  return count;
21
22
  };
@@ -59,7 +59,7 @@ exports.SystemPredicateDefs = [
59
59
  return true;
60
60
  }
61
61
  if (column.dataType === 'Date') {
62
- return inputs.some((input) => {
62
+ return inputs.every((input) => {
63
63
  return !isSameDay_1.default(input, value);
64
64
  });
65
65
  }
@@ -186,6 +186,14 @@ exports.SystemPredicateDefs = [
186
186
  icon: { text: '1' },
187
187
  columnScope: { DataTypes: ['Number'] },
188
188
  moduleScope: ['alert', 'flashingcell'],
189
+ handler: ({ value }) => !isNaN(Number(value)),
190
+ },
191
+ {
192
+ id: 'IsNotNumeric',
193
+ label: 'Is Not Numeric',
194
+ icon: { text: '1' },
195
+ columnScope: { DataTypes: ['Number'] },
196
+ moduleScope: ['alert', 'flashingcell'],
189
197
  handler: ({ value }) => isNaN(Number(value)),
190
198
  },
191
199
  // String System Filters
@@ -29,6 +29,7 @@ export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFi
29
29
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
30
30
  */
31
31
  export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
32
+ export declare const ALL_MODULES: AdaptableModule[];
32
33
  export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
33
34
  export declare type TypeHint<Base, Literals> = (Base & {
34
35
  __subType?: true;