@adaptabletools/adaptable-cjs 18.0.0-canary.9 → 18.0.1

package/src/agGrid/ActionColumnRenderer.js

@@ -36,14 +36,32 @@ const ActionButtons = (props) => {
     })));
 };
 const ReactActionColumnRenderer = (props) => {
+    var _a, _b, _c;
     const rerender = (0, useRerender_1.useRerender)();
     const adaptable = props.context.__adaptable;
     const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(props.colDef);
     if (!actionColumn || !actionButtons.length) {
         return null;
     }
-    // TODO: see why types do not match
-    if (adaptable.api.gridApi.isGroupRowNode(props.node) && !actionColumn.includeGroupedRows) {
+    const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(props.node);
+    const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
+    let shouldRender = true;
+    if (isGroupedRow) {
+        if ((_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) {
+            shouldRender = false;
+        }
+    }
+    else {
+        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
+            shouldRender = false;
+        }
+    }
+    if (!shouldRender) {
         return null;
     }
     const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
@@ -63,6 +81,7 @@ exports.ReactActionColumnRenderer = ReactActionColumnRenderer;
 class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
+        var _a, _b, _c;
         const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
@@ -71,8 +90,25 @@ class ActionColumnRenderer {
         // create the cell
         this.eGui = document.createElement('div');
         this.eGui.className = 'ab-ActionColumn';
-        // if its a group node then only show if set to do so
-        if (adaptable.api.gridApi.isGroupRowNode(params.node) && !actionColumn.includeGroupedRows) {
+        const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(params.node);
+        const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
+        let shouldRender = true;
+        if (isGroupedRow) {
+            if ((_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) {
+                shouldRender = false;
+            }
+        }
+        else {
+            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
+                shouldRender = false;
+            }
+        }
+        if (!shouldRender) {
             this.eGui.innerHTML = '';
             return;
         }

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -7,6 +7,7 @@ import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
 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';
@@ -26,7 +27,6 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-import { SummaryService } from '../Utilities/Services/SummaryService';
 export type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
@@ -35,6 +35,7 @@ interface AdaptableInitInternalConfig<TData = any> {
     adaptableOptions: AdaptableOptions<TData>;
     gridOptions: GridOptions<TData>;
     modules?: Module[];
+    isDetailGrid?: boolean;
     /**
      * Adaptable init hook for rendering the React/Angular AG Grid component
      */
@@ -57,9 +58,10 @@ export declare class AdaptableAgGrid implements IAdaptable {
      * once layouts are properly handled with the new aggrid methods & events
      * we can remove this hack
      */
-    private previousAgGridColumnState;
+    private previousAgGridLayoutState;
     _rawAdaptableOptions: AdaptableOptions;
     adaptableOptions: AdaptableOptions;
+    _isDetailGrid: boolean;
     agGridOptionsService: AgGridOptionsService;
     agGridAdapter: AgGridAdapter;
     agGridColumnAdapter: AgGridColumnAdapter;
@@ -82,7 +84,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: SummaryService;
     private LicenseService;
     private ChartingService;
     private ThemeService;
@@ -134,6 +135,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
      */
     static _initInternal(config: AdaptableInitInternalConfig): Promise<AdaptableApi>;
     private _initAdaptableAgGrid;
+    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
     refreshQuickFilter(): void;
@@ -144,6 +146,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     hideQuickFilter(): void;
     private normalizeAdaptableOptions;
     private setInitialGridOptions;
+    private isDetailGrid;
     /**
      * Either initializes the AG Grid instance or delegates it to the framework wrappers (React/Anglar)
      */
@@ -156,7 +159,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getAdaptableContainerElement(): HTMLElement | null;
     refreshSelectedCellsState(): SelectedCellInfo | undefined;
     refreshSelectedRowsState(): SelectedRowInfo | undefined;
-    isGridSelectable(): boolean;
+    isGridRowSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
     private initAdaptableStore;
     private mapAdaptableStateToAgGridState;
     private addGridEventListeners;
@@ -284,7 +288,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getAgGridLightThemeName;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
-    getAgGridAllGridColumns(): Column<any>[];
+    getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
     closeAllRowGroups(): void;
@@ -300,20 +304,13 @@ export declare class AdaptableAgGrid implements IAdaptable {
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     exportVisualDataToExcel(): void;
+    private processRowGroupForExcelExport;
+    private processCellForExcelExport;
     isQuickFilterAvailable(): boolean;
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;
     setLayout(layout?: Layout): void;
     private getActiveAdaptableAggFuncForCol;
-    /**
-     * Setting layout works by modifing the column state.
-     * The column state is based on the current existing columns.
-     * At this point the column groups do not exist, and the widths from layout are not applied.
-     *
-     * After the col sate is applied and the column groups are created we need
-     * to apply the state again to update the widths of the group columns.
-     */
-    private applyGroupColumnWidth;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;
@@ -345,7 +342,5 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private restoreUnGroupColumnOrder;
     private onSortChanged;
     private getColumnSorts;
-    setPinnedRows(pinnedRows: any, location: 'top' | 'bottom'): void;
-    setupRowSummaries(): void;
 }
 export {};