@adaptabletools/adaptable-cjs 18.0.0-canary.17 → 18.0.0-canary.18

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 (36) hide show
  1. package/package.json +1 -1
  2. package/src/Api/Internal/GridFilterInternalApi.d.ts +5 -0
  3. package/src/Api/Internal/GridFilterInternalApi.js +6 -0
  4. package/src/PredefinedConfig/Common/Menu.d.ts +9 -4
  5. package/src/PredefinedConfig/Common/Menu.js +62 -36
  6. package/src/Redux/Store/AdaptableStore.js +11 -6
  7. package/src/Strategy/AdaptableModuleBase.d.ts +5 -5
  8. package/src/Strategy/AdaptableModuleBase.js +3 -3
  9. package/src/Strategy/AlertModule.js +1 -1
  10. package/src/Strategy/CalculatedColumnModule.js +1 -1
  11. package/src/Strategy/ColumnFilterModule.d.ts +1 -1
  12. package/src/Strategy/ColumnFilterModule.js +44 -41
  13. package/src/Strategy/ColumnInfoModule.js +2 -2
  14. package/src/Strategy/CommentModule.js +2 -2
  15. package/src/Strategy/CustomSortModule.js +1 -1
  16. package/src/Strategy/DashboardModule.js +8 -8
  17. package/src/Strategy/DataImportModule.js +1 -1
  18. package/src/Strategy/ExportModule.js +3 -3
  19. package/src/Strategy/Fdc3Module.js +1 -1
  20. package/src/Strategy/FlashingCellModule.js +4 -4
  21. package/src/Strategy/FormatColumnModule.js +6 -6
  22. package/src/Strategy/FreeTextColumnModule.js +1 -1
  23. package/src/Strategy/GridInfoModule.js +2 -2
  24. package/src/Strategy/LayoutModule.js +13 -13
  25. package/src/Strategy/NoteModule.js +2 -2
  26. package/src/Strategy/PlusMinusModule.js +1 -1
  27. package/src/Strategy/SettingsPanelModule.js +3 -3
  28. package/src/Strategy/StyledColumnModule.js +13 -10
  29. package/src/Strategy/SystemStatusModule.js +1 -1
  30. package/src/Utilities/MenuItem.d.ts +7 -7
  31. package/src/agGrid/editors/AdaptableDateEditor/index.d.ts +1 -1
  32. package/src/agGrid/editors/AdaptableDateEditor/index.js +1 -1
  33. package/src/env.js +2 -2
  34. package/src/metamodel/adaptable.metamodel.d.ts +0 -6
  35. package/src/metamodel/adaptable.metamodel.js +1 -1
  36. package/tsconfig.cjs.tsbuildinfo +1 -1
package/src/Strategy/FormatColumnModule.js CHANGED
@@ -49,12 +49,12 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
49
49
  action: 'New',
50
50
  source: 'ColumnMenu',
51
51
  };
52
- const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
52
+ const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
53
53
  const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
54
54
  // .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
55
55
  // if no formats then just show Create
56
56
  if (ArrayExtensions_1.default.IsNullOrEmpty(formatColumnsForColumn)) {
57
- returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
57
+ returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
58
58
  // if 1 format then show a Create and an Edit
59
59
  }
60
60
  else if (formatColumnsForColumn.length == 1) {
@@ -64,9 +64,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
64
64
  value: formatColumnsForColumn[0],
65
65
  source: 'ColumnMenu',
66
66
  };
67
- const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
67
+ const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
68
68
  returnColumnMenuItems.push({
69
- name: 'format-column',
69
+ name: 'parent',
70
70
  label: 'Format Column',
71
71
  module: this.moduleInfo.ModuleName,
72
72
  isVisible: true,
@@ -81,9 +81,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
81
81
  const moduleInfo = this.api.internalApi
82
82
  .getModuleService()
83
83
  .getModuleInfoByModule('FormatColumn');
84
- const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
84
+ const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
85
85
  returnColumnMenuItems.push({
86
- name: 'format-column',
86
+ name: 'parent',
87
87
  label: 'Format Column',
88
88
  module: this.moduleInfo.ModuleName,
89
89
  isVisible: true,
package/src/Strategy/FreeTextColumnModule.js CHANGED
@@ -32,7 +32,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
32
32
  source: 'ColumnMenu',
33
33
  };
34
34
  return [
35
- this.createColumnMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
35
+ this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
36
36
  ];
37
37
  }
38
38
  }
package/src/Strategy/GridInfoModule.js CHANGED
@@ -15,7 +15,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
15
15
  if (this.isModuleAvailable()) {
16
16
  return [
17
17
  this.createMainMenuItemShowPopup({
18
- Name: 'grid-info',
18
+ Name: 'grid-info-show',
19
19
  Label: 'Grid Info',
20
20
  ComponentName: this.moduleInfo.Popup,
21
21
  Icon: this.moduleInfo.Glyph,
@@ -27,7 +27,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
27
27
  if (this.isModuleAvailable()) {
28
28
  return [
29
29
  this.createMainMenuItemShowPopup({
30
- Name: 'grid-info',
30
+ Name: 'grid-info-show',
31
31
  Label: 'Grid Info',
32
32
  ComponentName: this.moduleInfo.Popup,
33
33
  Icon: this.moduleInfo.Glyph,
package/src/Strategy/LayoutModule.js CHANGED
@@ -149,7 +149,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
149
149
  if (this.isModuleEditable()) {
150
150
  const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
151
151
  if (!isReadOnlyLayout) {
152
- returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
152
+ returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
153
153
  action: 'Edit',
154
154
  source: 'ColumnMenu',
155
155
  value: this.api.layoutApi.getCurrentLayout(),
@@ -157,10 +157,10 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
157
157
  }
158
158
  if (column) {
159
159
  if (!isReadOnlyLayout) {
160
- returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
160
+ returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
161
161
  }
162
162
  if (column.hideable) {
163
- returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
163
+ returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
164
164
  this.api.columnApi.hideColumn(column.columnId);
165
165
  }));
166
166
  }
@@ -169,24 +169,24 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
169
169
  if (column) {
170
170
  const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
171
171
  if (hasExistingSelection) {
172
- selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
172
+ selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
173
173
  this.api.columnApi.addColumnToSelection(column.columnId);
174
174
  }));
175
- selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
175
+ selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
176
176
  this.api.columnApi.selectColumn(column.columnId);
177
177
  }));
178
178
  }
179
179
  else {
180
- selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
180
+ selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
181
181
  this.api.columnApi.selectColumn(column.columnId);
182
182
  }));
183
183
  }
184
184
  }
185
- selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
185
+ selectMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
186
186
  this.api.gridApi.selectAll();
187
187
  }));
188
188
  returnColumnMenuItems.push({
189
- name: 'layout-select',
189
+ name: 'layout-select-parent',
190
190
  label: 'Select',
191
191
  isVisible: true,
192
192
  module: this.moduleInfo.ModuleName,
@@ -201,7 +201,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
201
201
  addContextMenuItems(menuContext) {
202
202
  let returnColumnMenuItems = [];
203
203
  if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
204
- returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
204
+ returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
205
205
  action: 'Edit',
206
206
  source: 'ColumnMenu',
207
207
  }));
@@ -213,19 +213,19 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
213
213
  let clickFunction = () => {
214
214
  this.api.gridApi.deselectAll();
215
215
  };
216
- returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
216
+ returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
217
217
  if (this.isModuleAvailable()) {
218
218
  let gridMenuItems = [];
219
219
  let autoSizeFunction = () => {
220
220
  this.api.columnApi.autosizeAllColumns();
221
221
  };
222
- gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
222
+ gridMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
223
223
  let clickFunction = () => {
224
224
  this.api.gridApi.selectAll();
225
225
  };
226
- gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
226
+ gridMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
227
227
  returnColumnMenuItems.push({
228
- name: 'layout-grid',
228
+ name: 'layout-grid-parent',
229
229
  label: 'Grid',
230
230
  module: this.moduleInfo.ModuleName,
231
231
  isVisible: true,
package/src/Strategy/NoteModule.js CHANGED
@@ -45,12 +45,12 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
45
45
  ColumnId: menuContext.adaptableColumn.columnId,
46
46
  })) !== null && _a !== void 0 ? _a : [];
47
47
  if (note) {
48
- items.push(this.createColumnMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
48
+ items.push(this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
49
49
  this.api.noteApi.deleteNote(note);
50
50
  }));
51
51
  }
52
52
  else {
53
- items.push(this.createColumnMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
53
+ items.push(this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
54
54
  // add an empty one
55
55
  this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
56
56
  this.api.internalApi.getCellPopupService().showPopup({
package/src/Strategy/PlusMinusModule.js CHANGED
@@ -64,7 +64,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
64
64
  source: 'ColumnMenu',
65
65
  };
66
66
  return [
67
- this.createColumnMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
67
+ this.createMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
68
68
  ];
69
69
  }
70
70
  }
package/src/Strategy/SettingsPanelModule.js CHANGED
@@ -13,17 +13,17 @@ class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
13
13
  addColumnMenuItems(column) {
14
14
  return [
15
15
  // To do : get the icon and name from settings in case they have changed?
16
- this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
16
+ this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
17
17
  ];
18
18
  }
19
19
  addContextMenuItems(menuContext) {
20
20
  return [
21
- this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
21
+ this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
22
22
  ];
23
23
  }
24
24
  addModuleMenuItem(source) {
25
25
  if (this.isModuleAvailable()) {
26
- return this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
26
+ return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
27
27
  }
28
28
  }
29
29
  }
package/src/Strategy/StyledColumnModule.js CHANGED
@@ -49,6 +49,9 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
49
49
  styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, SparkLineStyle: {} });
50
50
  }
51
51
  let label = hasSparklineStyle ? 'Edit ' : 'Create ';
52
+ let name = hasSparklineStyle
53
+ ? 'styled-column-sparkline-edit'
54
+ : 'styled-column-sparkline-add';
52
55
  let popupParam = {
53
56
  action: sparklineColumnExists ? 'Edit' : 'New',
54
57
  source: 'ColumnMenu',
@@ -57,7 +60,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
57
60
  defaultCurrentSectionName: 'Settings',
58
61
  },
59
62
  };
60
- returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('styled-column-sparkline', label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
63
+ returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
61
64
  }
62
65
  }
63
66
  // Next do non sparkline
@@ -83,7 +86,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
83
86
  const icon = this.getGlyphForStyledColumn(styledColumn);
84
87
  const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
85
88
  const name = this.getTypeName(styledColumn);
86
- returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
89
+ returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
87
90
  }
88
91
  }
89
92
  else {
@@ -95,7 +98,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
95
98
  config: {},
96
99
  };
97
100
  const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
98
- const newBadgeButton = this.createColumnMenuItemShowPopup('styled-column-badge', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
101
+ const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
99
102
  Badges: [ObjectFactory_1.default.CreateDefaultStyledColumnBadge()],
100
103
  } }), config: {
101
104
  defaultCurrentSectionName: 'Badges',
@@ -107,18 +110,18 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
107
110
  const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
108
111
  ColumnIds: [column.columnId],
109
112
  });
110
- const newGrandientButton = this.createColumnMenuItemShowPopup('styled-column-gradient', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
113
+ const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
111
114
  CellRanges: emptyRanges,
112
115
  } }), config: {
113
116
  defaultCurrentSectionName: 'Style',
114
117
  } }));
115
- const newPrecentBarButton = this.createColumnMenuItemShowPopup('styled-column-percent-bar', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
118
+ const newPrecentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
116
119
  CellRanges: emptyRanges,
117
120
  } }), config: {
118
121
  defaultCurrentSectionName: 'Style',
119
122
  } }));
120
123
  returnColumnMenuItems.push({
121
- name: 'styled-column',
124
+ name: 'parent',
122
125
  label: 'Create Styled Column',
123
126
  module: this.moduleInfo.ModuleName,
124
127
  isVisible: true,
@@ -239,16 +242,16 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
239
242
  getTypeName(styledColumn) {
240
243
  let type = null;
241
244
  if (styledColumn.GradientStyle) {
242
- type = 'styled-column-gradient';
245
+ type = 'styled-column-gradient-edit';
243
246
  }
244
247
  else if (styledColumn.PercentBarStyle) {
245
- type = 'styled-column-percent-bar';
248
+ type = 'styled-column-percent-bar-edit';
246
249
  }
247
250
  else if (styledColumn.SparkLineStyle) {
248
- type = 'styled-column-sparkline';
251
+ type = 'styled-column-sparkline-edit';
249
252
  }
250
253
  else if (styledColumn.BadgeStyle) {
251
- type = 'styled-column-badge';
254
+ type = 'styled-column-badge-edit';
252
255
  }
253
256
  return type;
254
257
  }
package/src/Strategy/SystemStatusModule.js CHANGED
@@ -12,7 +12,7 @@ class SystemStatusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
12
12
  addColumnMenuItems(column) {
13
13
  if (this.isModuleAvailable()) {
14
14
  return [
15
- this.createColumnMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
15
+ this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
16
16
  ];
17
17
  }
18
18
  }
package/src/Utilities/MenuItem.d.ts CHANGED
@@ -1,11 +1,11 @@
1
1
  import * as Redux from 'redux';
2
2
  import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
3
- import { AdaptableMenuItem, AdaptableMenuItemName } from '../PredefinedConfig/Common/Menu';
3
+ import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
4
4
  import { AdaptableModule } from '../PredefinedConfig/Common/Types';
5
5
  import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
6
6
  export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
7
- constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
8
- name: AdaptableMenuItemName;
7
+ constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
8
+ name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
9
9
  reduxAction: Redux.Action;
10
10
  label: string;
11
11
  module: AdaptableModule;
@@ -13,8 +13,8 @@ export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
13
13
  icon: AdaptableIcon;
14
14
  }
15
15
  export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
16
- constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
17
- name: AdaptableMenuItemName;
16
+ constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
17
+ name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
18
18
  onClick: () => void;
19
19
  label: string;
20
20
  module: AdaptableModule;
@@ -22,8 +22,8 @@ export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
22
22
  icon: AdaptableIcon;
23
23
  }
24
24
  export declare class MenuItemShowPopup implements AdaptableMenuItem {
25
- constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
26
- name: AdaptableMenuItemName;
25
+ constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
26
+ name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
27
27
  reduxAction: Redux.Action;
28
28
  label: string;
29
29
  module: AdaptableModule;
package/src/agGrid/editors/AdaptableDateEditor/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { ICellEditorParams, ICellEditorComp } from '@ag-grid-community/core';
2
+ import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
3
3
  import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
4
4
  export declare const ReactAdaptableDateEditor: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & {
5
5
  showClearButton?: boolean;
package/src/agGrid/editors/AdaptableDateEditor/index.js CHANGED
@@ -6,8 +6,8 @@ const React = tslib_1.__importStar(require("react"));
6
6
  const renderWithAdaptableContext_1 = require("../../../View/renderWithAdaptableContext");
7
7
  const InternalAdaptableDateEditor_1 = require("./InternalAdaptableDateEditor");
8
8
  const core_1 = require("ag-grid-community");
9
- const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
10
9
  const react_1 = require("react");
10
+ const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
11
11
  function shouldClearExistingValue(params) {
12
12
  return params.eventKey === core_1.KeyCode.BACKSPACE || params.eventKey === core_1.KeyCode.DELETE;
13
13
  }
package/src/env.js CHANGED
@@ -2,6 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = {
4
4
  INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
5
- PUBLISH_TIMESTAMP: 1711543434054 || Date.now(),
6
- VERSION: "18.0.0-canary.17" || '--current-version--',
5
+ PUBLISH_TIMESTAMP: 1711631076312 || Date.now(),
6
+ VERSION: "18.0.0-canary.18" || '--current-version--',
7
7
  };
package/src/metamodel/adaptable.metamodel.d.ts CHANGED
@@ -563,12 +563,6 @@ export declare const ADAPTABLE_METAMODEL: {
563
563
  desc: string;
564
564
  isOpt?: undefined;
565
565
  ref?: undefined;
566
- } | {
567
- name: string;
568
- kind: string;
569
- desc: string;
570
- ref: string;
571
- isOpt?: undefined;
572
566
  } | {
573
567
  name: string;
574
568
  kind: string;