@adaptabletools/adaptable 12.0.0-canary.5 → 12.0.0-canary.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.0-canary.5",
+  "version": "12.0.0-canary.6",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1655288118527;
+declare const _default: 1655383572755;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1655288118527;
+exports.default = 1655383572755;

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -67,23 +67,23 @@ export interface LayoutOptions {
 }
 export interface LayoutTagOptions {
     /**
-     * Automatically generate an Object Tag for each Layout
+     * Automatically generate an AdaptableObjectTag for each Layout
      *
      * @defaultValue false
      */
     autoGenerateTagsForLayouts?: boolean | ((context: AutoGenerateTagsForLayoutsContext) => AdaptableObjectTag[]);
     /**
-     * Checks if the provided Adaptable Object is available in the given Layout
+     * Automatically assumes that any `LayoutAssociatedObject` is available in the current Layout if it has a tag with the Layouts name (or no tags at all)
      *
-     * @defaultValue undefined
+     * @defaultValue false
      */
-    isObjectAvailableInLayout?: (context: LayoutAvailableContext) => boolean;
+    autoCheckTagsForLayouts?: boolean;
     /**
-     * Automatically checks if Adaptable Objects Tags are available in current Layout
+     * Checks if the provided Adaptable Object is available in the given Layout
      *
-     * @defaultValue false
+     * @defaultValue undefined
      */
-    autoCheckTagsForLayouts?: boolean;
+    isObjectAvailableInLayout?: (context: LayoutAvailableContext) => boolean;
 }
 /**
  * Customize how Layouts are displayed in Settings Panel

package/src/Api/Events/ActionRowSubmitted.d.ts

@@ -13,22 +13,46 @@ export declare type ActionRowType = 'rowCreated' | 'rowEdited' | 'rowDeleted';
  *  Info passed into ActionRowSubmitted Event for Created Rows
  */
 export interface CreatedActionRowInfo extends BaseEventInfo {
+    /**
+     * Specifies its a Created Action Row
+     */
     type: 'rowCreated';
+    /**
+     * Data entered in the Form
+     */
     formData: AdaptableFormData;
+    /**
+     * Node being cloned
+     */
     clonedRowNode?: RowNode;
 }
 /**
  * Info passed into ActionRowSubmitted Event for Edited Rows
  */
 export interface EditedActionRowInfo extends BaseEventInfo {
+    /**
+     * Specifies its an Edited Action Row
+     */
     type: 'rowEdited';
+    /**
+     * Data entered in the Form
+     */
     formData: AdaptableFormData;
+    /**
+     * Node being edited
+     */
     rowNode: RowNode;
 }
 /**
  * Info passed into ActionRowSubmitted Event for Deleted Rows
  */
 export interface DeletedActionRowInfo extends BaseEventInfo {
+    /**
+     * Specifies its a Deleted Action Row
+     */
     type: 'rowDeleted';
+    /**
+     * Node being deleted
+     */
     rowNode: RowNode;
 }

package/src/Api/Implementation/AlertApiImpl.d.ts

@@ -1,4 +1,4 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { AlertApi } from '../AlertApi';
 import { AlertState, AlertDefinition, AlertProperties, AdaptableAlertAction, AlertButton } from '../../PredefinedConfig/AlertState';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
@@ -12,9 +12,7 @@ import { GridDataChangedInfo } from '../Events/GridDataChanged';
 export declare class AlertApiImpl extends ApiBase implements AlertApi {
     getAlertState(): AlertState;
     getAdaptableFormByName(name: string): AdaptableForm<AlertFormContext> | undefined;
-    getAlertDefinitions(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AlertDefinition[];
+    getAlertDefinitions(config?: LayoutAssociatedObjectLoadConfig): AlertDefinition[];
     getAlertDefinitionById(id: AlertDefinition['Uuid']): AlertDefinition;
     getNonReactiveAlertDefinitions(): AlertDefinition[];
     getActiveNonReactiveAlertDefinitions(): AlertDefinition[];

package/src/Api/Implementation/AlertApiImpl.js

@@ -21,9 +21,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         return (_a = alertForms.find((f) => f.name === name)) === null || _a === void 0 ? void 0 : _a.form;
     }
     getAlertDefinitions(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getAlertState().AlertDefinitions) === null || _a === void 0 ? void 0 : _a.filter((alertDefinition) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(alertDefinition, 'Alert'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getAlertState().AlertDefinitions, 'Alert', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAlertDefinitionById(id) {
         return this.getAlertDefinitions().find((alert) => (alert === null || alert === void 0 ? void 0 : alert.Uuid) === id);

package/src/Api/Implementation/ApiBase.d.ts

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionOptions, ContainerOptions, DashboardOptions, EditOptions, FilterOptions, GeneralOptions, LayoutOptions, MenuOptions, SearchOptions, StateOptions, TeamSharingOptions, UserInterfaceOptions } from '../../types';
+import { ActionOptions, ContainerOptions, DashboardOptions, EditOptions, FilterOptions, GeneralOptions, LayoutAssociatedObject, LayoutOptions, MenuOptions, SearchOptions, StateOptions, TeamSharingOptions, UserInterfaceOptions } from '../../types';
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
@@ -31,6 +31,10 @@ export declare abstract class ApiBase {
      */
     protected checkItemExists(item: any, name: string, type: string): boolean;
     protected checkArrayExists(array: any): boolean;
+    protected handleLayoutAssociatedObjects<T extends LayoutAssociatedObject>(associatedObjects: T[], module: AdaptableModule, config?: {
+        includeLayoutNotAssociatedObjects?: boolean;
+        associatedWithLayout?: string;
+    }): T[];
     /**
      * Base api Helper method that dispatches a *Redux Action* to the Store
      * @param action the Redux Action to be dispatched
@@ -68,3 +72,10 @@ export declare abstract class ApiBase {
     protected getAdaptableApi(): AdaptableApi;
     destroy(): void;
 }
+/**
+ * Configuration for API methods which load `LayoutAssociatedObject`
+ */
+export interface LayoutAssociatedObjectLoadConfig {
+    includeLayoutNotAssociatedObjects?: boolean;
+    associatedWithLayout?: string;
+}

package/src/Api/Implementation/ApiBase.js

@@ -37,6 +37,13 @@ class ApiBase {
         }
         return true;
     }
+    handleLayoutAssociatedObjects(associatedObjects = [], module, config) {
+        const associatedLayout = (config === null || config === void 0 ? void 0 : config.associatedWithLayout)
+            ? this.adaptable.api.layoutApi.getLayoutByName(config.associatedWithLayout)
+            : this.getAdaptableApi().layoutApi.getCurrentLayout();
+        return associatedObjects.filter((associatedObject) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
+            this.adaptable.api.internalApi.isObjectAvailableInLayout(associatedObject, module, associatedLayout));
+    }
     /**
      * Base api Helper method that dispatches a *Redux Action* to the Store
      * @param action the Redux Action to be dispatched

package/src/Api/Implementation/ConditionalStyleApiImpl.d.ts

@@ -1,13 +1,11 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { ConditionalStyleApi } from '../ConditionalStyleApi';
 import { ConditionalStyleState, ConditionalStyle } from '../../PredefinedConfig/ConditionalStyleState';
 import { AdaptableColumn, AdaptableScope } from '../../types';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 export declare class ConditionalStyleApiImpl extends ApiBase implements ConditionalStyleApi {
     getConditionalStyleState(): ConditionalStyleState;
-    getAllConditionalStyle(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): ConditionalStyle[];
+    getAllConditionalStyle(config?: LayoutAssociatedObjectLoadConfig): ConditionalStyle[];
     getAllActiveConditionalStyle(): ConditionalStyle[];
     getConditionalStyleById(id: ConditionalStyle['Uuid']): ConditionalStyle;
     getAllSuspendedConditionalStyle(): ConditionalStyle[];

package/src/Api/Implementation/ConditionalStyleApiImpl.js

@@ -10,9 +10,8 @@ class ConditionalStyleApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().ConditionalStyle;
     }
     getAllConditionalStyle(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getConditionalStyleState().ConditionalStyles) === null || _a === void 0 ? void 0 : _a.filter((conditionalStyle) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(conditionalStyle, 'ConditionalStyle'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getConditionalStyleState().ConditionalStyles, 'ConditionalStyle', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveConditionalStyle() {
         return this.getAllConditionalStyle().filter((style) => !style.IsSuspended);

package/src/Api/Implementation/CustomSortApiImpl.d.ts

@@ -1,11 +1,9 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { CustomSortApi } from '../CustomSortApi';
 import { CustomSortState, CustomSort } from '../../PredefinedConfig/CustomSortState';
 export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi {
     getCustomSortState(): CustomSortState;
-    getAllCustomSort(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): CustomSort[];
+    getAllCustomSort(config?: LayoutAssociatedObjectLoadConfig): CustomSort[];
     getCustomSortById(id: CustomSort['Uuid']): CustomSort;
     getAllActiveCustomSort(): CustomSort[];
     getAllSuspendedCustomSort(): CustomSort[];

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -10,9 +10,8 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().CustomSort;
     }
     getAllCustomSort(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getCustomSortState().CustomSorts) === null || _a === void 0 ? void 0 : _a.filter((customSort) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(customSort, 'CustomSort'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getCustomSortState().CustomSorts, 'CustomSort', config)) !== null && _a !== void 0 ? _a : []);
     }
     getCustomSortById(id) {
         return this.getAllCustomSort().find((customSort) => customSort.Uuid === id);

package/src/Api/Implementation/FlashingCellApiImpl.d.ts

@@ -1,4 +1,4 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
@@ -6,9 +6,7 @@ import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePr
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 export declare class FlashingCellApiImpl extends ApiBase implements FlashingCellApi {
     getFlashingCellState(): FlashingCellState;
-    getFlashingCellDefinitions(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): FlashingCellDefinition[];
+    getFlashingCellDefinitions(config?: LayoutAssociatedObjectLoadConfig): FlashingCellDefinition[];
     mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     getFlashingCellDefinitionById(id: FlashingCellDefinition['Uuid']): FlashingCellDefinition;
     getActiveFlashingCellDefinitions(): FlashingCellDefinition[];

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -10,9 +10,8 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().FlashingCell;
     }
     getFlashingCellDefinitions(config) {
-        var _a, _b;
-        const flashingCellDefinitions = (_b = (_a = this.getFlashingCellState().FlashingCellDefinitions) === null || _a === void 0 ? void 0 : _a.filter((flashingCellDefinition) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(flashingCellDefinition, 'FlashingCell'))) !== null && _b !== void 0 ? _b : [];
+        var _a;
+        const flashingCellDefinitions = (_a = this.handleLayoutAssociatedObjects(this.getFlashingCellState().FlashingCellDefinitions, 'FlashingCell', config)) !== null && _a !== void 0 ? _a : [];
         return flashingCellDefinitions.map((flashingCellDefinition) => {
             return this.mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition);
         });

package/src/Api/Implementation/FormatColumnApiImpl.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
 import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
@@ -7,9 +7,7 @@ import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableFormat } from '../../types';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     getFormatColumnState(): FormatColumnState;
-    getAllFormatColumn(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): FormatColumn[];
+    getAllFormatColumn(config?: LayoutAssociatedObjectLoadConfig): FormatColumn[];
     getFormatColumnById(id: FormatColumn['Uuid']): FormatColumn;
     getAllActiveFormatColumn(): FormatColumn[];
     getAllSuspendedFormatColumn(): FormatColumn[];

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -14,9 +14,8 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().FormatColumn;
     }
     getAllFormatColumn(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getFormatColumnState().FormatColumns) === null || _a === void 0 ? void 0 : _a.filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(formatColumn, 'FormatColumn'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getFormatColumnState().FormatColumns, 'FormatColumn', config)) !== null && _a !== void 0 ? _a : []);
     }
     getFormatColumnById(id) {
         return this.getAllFormatColumn().find((formatColumn) => formatColumn.Uuid === id);

package/src/Api/Implementation/InternalApiImpl.d.ts

@@ -127,7 +127,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     hideProgressIndicator(): void;
     getCorrectEnglishVariant(wordToSpell: string): string;
     hasLayoutSpecificObjects(): boolean;
-    isObjectAvailableInLayout(object: LayoutAssociatedObject, module: AdaptableModule): boolean;
+    isObjectAvailableInLayout(object: LayoutAssociatedObject, module: AdaptableModule, layout: Layout): boolean;
     showLayoutNotAssociatedObjects(): boolean;
     shouldDisplayTagSections(): boolean;
     getAvailableTags(): AdaptableObjectTag[] | undefined;

package/src/Api/Implementation/InternalApiImpl.js

@@ -121,7 +121,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             ? toFlashingAlert(forPrimaryKey[columnId])
             : toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_CELL_ROW_KEY]);
         if ((adaptableFlashingCell === null || adaptableFlashingCell === void 0 ? void 0 : adaptableFlashingCell.flashingCellDefinition) &&
-            !this.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell')) {
+            !this.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell', this.getAdaptableApi().layoutApi.getCurrentLayout())) {
             return;
         }
         return adaptableFlashingCell;
@@ -494,18 +494,19 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         return false;
     }
-    isObjectAvailableInLayout(object, module) {
+    isObjectAvailableInLayout(object, module, layout) {
+        var _a;
         if (!this.hasLayoutSpecificObjects()) {
             return true;
         }
         const layoutTagOptions = this.getAdaptableOptions().layoutOptions.layoutTagOptions;
         if ((layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.autoCheckTagsForLayouts) == true) {
-            return this.getAdaptableApi().layoutApi.isObjectAvailableInCurrentLayout(object);
+            return ArrayExtensions_1.default.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
         }
         const context = {
             adaptableObject: object,
             module,
-            layout: this.getAdaptableApi().layoutApi.getCurrentLayout(),
+            layout,
             adaptableApi: this.getAdaptableApi(),
         };
         return layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.isObjectAvailableInLayout(context);

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -3,7 +3,6 @@ import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { LayoutAssociatedObject } from '../../types';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -41,7 +40,6 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     isDefaultLayout(layout: Layout): boolean;
     isCurrentLayoutDefault(): boolean;
     areExpandedRowGroupsSavedInLayouts(): boolean;
-    isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -315,12 +315,6 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         return (this.getLayoutOptions().includeExpandedRowGroups ||
             this.getLayoutOptions().displayRowGroups === 'dynamic');
     }
-    isObjectAvailableInCurrentLayout(adaptableObject) {
-        var _a;
-        return ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(adaptableObject.Tags)
-            ? true
-            : (_a = adaptableObject.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => tag).includes(this.getCurrentLayoutName());
-    }
     removeColumnFromCurrentLayout(columnId) {
         this.removeColumnFromLayout(columnId, this.getCurrentLayoutName());
     }

package/src/Api/Implementation/PlusMinusApiImpl.d.ts

@@ -1,12 +1,10 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { PlusMinusState, PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
 import { PlusMinusApi } from '../PlusMinusApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     getPlusMinusState(): PlusMinusState;
-    getAllPlusMinus(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): PlusMinusNudge[];
+    getAllPlusMinus(config?: LayoutAssociatedObjectLoadConfig): PlusMinusNudge[];
     getPlusMinusById(id: PlusMinusNudge['Uuid']): PlusMinusNudge;
     getAllActivePlusMinus(): PlusMinusNudge[];
     getAllSuspendedPlusMinus(): PlusMinusNudge[];

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -10,9 +10,8 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().PlusMinus;
     }
     getAllPlusMinus(config) {
-        var _a, _b;
-        const layoutSpecificPlusMinusNudges = (_b = (_a = this.getPlusMinusState().PlusMinusNudges) === null || _a === void 0 ? void 0 : _a.filter((plusMinusNudge) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(plusMinusNudge, 'PlusMinus'))) !== null && _b !== void 0 ? _b : [];
+        var _a;
+        const layoutSpecificPlusMinusNudges = (_a = this.handleLayoutAssociatedObjects(this.getPlusMinusState().PlusMinusNudges, 'PlusMinus', config)) !== null && _a !== void 0 ? _a : [];
         return layoutSpecificPlusMinusNudges.filter((plusMinusNudge) => plusMinusNudge.Rule == undefined || plusMinusNudge.Rule.BooleanExpression != undefined);
     }
     getPlusMinusById(id) {

package/src/Api/Implementation/ScheduleApiImpl.d.ts

@@ -1,4 +1,4 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { ScheduleApi } from '../ScheduleApi';
 import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
 import { ReportSchedule } from '../../PredefinedConfig/ExportState';
@@ -9,9 +9,7 @@ import { ReminderSchedule, ScheduleState } from '../../PredefinedConfig/Schedule
 export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     getScheduleState(): ScheduleState;
     getAllSchedule(): BaseSchedule[];
-    getAllReminderSchedule(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): ReminderSchedule[];
+    getAllReminderSchedule(config?: LayoutAssociatedObjectLoadConfig): ReminderSchedule[];
     getScheduleById(id: BaseSchedule['Uuid']): BaseSchedule;
     getAllActiveReminderSchedule(): ReminderSchedule[];
     getAllSuspendedReminderSchedule(): ReminderSchedule[];
@@ -20,9 +18,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     editReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     suspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     unSuspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
-    getAllReportSchedule(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): ReportSchedule[];
+    getAllReportSchedule(config?: LayoutAssociatedObjectLoadConfig): ReportSchedule[];
     getAllActiveReportSchedule(): ReportSchedule[];
     getAllSuspendedReportSchedule(): ReportSchedule[];
     addReportSchedule(schedule: ReportSchedule): ReportSchedule;
@@ -30,9 +26,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     deleteReportSchedule(schedule: ReportSchedule): void;
     suspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
     unSuspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
-    getAllIPushPullSchedule(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): IPushPullSchedule[];
+    getAllIPushPullSchedule(config?: LayoutAssociatedObjectLoadConfig): IPushPullSchedule[];
     getAllActiveIPushPullSchedule(): IPushPullSchedule[];
     getAllSuspendedIPushPullSchedule(): IPushPullSchedule[];
     addIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
@@ -40,9 +34,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     deleteIPushPullSchedule(schedule: IPushPullSchedule): void;
     suspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
     unSuspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
-    getAllGlue42Schedule(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): Glue42Schedule[];
+    getAllGlue42Schedule(config?: LayoutAssociatedObjectLoadConfig): Glue42Schedule[];
     getAllActiveGlue42Schedule(): Glue42Schedule[];
     getAllSuspendedGlue42Schedule(): Glue42Schedule[];
     addGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
@@ -50,9 +42,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     deleteGlue42Schedule(schedule: Glue42Schedule): void;
     suspendGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
     unSuspendGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
-    getAllOpenFinSchedule(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): OpenFinSchedule[];
+    getAllOpenFinSchedule(config?: LayoutAssociatedObjectLoadConfig): OpenFinSchedule[];
     getAllActiveOpenFinSchedule(): OpenFinSchedule[];
     getAllSuspendedOpenFinSchedule(): OpenFinSchedule[];
     addOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -19,9 +19,8 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return allSchedules;
     }
     getAllReminderSchedule(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getScheduleState().Reminders) === null || _a === void 0 ? void 0 : _a.filter((schedule) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(schedule, 'Schedule'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getScheduleState().Reminders, 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getScheduleById(id) {
         return this.getAllSchedule().find((schedule) => (schedule === null || schedule === void 0 ? void 0 : schedule.Uuid) === id);
@@ -52,10 +51,8 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllReportSchedule(config) {
-        var _a, _b;
-        return ((_b = (_a = this.adaptable.api.exportApi
-            .getReportSchedules()) === null || _a === void 0 ? void 0 : _a.filter((schedule) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(schedule, 'Schedule'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.adaptable.api.exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveReportSchedule() {
         return this.getAllReportSchedule().filter((schedule) => !schedule.IsSuspended);
@@ -83,10 +80,9 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllIPushPullSchedule(config) {
-        var _a, _b;
+        var _a;
         const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
-        return ((_b = (_a = ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules()) === null || _a === void 0 ? void 0 : _a.filter((schedule) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(schedule, 'Schedule'))) !== null && _b !== void 0 ? _b : []);
+        return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveIPushPullSchedule() {
         return this.getAllIPushPullSchedule().filter((schedule) => !schedule.IsSuspended);
@@ -114,10 +110,9 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllGlue42Schedule(config) {
-        var _a, _b;
+        var _a;
         const glue42Api = this.adaptable.api.pluginsApi.getGlue42PluginApi();
-        return ((_b = (_a = glue42Api === null || glue42Api === void 0 ? void 0 : glue42Api.getGlue42Schedules()) === null || _a === void 0 ? void 0 : _a.filter((schedule) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(schedule, 'Schedule'))) !== null && _b !== void 0 ? _b : []);
+        return ((_a = this.handleLayoutAssociatedObjects(glue42Api === null || glue42Api === void 0 ? void 0 : glue42Api.getGlue42Schedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveGlue42Schedule() {
         return this.getAllGlue42Schedule().filter((schedule) => !schedule.IsSuspended);
@@ -145,10 +140,9 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllOpenFinSchedule(config) {
-        var _a, _b;
+        var _a;
         const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
-        return ((_b = (_a = openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules()) === null || _a === void 0 ? void 0 : _a.filter((schedule) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(schedule, 'Schedule'))) !== null && _b !== void 0 ? _b : []);
+        return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getAllActiveOpenFinSchedule() {
         return this.getAllOpenFinSchedule().filter((schedule) => !schedule.IsSuspended);

package/src/Api/Implementation/ShortcutApiImpl.d.ts

@@ -1,11 +1,9 @@
-import { ApiBase } from './ApiBase';
+import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { ShortcutApi } from '../ShortcutApi';
 import { ShortcutState, Shortcut } from '../../PredefinedConfig/ShortcutState';
 export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getShortcutState(): ShortcutState;
-    getAllShortcut(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): Shortcut[];
+    getAllShortcut(config?: LayoutAssociatedObjectLoadConfig): Shortcut[];
     getShortcutById(id: Shortcut['Uuid']): Shortcut;
     getAllActiveShortcut(): Shortcut[];
     getAllSuspendedShortcut(): Shortcut[];

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -10,9 +10,8 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Shortcut;
     }
     getAllShortcut(config) {
-        var _a, _b;
-        return ((_b = (_a = this.getShortcutState().Shortcuts) === null || _a === void 0 ? void 0 : _a.filter((shortcut) => (config === null || config === void 0 ? void 0 : config.includeLayoutNotAssociatedObjects) ||
-            this.adaptable.api.internalApi.isObjectAvailableInLayout(shortcut, 'Shortcut'))) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.handleLayoutAssociatedObjects(this.getShortcutState().Shortcuts, 'Shortcut', config)) !== null && _a !== void 0 ? _a : []);
     }
     getShortcutById(id) {
         return this.getAllShortcut().find((shortcut) => (shortcut === null || shortcut === void 0 ? void 0 : shortcut.Uuid) === id);

package/src/Api/InternalApi.d.ts

@@ -126,7 +126,7 @@ export interface InternalApi {
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
     hasLayoutSpecificObjects(): boolean;
-    isObjectAvailableInLayout(object: LayoutAssociatedObject, module: AdaptableModule): boolean;
+    isObjectAvailableInLayout(object: LayoutAssociatedObject, module: AdaptableModule, layout: Layout): boolean;
     showLayoutNotAssociatedObjects(): boolean;
     executeWithProgressIndicator(label: string, executeFn: () => unknown): void;
     hideProgressIndicator(): void;

package/src/Api/LayoutApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, ColumnSort, LayoutAssociatedObject } from '../../types';
+import { AdaptableColumn, ColumnSort } from '../../types';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
@@ -182,11 +182,6 @@ export interface LayoutApi {
      * Returns true if Layouts will contain Expanded Row Groups information
      */
     areExpandedRowGroupsSavedInLayouts(): boolean;
-    /**
-     * Does an object's Tags include the Current Layout
-     * @param adaptableObject object to check
-     */
-    isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
     /**
      * Removes a Column from the Current Layout
      * @param columnId Column to remove

package/src/Redux/Store/AdaptableStore.js

@@ -215,6 +215,9 @@ class AdaptableStore {
         const composeEnhancers = (x) => x;
         const persistedReducer = (state, action) => {
             var _a, _b;
+            if (adaptable.isDestroyed) {
+                return state;
+            }
             const init = state === undefined;
             const newState = rootReducer(state, action);
             // ideally the reducer should be pure,

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

@@ -11,6 +11,7 @@ import { AdaptableOnePageWizardProps } from '../../View/Wizard/Interface/IAdapta
 import * as Redux from 'redux';
 import { SuspendableObject } from '../../../types';
 import { StatusBarPanelProps } from '../../View/StatusBar/StatusBarPanel';
+import { StrictExtract } from '../../Utilities/Extensions/TypeExtensions';
 export interface ModuleInfo {
     ModuleName: AdaptableModule;
     FriendlyName: string;
@@ -21,7 +22,7 @@ export interface ModuleInfo {
 }
 export declare type TeamSharingReferences = TeamSharingReference[];
 export declare type TeamSharingReference = {
-    Module: Extract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query'>;
+    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query' | 'Alert' | 'ConditionalStyle' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
     Reference: AdaptableObject;
 };
 export interface AdaptableObjectItemView {