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

package/src/Api/ActionApi.d.ts

@@ -0,0 +1,24 @@
+import { ActionColumn } from '../../types';
+/**
+ * A large range of column-related functions in AdapTable
+ */
+export interface ActionApi {
+    /**
+     * Retrieves any Action Columns (provided in User Interface Options)
+     */
+    getAllActionColumn(): ActionColumn[];
+    /**
+     * Open edit dialog for row with the given primary key value
+     * @param primaryKey - the primary key of the edited row
+     */
+    displayEditActionRow(primaryKey: any): void;
+    /**
+     * Open create dialog for a new row
+     */
+    displayCreateActionRow(): void;
+    /**
+     * Open create dialog for cloning an existing row
+     * @param clonedRowNodePrimaryKey - the primary key of the duplicated row
+     */
+    displayCloneActionRow(clonedRowNodePrimaryKey?: any): void;
+}

package/src/Api/AdaptableApi.d.ts

@@ -29,6 +29,7 @@ import { QueryApi } from './QueryApi';
 import { QueryLanguageApi } from './QueryLanguageApi';
 import { TeamSharingApi } from './TeamSharingApi';
 import { ColumnApi } from './ColumnApi';
+import { ActionApi } from './ActionApi';
 import { ApplicationApi } from './ApplicationApi';
 import { ScopeApi } from './ScopeApi';
 import { PredicateApi } from './PredicateApi';
@@ -44,6 +45,10 @@ import { StatusBarApi } from './StatusBarApi';
  * Has a huge number of classes each dedicated to a specific AdapTable Module or functionality
  */
 export interface AdaptableApi {
+    /**
+     * Provides access to Action Rows and Columns
+     */
+    actionApi: ActionApi;
     /**
      * Provides access to the Alert Module
      */

package/src/Api/ConfigApi.d.ts

@@ -33,7 +33,7 @@ export interface ConfigApi {
      */
     setAdaptableStateKey(adaptableStateKey: string, config?: {
         predefinedConfig: PredefinedConfig;
-    }): PromiseLike<any>;
+    }): PromiseLike<void>;
     /**
      * Returns current Predefined Config
      */

package/src/Api/EventApi.d.ts

@@ -14,7 +14,7 @@ import { AdaptableStateChangedInfo } from './Events/AdaptableStateChanged';
 import { FlashingCellDisplayedInfo } from './Events/FlashingCellDisplayed';
 import { GridDataChangedInfo } from './Events/GridDataChanged';
 import { TeamSharingEntityChangedInfo } from './Events/TeamSharingEntityChanged';
-import { RowFormSubmittedInfo } from './Events/RowFormSubmitted';
+import { ActionRowSubmittedInfo } from './Events/ActionRowSubmitted';
 import { DataSetChangedInfo } from './Events/DataSetChanged';
 /**
  * Responsible for publishing the many Events that AdapTable fires
@@ -196,18 +196,18 @@ export interface EventApi {
      */
     off(eventName: 'LiveDataChanged', callback: (liveDataChangedInfo: LiveDataChangedInfo) => void): void;
     /**
-     * Event fired when a Row Form is submitted
+     * Event fired when an Action Row is submitted
      *
-     * @param eventName RowFormSubmitted
-     * @param callback RowFormSubmittedInfo
+     * @param eventName ActionRowSubmitted
+     * @param callback ActionRowSubmittedInfo
      */
-    on(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): () => void;
+    on(eventName: 'ActionRowSubmitted', callback: (actionRowSubmittedInfo: ActionRowSubmittedInfo) => void): () => void;
     /**
-     * Unsubscribe from RowFormSubmitted
-     * @param eventName RowFormSubmitted
+     * Unsubscribe from ActionRowSubmitted
+     * @param eventName ActionRowSubmitted
      * @param callback
      */
-    off(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): void;
+    off(eventName: 'ActionRowSubmitted', callback: (actionRowSubmittedInfo: ActionRowSubmittedInfo) => void): void;
     /**
      * Event fired when a DataSet is changed
      *
@@ -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' | 'RowFormSubmitted' | 'DataSetChanged', data?: any): Promise<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>;
     destroy(): void;
 }

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

@@ -0,0 +1,58 @@
+import { BaseEventInfo } from './BaseEventInfo';
+import { AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
+import { RowNode } from '@ag-grid-community/all-modules';
+/**
+ * Info passed into ActionRowSubmitted Event - can be `CreatedActionRowInfo` or `EditedActionRowInfo` or `DeletedActionRowInfo`
+ */
+export declare type ActionRowSubmittedInfo = CreatedActionRowInfo | EditedActionRowInfo | DeletedActionRowInfo;
+/**
+ * Type of Action Row - Created, Edited or Deleted
+ */
+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/ActionRowSubmitted.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/GridApi.d.ts

@@ -464,18 +464,4 @@ export interface GridApi {
      * Opens Settings Panel with Grid Info section selected and visible
      */
     showGridInfoPopup(): void;
-    /**
-     * Open edit dialog for row with the given primary key value
-     * @param primaryKey - the primary key of the edited row
-     */
-    openEditRowForm(primaryKey: any): void;
-    /**
-     * Open create dialog for a new row
-     */
-    openCreateRowForm(): void;
-    /**
-     * Open create dialog for cloning an existing row
-     * @param clonedRowNodePrimaryKey - the primary key of the duplicated row
-     */
-    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
 }

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

@@ -0,0 +1,8 @@
+import { ActionApi, ActionColumn } from '../../../types';
+import { ApiBase } from './ApiBase';
+export declare class ActionApiImpl extends ApiBase implements ActionApi {
+    getAllActionColumn(): ActionColumn[];
+    displayEditActionRow(primaryKey: any): void;
+    displayCreateActionRow(duplicatedRowNodePrimaryKey?: any): void;
+    displayCloneActionRow(clonedRowNodePrimaryKey?: any): void;
+}

package/src/Api/Implementation/ActionApiImpl.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionApiImpl = void 0;
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ApiBase_1 = require("./ApiBase");
+class ActionApiImpl extends ApiBase_1.ApiBase {
+    getAllActionColumn() {
+        var _a;
+        return (_a = this.getActionOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
+    }
+    displayEditActionRow(primaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
+        }
+        const editForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowEditForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'edit_row_form',
+            Form: editForm,
+            // formProps are added to the formContext
+            FormProps: {
+                rowNode,
+            },
+        }));
+    }
+    displayCreateActionRow(duplicatedRowNodePrimaryKey) {
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm();
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+        }));
+    }
+    displayCloneActionRow(clonedRowNodePrimaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(clonedRowNodePrimaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT clone row: rowNode not found for primaryKey ${clonedRowNodePrimaryKey}`);
+        }
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+            // formProps are added to the formContext
+            FormProps: {
+                clonedRowNode: rowNode,
+            },
+        }));
+    }
+}
+exports.ActionApiImpl = ActionApiImpl;

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

@@ -38,8 +38,10 @@ import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
 import { StatusBarApi } from '../StatusBarApi';
+import { ActionApi } from '../../../types';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
+    actionApi: ActionApi;
     applicationApi: ApplicationApi;
     alertApi: AlertApi;
     flashingCellApi: FlashingCellApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -40,11 +40,13 @@ const QueryLanguageApiImpl_1 = require("./QueryLanguageApiImpl");
 const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
 const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
+const ActionApiImpl_1 = require("./ActionApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
         this.destroyed = false;
         this.adaptable = adaptable;
+        this.actionApi = new ActionApiImpl_1.ActionApiImpl(adaptable);
         this.applicationApi = new ApplicationApiImpl_1.ApplicationApiImpl(adaptable);
         this.alertApi = new AlertApiImpl_1.AlertApiImpl(adaptable);
         this.flashingCellApi = new FlashingCellApiImpl_1.FlashingCellApiImpl(adaptable);

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 { 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
@@ -46,6 +50,7 @@ export declare abstract class ApiBase {
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
     protected getOptions(): AdaptableOptions;
+    protected getActionOptions(): ActionOptions;
     protected getColumnOptions(): ColumnOptions;
     protected getContainerOptions(): ContainerOptions;
     protected getNotificationsOptions(): NotificationsOptions;
@@ -67,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
@@ -74,6 +81,9 @@ class ApiBase {
     getOptions() {
         return this.adaptable.adaptableOptions;
     }
+    getActionOptions() {
+        return this.getOptions().actionOptions;
+    }
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -76,8 +76,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.userInterfaceApi
-            .getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
+        return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
+            null);
     }
     isFormatNumericStyleColumn(column) {
         if (column) {

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

@@ -39,7 +39,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     setAdaptableStateKey(adaptableStateKey: string, config?: {
         predefinedConfig: PredefinedConfig;
         flushCurrentState?: boolean;
-    }): Promise<any>;
+    }): Promise<void>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;
     getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;

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

@@ -103,9 +103,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     refreshRowNode(rowNode: RowNode): void;
     refreshRowNodes(rowNodes: RowNode[]): void;
     areCellsEditable(gridCells: GridCell[]): boolean;
-    openEditRowForm(primaryKey: any): void;
-    openCreateRowForm(duplicatedRowNodePrimaryKey?: any): void;
-    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
     getRowCount(): number;
     getVisibleRowCount(): number;
     getRowsInViewport(): RowNode[];

package/src/Api/Implementation/GridApiImpl.js

@@ -7,7 +7,6 @@ const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Grid
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
-const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -373,49 +372,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
         return true;
     }
-    openEditRowForm(primaryKey) {
-        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
-        if (!rowNode) {
-            LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
-        }
-        const editForm = this.adaptable.api.internalApi
-            .getRowEditService()
-            .buildRowEditForm(rowNode);
-        this.dispatchAction(PopupRedux_1.PopupShowForm({
-            Id: 'edit_row_form',
-            Form: editForm,
-            // formProps are added to the formContext
-            FormProps: {
-                rowNode,
-            },
-        }));
-    }
-    openCreateRowForm(duplicatedRowNodePrimaryKey) {
-        const createForm = this.adaptable.api.internalApi
-            .getRowEditService()
-            .buildRowCreateForm();
-        this.dispatchAction(PopupRedux_1.PopupShowForm({
-            Id: 'create_row_form',
-            Form: createForm,
-        }));
-    }
-    openCloneRowForm(clonedRowNodePrimaryKey) {
-        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(clonedRowNodePrimaryKey);
-        if (!rowNode) {
-            LoggingHelper_1.LogAdaptableWarning(`Can NOT clone row: rowNode not found for primaryKey ${clonedRowNodePrimaryKey}`);
-        }
-        const createForm = this.adaptable.api.internalApi
-            .getRowEditService()
-            .buildRowCreateForm(rowNode);
-        this.dispatchAction(PopupRedux_1.PopupShowForm({
-            Id: 'create_row_form',
-            Form: createForm,
-            // formProps are added to the formContext
-            FormProps: {
-                clonedRowNode: rowNode,
-            },
-        }));
-    }
     getRowCount() {
         return this.adaptable.getRowCount();
     }

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);