@adaptabletools/adaptable-cjs 19.0.3 → 19.0.5

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 (30) hide show
  1. package/package.json +1 -2
  2. package/src/Api/BulkUpdateApi.d.ts +0 -6
  3. package/src/Api/GridApi.d.ts +4 -4
  4. package/src/Api/Implementation/BulkUpdateApiImpl.d.ts +0 -2
  5. package/src/Api/Implementation/BulkUpdateApiImpl.js +0 -4
  6. package/src/Api/Implementation/ColumnApiImpl.js +1 -1
  7. package/src/Api/Implementation/SmartEditApiImpl.d.ts +0 -2
  8. package/src/Api/Implementation/SmartEditApiImpl.js +0 -4
  9. package/src/Api/SmartEditApi.d.ts +0 -6
  10. package/src/Redux/ActionsReducers/BulkUpdateRedux.d.ts +2 -11
  11. package/src/Redux/ActionsReducers/BulkUpdateRedux.js +3 -12
  12. package/src/Redux/ActionsReducers/SmartEditRedux.d.ts +2 -11
  13. package/src/Redux/ActionsReducers/SmartEditRedux.js +3 -12
  14. package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js +1 -2
  15. package/src/Redux/Store/AdaptableStore.js +16 -30
  16. package/src/Strategy/Interface/ISmartEditModule.d.ts +0 -2
  17. package/src/Strategy/SmartEditModule.d.ts +0 -2
  18. package/src/Strategy/SmartEditModule.js +0 -3
  19. package/src/View/BulkUpdate/BulkUpdatePopup.d.ts +1 -1
  20. package/src/View/BulkUpdate/BulkUpdatePopup.js +2 -2
  21. package/src/View/BulkUpdate/BulkUpdateViewPanel.d.ts +1 -2
  22. package/src/View/BulkUpdate/BulkUpdateViewPanel.js +2 -5
  23. package/src/View/Components/FilterForm/ListBoxFilterForm.js +1 -1
  24. package/src/View/SmartEdit/SmartEditPopup.d.ts +1 -2
  25. package/src/View/SmartEdit/SmartEditPopup.js +2 -5
  26. package/src/View/SmartEdit/SmartEditViewPanel.d.ts +1 -1
  27. package/src/View/SmartEdit/SmartEditViewPanel.js +2 -2
  28. package/src/agGrid/AgGridColumnAdapter.js +7 -0
  29. package/src/env.js +2 -2
  30. package/tsconfig.cjs.tsbuildinfo +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable-cjs",
3
- "version": "19.0.3",
3
+ "version": "19.0.5",
4
4
  "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
5
5
  "keywords": [
6
6
  "web-components",
@@ -41,7 +41,6 @@
41
41
  "@finos/fdc3": "2.1.0-beta.8",
42
42
  "@infinite-table/infinite-react": "3.2.10",
43
43
  "date-fns": "^2.28.0",
44
- "isomorphic-fetch": "^2.2.1",
45
44
  "lodash": "^4.17.15",
46
45
  "normalize.css": "^8.0.1",
47
46
  "prop-types": "^15.6.2",
@@ -1,4 +1,3 @@
1
- import { CellUpdateRequest } from '../PredefinedConfig/Selection/GridCell';
2
1
  /**
3
2
  * Provides run-time access to the Bulk Update Module
4
3
  **/
@@ -11,9 +10,4 @@ export interface BulkUpdateApi {
11
10
  * Opens Bulk Update Settings Panel
12
11
  */
13
12
  openBulkUpdateSettingsPanel(): void;
14
- /**
15
- * Applies a Bulk Update to given Cells
16
- * @param cellUpdateRequests Cells to apply the Bulk Update
17
- */
18
- applyBulkUpdate(cellUpdateRequests: CellUpdateRequest[]): void;
19
13
  }
@@ -13,7 +13,7 @@ import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo'
13
13
  import { TransposeConfig } from '../PredefinedConfig/Common/TransposeConfig';
14
14
  import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
15
15
  /**
16
- * Provides access to important properites of AdapTable e.g. sorting, selected cells etc.
16
+ * Provides access to important properties and functionalities of AdapTable e.g. sorting, selected cells etc.
17
17
  */
18
18
  export interface GridApi {
19
19
  getVariant(): AdaptableVariant;
@@ -550,12 +550,12 @@ export interface GridApi {
550
550
  */
551
551
  getAllAgGridColumns(): Column<any>[];
552
552
  /**
553
- * Updates the Column State for a given Column. Column State is stateful information and represents changing values of the grid. It will update the current Layout with the new state.
553
+ * Updates Column State for a given Column; Column State is stateful information and represents changing values of the grid. AdapTable will update the current Layout with the new state.
554
554
  * @param columnState - the AG Grid ColumnState to set
555
555
  */
556
556
  updateAgGridColumnState(columnState: ColumnState): void;
557
557
  /**
558
- * Updates the Column State for a given Columns. Column State is stateful information and represents changing values of the grid. It will update the current Layout with the new state.
558
+ * Updates Column State for given Columns; Column State is stateful information and represents changing values of the grid. AdapTable will update the current Layout with the new state.
559
559
  * @param columnStates - the AG Grid ColumnState to set
560
560
  */
561
561
  updateAgGridColumnStates(columnStates: ColumnState[]): void;
@@ -587,7 +587,7 @@ export interface GridApi {
587
587
  addAgGridColumnDefinition(columnDefinition: ColDefWithId): void;
588
588
  }
589
589
  /**
590
- * Column Definition with a mandatory `colId` property
590
+ * AG Grid Column Definition with a mandatory `colId` property
591
591
  */
592
592
  export type ColDefWithId = Omit<ColDef, 'colId'> & {
593
593
  colId: string;
@@ -1,9 +1,7 @@
1
1
  import { ApiBase } from './ApiBase';
2
2
  import { BulkUpdateApi } from '../BulkUpdateApi';
3
- import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
4
3
  export declare class BulkUpdateApiImpl extends ApiBase implements BulkUpdateApi {
5
4
  getBulkUpdateValue(): string;
6
5
  openBulkUpdateSettingsPanel(): void;
7
6
  showBulkUpdatePopup(): void;
8
- applyBulkUpdate(cellUpdateRequests: CellUpdateRequest[]): void;
9
7
  }
@@ -4,7 +4,6 @@ exports.BulkUpdateApiImpl = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const ApiBase_1 = require("./ApiBase");
6
6
  const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
7
- const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
8
7
  class BulkUpdateApiImpl extends ApiBase_1.ApiBase {
9
8
  getBulkUpdateValue() {
10
9
  return this.getAdaptableState().System.BulkUpdateValue;
@@ -15,8 +14,5 @@ class BulkUpdateApiImpl extends ApiBase_1.ApiBase {
15
14
  showBulkUpdatePopup() {
16
15
  this.openBulkUpdateSettingsPanel();
17
16
  }
18
- applyBulkUpdate(cellUpdateRequests) {
19
- this.dispatchAction(BulkUpdateRedux.BulkUpdateApply(cellUpdateRequests));
20
- }
21
17
  }
22
18
  exports.BulkUpdateApiImpl = BulkUpdateApiImpl;
@@ -391,7 +391,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
391
391
  this.getGridApi().updateAgGridColumnStates(columnConfigs);
392
392
  }
393
393
  setColumnDefinitions(columnDefinitions) {
394
- (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setColumnDefinitions');
394
+ (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setAgGridColumnDefinitions');
395
395
  this.getGridApi().setAgGridColumnDefinitions(columnDefinitions);
396
396
  }
397
397
  }
@@ -1,7 +1,6 @@
1
1
  import { ApiBase } from './ApiBase';
2
2
  import { MathOperation } from '../../PredefinedConfig/Common/Enums';
3
3
  import { SmartEditApi } from '../SmartEditApi';
4
- import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
5
4
  import { SmartEditCustomOperation, SmartEditOperation } from '../../AdaptableOptions/EditOptions';
6
5
  export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
7
6
  setSmartEditOperation(mathOperation: MathOperation): void;
@@ -9,7 +8,6 @@ export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
9
8
  setSmartEditValue(smartEditValue: number): void;
10
9
  getSmartEditValue(): number;
11
10
  openSmartEditSettingsPanel(): void;
12
- applySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
13
11
  getSmartEditCustomOperations(): SmartEditCustomOperation[];
14
12
  setCustomSmartEditOperation(customOperationName: string): void;
15
13
  }
@@ -4,7 +4,6 @@ exports.SmartEditApiImpl = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
6
6
  const ApiBase_1 = require("./ApiBase");
7
- const SmartEditRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SmartEditRedux"));
8
7
  const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
9
8
  class SmartEditApiImpl extends ApiBase_1.ApiBase {
10
9
  setSmartEditOperation(mathOperation) {
@@ -22,9 +21,6 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
22
21
  openSmartEditSettingsPanel() {
23
22
  this.showModulePopup(ModuleConstants.SmartEditModuleId);
24
23
  }
25
- applySmartEdit(cellUpdateRequests) {
26
- this.dispatchAction(SmartEditRedux.SmartEditApply(cellUpdateRequests));
27
- }
28
24
  getSmartEditCustomOperations() {
29
25
  var _a;
30
26
  return (_a = this.getEditOptions().smartEditCustomOperations) !== null && _a !== void 0 ? _a : [];
@@ -1,6 +1,5 @@
1
1
  import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
2
2
  import { MathOperation } from '../PredefinedConfig/Common/Enums';
3
- import { CellUpdateRequest } from '../PredefinedConfig/Selection/GridCell';
4
3
  import { SmartEditCustomOperation } from '../types';
5
4
  /**
6
5
  * Provides run-time access to the Smart Edit Module
@@ -33,11 +32,6 @@ export interface SmartEditApi {
33
32
  * Opens Settings Panel with Smart Edit section selected and visible
34
33
  */
35
34
  openSmartEditSettingsPanel(): void;
36
- /**
37
- * Applies a Smart Edit to given Cells
38
- * @param cellUpdateRequests Cells to apply the Smart Edit
39
- */
40
- applySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
41
35
  /**
42
36
  * Retrieves an Smart Edit Custom Operations (provided in Edit Options)
43
37
  */
@@ -1,9 +1,4 @@
1
1
  import * as Redux from 'redux';
2
- import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
3
- /**
4
- * @ReduxAction Bulk Update has been completed
5
- */
6
- export declare const BULK_UPDATE_COMPLETE = "BULK_UPDATE_COMPLETE";
7
2
  /**
8
3
  * @ReduxAction Bulk Update is being applied
9
4
  */
@@ -12,14 +7,10 @@ export declare const BULK_UPDATE_APPLY = "BULK_UPDATE_APPLY";
12
7
  * @ReduxAction Bulk Update Module is ready
13
8
  */
14
9
  export declare const BULK_UPDATE_READY = "BULK_UPDATE_READY";
15
- export interface BulkUpdateCompleteAction extends Redux.Action {
16
- bypassValidationWarnings: boolean;
17
- }
18
10
  export interface BulkUpdateApplyAction extends Redux.Action {
19
- cellUpdateRequests: CellUpdateRequest[];
11
+ bypassValidationWarnings: boolean;
20
12
  }
21
13
  export interface BulkUpdateReadyAction extends Redux.Action {
22
14
  }
23
- export declare const BulkUpdateComplete: (bypassValidationWarnings: boolean) => BulkUpdateCompleteAction;
24
- export declare const BulkUpdateApply: (cellUpdateRequests: CellUpdateRequest[]) => BulkUpdateApplyAction;
15
+ export declare const BulkUpdateApply: (bypassValidationWarnings: boolean) => BulkUpdateApplyAction;
25
16
  export declare const BulkUpdateReady: () => BulkUpdateReadyAction;
@@ -1,10 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.BulkUpdateReady = exports.BulkUpdateApply = exports.BulkUpdateComplete = exports.BULK_UPDATE_READY = exports.BULK_UPDATE_APPLY = exports.BULK_UPDATE_COMPLETE = void 0;
4
- /**
5
- * @ReduxAction Bulk Update has been completed
6
- */
7
- exports.BULK_UPDATE_COMPLETE = 'BULK_UPDATE_COMPLETE';
3
+ exports.BulkUpdateReady = exports.BulkUpdateApply = exports.BULK_UPDATE_READY = exports.BULK_UPDATE_APPLY = void 0;
8
4
  /**
9
5
  * @ReduxAction Bulk Update is being applied
10
6
  */
@@ -13,14 +9,9 @@ exports.BULK_UPDATE_APPLY = 'BULK_UPDATE_APPLY';
13
9
  * @ReduxAction Bulk Update Module is ready
14
10
  */
15
11
  exports.BULK_UPDATE_READY = 'BULK_UPDATE_READY';
16
- const BulkUpdateComplete = (bypassValidationWarnings) => ({
17
- type: exports.BULK_UPDATE_COMPLETE,
18
- bypassValidationWarnings: bypassValidationWarnings,
19
- });
20
- exports.BulkUpdateComplete = BulkUpdateComplete;
21
- const BulkUpdateApply = (cellUpdateRequests) => ({
12
+ const BulkUpdateApply = (bypassValidationWarnings) => ({
22
13
  type: exports.BULK_UPDATE_APPLY,
23
- cellUpdateRequests,
14
+ bypassValidationWarnings: bypassValidationWarnings,
24
15
  });
25
16
  exports.BulkUpdateApply = BulkUpdateApply;
26
17
  const BulkUpdateReady = () => ({
@@ -1,9 +1,4 @@
1
1
  import * as Redux from 'redux';
2
- import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
3
- /**
4
- * @ReduxAction Smart Edit has been completed
5
- */
6
- export declare const SMART_EDIT_COMPLETE = "SMART_EDIT_COMPLETE";
7
2
  /**
8
3
  * @ReduxAction Smart Editis being applied
9
4
  */
@@ -12,14 +7,10 @@ export declare const SMART_EDIT_APPLY = "SMART_EDIT_APPLY";
12
7
  * @ReduxAction SmartEdit Module is ready
13
8
  */
14
9
  export declare const SMART_EDIT_READY = "SMART_EDIT_READY";
15
- export interface SmartEditRunAction extends Redux.Action {
16
- bypassValidationWarnings: boolean;
17
- }
18
10
  export interface SmartEditApplyAction extends Redux.Action {
19
- cellUpdateRequests: CellUpdateRequest[];
11
+ bypassValidationWarnings: boolean;
20
12
  }
21
13
  export interface SmartEditReadyAction extends Redux.Action {
22
14
  }
23
- export declare const SmartEditRun: (bypassValidationWarnings: boolean) => SmartEditRunAction;
24
- export declare const SmartEditApply: (cellUpdateRequests: CellUpdateRequest[]) => SmartEditApplyAction;
15
+ export declare const SmartEditApply: (bypassValidationWarnings: boolean) => SmartEditApplyAction;
25
16
  export declare const SmartEditReady: () => SmartEditReadyAction;
@@ -1,10 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.SmartEditReady = exports.SmartEditApply = exports.SmartEditRun = exports.SMART_EDIT_READY = exports.SMART_EDIT_APPLY = exports.SMART_EDIT_COMPLETE = void 0;
4
- /**
5
- * @ReduxAction Smart Edit has been completed
6
- */
7
- exports.SMART_EDIT_COMPLETE = 'SMART_EDIT_COMPLETE';
3
+ exports.SmartEditReady = exports.SmartEditApply = exports.SMART_EDIT_READY = exports.SMART_EDIT_APPLY = void 0;
8
4
  /**
9
5
  * @ReduxAction Smart Editis being applied
10
6
  */
@@ -13,14 +9,9 @@ exports.SMART_EDIT_APPLY = 'SMART_EDIT_APPLY';
13
9
  * @ReduxAction SmartEdit Module is ready
14
10
  */
15
11
  exports.SMART_EDIT_READY = 'SMART_EDIT_READY';
16
- const SmartEditRun = (bypassValidationWarnings) => ({
17
- type: exports.SMART_EDIT_COMPLETE,
18
- bypassValidationWarnings: bypassValidationWarnings,
19
- });
20
- exports.SmartEditRun = SmartEditRun;
21
- const SmartEditApply = (cellUpdateRequests) => ({
12
+ const SmartEditApply = (bypassValidationWarnings) => ({
22
13
  type: exports.SMART_EDIT_APPLY,
23
- cellUpdateRequests,
14
+ bypassValidationWarnings: bypassValidationWarnings,
24
15
  });
25
16
  exports.SmartEditApply = SmartEditApply;
26
17
  const SmartEditReady = () => ({
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createEngine = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const isomorphic_fetch_1 = tslib_1.__importDefault(require("isomorphic-fetch"));
6
5
  const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
7
6
  const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
8
7
  const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
@@ -57,7 +56,7 @@ class AdaptableReduxLocalStorageEngine {
57
56
  if (typeof predefinedConfig === 'string' &&
58
57
  StringExtensions_1.StringExtensions.IsNotNullOrEmpty(predefinedConfig)) {
59
58
  // we have config in a file so lets merge it with the other state
60
- return (0, isomorphic_fetch_1.default)(predefinedConfig)
59
+ return fetch(predefinedConfig)
61
60
  .then(checkStatus)
62
61
  .then((response) => response.json())
63
62
  .then((parsedPredefinedState) => {
@@ -129,27 +129,27 @@ class AdaptableStore {
129
129
  Comment: CommentsRedux.CommentsReducer,
130
130
  // Reducers for Persisted State
131
131
  Alert: AlertRedux.AlertReducer,
132
- FlashingCell: FlashingCellRedux.FlashingCellReducer,
133
132
  Application: ApplicationRedux.ApplicationReducer,
134
133
  CalculatedColumn: CalculatedColumnRedux.CalculatedColumnReducer,
134
+ Charting: ChartingRedux.ChartingReducer,
135
135
  CustomSort: CustomSortRedux.CustomSortReducer,
136
136
  Dashboard: DashboardRedux.DashboardReducer,
137
137
  Export: ExportRedux.ExportReducer,
138
+ FlashingCell: FlashingCellRedux.FlashingCellReducer,
138
139
  FormatColumn: FormatColumnRedux.FormatColumnReducer,
139
140
  FreeTextColumn: FreeTextColumnRedux.FreeTextColumnReducer,
140
141
  Layout: LayoutRedux.LayoutReducer,
141
- Schedule: ScheduleRedux.ScheduleReducer,
142
- StatusBar: StatusBarRedux.StatusBarReducer,
142
+ NamedQuery: NamedQueryRedux.NamedQueryReducer,
143
+ Note: NoteRedux.NoteReducer,
143
144
  PlusMinus: PlusMinusRedux.PlusMinusReducer,
144
145
  QuickSearch: QuickSearchRedux.QuickSearchReducer,
146
+ Schedule: ScheduleRedux.ScheduleReducer,
145
147
  Shortcut: ShortcutRedux.ShortcutReducer,
148
+ StatusBar: StatusBarRedux.StatusBarReducer,
149
+ StyledColumn: StyledColumnRedux.StyledColumnReducer,
146
150
  TeamSharing: TeamSharingRedux.TeamSharingReducer,
147
151
  Theme: ThemeRedux.ThemeReducer,
148
152
  ToolPanel: ToolPanelRedux.ToolPanelReducer,
149
- Charting: ChartingRedux.ChartingReducer,
150
- StyledColumn: StyledColumnRedux.StyledColumnReducer,
151
- Note: NoteRedux.NoteReducer,
152
- NamedQuery: NamedQueryRedux.NamedQueryReducer,
153
153
  };
154
154
  // allow plugins to participate in the root reducer
155
155
  adaptable.forPlugins((plugin) => {
@@ -412,6 +412,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
412
412
  adaptable.updateColumnModelAndRefreshGrid();
413
413
  return returnAction;
414
414
  }
415
+ /*******************
416
+ * Alert ACTIONS
417
+ *******************/
415
418
  /**
416
419
  * Use Case: User has deleted a System Alert which has a Highlight Cell
417
420
  * Action: Refresh the cell (to clear the style)
@@ -1136,28 +1139,17 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
1136
1139
  }
1137
1140
  /**
1138
1141
  * Use Case: User has clicked 'Apply' in Smart Edit popup or toolbar
1139
- * Action (1): Gets the values that need to be applied from the Preview Info and passes to Preview Helper (incl. whether to bypass validation)
1140
- * Action (2): Sends these new values to the Smart Edit module (which will, in turn, apply them to Adaptable)
1142
+ * Action (1): Gets the values that need to be applied from the Preview Info and passes to Preview Helper (incl. whether to bypass validation)
1143
+ * Action (2): Sets the cell values in the Grid
1141
1144
  */
1142
- case SmartEditRedux.SMART_EDIT_COMPLETE: {
1143
- let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
1145
+ case SmartEditRedux.SMART_EDIT_APPLY: {
1144
1146
  const actionTyped = action;
1145
1147
  let thePreview = middlewareAPI.getState().System.SmartEditPreviewInfo;
1146
1148
  let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
1147
- module.ApplySmartEdit(newValues);
1149
+ adaptable.api.gridApi.setCellValues(newValues);
1148
1150
  middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
1149
1151
  return next(action);
1150
1152
  }
1151
- /**
1152
- * Use Case: Smart Edit has been applied
1153
- * Action: update the grid cells
1154
- */
1155
- case SmartEditRedux.SMART_EDIT_APPLY: {
1156
- let returnAction = next(action);
1157
- const actionTyped = action;
1158
- adaptable.api.gridApi.setCellValues(actionTyped.cellUpdateRequests);
1159
- return returnAction;
1160
- }
1161
1153
  /*******************
1162
1154
  * BULK UPDATE ACTIONS
1163
1155
  *******************/
@@ -1195,20 +1187,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
1195
1187
  middlewareAPI.dispatch(SystemRedux.BulkUpdateSetPreview(apiReturn));
1196
1188
  return returnAction;
1197
1189
  }
1198
- case BulkUpdateRedux.BULK_UPDATE_COMPLETE: {
1190
+ case BulkUpdateRedux.BULK_UPDATE_APPLY: {
1199
1191
  const actionTyped = action;
1200
1192
  let thePreview = middlewareAPI.getState().System.BulkUpdatePreviewInfo;
1201
1193
  let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
1202
- adaptable.api.bulkUpdateApi.applyBulkUpdate(newValues);
1194
+ adaptable.api.gridApi.setCellValues(newValues);
1203
1195
  middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
1204
1196
  return next(action);
1205
1197
  }
1206
- case BulkUpdateRedux.BULK_UPDATE_APPLY: {
1207
- let returnAction = next(action);
1208
- const actionTyped = action;
1209
- adaptable.api.gridApi.setCellValues(actionTyped.cellUpdateRequests);
1210
- return returnAction;
1211
- }
1212
1198
  /*******************
1213
1199
  * PLUS MINUS ACTIONS
1214
1200
  *******************/
@@ -2,9 +2,7 @@ import { IModule } from './IModule';
2
2
  import { IModuleActionReturn } from './IModuleActionReturn';
3
3
  import { MathOperation } from '../../PredefinedConfig/Common/Enums';
4
4
  import { PreviewInfo } from '../../Utilities/Interface/Preview';
5
- import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
6
5
  export interface ISmartEditModule extends IModule {
7
6
  CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
8
7
  BuildPreviewValues(smartEditValue: number, smartEditOperation: MathOperation): PreviewInfo;
9
- ApplySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
10
8
  }
@@ -2,7 +2,6 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
2
2
  import { IModuleActionReturn } from './Interface/IModuleActionReturn';
3
3
  import { ISmartEditModule } from './Interface/ISmartEditModule';
4
4
  import { PreviewInfo } from '../Utilities/Interface/Preview';
5
- import { CellUpdateRequest } from '../PredefinedConfig/Selection/GridCell';
6
5
  import { MenuItemShowPopup } from '../Utilities/MenuItem';
7
6
  import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
8
7
  import { AdaptableApi } from '../Api/AdaptableApi';
@@ -12,7 +11,6 @@ export declare class SmartEditModule extends AdaptableModuleBase implements ISma
12
11
  constructor(api: AdaptableApi);
13
12
  getViewAccessLevel(): AccessLevel;
14
13
  createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
15
- ApplySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
16
14
  CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
17
15
  BuildPreviewValues(smartEditValue: number, smartEditOperation: SmartEditOperation): PreviewInfo;
18
16
  }
@@ -42,9 +42,6 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
42
42
  }
43
43
  return [menuItemShowPopup];
44
44
  }
45
- ApplySmartEdit(cellUpdateRequests) {
46
- this.api.smartEditApi.applySmartEdit(cellUpdateRequests);
47
- }
48
45
  CheckCorrectCellSelection() {
49
46
  let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
50
47
  if (this.api.internalApi.isGridInPivotMode()) {
@@ -11,7 +11,7 @@ interface BulkUpdatePopupProps extends ModuleViewPopupProps<BulkUpdatePopupCompo
11
11
  PreviewInfo: PreviewInfo;
12
12
  onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
13
13
  onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
14
- onRunBulkUpdate: () => BulkUpdateRedux.BulkUpdateCompleteAction;
14
+ onApplyBulkUpdate: () => BulkUpdateRedux.BulkUpdateApplyAction;
15
15
  SelectedGridCells: GridCell[];
16
16
  }
17
17
  export interface BulkUpdatePopupState {
@@ -85,7 +85,7 @@ class BulkUpdatePopupComponent extends React.Component {
85
85
  this.onApplyBulkUpdate();
86
86
  }
87
87
  onApplyBulkUpdate() {
88
- this.props.onRunBulkUpdate();
88
+ this.props.onApplyBulkUpdate();
89
89
  }
90
90
  }
91
91
  function mapStateToProps(state, ownProps) {
@@ -101,7 +101,7 @@ function mapDispatchToProps(dispatch) {
101
101
  return {
102
102
  onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
103
103
  onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
104
- onRunBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateComplete(false)),
104
+ onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
105
105
  };
106
106
  }
107
107
  exports.BulkUpdatePopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(BulkUpdatePopupComponent);
@@ -12,7 +12,7 @@ export interface BulkUpdateViewPanelComponentProps extends ViewPanelProps {
12
12
  InPivotMode: Boolean;
13
13
  onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
14
14
  onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
15
- onRunBulkUpdate: () => BulkUpdateRedux.BulkUpdateCompleteAction;
15
+ onApplyBulkUpdate: () => BulkUpdateRedux.BulkUpdateApplyAction;
16
16
  SelectedGridCells: GridCell[];
17
17
  }
18
18
  declare class BulkUpdateViewPanelComponent extends React.Component<BulkUpdateViewPanelComponentProps, {}> {
@@ -25,7 +25,6 @@ declare class BulkUpdateViewPanelComponent extends React.Component<BulkUpdateVie
25
25
  private checkSelectedCells;
26
26
  private getStatusColour;
27
27
  private onApplyClick;
28
- onApplyBulkUpdate(): any;
29
28
  }
30
29
  export declare let BulkUpdateViewPanelControl: import("react-redux").ConnectedComponent<typeof BulkUpdateViewPanelComponent, any>;
31
30
  export {};
@@ -82,10 +82,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
82
82
  return Enums_1.StatusColour.Success;
83
83
  }
84
84
  onApplyClick() {
85
- this.onApplyBulkUpdate();
86
- }
87
- onApplyBulkUpdate() {
88
- this.props.onRunBulkUpdate();
85
+ this.props.onApplyBulkUpdate();
89
86
  this.props.onBulkUpdateValueChange(undefined);
90
87
  }
91
88
  }
@@ -103,7 +100,7 @@ function mapDispatchToProps(dispatch) {
103
100
  return {
104
101
  onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
105
102
  onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
106
- onRunBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateComplete(false)),
103
+ onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
107
104
  };
108
105
  }
109
106
  exports.BulkUpdateViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(BulkUpdateViewPanelComponent);
@@ -76,7 +76,7 @@ const ListBoxFilterForm = (props) => {
76
76
  }
77
77
  return (React.createElement(ListGroupItem_1.default, { noZebra: props.useAgGridStyle, key: 'columnValue' + index, onClick: () => onClickItemColumnValue(distinctValue.value), active: isActive, value: distinctValue.value }, distinctValue.label));
78
78
  });
79
- const textClear = (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { autoFocus: true, type: "text", placeholder: "Search Column Values", value: FilterValue, style: {
79
+ const textClear = (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { autoFocus: false, type: "text", placeholder: "Search Column Values", value: FilterValue, style: {
80
80
  paddingTop: 'var(--ab-space-1)',
81
81
  paddingBottom: 'var(--ab-space-1)',
82
82
  }, inputStyle: { padding: 'var(--ab-space-1)' }, OnTextChange: handleFilterValueChange }));
@@ -11,7 +11,7 @@ interface SmartEditPopupProps extends ModuleViewPopupProps<SmartEditPopupCompone
11
11
  onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
12
12
  onSmartEditOperationChange: (SmartEditOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
13
13
  onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
14
- onRunSmartEdit: () => SmartEditRedux.SmartEditRunAction;
14
+ onApplySmartEdit: () => SmartEditRedux.SmartEditApplyAction;
15
15
  }
16
16
  declare class SmartEditPopupComponent extends React.Component<SmartEditPopupProps, {}> {
17
17
  constructor(props: SmartEditPopupProps);
@@ -19,7 +19,6 @@ declare class SmartEditPopupComponent extends React.Component<SmartEditPopupProp
19
19
  render(): JSX.Element;
20
20
  private submit;
21
21
  private onSmartEditValueChange;
22
- private onApplySmartEdit;
23
22
  private getButtonStyle;
24
23
  }
25
24
  export declare let SmartEditPopup: import("react-redux").ConnectedComponent<typeof SmartEditPopupComponent, any>;
@@ -74,15 +74,12 @@ class SmartEditPopupComponent extends React.Component {
74
74
  previewPanel));
75
75
  }
76
76
  submit() {
77
- this.onApplySmartEdit();
77
+ this.props.onApplySmartEdit();
78
78
  }
79
79
  onSmartEditValueChange(event) {
80
80
  const e = event.target;
81
81
  this.props.onSmartEditValueChange(Number(e.value));
82
82
  }
83
- onApplySmartEdit() {
84
- this.props.onRunSmartEdit();
85
- }
86
83
  getButtonStyle() {
87
84
  if (this.props.PreviewInfo) {
88
85
  if (this.props.PreviewInfo.previewValidationSummary.validationResult == 'All') {
@@ -107,7 +104,7 @@ function mapDispatchToProps(dispatch) {
107
104
  onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
108
105
  onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
109
106
  onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
110
- onRunSmartEdit: () => dispatch(SmartEditRedux.SmartEditRun(false)),
107
+ onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
111
108
  };
112
109
  }
113
110
  exports.SmartEditPopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(SmartEditPopupComponent);
@@ -13,7 +13,7 @@ export interface SmartEditViewPanelComponentProps extends ViewPanelProps {
13
13
  onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
14
14
  onSmartEditOperationChange: (MathOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
15
15
  onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
16
- onRunSmartEdit: () => SmartEditRedux.SmartEditRunAction;
16
+ onApplySmartEdit: () => SmartEditRedux.SmartEditApplyAction;
17
17
  }
18
18
  interface SmartEditViewPanelComponentState {
19
19
  SelectedColumnId: string;
@@ -108,7 +108,7 @@ class SmartEditViewPanelComponent extends React.Component {
108
108
  this.onApplySmartEdit();
109
109
  }
110
110
  onApplySmartEdit() {
111
- this.props.onRunSmartEdit();
111
+ this.props.onApplySmartEdit();
112
112
  }
113
113
  }
114
114
  function mapStateToProps(state, ownProps) {
@@ -125,7 +125,7 @@ function mapDispatchToProps(dispatch) {
125
125
  onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
126
126
  onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
127
127
  onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
128
- onRunSmartEdit: () => dispatch(SmartEditRedux.SmartEditRun(false)),
128
+ onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
129
129
  };
130
130
  }
131
131
  exports.SmartEditViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(SmartEditViewPanelComponent);
@@ -432,6 +432,13 @@ class AgGridColumnAdapter {
432
432
  return userValue;
433
433
  }
434
434
  const editableCallback = (params) => {
435
+ if (typeof userValue === 'function') {
436
+ const agGridColDefEditable = userValue(params);
437
+ if (agGridColDefEditable === false) {
438
+ return false;
439
+ }
440
+ }
441
+ // if AG Grid editable is still true, we check if Adaptable allows it
435
442
  const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
436
443
  return this.adaptableApi.gridApi.isCellEditable(gridCell);
437
444
  };
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: 1728393044652 || Date.now(),
6
- VERSION: "19.0.3" || '--current-version--',
5
+ PUBLISH_TIMESTAMP: 1728922251697 || Date.now(),
6
+ VERSION: "19.0.5" || '--current-version--',
7
7
  };