@adaptabletools/adaptable 19.0.3 → 19.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) 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 +2 -10
  12. package/src/Redux/ActionsReducers/SmartEditRedux.d.ts +2 -11
  13. package/src/Redux/ActionsReducers/SmartEditRedux.js +2 -10
  14. package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js +0 -1
  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/SmartEdit/SmartEditPopup.d.ts +1 -2
  24. package/src/View/SmartEdit/SmartEditPopup.js +2 -5
  25. package/src/View/SmartEdit/SmartEditViewPanel.d.ts +1 -1
  26. package/src/View/SmartEdit/SmartEditViewPanel.js +2 -2
  27. package/src/agGrid/AgGridColumnAdapter.js +7 -0
  28. package/src/env.js +2 -2
  29. package/tsconfig.esm.tsbuildinfo +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable",
3
- "version": "19.0.3",
3
+ "version": "19.0.4",
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",
@@ -40,7 +40,6 @@
40
40
  "@finos/fdc3": "2.1.0-beta.8",
41
41
  "@infinite-table/infinite-react": "3.2.10",
42
42
  "date-fns": "^2.28.0",
43
- "isomorphic-fetch": "^2.2.1",
44
43
  "lodash": "^4.17.15",
45
44
  "normalize.css": "^8.0.1",
46
45
  "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
  }
@@ -1,6 +1,5 @@
1
1
  import { ApiBase } from './ApiBase';
2
2
  import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
3
- import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
4
3
  export class BulkUpdateApiImpl extends ApiBase {
5
4
  getBulkUpdateValue() {
6
5
  return this.getAdaptableState().System.BulkUpdateValue;
@@ -11,7 +10,4 @@ export class BulkUpdateApiImpl extends ApiBase {
11
10
  showBulkUpdatePopup() {
12
11
  this.openBulkUpdateSettingsPanel();
13
12
  }
14
- applyBulkUpdate(cellUpdateRequests) {
15
- this.dispatchAction(BulkUpdateRedux.BulkUpdateApply(cellUpdateRequests));
16
- }
17
13
  }
@@ -385,7 +385,7 @@ export class ColumnApiImpl extends ApiBase {
385
385
  this.getGridApi().updateAgGridColumnStates(columnConfigs);
386
386
  }
387
387
  setColumnDefinitions(columnDefinitions) {
388
- logDeprecationExternal(this.adaptable.logger, 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setColumnDefinitions');
388
+ logDeprecationExternal(this.adaptable.logger, 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setAgGridColumnDefinitions');
389
389
  this.getGridApi().setAgGridColumnDefinitions(columnDefinitions);
390
390
  }
391
391
  }
@@ -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
  }
@@ -1,6 +1,5 @@
1
1
  import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
2
2
  import { ApiBase } from './ApiBase';
3
- import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
4
3
  import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
5
4
  export class SmartEditApiImpl extends ApiBase {
6
5
  setSmartEditOperation(mathOperation) {
@@ -18,9 +17,6 @@ export class SmartEditApiImpl extends ApiBase {
18
17
  openSmartEditSettingsPanel() {
19
18
  this.showModulePopup(ModuleConstants.SmartEditModuleId);
20
19
  }
21
- applySmartEdit(cellUpdateRequests) {
22
- this.dispatchAction(SmartEditRedux.SmartEditApply(cellUpdateRequests));
23
- }
24
20
  getSmartEditCustomOperations() {
25
21
  var _a;
26
22
  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,7 +1,3 @@
1
- /**
2
- * @ReduxAction Bulk Update has been completed
3
- */
4
- export const BULK_UPDATE_COMPLETE = 'BULK_UPDATE_COMPLETE';
5
1
  /**
6
2
  * @ReduxAction Bulk Update is being applied
7
3
  */
@@ -10,13 +6,9 @@ export const BULK_UPDATE_APPLY = 'BULK_UPDATE_APPLY';
10
6
  * @ReduxAction Bulk Update Module is ready
11
7
  */
12
8
  export const BULK_UPDATE_READY = 'BULK_UPDATE_READY';
13
- export const BulkUpdateComplete = (bypassValidationWarnings) => ({
14
- type: BULK_UPDATE_COMPLETE,
15
- bypassValidationWarnings: bypassValidationWarnings,
16
- });
17
- export const BulkUpdateApply = (cellUpdateRequests) => ({
9
+ export const BulkUpdateApply = (bypassValidationWarnings) => ({
18
10
  type: BULK_UPDATE_APPLY,
19
- cellUpdateRequests,
11
+ bypassValidationWarnings: bypassValidationWarnings,
20
12
  });
21
13
  export const BulkUpdateReady = () => ({
22
14
  type: BULK_UPDATE_READY,
@@ -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,7 +1,3 @@
1
- /**
2
- * @ReduxAction Smart Edit has been completed
3
- */
4
- export const SMART_EDIT_COMPLETE = 'SMART_EDIT_COMPLETE';
5
1
  /**
6
2
  * @ReduxAction Smart Editis being applied
7
3
  */
@@ -10,13 +6,9 @@ export const SMART_EDIT_APPLY = 'SMART_EDIT_APPLY';
10
6
  * @ReduxAction SmartEdit Module is ready
11
7
  */
12
8
  export const SMART_EDIT_READY = 'SMART_EDIT_READY';
13
- export const SmartEditRun = (bypassValidationWarnings) => ({
14
- type: SMART_EDIT_COMPLETE,
15
- bypassValidationWarnings: bypassValidationWarnings,
16
- });
17
- export const SmartEditApply = (cellUpdateRequests) => ({
9
+ export const SmartEditApply = (bypassValidationWarnings) => ({
18
10
  type: SMART_EDIT_APPLY,
19
- cellUpdateRequests,
11
+ bypassValidationWarnings: bypassValidationWarnings,
20
12
  });
21
13
  export const SmartEditReady = () => ({
22
14
  type: SMART_EDIT_READY,
@@ -1,4 +1,3 @@
1
- import fetch from 'isomorphic-fetch';
2
1
  import debounce from 'lodash/debounce';
3
2
  import { AddStateSource, MergeStateFunction } from './AdaptableReduxMerger';
4
3
  import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
@@ -123,27 +123,27 @@ export class AdaptableStore {
123
123
  Comment: CommentsRedux.CommentsReducer,
124
124
  // Reducers for Persisted State
125
125
  Alert: AlertRedux.AlertReducer,
126
- FlashingCell: FlashingCellRedux.FlashingCellReducer,
127
126
  Application: ApplicationRedux.ApplicationReducer,
128
127
  CalculatedColumn: CalculatedColumnRedux.CalculatedColumnReducer,
128
+ Charting: ChartingRedux.ChartingReducer,
129
129
  CustomSort: CustomSortRedux.CustomSortReducer,
130
130
  Dashboard: DashboardRedux.DashboardReducer,
131
131
  Export: ExportRedux.ExportReducer,
132
+ FlashingCell: FlashingCellRedux.FlashingCellReducer,
132
133
  FormatColumn: FormatColumnRedux.FormatColumnReducer,
133
134
  FreeTextColumn: FreeTextColumnRedux.FreeTextColumnReducer,
134
135
  Layout: LayoutRedux.LayoutReducer,
135
- Schedule: ScheduleRedux.ScheduleReducer,
136
- StatusBar: StatusBarRedux.StatusBarReducer,
136
+ NamedQuery: NamedQueryRedux.NamedQueryReducer,
137
+ Note: NoteRedux.NoteReducer,
137
138
  PlusMinus: PlusMinusRedux.PlusMinusReducer,
138
139
  QuickSearch: QuickSearchRedux.QuickSearchReducer,
140
+ Schedule: ScheduleRedux.ScheduleReducer,
139
141
  Shortcut: ShortcutRedux.ShortcutReducer,
142
+ StatusBar: StatusBarRedux.StatusBarReducer,
143
+ StyledColumn: StyledColumnRedux.StyledColumnReducer,
140
144
  TeamSharing: TeamSharingRedux.TeamSharingReducer,
141
145
  Theme: ThemeRedux.ThemeReducer,
142
146
  ToolPanel: ToolPanelRedux.ToolPanelReducer,
143
- Charting: ChartingRedux.ChartingReducer,
144
- StyledColumn: StyledColumnRedux.StyledColumnReducer,
145
- Note: NoteRedux.NoteReducer,
146
- NamedQuery: NamedQueryRedux.NamedQueryReducer,
147
147
  };
148
148
  // allow plugins to participate in the root reducer
149
149
  adaptable.forPlugins((plugin) => {
@@ -405,6 +405,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
405
405
  adaptable.updateColumnModelAndRefreshGrid();
406
406
  return returnAction;
407
407
  }
408
+ /*******************
409
+ * Alert ACTIONS
410
+ *******************/
408
411
  /**
409
412
  * Use Case: User has deleted a System Alert which has a Highlight Cell
410
413
  * Action: Refresh the cell (to clear the style)
@@ -1129,28 +1132,17 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
1129
1132
  }
1130
1133
  /**
1131
1134
  * Use Case: User has clicked 'Apply' in Smart Edit popup or toolbar
1132
- * Action (1): Gets the values that need to be applied from the Preview Info and passes to Preview Helper (incl. whether to bypass validation)
1133
- * Action (2): Sends these new values to the Smart Edit module (which will, in turn, apply them to Adaptable)
1135
+ * Action (1): Gets the values that need to be applied from the Preview Info and passes to Preview Helper (incl. whether to bypass validation)
1136
+ * Action (2): Sets the cell values in the Grid
1134
1137
  */
1135
- case SmartEditRedux.SMART_EDIT_COMPLETE: {
1136
- let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
1138
+ case SmartEditRedux.SMART_EDIT_APPLY: {
1137
1139
  const actionTyped = action;
1138
1140
  let thePreview = middlewareAPI.getState().System.SmartEditPreviewInfo;
1139
1141
  let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
1140
- module.ApplySmartEdit(newValues);
1142
+ adaptable.api.gridApi.setCellValues(newValues);
1141
1143
  middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
1142
1144
  return next(action);
1143
1145
  }
1144
- /**
1145
- * Use Case: Smart Edit has been applied
1146
- * Action: update the grid cells
1147
- */
1148
- case SmartEditRedux.SMART_EDIT_APPLY: {
1149
- let returnAction = next(action);
1150
- const actionTyped = action;
1151
- adaptable.api.gridApi.setCellValues(actionTyped.cellUpdateRequests);
1152
- return returnAction;
1153
- }
1154
1146
  /*******************
1155
1147
  * BULK UPDATE ACTIONS
1156
1148
  *******************/
@@ -1188,20 +1180,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
1188
1180
  middlewareAPI.dispatch(SystemRedux.BulkUpdateSetPreview(apiReturn));
1189
1181
  return returnAction;
1190
1182
  }
1191
- case BulkUpdateRedux.BULK_UPDATE_COMPLETE: {
1183
+ case BulkUpdateRedux.BULK_UPDATE_APPLY: {
1192
1184
  const actionTyped = action;
1193
1185
  let thePreview = middlewareAPI.getState().System.BulkUpdatePreviewInfo;
1194
1186
  let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
1195
- adaptable.api.bulkUpdateApi.applyBulkUpdate(newValues);
1187
+ adaptable.api.gridApi.setCellValues(newValues);
1196
1188
  middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
1197
1189
  return next(action);
1198
1190
  }
1199
- case BulkUpdateRedux.BULK_UPDATE_APPLY: {
1200
- let returnAction = next(action);
1201
- const actionTyped = action;
1202
- adaptable.api.gridApi.setCellValues(actionTyped.cellUpdateRequests);
1203
- return returnAction;
1204
- }
1205
1191
  /*******************
1206
1192
  * PLUS MINUS ACTIONS
1207
1193
  *******************/
@@ -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
  }
@@ -38,9 +38,6 @@ export class SmartEditModule extends AdaptableModuleBase {
38
38
  }
39
39
  return [menuItemShowPopup];
40
40
  }
41
- ApplySmartEdit(cellUpdateRequests) {
42
- this.api.smartEditApi.applySmartEdit(cellUpdateRequests);
43
- }
44
41
  CheckCorrectCellSelection() {
45
42
  let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
46
43
  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 {
@@ -81,7 +81,7 @@ class BulkUpdatePopupComponent extends React.Component {
81
81
  this.onApplyBulkUpdate();
82
82
  }
83
83
  onApplyBulkUpdate() {
84
- this.props.onRunBulkUpdate();
84
+ this.props.onApplyBulkUpdate();
85
85
  }
86
86
  }
87
87
  function mapStateToProps(state, ownProps) {
@@ -97,7 +97,7 @@ function mapDispatchToProps(dispatch) {
97
97
  return {
98
98
  onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
99
99
  onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
100
- onRunBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateComplete(false)),
100
+ onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
101
101
  };
102
102
  }
103
103
  export let BulkUpdatePopup = 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 {};
@@ -78,10 +78,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
78
78
  return StatusColour.Success;
79
79
  }
80
80
  onApplyClick() {
81
- this.onApplyBulkUpdate();
82
- }
83
- onApplyBulkUpdate() {
84
- this.props.onRunBulkUpdate();
81
+ this.props.onApplyBulkUpdate();
85
82
  this.props.onBulkUpdateValueChange(undefined);
86
83
  }
87
84
  }
@@ -99,7 +96,7 @@ function mapDispatchToProps(dispatch) {
99
96
  return {
100
97
  onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
101
98
  onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
102
- onRunBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateComplete(false)),
99
+ onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
103
100
  };
104
101
  }
105
102
  export let BulkUpdateViewPanelControl = connect(mapStateToProps, mapDispatchToProps)(BulkUpdateViewPanelComponent);
@@ -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>;
@@ -70,15 +70,12 @@ class SmartEditPopupComponent extends React.Component {
70
70
  previewPanel));
71
71
  }
72
72
  submit() {
73
- this.onApplySmartEdit();
73
+ this.props.onApplySmartEdit();
74
74
  }
75
75
  onSmartEditValueChange(event) {
76
76
  const e = event.target;
77
77
  this.props.onSmartEditValueChange(Number(e.value));
78
78
  }
79
- onApplySmartEdit() {
80
- this.props.onRunSmartEdit();
81
- }
82
79
  getButtonStyle() {
83
80
  if (this.props.PreviewInfo) {
84
81
  if (this.props.PreviewInfo.previewValidationSummary.validationResult == 'All') {
@@ -103,7 +100,7 @@ function mapDispatchToProps(dispatch) {
103
100
  onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
104
101
  onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
105
102
  onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
106
- onRunSmartEdit: () => dispatch(SmartEditRedux.SmartEditRun(false)),
103
+ onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
107
104
  };
108
105
  }
109
106
  export let SmartEditPopup = 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;
@@ -104,7 +104,7 @@ class SmartEditViewPanelComponent extends React.Component {
104
104
  this.onApplySmartEdit();
105
105
  }
106
106
  onApplySmartEdit() {
107
- this.props.onRunSmartEdit();
107
+ this.props.onApplySmartEdit();
108
108
  }
109
109
  }
110
110
  function mapStateToProps(state, ownProps) {
@@ -121,7 +121,7 @@ function mapDispatchToProps(dispatch) {
121
121
  onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
122
122
  onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
123
123
  onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
124
- onRunSmartEdit: () => dispatch(SmartEditRedux.SmartEditRun(false)),
124
+ onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
125
125
  };
126
126
  }
127
127
  export let SmartEditViewPanelControl = connect(mapStateToProps, mapDispatchToProps)(SmartEditViewPanelComponent);
@@ -427,6 +427,13 @@ export class AgGridColumnAdapter {
427
427
  return userValue;
428
428
  }
429
429
  const editableCallback = (params) => {
430
+ if (typeof userValue === 'function') {
431
+ const agGridColDefEditable = userValue(params);
432
+ if (agGridColDefEditable === false) {
433
+ return false;
434
+ }
435
+ }
436
+ // if AG Grid editable is still true, we check if Adaptable allows it
430
437
  const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
431
438
  return this.adaptableApi.gridApi.isCellEditable(gridCell);
432
439
  };
package/src/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  export default {
2
2
  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" || '',
3
- PUBLISH_TIMESTAMP: 1728393013093 || Date.now(),
4
- VERSION: "19.0.3" || '--current-version--',
3
+ PUBLISH_TIMESTAMP: 1728918286871 || Date.now(),
4
+ VERSION: "19.0.4" || '--current-version--',
5
5
  };