@adaptabletools/adaptable 20.3.0-canary.2 → 21.0.0-canary.0

package/src/Strategy/ColumnFilterModule.js

@@ -8,6 +8,36 @@ export class ColumnFilterModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ColumnFilterModuleId, ModuleConstants.ColumnFilterFriendlyName, 'filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
+    onAdaptableReady() {
+        if (this.api.optionsApi.getFilterOptions().columnFilterOptions.showQuickFilter == false) {
+            this.api.filterApi.columnFilterApi.hideQuickFilterBar();
+        }
+        else {
+            this.api.filterApi.columnFilterApi.showQuickFilterBar();
+        }
+        const columnFilters = this.api.filterApi.columnFilterApi.getColumnFilters();
+        columnFilters.forEach((cf) => {
+            if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
+                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
+            }
+        });
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            const changedColumnId = cellDataChangedInfo.column.columnId;
+            this.api.filterApi.columnFilterApi.resetFilterValues(changedColumnId);
+        });
+        // we reset the filter cache on sort change, because we might have columns
+        // with "In" filters, with custom values, which use `context.orderedValues`
+        // customInFilterValues: (context: CustomInFilterValuesContext<Car>) => {
+        //   return context.orderedValues;
+        // }
+        // and that order will most likely change when sorting happens
+        // so we need to reset the cached filter values when sorting changes
+        this.api.eventApi.on('GridSorted', () => {
+            this.api.filterApi.columnFilterApi.resetAllFilterValues();
+        });
+    }
     setModuleEntitlement() {
         if (!this.api.optionsApi.getFilterOptions().useAdaptableFiltering) {
             this.AccessLevel = 'Hidden';
@@ -25,20 +55,6 @@ export class ColumnFilterModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    onAdaptableReady() {
-        if (this.api.optionsApi.getFilterOptions().columnFilterOptions.showQuickFilter == false) {
-            this.api.filterApi.columnFilterApi.hideQuickFilterBar();
-        }
-        else {
-            this.api.filterApi.columnFilterApi.showQuickFilterBar();
-        }
-        const columnFilters = this.api.filterApi.columnFilterApi.getColumnFilters();
-        columnFilters.forEach((cf) => {
-            if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
-                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
-            }
-        });
-    }
     createColumnMenuItems(column) {
         let columnFilterMenuItems = [];
         if (column &&
@@ -64,7 +80,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
+        if (!menuContext.isRowGroupColumn && this.isModuleVisible()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
                 menuContext.isSingleSelectedColumn &&

package/src/Strategy/ColumnInfoModule.js

@@ -8,7 +8,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
         return 'Full';
     }
     createColumnMenuItems(column) {
-        if (this.isModuleAvailable() && !column.isTreeColumn) {
+        if (this.isModuleVisible() && !column.isTreeColumn) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
                 column: column,
@@ -25,7 +25,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
                 column: menuContext.adaptableColumn,

package/src/Strategy/CommentModule.d.ts

@@ -5,7 +5,7 @@ import { IModule } from './Interface/IModule';
 export declare class CommentModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    isModuleAvailable(): boolean;
+    isModuleEnabled(): boolean;
     private loadComments;
     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/CommentModule.js

@@ -7,7 +7,7 @@ export class CommentModule extends AdaptableModuleBase {
     onAdaptableReady() {
         this.loadComments();
     }
-    isModuleAvailable() {
+    isModuleEnabled() {
         const options = this.api.optionsApi.getCommentOptions();
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
@@ -15,7 +15,7 @@ export class CommentModule extends AdaptableModuleBase {
         if (this.api.optionsApi.isAutogeneratePrimaryKey()) {
             return false;
         }
-        return super.isModuleAvailable();
+        return super.isModuleEnabled();
     }
     async loadComments() {
         const commentThreads = await this.api.optionsApi
@@ -24,7 +24,7 @@ export class CommentModule extends AdaptableModuleBase {
         this.api.commentApi.setComments(commentThreads);
     }
     createContextMenuItems(menuContext) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (!this.api.commentApi.internalApi.areCommentsSupportedInLayout()) {

package/src/Strategy/CustomSortModule.d.ts

@@ -5,11 +5,10 @@ import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
+import { LayoutExtendedConfig } from '../types';
 export declare class CustomSortModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
+    getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(customSort: CustomSort): string[];
     hasNamedQueryReferences(): boolean;
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"custom-sort-add" | "custom-sort-edit">[];
@@ -17,5 +16,5 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
 }

package/src/Strategy/CustomSortModule.js

@@ -56,7 +56,7 @@ export class CustomSortModule extends AdaptableModuleBase {
     }
     toViewAll() {
         return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+            includeLayoutNotExtendedObjects: this.showLayoutNonExtendedObjects(),
         }).map((customSort) => this.toView(customSort));
     }
     getViewProperties() {
@@ -73,7 +73,7 @@ export class CustomSortModule extends AdaptableModuleBase {
             },
         };
     }
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return true;
     }
 }

package/src/Strategy/DashboardModule.js

@@ -25,7 +25,7 @@ export class DashboardModule extends AdaptableModuleBase {
         return this.buildMenuItems();
     }
     buildMenuItems() {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             let menuItems = [];
             const dashboardState = this.api.dashboardApi.getDashboardState();
             if (this.isModuleEditable()) {

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -2,14 +2,15 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+import { AgModuleName } from 'ag-grid-enterprise';
 export declare class DataChangeHistoryModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
     isListeningToCellDataChanges: boolean;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    protected getAgGridModuleDependencies(): AgModuleName[];
     shouldListenToDataChanges(): boolean;
     checkListenToCellDataChanged(): void;
     setupCellDataChangeListener(): void;
-    isModuleAvailable(): boolean;
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;
     private isDataChangeLoggable;

package/src/Strategy/DataChangeHistoryModule.js

@@ -10,6 +10,9 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
         this.api.internalApi.initializeDataChangeHistory();
         this.checkListenToCellDataChanged();
     }
+    getAgGridModuleDependencies() {
+        return ['ClientSideRowModelModule'];
+    }
     shouldListenToDataChanges() {
         return this.api.dataChangeHistoryApi.getDataChangeHistoryMode() === 'ACTIVE';
     }
@@ -30,16 +33,6 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
             }
         });
     }
-    isModuleAvailable() {
-        const isAdaptableModuleAvailable = super.isModuleAvailable();
-        const isAgGridModuleAvailable = this.api.internalApi
-            .getAdaptableInstance()
-            .agGridAdapter.isAgGridModuleRegistered('ClientSideRowModel');
-        if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
-            this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ClientSideRowModel`);
-        }
-        return isAdaptableModuleAvailable && isAgGridModuleAvailable;
-    }
     getPopupMaxWidth() {
         return 1000;
     }

package/src/Strategy/DataImportModule.js

@@ -5,18 +5,18 @@ export class DataImportModule extends AdaptableModuleBase {
         super(ModuleConstants.DataImportModuleId, ModuleConstants.DataImportFriendyName, 'import', 'DataImportPopup', 'Import Data', api);
     }
     createModuleMenuItem(source) {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             return this.createDataImportMenuItem(source);
         }
     }
     createContextMenuItems() {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             return [this.createDataImportMenuItem('ContextMenu')];
         }
         return undefined;
     }
     createColumnMenuItems() {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             return [this.createDataImportMenuItem('ColumnMenu')];
         }
     }

package/src/Strategy/ExportModule.js

@@ -30,7 +30,7 @@ export class ExportModule extends AdaptableModuleBase {
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
     createContextMenuItems(menuContext) {
-        const canExport = !menuContext.isRowGroupColumn && this.isModuleAvailable();
+        const canExport = !menuContext.isRowGroupColumn && this.isModuleVisible();
         if (!canExport) {
             return;
         }

package/src/Strategy/Fdc3Module.js

@@ -5,7 +5,7 @@ export class Fdc3Module extends AdaptableModuleBase {
         super(ModuleConstants.Fdc3ModuleId, ModuleConstants.Fdc3FriendlyName, 'fdc3', null, 'The FDC3 Module - handles the FDC3 integration', api);
     }
     createContextMenuItems(menuContext) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (menuContext.adaptableColumn && menuContext.rowNode) {

package/src/Strategy/FlashingCellModule.d.ts

@@ -5,7 +5,7 @@ import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
-import { FlashingCellDefinition } from '../types';
+import { FlashingCellDefinition, LayoutExtendedConfig } from '../types';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
 export declare class FlashingCellModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
     private isListeningToCellDataChanges;
@@ -16,9 +16,7 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     setupCellDataChangeListener(): void;
     private getFlashingCellDefinitionsForDataChange;
     private showFlashingCellsForDefinitions;
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
+    getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemDoReduxAction<"separator" | "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">[];
@@ -29,5 +27,5 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     toView(flashingCell: FlashingCellDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
 }

package/src/Strategy/FlashingCellModule.js

@@ -192,7 +192,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
     }
     createContextMenuItems(menuContext) {
         const items = [];
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
+        if (!menuContext.isRowGroupColumn && this.isModuleVisible()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
                 const flashingCellForRow = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue);
                 const flashingCellForCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
@@ -260,7 +260,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
     }
     toViewAll() {
         return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+            includeLayoutNotExtendedObjects: this.showLayoutNonExtendedObjects(),
         }).map((flashingCell) => this.toView(flashingCell));
     }
     getViewProperties() {
@@ -274,7 +274,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
             getEditWizard: () => FlashingCellWizard,
         };
     }
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return true;
     }
 }

package/src/Strategy/FormatColumnModule.d.ts

@@ -6,11 +6,10 @@ import { FormatColumn } from '../AdaptableState/FormatColumnState';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
+import { LayoutExtendedConfig } from '../types';
 export declare class FormatColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
+    getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     getReferencedNamedQueryNames(formatColumn: FormatColumn): string[];
     createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"separator" | "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">[];
@@ -18,5 +17,5 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
 }

package/src/Strategy/FormatColumnModule.js

@@ -10,6 +10,7 @@ import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
+import { getFormatColumnSettingsTargetItems } from './Utilities/FormatColumn/getFormatColumnSettingsTargetItems';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -82,6 +83,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
             abObject: formatColumn,
             items: [
                 getScopeViewItems(formatColumn.Scope, this.api),
+                getFormatColumnSettingsTargetItems(formatColumn),
                 formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),
                 {
                     name: 'Style',
@@ -98,7 +100,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
     }
     toViewAll() {
         return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+            includeLayoutNotExtendedObjects: this.showLayoutNonExtendedObjects(),
         }).map((formatColumn) => this.toView(formatColumn));
     }
     getViewProperties() {
@@ -115,7 +117,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
             },
         };
     }
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return true;
     }
 }

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -12,7 +12,7 @@ export declare class FreeTextColumnModule extends AdaptableModuleBase implements
     shouldListenToDataChanges(): boolean;
     checkListenToCellDataChanged(): void;
     setupCellDataChangeListener(): void;
-    isModuleAvailable(): boolean;
+    isModuleEnabled(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "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">[];

package/src/Strategy/FreeTextColumnModule.js

@@ -34,9 +34,9 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
             }
         });
     }
-    isModuleAvailable() {
+    isModuleEnabled() {
         // FreeTextColumn module doesn't support autogenerated primary keys
-        return super.isModuleAvailable() && !this.api.optionsApi.isAutogeneratePrimaryKey();
+        return !this.api.optionsApi.isAutogeneratePrimaryKey();
     }
     getModuleAdaptableObjects() {
         return this.api.freeTextColumnApi.getFreeTextColumns();

package/src/Strategy/GridInfoModule.js

@@ -8,7 +8,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         return 'Full';
     }
     createColumnMenuItems(column) {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             return [
                 this.createMainMenuItemShowPopup({
                     Name: 'grid-info-show',
@@ -20,7 +20,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             return [
                 this.createMainMenuItemShowPopup({
                     Name: 'grid-info-show',

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

@@ -145,12 +145,16 @@ export interface AdaptableModuleView {
 export interface IModule {
     moduleInfo: ModuleInfo;
     AccessLevel: AccessLevel;
+    logMissingAgGridDepsInfos(): void;
+    setAgGridDepsInfo(): void;
+    isModuleEnabled(): boolean;
+    isModuleAvailable(): boolean;
+    isModuleVisible(): boolean;
+    isModuleEditable(): boolean;
     createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<AdaptableColumnMenuItemName>[] | undefined;
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
     setModuleEntitlement(): void;
-    isModuleAvailable(): boolean;
-    isModuleEditable(): boolean;
     isModuleObjectsShareable(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleAdaptableObjects(): AdaptableObject[];
@@ -159,7 +163,7 @@ export interface IModule {
     getModuleCalculatedColumnReferences(): CalculatedColumn[];
     getModuleFreeTextColumnReferences(): FreeTextColumn[];
     getPopupMaxWidth(): number | undefined;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
     /**
      * The following view options are used to render adaptable objects and
      * module general views.

package/src/Strategy/LayoutModule.js

@@ -71,36 +71,36 @@ export class LayoutModule extends AdaptableModuleBase {
         const teamSharingReferences = super.getTeamSharingReferences(adaptableObject);
         const layoutName = adaptableObject.Name;
         if (this.api.layoutApi.internalApi.hasLayoutSpecificObjects() && !!layoutName) {
-            const layoutAssociatedObjectReferences = [];
+            const LayoutExtensionObjectReferences = [];
             const loadConfig = {
-                associatedWithLayout: layoutName,
+                extendedLayoutName: layoutName,
             };
             // we ensured that there are layout specific objects, so all the "getAll*()" api methods will return only the objects available in the current layout
-            this.api.alertApi.getAlertDefinitions(loadConfig).forEach((alertDefinition) => layoutAssociatedObjectReferences.push({
+            this.api.alertApi.getAlertDefinitions(loadConfig).forEach((alertDefinition) => LayoutExtensionObjectReferences.push({
                 Reference: alertDefinition,
                 Module: 'Alert',
             }));
-            this.api.customSortApi.getCustomSorts(loadConfig).forEach((customSort) => layoutAssociatedObjectReferences.push({
+            this.api.customSortApi.getCustomSorts(loadConfig).forEach((customSort) => LayoutExtensionObjectReferences.push({
                 Reference: customSort,
                 Module: 'CustomSort',
             }));
-            this.api.flashingCellApi.getFlashingCellDefinitions(loadConfig).forEach((flashingCell) => layoutAssociatedObjectReferences.push({
+            this.api.flashingCellApi.getFlashingCellDefinitions(loadConfig).forEach((flashingCell) => LayoutExtensionObjectReferences.push({
                 Reference: flashingCell,
                 Module: 'FlashingCell',
             }));
-            this.api.formatColumnApi.getFormatColumns(loadConfig).forEach((formatColumn) => layoutAssociatedObjectReferences.push({
+            this.api.formatColumnApi.getFormatColumns(loadConfig).forEach((formatColumn) => LayoutExtensionObjectReferences.push({
                 Reference: formatColumn,
                 Module: 'FormatColumn',
             }));
-            this.api.styledColumnApi.getStyledColumns(loadConfig).forEach((styledcolumn) => layoutAssociatedObjectReferences.push({
+            this.api.styledColumnApi.getStyledColumns(loadConfig).forEach((styledcolumn) => LayoutExtensionObjectReferences.push({
                 Reference: styledcolumn,
                 Module: 'StyledColumn',
             }));
-            this.api.plusMinusApi.getAllPlusMinus(loadConfig).forEach((plusMinusNudge) => layoutAssociatedObjectReferences.push({
+            this.api.plusMinusApi.getAllPlusMinus(loadConfig).forEach((plusMinusNudge) => LayoutExtensionObjectReferences.push({
                 Reference: plusMinusNudge,
                 Module: 'PlusMinus',
             }));
-            this.api.shortcutApi.getShortcuts(loadConfig).forEach((shortcut) => layoutAssociatedObjectReferences.push({
+            this.api.shortcutApi.getShortcuts(loadConfig).forEach((shortcut) => LayoutExtensionObjectReferences.push({
                 Reference: shortcut,
                 Module: 'Shortcut',
             }));
@@ -109,11 +109,11 @@ export class LayoutModule extends AdaptableModuleBase {
                 ...this.api.scheduleApi.getReminderSchedules(loadConfig),
                 ...this.api.scheduleApi.getIPushPullSchedules(loadConfig),
                 ...this.api.scheduleApi.getOpenFinSchedules(loadConfig),
-            ].forEach((schedule) => layoutAssociatedObjectReferences.push({
+            ].forEach((schedule) => LayoutExtensionObjectReferences.push({
                 Reference: schedule,
                 Module: 'Schedule',
             }));
-            teamSharingReferences.push(...layoutAssociatedObjectReferences);
+            teamSharingReferences.push(...LayoutExtensionObjectReferences);
         }
         return teamSharingReferences;
     }

package/src/Strategy/NoteModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class NoteModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    isModuleAvailable(): boolean;
+    isModuleEnabled(): boolean;
     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

@@ -4,15 +4,15 @@ export class NoteModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.NoteModuleId, ModuleConstants.NoteFriendlyName, 'note', 'NotePopup', 'Notes', api);
     }
-    isModuleAvailable() {
+    isModuleEnabled() {
         // Note module doesn't support autogenerated primary keys
-        return super.isModuleAvailable() && !this.api.optionsApi.isAutogeneratePrimaryKey();
+        return !this.api.optionsApi.isAutogeneratePrimaryKey();
     }
     getModuleAdaptableObjects() {
         return this.api.noteApi.getAllNotes();
     }
     createContextMenuItems(menuContext) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (!this.api.noteApi.internalApi.areNotesSupported()) {

package/src/Strategy/PlusMinusModule.d.ts

@@ -7,13 +7,12 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IPlusMinusModule } from './Interface/IPlusMinusModule';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableObjectView, AdaptableModuleView } from './Interface/IModule';
+import { LayoutExtendedConfig } from '../types';
 export declare class PlusMinusModule extends AdaptableModuleBase implements IPlusMinusModule {
     private shouldHandleKeyDown;
     private adaptable;
     constructor(api: AdaptableApi);
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
+    getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
     onAdaptableReady(): void;
@@ -29,5 +28,5 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     toView(plusMinus: PlusMinusNudge): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
 }

package/src/Strategy/PlusMinusModule.js

@@ -218,7 +218,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
     }
     toViewAll() {
         return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+            includeLayoutNotExtendedObjects: this.showLayoutNonExtendedObjects(),
         }).map((plusMinus) => this.toView(plusMinus));
     }
     getViewProperties() {
@@ -235,7 +235,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
             },
         };
     }
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return true;
     }
 }

package/src/Strategy/QuickSearchModule.d.ts

@@ -1,8 +1,10 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
+import { AgModuleName } from 'ag-grid-enterprise';
 export declare class QuickSearchModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    protected getAgGridModuleDependencies(): AgModuleName[];
     getViewProperties(): AdaptableModuleView;
     onAdaptableReady(): void;
 }

package/src/Strategy/QuickSearchModule.js

@@ -6,6 +6,9 @@ export class QuickSearchModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.QuickSearchModuleId, ModuleConstants.QuickSearchFriendlyName, 'search-table', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
     }
+    getAgGridModuleDependencies() {
+        return ['FindModule'];
+    }
     getViewProperties() {
         return {
             getStatusBarPanelProps() {
@@ -18,6 +21,12 @@ export class QuickSearchModule extends AdaptableModuleBase {
     onAdaptableReady() {
         const { api } = this;
         const { internalApi, agGridApi } = api;
+        // Check for AG Grid QuickFilterModule if running Filter After Quick Search
+        if (api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch) {
+            if (!api.internalApi.getAgGridModulesAdapter().isAgGridModuleRegistered('QuickFilterModule')) {
+                api.consoleError('The AG Grid "GridFilter" Module is required if running Quick Search as Filter; Quick Search will run but no Filters will be applied');
+            }
+        }
         const isServerSideRowModel = agGridApi.getGridOption('rowModelType') === 'serverSide';
         if (isServerSideRowModel &&
             internalApi.getAdaptableState().QuickSearch.CellMatchStyle === undefined) {