@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -7,10 +7,10 @@ import { Tabs } from '../components/Tabs';
 import { ColumnFilterModuleId } from '../Utilities/Constants/ModuleConstants';
 import { useAdaptable } from './AdaptableContext';
 export const SpecialColumnSettingsWizardStep = (props) => {
-    var _a, _b;
+    var _a, _b, _c;
     const adaptable = useAdaptable();
-    const possibleColumnTypes = adaptable.api.optionsApi.getColumnOptions().columnTypes;
-    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    const possibleColumnTypes = (_a = adaptable.api.columnApi.getColumnTypes()) !== null && _a !== void 0 ? _a : [];
+    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_b = props.settings) !== null && _b !== void 0 ? _b : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;
         const columnTypes = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) !== null && _b !== void 0 ? _b : [];
@@ -51,7 +51,7 @@ export const SpecialColumnSettingsWizardStep = (props) => {
         Boolean(possibleColumnTypes === null || possibleColumnTypes === void 0 ? void 0 : possibleColumnTypes.length) && (React.createElement(Tabs, { marginTop: 2, autoFocus: false },
             React.createElement(Tabs.Tab, null, "Column Types"),
             React.createElement(Tabs.Content, null,
-                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_b = chunk(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _b === void 0 ? void 0 : _b.map(([first, second]) => {
+                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_c = chunk(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _c === void 0 ? void 0 : _c.map(([first, second]) => {
                     var _a, _b, _c, _d, _e, _f;
                     return (React.createElement(FormRow, { key: first },
                         first && (React.createElement(CheckBox, { "data-name": first, onChange: (checked) => handleColumnTypeChange(first, checked), checked: (_c = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, first) }, first)),

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -7,7 +7,6 @@ import HelpBlock from '../../../components/HelpBlock';
 import SimpleButton from '../../../components/SimpleButton';
 import { Tabs } from '../../../components/Tabs';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
-import { AdaptablePopover } from '../../AdaptablePopover';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { PredicateEditor } from '../../Components/PredicateEditor/PredicateEditor';
 import { StyleComponent } from '../../Components/StyleComponent';
@@ -16,6 +15,7 @@ import { StyledColumnBadgePreview } from './StyledColumnWizardStyleSection/Compo
 import { Badge } from '../../Components/Badge';
 import { AdaptableIconComponent } from '../../Components/AdaptableIconComponent';
 import { DEFAULT_INTEGER_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
+import { Accordion } from '../../../components/Accordion';
 const BadgeEditor = (props) => {
     var _a, _b;
     const { api } = useOnePageAdaptableWizardContext();
@@ -36,12 +36,10 @@ const BadgeEditor = (props) => {
                 React.createElement(FormRow, { label: "Style" },
                     React.createElement(HelpBlock, { fontSize: 2, mb: 1, mt: 2 }, "Select the Style for the Badge"),
                     ' ',
-                    React.createElement(AdaptablePopover, { showEvent: "mouseenter", hideEvent: "mouseleave", showIcon: false, useButton: false, popoverMaxWidth: 700, bodyText: [
-                            React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
-                                    onChange(Object.assign(Object.assign({}, badge), { Style }));
-                                } }),
-                        ] },
-                        React.createElement(SimpleButton, { variant: "raised" }, "Edit Badge Style"))),
+                    React.createElement(Accordion, { title: "Edit Badge Style" },
+                        React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
+                                onChange(Object.assign(Object.assign({}, badge), { Style }));
+                            } }))),
                 !api.columnApi.hasArrayDataType(columnId) && ( // dont show predicates for arrays
                 (React.createElement(
                     FormRow,

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -77,7 +77,7 @@ export const StyledColumnWizard = (props) => {
                     React.createElement(StyledColumnWizardStyleSection, { onChange: setStyledColumn })));
             },
             title: 'Style',
-        }, AdditionalSettingSection);
+        });
     }
     else if (styledColumn.BadgeStyle) {
         specificSteps.push({

package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.js

@@ -55,7 +55,7 @@ export const StyledColumnWizardColumnSection = (props) => {
     }, [data]);
     const handleColumnsChange = (columnIds) => {
         const columnId = columnIds[0];
-        const emptyRanges = api.scopeApi.createCellColorRangesForScope({
+        const emptyRanges = api.columnScopeApi.createCellColorRangesForScope({
             ColumnIds: [columnId],
         });
         const newStyledColumn = Object.assign(Object.assign({}, data), { ColumnId: columnId });

package/src/View/StyledColumn/Wizard/StyledColumnWizardSettingsSection.js

@@ -1,32 +1,56 @@
 import * as React from 'react';
 import { Box, Flex, Text } from 'rebass';
-import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { CheckBox } from '../../../components/CheckBox';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { Tabs } from '../../../components/Tabs';
-import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
-let alignmentOptions = [
-    { value: 'Left', label: 'Left' },
-    { value: 'Right', label: 'Right' },
-    { value: 'Center', label: 'Center' },
-];
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 export const renderStyledColumnWizardSettingsSummary = (data) => {
+    var _a, _b, _c;
+    const badgeStyle = data;
     return (React.createElement(Box, { padding: 2 },
         React.createElement(Text, { mt: 3 },
-            "Include grouped rows ",
-            React.createElement(Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
+            "Data Rows ",
+            React.createElement(Tag, null, ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows) ? 'no' : 'yes')),
+        ' ',
+        React.createElement(Text, { mt: 3 },
+            "Group Rows ",
+            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows) ? 'no' : 'yes')),
+        React.createElement(Text, { mt: 3 },
+            "Summary Rows ",
+            React.createElement(Tag, null, ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) ? 'no' : 'yes'))));
 };
 export const StyledColumnWizardSettingsSection = (props) => {
-    const { data, api } = useOnePageAdaptableWizardContext();
-    const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
+    var _a, _b, _c;
+    const { data } = useOnePageAdaptableWizardContext();
+    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeDataRows }) }) }));
+    };
+    const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupRows: ExcludeGroupedRows }) }) }));
+    };
+    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeSummaryRows }) }) }));
     };
     return (React.createElement(Tabs, null,
         React.createElement(Tabs.Tab, null, "Settings"),
         React.createElement(Tabs.Content, null,
             React.createElement(Flex, { flexDirection: "row" },
                 React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Include Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Data Rows:" },
+                        React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_a = data.BadgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
+                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
+                        React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                    React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))))))));
+                            React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_c = data.BadgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, mr: 2 }))),
+                    ' ')))));
 };

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.js

@@ -204,7 +204,7 @@ export const StyledColumnWizardStyleSection = (props) => {
     };
     const handleRangeValueTypeChange = React.useCallback((rangeValueType) => {
         const ranges = rangeValueType === 'Number'
-            ? api.scopeApi.createCellColorRangesForScope(scope)
+            ? api.columnScopeApi.createCellColorRangesForScope(scope)
             : [
                 {
                     Min: 0,

package/src/agGrid/ActionColumnRenderer.js

@@ -32,14 +32,32 @@ const ActionButtons = (props) => {
     })));
 };
 export const ReactActionColumnRenderer = (props) => {
+    var _a, _b, _c;
     const rerender = 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);
@@ -58,6 +76,7 @@ export const ReactActionColumnRenderer = (props) => {
 export 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) {
@@ -66,8 +85,25 @@ export 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 {};