@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/Strategy/GridFilterModule.js

@@ -6,10 +6,22 @@ export class GridFilterModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.GridFilterModuleId, ModuleConstants.GridFilterFriendlyName, 'filter-list', 'GridFilterPopup', 'Controls the Grid Filter funtionality', api);
     }
+    setModuleEntitlement() {
+        if (!this.api.optionsApi.getFilterOptions().useAdaptableFiltering) {
+            this.AccessLevel = 'Hidden';
+        }
+        else {
+            this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+        }
+    }
+    getModuleAdaptableObjects() {
+        const currentGridFilter = this.api.filterApi.gridFilterApi.getCurrentGridFilter();
+        return currentGridFilter ? [currentGridFilter] : [];
+    }
     getViewProperties() {
         return {
             getStatusBarPanelProps: () => {
-                const popover = this.api.gridFilterApi.getCurrentGridFilterExpression();
+                const popover = this.api.filterApi.gridFilterApi.getCurrentGridFilterExpression();
                 return {
                     content: GridFilterStatusbar,
                     extraActions: [EditGridFilterButton],

package/src/Strategy/GridInfoModule.d.ts

@@ -7,6 +7,6 @@ import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 export declare class GridInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").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">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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">[];
 }

package/src/Strategy/Interface/ICellDataChangeListenerModule.d.ts

@@ -0,0 +1,6 @@
+import { IModule } from './IModule';
+export interface ICellDataChangeListenerModule extends IModule {
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
+    shouldListenToDataChanges(): boolean;
+}

package/src/Strategy/Interface/ICellSummaryModule.d.ts

@@ -1,6 +1,6 @@
 import { IModule } from './IModule';
 import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { CellSummmary } from '../../PredefinedConfig/Common/CellSummary';
+import { CellSummmaryInfo } from '../../PredefinedConfig/Common/CellSummary';
 export interface ICellSummaryModule extends IModule {
-    createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
+    createCellSummaryInfo(selectedCellInfo: SelectedCellInfo): CellSummmaryInfo;
 }

package/src/Strategy/Interface/{IShortcutModule.d.ts → IKeyDownListenerModule.d.ts}

@@ -1,4 +1,4 @@
 import { IModule } from './IModule';
-export interface IShortcutModule extends IModule {
+export interface IKeyDownListenerModule extends IModule {
     checkListenToKeyDown(): void;
 }

package/src/Strategy/Interface/IModule.d.ts

@@ -37,6 +37,10 @@ export interface AdaptableObjectItemView {
     label?: string | React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
     }>>;
+    /**
+     * True is the item label should be displayed in the same container as the value.
+     */
+    isLabelInline?: boolean;
     /**
      * How the item is rendered.
      * Defaults to tags.

package/src/Strategy/Interface/IPlusMinusModule.d.ts

@@ -1,7 +1,6 @@
-import { IModule } from './IModule';
 import { PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-export interface IPlusMinusModule extends IModule {
+import { IKeyDownListenerModule } from './IKeyDownListenerModule';
+export interface IPlusMinusModule extends IKeyDownListenerModule {
     applyPlusMinus(plusMinusNudges: PlusMinusNudge[], selectedCells: GridCell[], direction: 'up' | 'down'): boolean;
-    checkListenToKeyDown(): void;
 }

package/src/Strategy/LayoutModule.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { Layout, LayoutState } from '../PredefinedConfig/LayoutState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableModuleView, IModule, TeamSharingReferences } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule, TeamSharingReferences } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
     protected LayoutState: LayoutState;
@@ -16,31 +15,13 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"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">[];
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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">[];
     private createViewPivotItemsMenuItem;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
-    toViewAll(): {
-        items: ({
-            name: string;
-            values: string[];
-        } | {
-            name: string;
-            view: JSX.Element;
-        })[];
-        abObject: Layout;
-    }[];
-    toView(layout: Layout): {
-        items: ({
-            name: string;
-            values: string[];
-        } | {
-            name: string;
-            view: JSX.Element;
-        })[];
-        abObject: Layout;
-    };
+    toViewAll(): AdaptableObjectView[];
+    toView(layout: Layout): AdaptableObjectView;
     getViewProperties(): AdaptableModuleView;
-    handleLayoutChange(): void;
+    handleLayoutSelection(): void;
     getReferencedNamedQueryNames(layout: Layout): string[];
 }

package/src/Strategy/LayoutModule.js

@@ -6,7 +6,6 @@ import { LayoutRadioSelector } from '../View/Layout/LayoutRadioSelector';
 import { LayoutStatusbar } from '../View/Layout/LayoutStatusBarSubPanelPopover';
 import { EditCurrentLayoutButton } from '../View/Layout/EditCurrentLayoutButton';
 import { LayoutCloneButton } from '../View/Layout/LayoutCloneButton';
-import { SaveLayoutButton } from '../View/Layout/SaveLayoutButton';
 import { LayoutWizard } from '../View/Layout/Wizard/LayoutWizard';
 import { getLayoutFilterViewItems } from './Utilities/Layout/getLayoutFilterViewItems';
 import { getLayoutSortViewItems } from './Utilities/Layout/getLayoutSortViewItems';
@@ -16,23 +15,26 @@ import flattenDeep from 'lodash/flattenDeep';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import { getGridFilterViewItems } from '../View/Layout/Wizard/getGridFilterPreview';
 import { RowSummaryService } from '../Utilities/Services/RowSummaryService';
+import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
 export class LayoutModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
         this.rowSummaryService = new RowSummaryService(this.api);
     }
     onAdaptableReady() {
-        this.rowSummaryService.onAdapterReady();
+        this.rowSummaryService.onAdaptableReady();
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
-            var _a;
-            if (layoutChangedInfo.newLayoutState.CurrentLayout !==
-                ((_a = layoutChangedInfo.oldLayoutState) === null || _a === void 0 ? void 0 : _a.CurrentLayout)) {
-                // we are interested only if current layout was changed (is different from the previous one)
-                this.handleLayoutChange();
+            if (layoutChangedInfo.actionName === 'LAYOUT_SELECT' &&
+                layoutChangedInfo.newLayoutState.CurrentLayout !==
+                    layoutChangedInfo.oldLayoutState?.CurrentLayout) {
+                this.handleLayoutSelection();
             }
         });
         requestAnimationFrame(() => {
-            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+            if (this.api.isDestroyed()) {
+                return;
+            }
+            this.api.eventApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
         });
     }
     getModuleAdaptableObjects() {
@@ -40,12 +42,25 @@ export class LayoutModule extends AdaptableModuleBase {
     }
     getExplicitlyReferencedColumnIds(layout) {
         const columnIds = [];
-        columnIds.push(...layout.Columns);
-        if (layout.AggregationColumns) {
-            columnIds.push(...Object.keys(layout.AggregationColumns));
+        if (layout.TableColumns) {
+            const visibility = layout.ColumnVisibility || {};
+            columnIds.push(...layout.TableColumns.filter((colId) => {
+                return visibility[colId] !== false;
+            }));
         }
-        if (layout.PivotColumns) {
-            columnIds.push(...layout.PivotColumns);
+        if (layout.TableAggregationColumns) {
+            columnIds.push(...Object.keys(layout.TableAggregationColumns));
+        }
+        if (isPivotLayout(layout)) {
+            if (layout.PivotColumns) {
+                columnIds.push(...layout.PivotColumns);
+            }
+            if (layout.PivotAggregationColumns) {
+                columnIds.push(...layout.PivotAggregationColumns.map((x) => x.ColumnId));
+            }
+            if (layout.PivotGroupedColumns) {
+                columnIds.push(...layout.PivotGroupedColumns);
+            }
         }
         if (layout.RowGroupedColumns) {
             columnIds.push(...layout.RowGroupedColumns);
@@ -106,7 +121,6 @@ export class LayoutModule extends AdaptableModuleBase {
         return true;
     }
     createColumnMenuItems(column) {
-        var _a, _b;
         if (!this.isModuleEditable()) {
             return;
         }
@@ -118,7 +132,7 @@ export class LayoutModule extends AdaptableModuleBase {
                 source: 'ColumnMenu',
                 value: this.api.layoutApi.getCurrentLayout(),
             }));
-            if (column) {
+            if (column && !column.isTreeColumn) {
                 returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
             }
         }
@@ -128,7 +142,7 @@ export class LayoutModule extends AdaptableModuleBase {
                     this.api.columnApi.hideColumn(column.columnId);
                 }));
             }
-            const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
+            const hasExistingSelection = this.api.gridApi.getSelectedCellInfo()?.gridCells?.length;
             if (hasExistingSelection) {
                 returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Select Column (Preserve Selection)', 'select-fwd', () => {
                     this.api.columnApi.addColumnToSelection(column.columnId);
@@ -179,20 +193,19 @@ export class LayoutModule extends AdaptableModuleBase {
     // TODO next time this method is touched, it should be extracted in an internal Api
     createViewPivotItemsMenuItem(menuContext) {
         // current group => menuContext.rowNode.field;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
-        if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
+        const selectedCellInfo = menuContext.selectedCellInfo ?? this.api.gridApi.getSelectedCellInfo();
+        if (selectedCellInfo?.gridCells?.length !== 1) {
             return;
         }
-        const gridCell = (_c = menuContext.gridCell) !== null && _c !== void 0 ? _c : selectedCellInfo.gridCells[0];
+        const gridCell = menuContext.gridCell ?? selectedCellInfo.gridCells[0];
         const currentLayout = this.api.layoutApi.getCurrentLayout();
-        if (!currentLayout.EnablePivot) {
+        if (!isPivotLayout(currentLayout)) {
             return;
         }
         const { agGridColumn } = menuContext;
         const columnId = agGridColumn.getColId();
-        const isPivotColumn = this.api.columnApi.isAutoPivotColumn(columnId);
-        if (!isPivotColumn && this.api.columnApi.getColumnDataTypeForColumnId(columnId) !== 'Number') {
+        const isPivotColumn = this.api.columnApi.isPivotResultColumn(columnId);
+        if (!isPivotColumn && this.api.columnApi.getColumnDataTypeForColumnId(columnId) !== 'number') {
             return;
         }
         /**
@@ -203,11 +216,11 @@ export class LayoutModule extends AdaptableModuleBase {
          */
         // pivot_status_Booked_price
         // price
-        const aggColumn = (_g = (_f = (_e = (_d = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _d === void 0 ? void 0 : _d.call(agGridColumn).pivotValueColumn) === null || _e === void 0 ? void 0 : _e.getColDef) === null || _f === void 0 ? void 0 : _f.call(_e)) === null || _g === void 0 ? void 0 : _g.field;
+        const aggColumn = agGridColumn?.getColDef?.().pivotValueColumn?.getColDef?.()?.field;
         // Booked
-        const pivotValue = (_k = (_j = (_h = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _h === void 0 ? void 0 : _h.call(agGridColumn)) === null || _j === void 0 ? void 0 : _j.pivotKeys) === null || _k === void 0 ? void 0 : _k[0];
+        const pivotValue = agGridColumn?.getColDef?.()?.pivotKeys?.[0];
         // status - the preview works only with one column
-        const pivotColumnId = (_l = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _l === void 0 ? void 0 : _l[0];
+        const pivotColumnId = currentLayout?.PivotColumns?.[0];
         function getData(rows) {
             return [
                 ...rows.map((row) => {
@@ -221,7 +234,7 @@ export class LayoutModule extends AdaptableModuleBase {
         const data = flattenDeep(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
         const cellValue = isPivotColumn
-            ? (_o = (_m = menuContext.rowNode) === null || _m === void 0 ? void 0 : _m.aggData) === null || _o === void 0 ? void 0 : _o[columnId]
+            ? menuContext.rowNode?.aggData?.[columnId]
             : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
@@ -235,7 +248,7 @@ export class LayoutModule extends AdaptableModuleBase {
         };
         return {
             name: 'layout-aggregated-view',
-            module: this.moduleInfo.ModuleName,
+            category: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
             onClick: () => {
@@ -264,12 +277,13 @@ export class LayoutModule extends AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const maxColumnsToDisplay = (_b = (_a = this.api.optionsApi.getLayoutOptions().layoutViewOptions) === null || _a === void 0 ? void 0 : _a.maxColumnsToDisplay) !== null && _b !== void 0 ? _b : 10;
+        const maxColumnsToDisplay = this.api.optionsApi.getLayoutOptions().layoutViewOptions?.maxColumnsToDisplay ?? 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameForColumnId(columnId);
         };
-        let columns = layout.Columns.filter((c) => !this.api.columnApi.isAutoRowGroupColumn(c)).filter((c) => !this.api.columnApi.isAutoPivotColumn(c));
+        let columns = (layout.TableColumns || [])
+            .filter((c) => !this.api.columnApi.isAutoRowGroupColumn(c))
+            .filter((c) => !this.api.columnApi.isPivotResultColumn(c));
         if (columns.length >
             maxColumnsToDisplay + 1 /* +1 is to show tag only beginning with 2, 'other 2' */) {
             const extraColumns = columns.length - maxColumnsToDisplay;
@@ -284,39 +298,60 @@ export class LayoutModule extends AdaptableModuleBase {
         return {
             items: [
                 {
-                    name: 'Name',
-                    values: [layout.Name],
+                    name: 'Grid Type',
+                    values: [isPivotLayout(layout) ? 'Pivot' : 'Table'],
                 },
                 {
-                    name: 'Layout Grid Type',
-                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Pivot' : 'Table'],
+                    name: 'Name',
+                    values: [layout.Name],
                 },
                 /**
                  * Hide pivot columns.
                  *
                  * The generated pivot columns cannot be prevented from beeing on the layout object.
-                 * When they are removed/not added, they no longer apear in the grid.
+                 * When they are removed/not added, they no longer appear in the grid.
                  */
-                !layout.EnablePivot && {
+                !isPivotLayout(layout) && {
                     name: 'Columns',
                     values: columns,
                 },
-                ((_c = layout.ColumnSorts) === null || _c === void 0 ? void 0 : _c.length) && getLayoutSortViewItems(layout, this.api),
-                ((_d = layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) === null || _d === void 0 ? void 0 : _d.length) && getLayoutFilterViewItems(layout, this.api),
-                ((_e = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _e === void 0 ? void 0 : _e.length) && {
-                    name: 'Grouped Columns',
+                layout.ColumnSorts?.length && getLayoutSortViewItems(layout, this.api),
+                layout?.ColumnFilters?.length && getLayoutFilterViewItems(layout, this.api),
+                layout?.RowGroupedColumns?.length && {
+                    name: 'Row Groups',
                     values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
-                ((_f = layout === null || layout === void 0 ? void 0 : layout.PivotColumns) === null || _f === void 0 ? void 0 : _f.length) && {
+                layout?.PivotColumns?.length && {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
-                (layout === null || layout === void 0 ? void 0 : layout.AggregationColumns) &&
-                    Object.keys(layout === null || layout === void 0 ? void 0 : layout.AggregationColumns).length && {
-                    name: 'Aggregation Columns',
-                    values: Object.entries(layout === null || layout === void 0 ? void 0 : layout.AggregationColumns)
-                        .map(([colId, aggFn]) => {
-                        if (colId === 'Source' || colId === 'Uuid') {
+                layout?.PivotGroupedColumns?.length && {
+                    name: 'Pivot Row Groups',
+                    values: layout.PivotGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
+                },
+                layout?.TableAggregationColumns &&
+                    layout.TableAggregationColumns.length && {
+                    name: 'Aggregations',
+                    values: layout.TableAggregationColumns.map(({ ColumnId, AggFunc: aggFn }) => {
+                        if (ColumnId === 'Source' || ColumnId === 'Uuid' || ColumnId === 'AdaptableVersion') {
+                            return '';
+                        }
+                        let aggFnName = '';
+                        if (typeof aggFn === 'string') {
+                            aggFnName = aggFn;
+                        }
+                        else if (typeof aggFn === 'object' && aggFn.type === 'weightedAverage') {
+                            aggFnName = WEIGHTED_AVERAGE_AGG_FN_NAME;
+                        }
+                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
+                    }).filter(Boolean),
+                },
+                isPivotLayout(layout) &&
+                    layout?.PivotAggregationColumns &&
+                    layout.PivotAggregationColumns.length && {
+                    name: 'Pivot Aggregations',
+                    values: layout.PivotAggregationColumns.map(({ ColumnId, AggFunc: aggFn }) => {
+                        if (ColumnId === 'Source' || ColumnId === 'Uuid' || ColumnId === 'AdaptableVersion') {
                             return '';
                         }
                         let aggFnName = '';
@@ -326,20 +361,22 @@ export class LayoutModule extends AdaptableModuleBase {
                         else if (typeof aggFn === 'object' && aggFn.type === 'weightedAverage') {
                             aggFnName = WEIGHTED_AVERAGE_AGG_FN_NAME;
                         }
-                        return `${aggFnName}(${columnIdToFriendlyName(colId)})`;
-                    })
-                        .filter(Boolean),
+                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
+                    }).filter(Boolean),
                 },
-                (layout === null || layout === void 0 ? void 0 : layout.GridFilter) &&
+                layout?.GridFilter &&
                     StringExtensions.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
                     getGridFilterViewItems(layout),
-                ((_g = layout === null || layout === void 0 ? void 0 : layout.RowSummaries) === null || _g === void 0 ? void 0 : _g.length) && {
+                layout &&
+                    !isPivotLayout(layout) &&
+                    layout.RowSummaries?.length && {
                     name: 'Row Summaries',
-                    values: layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary) => {
-                        var _a;
-                        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+                    values: layout.RowSummaries.map((rowSummary) => {
+                        const columns = Object.entries(rowSummary.ColumnsMap ?? {})
                             .map(([columnId, expression]) => {
-                            if (columnId === 'Source' || columnId === 'Uuid') {
+                            if (columnId === 'Source' ||
+                                columnId === 'Uuid' ||
+                                columnId === 'AdaptableVersion') {
                                 return '';
                             }
                             return `${expression}(${columnIdToFriendlyName(columnId)})`;
@@ -355,6 +392,16 @@ export class LayoutModule extends AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            abObjectTypes: [
+                {
+                    name: 'Table Layout',
+                    accessLevel: this.AccessLevel,
+                },
+                !this.api.gridApi.isTreeDataGrid() && {
+                    name: 'Pivot Layout',
+                    accessLevel: this.AccessLevel,
+                },
+            ].filter(Boolean),
             actions: [LayoutRadioSelector, LayoutCloneButton],
             getDeleteAction: (layout) => {
                 // make sure we do not delete the last layout
@@ -366,13 +413,14 @@ export class LayoutModule extends AdaptableModuleBase {
             getEditWizard: () => LayoutWizard,
             getStatusBarPanelProps: () => {
                 return {
+                    triggerActionOnWrapperClick: false,
                     content: LayoutStatusbar,
-                    extraActions: [EditCurrentLayoutButton, SaveLayoutButton],
+                    extraActions: [EditCurrentLayoutButton],
                 };
             },
         };
     }
-    handleLayoutChange() {
+    handleLayoutSelection() {
         if (!this.api.layoutApi.internalApi.hasLayoutSpecificObjects()) {
             // no need if no callback implementation is provided or no auto checking
             return;
@@ -394,13 +442,10 @@ export class LayoutModule extends AdaptableModuleBase {
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn, StyledColumn
         // we need to re-setup the column defs, as some colDefs properties may be changed
-        this.api.internalApi
-            .getAdaptableInstance()
-            .updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
+        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
     }
     getReferencedNamedQueryNames(layout) {
-        var _a;
-        if (!((_a = layout.GridFilter) === null || _a === void 0 ? void 0 : _a.Expression)) {
+        if (!layout.GridFilter?.Expression) {
             return [];
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(layout.GridFilter.Expression);

package/src/Strategy/NamedQueryModule.d.ts

@@ -1,10 +1,7 @@
-/// <reference types="react" />
 import { AdaptableApi, AdaptableObject, NamedQuery } from '../../types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as NamedQueryRedux from '../Redux/ActionsReducers/NamedQueryRedux';
-import { NamedQueryWizard } from '../View/NamedQuery/Wizard/NamedQueryWizard';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IModule } from './Interface/IModule';
+import { AdaptableModuleView, IModule } from './Interface/IModule';
 export declare class NamedQueryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
@@ -19,15 +16,5 @@ export declare class NamedQueryModule extends AdaptableModuleBase implements IMo
         abObject: NamedQuery;
         items: import("./Interface/IModule").AdaptableObjectItemView[];
     }[];
-    getViewProperties(): {
-        getDeleteAction: (namedQuery: NamedQuery) => NamedQueryRedux.NamedQueryDeleteAction;
-        newTooltipText: string;
-        emptyView: string;
-        getEditWizard: () => typeof NamedQueryWizard;
-        getStatusBarPanelProps: () => {
-            content: string;
-            extraActions: (() => JSX.Element)[];
-            popover: string;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/NamedQueryModule.js

@@ -1,9 +1,9 @@
 import * as NamedQueryRedux from '../Redux/ActionsReducers/NamedQueryRedux';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { NamedQueryWizard } from '../View/NamedQuery/Wizard/NamedQueryWizard';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 export class NamedQueryModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.NamedQueryModuleId, ModuleConstants.NamedQueryFriendlyName, 'grid-filter', 'NamedQueryPopup', 'Creates Named Queries', api);
@@ -51,7 +51,7 @@ export class NamedQueryModule extends AdaptableModuleBase {
             getEditWizard: () => NamedQueryWizard,
             getStatusBarPanelProps: () => {
                 const queryMaxLength = 15;
-                const query = this.api.gridFilterApi.getCurrentGridFilterExpression();
+                const query = this.api.filterApi.gridFilterApi.getCurrentGridFilterExpression();
                 let text = query;
                 let popover = null;
                 if (query.length > queryMaxLength) {

package/src/Strategy/NoteModule.d.ts

@@ -1,9 +1,11 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableObject } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class NoteModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"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">[];
+    getModuleAdaptableObjects(): AdaptableObject[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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">[];
 }

package/src/Strategy/NoteModule.js

@@ -1,5 +1,4 @@
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { createBaseContext } from '../Utilities/ObjectFactory';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 export class NoteModule extends AdaptableModuleBase {
     constructor(api) {
@@ -7,10 +6,12 @@ export class NoteModule extends AdaptableModuleBase {
     }
     isModuleAvailable() {
         // Note module doesn't support autogenerated primary keys
-        return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
+        return super.isModuleAvailable() && !this.api.optionsApi.isAutogeneratePrimaryKey();
+    }
+    getModuleAdaptableObjects() {
+        return this.api.noteApi.getAllNotes();
     }
     createContextMenuItems(menuContext) {
-        var _a, _b;
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -20,12 +21,16 @@ export class NoteModule extends AdaptableModuleBase {
         if (menuContext.isRowGroupColumn || menuContext.isGroupedNode) {
             return;
         }
-        const isReadOnly = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        const isReadOnly = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) ===
+            'ReadOnly';
         if (isReadOnly) {
             return undefined;
         }
-        const isCellNotable = typeof ((_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
-            ? this.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api)))
+        const isCellNotable = typeof this.api.optionsApi?.getNoteOptions()?.isCellNotable === 'function'
+            ? this.api.optionsApi.getNoteOptions().isCellNotable({
+                gridCell: menuContext.gridCell,
+                ...this.api.internalApi.buildBaseContext(),
+            })
             : true;
         if (!isCellNotable) {
             return;
@@ -46,7 +51,7 @@ export class NoteModule extends AdaptableModuleBase {
                 this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
                     // add an empty one
                     this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                    this.api.internalApi.getCellPopupService().showPopup({
+                    this.api.internalApi.getAnnotationsService().showPopup({
                         PrimaryKeyValue: menuContext.primaryKeyValue,
                         ColumnId: menuContext.adaptableColumn.columnId,
                     }, true);