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

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

@@ -12,4 +12,8 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
     shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
     unshareEntity(entityId: string): void;
+    importSharedEntry(sharedEntity: SharedEntity): void;
+    private getTeamSharingState;
+    getLoadedSharedEntities(): SharedEntity[];
+    triggerLoadingTeamSharingEntries(): void;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -69,5 +69,17 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
     }
+    importSharedEntry(sharedEntity) {
+        this.adaptable.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingImportItem(sharedEntity));
+    }
+    getTeamSharingState() {
+        return this.getAdaptableState().TeamSharing;
+    }
+    getLoadedSharedEntities() {
+        return this.getTeamSharingState().SharedEntities;
+    }
+    triggerLoadingTeamSharingEntries() {
+        this.adaptable.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingGet());
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

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

@@ -59,4 +59,10 @@ export interface PredicateApi {
      * @param dataType DataType of Column
      */
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
+    /**
+     * Returns true if the predicate has a dropdown.
+     *
+     * @param predicate
+     */
+    hasPredicateValues(predicate: AdaptablePredicate): boolean;
 }

package/src/Api/TeamSharingApi.d.ts

@@ -54,4 +54,19 @@ export interface TeamSharingApi {
      * @param entityId the ID of the AdaptableObject to be removed from Team Share
      */
     unshareEntity(entityId: string): void;
+    /**
+     * Import shared entry.
+     *
+     * @param sharedEntity shared entry to import
+     */
+    importSharedEntry(sharedEntity: SharedEntity): void;
+    /**
+     * Retrieves already loaded shared entries.
+     */
+    getLoadedSharedEntities(): SharedEntity[];
+    /**
+     * Trigger loading of shared entries.
+     * By default shared entries are loaded when the Team Sharing popup is visible.
+     */
+    triggerLoadingTeamSharingEntries(): void;
 }

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,
@@ -726,7 +729,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_DATA_SET_SELECT: {
                     let returnAction = next(action);
                     const dataSet = adaptable.api.dataSetApi.getCurrentDataSet();
-                    adaptable.api.dataSetApi.fireDataSetChangeEvent(dataSet);
+                    adaptable.api.dataSetApi.fireDataSetSelectedEvent(dataSet);
                     requestAnimationFrame(() => {
                         if (dataSet.form) {
                             middlewareAPI.dispatch(PopupRedux_1.PopupShowForm({

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 {

package/src/Strategy/LayoutModule.d.ts

@@ -4,13 +4,14 @@ import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Commo
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableModuleView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, IModule, TeamSharingReferences } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
+    getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     hasNamedQueryReferences(): boolean;
     handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;

package/src/Strategy/LayoutModule.js

@@ -43,7 +43,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     */
     getModuleAdaptableObjects() {
-        // ignore - triggering build
         return this.api.layoutApi.getAllLayout();
     }
     getExplicitlyReferencedColumnIds(layout) {
@@ -60,6 +59,57 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return Array.from(new Set(columnIds));
     }
+    getTeamSharingReferences(adaptableObject) {
+        const teamSharingReferences = super.getTeamSharingReferences(adaptableObject);
+        const layoutName = adaptableObject.Name;
+        if (this.api.internalApi.hasLayoutSpecificObjects() && !!layoutName) {
+            const layoutAssociatedObjectReferences = [];
+            const loadConfig = {
+                associatedWithLayout: layoutName,
+            };
+            // we ensured that there are layout specific objects, so all the "getAll*()" api methods will return only the objects available in the current layout
+            this.api.alertApi.getAlertDefinitions(loadConfig).forEach((alertDefinition) => layoutAssociatedObjectReferences.push({
+                Reference: alertDefinition,
+                Module: 'Alert',
+            }));
+            this.api.conditionalStyleApi.getAllConditionalStyle(loadConfig).forEach((conditionalStyle) => layoutAssociatedObjectReferences.push({
+                Reference: conditionalStyle,
+                Module: 'ConditionalStyle',
+            }));
+            this.api.customSortApi.getAllCustomSort(loadConfig).forEach((customSort) => layoutAssociatedObjectReferences.push({
+                Reference: customSort,
+                Module: 'CustomSort',
+            }));
+            this.api.flashingCellApi.getFlashingCellDefinitions(loadConfig).forEach((flashingCell) => layoutAssociatedObjectReferences.push({
+                Reference: flashingCell,
+                Module: 'FlashingCell',
+            }));
+            this.api.formatColumnApi.getAllFormatColumn(loadConfig).forEach((formatColumn) => layoutAssociatedObjectReferences.push({
+                Reference: formatColumn,
+                Module: 'FormatColumn',
+            }));
+            this.api.plusMinusApi.getAllPlusMinus(loadConfig).forEach((plusMinusNudge) => layoutAssociatedObjectReferences.push({
+                Reference: plusMinusNudge,
+                Module: 'PlusMinus',
+            }));
+            this.api.shortcutApi.getAllShortcut(loadConfig).forEach((shortcut) => layoutAssociatedObjectReferences.push({
+                Reference: shortcut,
+                Module: 'Shortcut',
+            }));
+            [
+                ...this.api.scheduleApi.getAllReportSchedule(loadConfig),
+                ...this.api.scheduleApi.getAllReminderSchedule(loadConfig),
+                ...this.api.scheduleApi.getAllGlue42Schedule(loadConfig),
+                ...this.api.scheduleApi.getAllIPushPullSchedule(loadConfig),
+                ...this.api.scheduleApi.getAllOpenFinSchedule(loadConfig),
+            ].forEach((schedule) => layoutAssociatedObjectReferences.push({
+                Reference: schedule,
+                Module: 'Schedule',
+            }));
+            teamSharingReferences.push(...layoutAssociatedObjectReferences);
+        }
+        return teamSharingReferences;
+    }
     hasNamedQueryReferences() {
         return false;
     }

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -325,7 +325,7 @@ class QuickFilterFormComponent extends React.Component {
         this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
     hasValuesPredicate(predicate) {
-        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+        return this.props.api.predicateApi.hasPredicateValues(predicate);
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -113,6 +113,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         },
         layoutOptions: {
             createDefaultLayout: false,
+            autoSizeColumnsInLayout: true,
         },
         actionOptions: actionOptions,
         predefinedConfig: {
@@ -287,7 +288,7 @@ const getColumnHeaderLabel = (columnId, mainAdaptableInstance) => {
     return headerMap.get(columnId);
 };
 const getChangeTriggerLabel = (changeInfo) => {
-    return changeInfo.trigger === 'tick' ? 'Ticking data' : 'User edit';
+    return changeInfo.trigger === 'tick' ? 'Ticking' : 'User Edit';
 };
 const filterChangeHistoryLog = (changeObject, filterValues) => {
     const result = {};

package/src/View/GridInfo/GridInfoPopup.js

@@ -52,7 +52,9 @@ const GridInfoPopup = (props) => {
         const calcColumns = props.api.calculatedColumnApi
             .getAllCalculatedColumn()
             .map((c) => c.ColumnId);
-        const actionColumns = props.api.actionApi.getAllActionColumn().map((c) => c.columnId);
+        const actionColumns = props.api.actionApi
+            .getAllActionColumn()
+            .map((ac) => ac.columnId);
         const freeTextColumns = props.api.freeTextColumnApi
             .getAllFreeTextColumn()
             .map((c) => c.ColumnId);

package/src/View/StatusBar/StatusBarPopup.js

@@ -39,6 +39,6 @@ const StatusBarPopup = (props) => {
             dragAndDropTab: false,
             deleteTab: false,
             editTabName: false,
-        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'Status Bar Panels', unusedPanelTitle: "Available Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
+        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'AdapTable Status Bar Panels', unusedPanelTitle: "Available Module Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
 };
 exports.StatusBarPopup = StatusBarPopup;

package/src/agGrid/Adaptable.js

@@ -2935,12 +2935,14 @@ class Adaptable {
         this.prepareGrid();
     }
     updateColumnFilterActiveState() {
+        var _a;
         const columnFilters = this.api.filterApi.getColumnFilters();
-        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
+        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.filterApi.isFilterActive(columnFilter));
+        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(activeFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
             // used in particular at init time to show the filter icon correctly
-            for (const colFilter of columnFilters) {
+            for (const colFilter of activeFilters) {
                 const agGridCol = this.gridOptions.columnApi.getColumn(colFilter.ColumnId);
                 if (agGridCol) {
                     columnsWithActiveFilters[agGridCol.getColId()] = true;

package/src/components/Dashboard/Dashboard.js

@@ -43,7 +43,7 @@ function Dashboard(props) {
             } }, child.props.title)))));
     const renderTabsDropdown = () => {
         var _a, _b, _c;
-        if (children && children.length === 0) {
+        if (children && children.length < 2) {
             return null;
         }
         const activeTabTitle = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[activeTabIndex]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : 'Select Toolbar';
@@ -72,6 +72,7 @@ function Dashboard(props) {
     const renderHomeToolbar = () => (React.createElement(DashboardToolbar_1.DashboardToolbar, { onConfigure: onShowDashboardPopup, className: "ab-Dashboard__home-toolbar", title: title, tooltip: `Configure Dashboard`, showConfigure: true, showClose: false, accessLevel: 'Full' },
         left,
         right,
+        children && children.length > 1,
         renderTabsDropdown()));
     return (React.createElement("div", { 
         // @ts-ignore

package/src/metamodel/adaptable.metamodel.d.ts

@@ -296,6 +296,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    AdaptableDataChangeHistoryAction: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     AdaptableExternalIcon: {
         name: string;
         kind: string;
@@ -1693,6 +1698,28 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional?: undefined;
+            reference?: undefined;
+        })[];
     };
     CustomDestination: {
         name: string;
@@ -1728,6 +1755,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    CustomRenderContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     CustomReport: {
         name: string;
         kind: string;
@@ -2021,6 +2053,29 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
+    DataChangeHistoryButton: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    DataChangeHistoryContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
+    };
     DataChangeHistoryOptions: {
         name: string;
         kind: string;
@@ -2084,6 +2139,18 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    DataSetSelectedInfo: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
     DataUpdateConfig: {
         name: string;
         kind: string;
@@ -2125,6 +2192,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
     };
     EditActionRowContext: {
         name: string;
@@ -2148,6 +2228,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
     };
     EditLookUpPermittedValues: {
         name: string;
@@ -3129,6 +3222,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    LayoutAssociatedObjectLoadConfig: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     LayoutAvailableContext: {
         name: string;
         kind: string;