@adaptabletools/adaptable-cjs 18.1.14 → 18.1.15-canary.0

package/src/agGrid/ActionColumnRenderer.js

@@ -50,13 +50,14 @@ const ReactActionColumnRenderer = (props) => {
     const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(props.node);
     const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
     let shouldRender = true;
+    const isActionRowColumn = adaptable.api.columnApi.internalApi.isActionRowButtonColumn(props.colDef.colId);
     if (isGroupedRow) {
-        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
+        if (isActionRowColumn || ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows)) {
             shouldRender = false;
         }
     }
     else if (isSummaryRow) {
-        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+        if (isActionRowColumn || ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows)) {
             shouldRender = false;
         }
     }
@@ -69,15 +70,7 @@ const ReactActionColumnRenderer = (props) => {
         return null;
     }
     const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
-    const buttonContext = {
-        actionColumn,
-        primaryKeyValue: pkValue,
-        rowNode: props.node,
-        adaptableApi: adaptable.api,
-        userName: adaptable.adaptableOptions.userName,
-        adaptableId: adaptable.adaptableOptions.adaptableId,
-        data: props.data,
-    };
+    const buttonContext = Object.assign(Object.assign({ actionColumn, primaryKeyValue: pkValue, rowNode: props.node }, adaptable.api.internalApi.buildBaseContext()), { data: props.data });
     return (React.createElement("div", { className: "ab-ActionColumn" },
         React.createElement(ActionButtons, { buttons: actionButtons, adaptableApi: adaptable.api, context: buttonContext, rerender: rerender })));
 };
@@ -101,13 +94,14 @@ class ActionColumnRenderer {
         const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(params.node);
         const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
         let shouldRender = true;
+        const isActionRowColumn = adaptable.api.columnApi.internalApi.isActionRowButtonColumn(params.colDef.colId);
         if (isGroupedRow) {
-            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
+            if (isActionRowColumn || ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows)) {
                 shouldRender = false;
             }
         }
         else if (isSummaryRow) {
-            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+            if (isActionRowColumn || ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows)) {
                 shouldRender = false;
             }
         }
@@ -121,15 +115,7 @@ class ActionColumnRenderer {
             return;
         }
         const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
-        const buttonContext = {
-            actionColumn,
-            primaryKeyValue: pkValue,
-            rowNode: params.node,
-            adaptableApi: adaptable.api,
-            userName: adaptable.adaptableOptions.userName,
-            adaptableId: adaptable.adaptableOptions.adaptableId,
-            data: params.data,
-        };
+        const buttonContext = Object.assign(Object.assign({ actionColumn, primaryKeyValue: pkValue, rowNode: params.node }, adaptable.api.internalApi.buildBaseContext()), { data: params.data });
         const eGui = this.eGui;
         const doRender = () => {
             this.unmountReactRoot = adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(ActionButtons({

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -3,7 +3,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType } from '@ag-grid-community/core';
 import { AdaptableLogger } from './AdaptableLogger';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable, NormalizeAdaptableStateOptions } from '../AdaptableInterfaces/IAdaptable';
 import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
@@ -11,8 +11,6 @@ import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableState } from '../PredefinedConfig/AdaptableState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
-import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
-import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -28,7 +26,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'available' | 'ready' | 'preDestroyed';
+export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'agGridReady' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
 interface AdaptableInitInternalConfig<TData = any> {
     variant: AdaptableVariant;
@@ -73,8 +71,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     adaptableModules: IModuleCollection;
     DataService: IDataService;
     CalculatedColumnExpressionService: ICalculatedColumnExpressionService;
-    EntitlementService: IEntitlementService;
-    ReportService: IReportService;
     ModuleService: IModuleService;
     ValidationService: IValidationService;
     QueryLanguageService: IQueryLanguageService;
@@ -128,6 +124,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     static forEachAdaptable(fn: (adaptable: AdaptableAgGrid) => void): void;
     private static collectInstance;
     private static dismissInstance;
+    get isAgGridInitialising(): boolean;
     get isReady(): boolean;
     get isAvailable(): boolean;
     get isDestroyed(): boolean;
@@ -141,7 +138,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
      */
     static _initInternal(config: AdaptableInitInternalConfig): Promise<AdaptableApi>;
     private _initAdaptableAgGrid;
-    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
+    normalizeAdaptableState(state: AdaptableState, agGridOptions: NormalizeAdaptableStateOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
     refreshQuickFilter(): void;
@@ -351,5 +348,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private onSortChanged;
     private getColumnSorts;
     private monkeyPatchingGridOptionsUpdates;
+    private DANGER_getPrivateAgGridBeans;
 }
 export {};