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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.0-canary.5",
+  "version": "12.0.0-canary.8",
   "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: 1655668818436;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/AdaptableFrameworkComponent.d.ts

@@ -29,6 +29,9 @@ export declare type AngularFrameworkComponent<T = unknown> = {
 export declare type ReactFrameworkComponent = ({ adaptableApi, }: {
     adaptableApi: AdaptableApi;
 }) => ReactElement;
+/**
+ * Context provided for any custom rendering
+ */
 export interface CustomRenderContext {
     visible: boolean;
     element: HTMLDivElement;

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -86,7 +86,7 @@ export interface FDC3Column {
     /**
      * Returns a custom icon to display in the Raise Intent Context Menu Item;
      */
-    getIconForIntent?: (intent: FDC3Intent | CustomFDC3Intent) => AdaptableIcon;
+    intentIcon?: (intent: FDC3Intent | CustomFDC3Intent) => AdaptableIcon;
 }
 /**
  * A Column which will be defined as an FDC3 Instrument

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/DataSetApi.d.ts

@@ -33,8 +33,8 @@ export interface DataSetApi {
      */
     showDataSetPopup(): void;
     /**
-     * Fire the DataSet Changed Event
-     * @param dataSet Data Set which has changed
+     * Fires the DataSet Selected Event
+     * @param dataSet Data Set which has been selected
      */
-    fireDataSetChangeEvent(dataSet: DataSet): void;
+    fireDataSetSelectedEvent(dataSet: DataSet): void;
 }

package/src/Api/EventApi.d.ts

@@ -15,7 +15,7 @@ import { FlashingCellDisplayedInfo } from './Events/FlashingCellDisplayed';
 import { GridDataChangedInfo } from './Events/GridDataChanged';
 import { TeamSharingEntityChangedInfo } from './Events/TeamSharingEntityChanged';
 import { ActionRowSubmittedInfo } from './Events/ActionRowSubmitted';
-import { DataSetChangedInfo } from './Events/DataSetChanged';
+import { DataSetSelectedInfo } from './Events/DataSetSelected';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -209,18 +209,18 @@ export interface EventApi {
      */
     off(eventName: 'ActionRowSubmitted', callback: (actionRowSubmittedInfo: ActionRowSubmittedInfo) => void): void;
     /**
-     * Event fired when a DataSet is changed
+     * Event fired when a DataSet is Selected
      *
-     * @param eventName DataSetChanged
-     * @param callback DataSetChangedInfo
+     * @param eventName DataSetSelected
+     * @param callback DataSetSelectedInfo
      */
-    on(eventName: 'DataSetChanged', callback: (dataSetChangedInfo: DataSetChangedInfo) => void): () => void;
+    on(eventName: 'DataSetSelected', callback: (dataSetSelectedInfo: DataSetSelectedInfo) => void): () => void;
     /**
-     * Unsubscribe from DataSetChanged
-     * @param eventName DataSetChanged
+     * Unsubscribe from DataSetSelected
+     * @param eventName DataSetSelected
      * @param callback
      */
-    off(eventName: 'DataSetChanged', callback: (dataSetChangedInfo: DataSetChangedInfo) => void): void;
+    off(eventName: 'DataSetSelected', callback: (dataSetSelectedInfo: DataSetSelectedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -252,6 +252,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent' | 'ActionRowSubmitted' | 'DataSetChanged', data?: any): Promise<any>;
+    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent' | 'ActionRowSubmitted' | 'DataSetSelected', data?: any): Promise<any>;
     destroy(): void;
 }

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/Events/DataSetSelected.d.ts

@@ -0,0 +1,11 @@
+import { DataSet } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Object returned by the `DataSetSelected` event
+ */
+export interface DataSetSelectedInfo extends BaseEventInfo {
+    /**
+     * The DataSet that has been selected
+     */
+    dataSet: DataSet;
+}

package/src/Api/FilterApi.d.ts

@@ -108,4 +108,11 @@ export interface FilterApi {
      * @param node Row Node to evaluate
      */
     evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
+    /**
+     * Checks if a filter is active or applied.
+     * It is applied when:
+     * - filter predicate does not have inputs
+     * - filter predicate has inputs with values
+     */
+    isFilterActive(columnFilter: ColumnFilter): boolean;
 }

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/DataSetApiImpl.d.ts

@@ -8,5 +8,5 @@ export declare class DataSetApiImpl extends ApiBase implements DataSetApi {
     setDataSet(dataSetName: string): void;
     clearCurrentDataSet(): void;
     showDataSetPopup(): void;
-    fireDataSetChangeEvent(dataSet: DataSet): void;
+    fireDataSetSelectedEvent(dataSet: DataSet): void;
 }

package/src/Api/Implementation/DataSetApiImpl.js

@@ -29,13 +29,13 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
     showDataSetPopup() {
         this.showModulePopup(ModuleConstants.DataSetModuleId);
     }
-    fireDataSetChangeEvent(dataSet) {
+    fireDataSetSelectedEvent(dataSet) {
         if (this.adaptable.isInitialised) {
-            const dataSetChangedInfo = {
+            const dataSetSelectedInfo = {
                 adaptableApi: this.adaptable.api,
                 dataSet,
             };
-            this.adaptable.api.eventApi.emit('DataSetChanged', dataSetChangedInfo);
+            this.adaptable.api.eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }
     }
 }

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

@@ -28,4 +28,12 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
     evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
     private getColumnFilterById;
+    /**
+     * Checks if a filter is applied. It is applied when:
+     * - has no inputs
+     * - has inputs and inputs have values
+     *
+     * @param filter
+     */
+    isFilterActive(filter: ColumnFilter): boolean;
 }

package/src/Api/Implementation/FilterApiImpl.js

@@ -7,6 +7,7 @@ const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/La
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class FilterApiImpl extends ApiBase_1.ApiBase {
     getAllSystemFilterIds() {
         return this.getFilterOptions().systemFilters;
@@ -179,5 +180,29 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         var _a;
         return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
     }
+    /**
+     * Checks if a filter is applied. It is applied when:
+     * - has no inputs
+     * - has inputs and inputs have values
+     *
+     * @param filter
+     */
+    isFilterActive(filter) {
+        const predicateDef = this.adaptable.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
+        if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
+            // values predicates have no inputs in the definition
+            !this.adaptable.api.predicateApi.hasPredicateValues(filter.Predicate)) {
+            return true;
+        }
+        const inputs = filter.Predicate.Inputs;
+        if (ArrayExtensions_1.default.IsEmpty(inputs)) {
+            return false;
+        }
+        // all values in the array need to be non-empty (e.g. between has two values, [min, max])
+        const allInputsHaveValues = inputs.every((value) => {
+            return value !== undefined && value !== null && value !== '';
+        });
+        return allInputsHaveValues;
+    }
 }
 exports.FilterApiImpl = FilterApiImpl;

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/PredicateApiImpl.d.ts

@@ -14,4 +14,5 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
+    hasPredicateValues(predicate: AdaptablePredicate): boolean;
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -96,5 +96,8 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         }
         return predicateId;
     }
+    hasPredicateValues(predicate) {
+        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;