@adaptabletools/adaptable 11.2.2 → 11.2.4

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

@@ -3,6 +3,7 @@ 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;
@@ -40,4 +41,5 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     isDefaultLayout(layout: Layout): boolean;
     isCurrentLayoutDefault(): boolean;
     areExpandedRowGroupsSavedInLayouts(): boolean;
+    isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -315,5 +315,11 @@ 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());
+    }
 }
 exports.LayoutApiImpl = LayoutApiImpl;

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -80,7 +80,7 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
     }
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
         const systemStatusMessageDisplayedInfo = {
-            adaptableApi: this.adaptable.api,
+            adaptableApi: this.getAdaptableApi(),
             systemStatusMessageInfo: systemStatusMessageInfo,
         };
         this.adaptable.api.eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { TeamSharingApi } from '../TeamSharingApi';
-import { TeamSharingState, SharedEntity } from '../../types';
+import { TeamSharingState, SharedEntity, AdaptableModule, AdaptableObject, SharedEntityConfig } from '../../types';
 export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingApi {
     getTeamSharingState(): TeamSharingState;
     getSharedEntities(): SharedEntity[];
@@ -9,4 +9,5 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     checkForUpdates(): void;
     showTeamSharingPopup(): void;
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
+    shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
 const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux");
+const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     getTeamSharingState() {
         return this.getAdaptableState().TeamSharing;
@@ -13,8 +15,8 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().TeamSharing.SharedEntities;
     }
     isTeamSharingActivated() {
-        return (!this.adaptable.api.internalApi
-            .getEntitlementService()
+        return (!this.getAdaptableApi()
+            .internalApi.getEntitlementService()
             .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
             this.adaptable.adaptableOptions.teamSharingOptions &&
             this.adaptable.adaptableOptions.teamSharingOptions.enableTeamSharing &&
@@ -41,5 +43,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }
     }
+    shareEntity(entity, module, sharedEntityConfig) {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be shared');
+            return;
+        }
+        this.dispatchAction(TeamSharingRedux.TeamSharingShare(entity, module, sharedEntityConfig));
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

package/src/Api/Implementation/ThemeApiImpl.js

@@ -48,7 +48,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         }
         this.adaptable.applyAdaptableTheme(currentTheme);
         let themeChangedInfo = {
-            adaptableApi: this.adaptable.api,
+            adaptableApi: this.getAdaptableApi(),
             theme: currentTheme,
         };
         this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);

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

@@ -4,7 +4,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
-import { GridCell } from '../../types';
+import { AdaptableObjectTag, GridCell } from '../../types';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
@@ -25,4 +25,5 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAllActionColumn(): ActionColumn[];
+    getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -8,7 +8,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         let colorPalette = this.getUserInterfaceOptions().colorPalette;
         // first do the function then get hardcoded items
         if (colorPalette != null && typeof colorPalette === 'function') {
-            const currentTheme = this.adaptable.api.themeApi.getCurrentTheme();
+            const currentTheme = this.getAdaptableApi().themeApi.getCurrentTheme();
             const colours = colorPalette(currentTheme);
             return colours;
         }
@@ -35,14 +35,14 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         // columns id
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('ColumnIds' in permittedValue.scope &&
-                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getAdaptableApi().scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
         }
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('DataTypes' in permittedValue.scope &&
-                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getAdaptableApi().scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
@@ -70,7 +70,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         if (permittedValues != null && typeof permittedValues === 'function') {
             if (column) {
                 const permittedValuesParams = {
-                    adaptableApi: this.adaptable.api,
+                    adaptableApi: this.getAdaptableApi(),
                     column: column,
                 };
                 return permittedValues(permittedValuesParams);
@@ -172,5 +172,17 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         var _a;
         return (_a = this.getUserInterfaceOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
+    getAdaptableObjectTags() {
+        let objectTags = this.getUserInterfaceOptions().objectTags;
+        if (objectTags != null && typeof objectTags === 'function') {
+            return objectTags(this.getAdaptableApi());
+        }
+        else {
+            let arr = objectTags;
+            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
+                return arr;
+            }
+        }
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/InternalApi.d.ts

@@ -131,4 +131,6 @@ export interface InternalApi {
     shouldDisplayTagSections(): boolean;
     getAvailableTags(): AdaptableObjectTag[] | undefined;
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
+    getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
+    getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
 }

package/src/Api/LayoutApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, ColumnSort } from '../../types';
+import { AdaptableColumn, ColumnSort, LayoutAssociatedObject } from '../../types';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
@@ -182,4 +182,9 @@ 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;
 }

package/src/Api/TeamSharingApi.d.ts

@@ -1,4 +1,6 @@
-import { TeamSharingState, SharedEntity } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { SharedEntity } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableModule, SharedEntityConfig, TeamSharingState } from '../types';
 /**
  * Provides run-time access to Team Sharing Module and associated state
  */
@@ -32,4 +34,11 @@ export interface TeamSharingApi {
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
+    /**
+     * Puts an Adaptable Object into Team Share
+     * @param entity entity to Share
+     * @param module module which Shared Entity belongs to
+     * @param sharedEntityConfig Config info about the Sharing Actions
+     */
+    shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -3,6 +3,7 @@ import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -70,7 +71,11 @@ export interface UserInterfaceApi {
      */
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     /**
-     * Retrieves any Action Columns in User Interface Options
+     * Retrieves any Action Columns (provided in User Interface Options)
      */
     getAllActionColumn(): ActionColumn[];
+    /**
+     * Retrieves any Object Tags (provided in User Interface Options)
+     */
+    getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
 }

package/src/PredefinedConfig/Common/AdaptableColumn.d.ts

@@ -33,6 +33,10 @@ export interface AdaptableColumnGroup {
  * Defines an Adaptable Column - created at run-time based on AG Grid column definition
  */
 export interface AdaptableColumn extends AdaptableColumnBase {
+    /**
+     * Is the field of the row to get the cell data from
+     */
+    field?: string;
     /**
      * Is this the Primary Key column
      */

package/src/PredefinedConfig/Common/AdaptableFormat.d.ts

@@ -11,10 +11,15 @@ export declare type AdaptableFormat = {
     Formatter: 'StringFormatter';
     Options: StringFormatterOptions;
 };
+export interface BaseFormatterOptions {
+    CustomDisplayFormats?: {
+        Id: string;
+    }[];
+}
 /**
  * Formatter Options for Numeric Columns
  */
-export interface NumberFormatterOptions {
+export interface NumberFormatterOptions extends BaseFormatterOptions {
     /**
      * Number of digits to show in fractions
      */
@@ -55,7 +60,7 @@ export interface NumberFormatterOptions {
 /**
  * Formatter Options for Date Columns - contains a single `Pattern` property
  */
-export interface DateFormatterOptions {
+export interface DateFormatterOptions extends BaseFormatterOptions {
     /**
      * Pattern to use for Date Format
      */
@@ -64,7 +69,7 @@ export interface DateFormatterOptions {
 /**
  * Formatter Options for String Columns
  */
-export interface StringFormatterOptions {
+export interface StringFormatterOptions extends BaseFormatterOptions {
     /**
      * Sets text to Upper or Lower case
      */

package/src/PredefinedConfig/Common/AdaptableObject.d.ts

@@ -16,20 +16,20 @@ export interface AdaptableObject {
      */
     IsReadOnly?: boolean;
     /**
-     * List of tags associated with the object
+     * List of Tags associated with the Object; often used for (but not limited to) managing Layout object scope
      */
     Tags?: AdaptableObjectTag[];
 }
 /**
- * Tag object defined as a label and a value
+ * Object Tag - defined as a label and a value
  */
-export declare type AdaptableObjectTag = {
+export declare type AdaptableObjectTag = string | {
     /**
-     * Label for the tag
+     * Label for the Tag
      */
     label: string;
     /**
-     * Value for the tag
+     * Value for the Tag - string or number
      */
     value: string | number;
 };

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -27,7 +27,23 @@ exports.SystemPredicateDefs = [
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
         moduleScope: ['filter'],
-        handler: ({ displayValue, inputs }) => inputs.length === 0 || inputs.includes(displayValue),
+        handler: ({ inputs, column, value }) => {
+            if (inputs.length === 0) {
+                return true;
+            }
+            if (column.dataType === 'Date') {
+                return inputs.some((input) => {
+                    return isSameDay_1.default(input, value);
+                });
+            }
+            if (column.dataType === 'Number') {
+                return inputs.includes(value);
+            }
+            if (column.dataType === 'String') {
+                return inputs.includes(value);
+            }
+            return true;
+        },
         toString: ({ inputs }) => `IN (${inputs.join(', ')})`,
         shortcuts: ['#', '['],
     },

package/src/PredefinedConfig/Common/FDC3Context.d.ts

@@ -1,3 +1,4 @@
+import { CustomFDC3Intent } from '../../AdaptableOptions/FinancePluginOptions';
 import { BaseEventInfo } from '../../Api/Events/BaseEventInfo';
 import { FDC3Intent } from '../../types';
 /**
@@ -221,10 +222,13 @@ export interface AdaptableFDC3EventInfo extends BaseEventInfo {
     /**
      * The FDC3 Intent which caused Event to fire (if type is `RaiseIntent`)
      */
-    intent?: FDC3Intent;
+    intent?: FDC3Intent | CustomFDC3Intent;
     /**
      * Full FDC3 Context for the object related to the event
      */
     context: FDC3Context;
 }
 export declare type ContextType = 'fdc3.instrument' | 'fdc3.instrumentList' | 'fdc3.position' | 'fdc3.portfolio' | 'fdc3.contact' | 'fdc3.contactList' | 'fdc3.organization' | 'fdc3.country';
+export interface CustomFDC3Context extends FDC3Context {
+    type: any;
+}

package/src/Redux/ActionsReducers/TeamSharingRedux.d.ts

@@ -42,7 +42,7 @@ export interface TeamSharingCommitImportAction extends Redux.Action {
 }
 export interface TeamSharingCheckForUpdatesAction extends Redux.Action {
 }
-export declare const TeamSharingShare: (Entity: AdaptableObject, Module: AdaptableModule, Configuration: SharedEntityConfig) => TeamSharingShareAction;
+export declare const TeamSharingShare: (entity: AdaptableObject, module: AdaptableModule, configuration: SharedEntityConfig) => TeamSharingShareAction;
 export declare const TeamSharingSet: (Entities: SharedEntity[]) => TeamSharingSetAction;
 export declare const TeamSharingImportItem: (SharedEntity: SharedEntity) => TeamSharingImportItemAction;
 export declare const TeamSharingProcessImport: (ImportSteps: TeamSharingImportStep[]) => TeamSharingProcessImportAction;

package/src/Redux/ActionsReducers/TeamSharingRedux.js

@@ -12,11 +12,11 @@ exports.TEAMSHARING_REMOVE_ITEM = 'TEAMSHARING_REMOVE_ITEM';
 exports.TEAMSHARING_LINK_ITEM = 'TEAMSHARING_LINK_ITEM';
 exports.TEAMSHARING_UPDATE_ITEM = 'TEAMSHARING_UPDATE_ITEM';
 exports.TEAMSHARING_CHECK_FOR_UPDATES = 'TEAMSHARING_CHECK_FOR_UPDATES';
-exports.TeamSharingShare = (Entity, Module, Configuration) => ({
+exports.TeamSharingShare = (entity, module, configuration) => ({
     type: exports.TEAMSHARING_SHARE,
-    Entity,
-    Module,
-    Configuration,
+    Entity: entity,
+    Module: module,
+    Configuration: configuration,
 });
 exports.TeamSharingSet = (Entities) => ({
     type: exports.TEAMSHARING_SET,

package/src/Strategy/DashboardModule.js

@@ -23,6 +23,9 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // but so do all the other possible handlers of the 'DashboardChanged' event
         // therefore, we give them a head start to subscribe to 'DashboardChanged' before emitting it
         setTimeout(() => {
+            if (this.api.isDestroyed()) {
+                return;
+            }
             this.api.dashboardApi.fireDashboardChangedEvent('ADAPTABLE_READY', null, this.api.dashboardApi.getDashboardState());
         }, 20);
     }

package/src/Strategy/FilterModule.d.ts

@@ -17,6 +17,13 @@ export declare class FilterModule extends AdaptableModuleBase implements IModule
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
+    toViewCompact(filter: ColumnFilter): {
+        item: {
+            name: string;
+            values: string[];
+        };
+        abObject: ColumnFilter;
+    };
     toView(filter: ColumnFilter): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): {

package/src/Strategy/FilterModule.js

@@ -77,12 +77,21 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             EditAction: FilterRedux.ColumnFilterEdit,
         };
     }
+    toViewCompact(filter) {
+        return {
+            item: {
+                name: this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId),
+                values: [this.api.filterApi.columnFilterToString(filter)],
+            },
+            abObject: filter,
+        };
+    }
     toView(filter) {
         return {
             items: [
                 {
                     name: 'Column',
-                    values: [filter.ColumnId],
+                    values: [this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId)],
                 },
                 {
                     name: 'Filter',
@@ -120,7 +129,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return {
                     content: text,
                     popover,
-                    popoverMinWidth: 280,
+                    popoverMinWidth: 320,
                 };
             },
         };

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api.formatColumnApi)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

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

@@ -62,6 +62,10 @@ export interface AdaptableObjectView {
      */
     abObject: AdaptableObject;
 }
+export interface AdaptableObjectCompactView {
+    item: AdaptableObjectItemView;
+    abObject: AdaptableObject;
+}
 export declare type AdaptableModuleViewAction = React.FunctionComponent<{
     data: AdaptableObject;
     accessLevel: AccessLevel;
@@ -130,6 +134,7 @@ export interface IModule {
      */
     toView?: (abObject: AdaptableObject) => AdaptableObjectView;
     toViewAll?: () => AdaptableObjectView[];
+    toViewCompact?: (abObject: AdaptableObject) => AdaptableObjectCompactView;
     getViewProperties?: () => AdaptableModuleView;
 }
 /**

package/src/Strategy/LayoutModule.js

@@ -144,7 +144,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     toView(layout) {
         var _a, _b, _c, _d, _e, _f, _g;
-        const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.viewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
+        const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.layoutViewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameFromColumnId(columnId);
         };
@@ -152,11 +152,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (columns.length >
             maxColumnsToDisplay + 1 /* +1 is to show tag only beginning with 2, 'other 2' */) {
             const extraColumns = columns.length - maxColumnsToDisplay;
-            const firstNColumns = columns
-                .slice(0, maxColumnsToDisplay)
-                .map((colId) => columnIdToFriendlyName(colId));
+            const firstNColumns = columns.slice(0, maxColumnsToDisplay);
             columns = [...firstNColumns, `and other ${extraColumns}`];
         }
+        else {
+            columns = columns.map((column) => this.api.columnApi.getFriendlyNameFromColumnId(column));
+        }
         return {
             items: [
                 {
@@ -220,9 +221,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     handleLayoutChange() {
-        // update objects associated with the current layout via the LayoutOptions.isObjectAssociatedWithLayout() method
-        if (!this.api.internalApi.getAdaptableOptions().layoutOptions.isObjectAvailableInLayout) {
-            // no need if no callback implementation is provided
+        if (!this.api.internalApi.hasLayoutSpecificObjects()) {
+            // no need if no callback implementation is provided or no auto checking
             return;
         }
         // PlusMinus

package/src/Strategy/Utilities/getObjectTagsViewItems.js

@@ -8,6 +8,6 @@ exports.getObjectTagsViewItems = (object, api) => {
     }
     return {
         name: 'Tags',
-        values: (_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => tag.label),
+        values: (_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => api.internalApi.getLabelForTag(tag)),
     };
 };

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -134,9 +134,12 @@ exports.DefaultAdaptableOptions = {
         autoSizeColumnsInLayout: false,
         autoSizeColumnsInPivotLayout: false,
         createDefaultLayout: false,
-        viewOptions: {
+        layoutViewOptions: {
             maxColumnsToDisplay: 10,
         },
+        layoutTagOptions: {
+            autoCheckTagsForLayouts: false,
+        },
     },
     menuOptions: {
         showAdaptableContextMenu: true,

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -196,13 +196,14 @@ const getSumAggregation$ = (source$, initialSum) => {
 const getColumnValueSum = (column, context) => {
     let sum = 0;
     context.api.internalApi.forAllRowNodesDo((rowNode) => {
-        var _a;
         // if there is a WHERE clause defined, check if the current rowNode satisfies the condition
         if (context.filterFn && !context.filterFn(rowNode)) {
             return;
         }
-        const cellValue = (_a = rowNode.data) === null || _a === void 0 ? void 0 : _a[column];
-        // cell value may not always be defined (ex. group nodes)
+        if (context.api.gridApi.isGroupRowNode(rowNode)) {
+            return;
+        }
+        const cellValue = context.api.gridApi.getRawValueFromRowNode(rowNode, column);
         if (cellValue != undefined) {
             sum = sum + expressionFunctionUtils_1.getNumericValue(rowNode.data[column]);
         }

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -28,15 +28,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 columnDependencies: [sumColumnName],
             };
-            if (groupByParameter) {
-                const groupByColumnName = groupByParameter.value;
-                aggregationExpressionEvaluation.aggregationParams.groupBy = [
-                    {
-                        field: groupByColumnName,
-                    },
-                ];
-                aggregationExpressionEvaluation.columnDependencies.push(groupByColumnName);
-            }
+            addGroupByParams(groupByParameter, aggregationExpressionEvaluation);
             const result = {
                 name: 'SUM',
                 type: 'aggregation',
@@ -149,15 +141,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 columnDependencies: [avgColumnName],
             };
-            if (groupByParameter) {
-                const groupByColumnName = groupByParameter.value;
-                aggregationExpressionEvaluation.aggregationParams.groupBy = [
-                    {
-                        field: groupByColumnName,
-                    },
-                ];
-                aggregationExpressionEvaluation.columnDependencies.push(groupByColumnName);
-            }
+            addGroupByParams(groupByParameter, aggregationExpressionEvaluation);
             const result = {
                 name: 'AVG',
                 type: 'aggregation',
@@ -198,15 +182,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 columnDependencies: [minColumnName],
             };
-            if (groupByParameter) {
-                const groupByColumnName = groupByParameter.value;
-                aggregationExpressionEvaluation.aggregationParams.groupBy = [
-                    {
-                        field: groupByColumnName,
-                    },
-                ];
-                aggregationExpressionEvaluation.columnDependencies.push(groupByColumnName);
-            }
+            addGroupByParams(groupByParameter, aggregationExpressionEvaluation);
             const result = {
                 name: 'MIN',
                 type: 'aggregation',
@@ -247,15 +223,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 columnDependencies: [maxColumnName],
             };
-            if (groupByParameter) {
-                const groupByColumnName = groupByParameter.value;
-                aggregationExpressionEvaluation.aggregationParams.groupBy = [
-                    {
-                        field: groupByColumnName,
-                    },
-                ];
-                aggregationExpressionEvaluation.columnDependencies.push(groupByColumnName);
-            }
+            addGroupByParams(groupByParameter, aggregationExpressionEvaluation);
             const result = {
                 name: 'MAX',
                 type: 'aggregation',
@@ -337,3 +305,15 @@ exports.aggregatedScalarExpressionFunctions = {
         examples: ['[col1]', 'COL("col1")'],
     },
 };
+// !! mutates expressionEvaluation
+const addGroupByParams = (groupByParameter, expressionEvaluation) => {
+    if (groupByParameter) {
+        const groupByColumnName = groupByParameter.value;
+        expressionEvaluation.aggregationParams.groupBy = [
+            {
+                field: groupByColumnName,
+            },
+        ];
+        expressionEvaluation.columnDependencies.push(groupByColumnName);
+    }
+};

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -226,10 +226,8 @@ exports.booleanExpressionFunctions = {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
             return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
-                var _a, _b;
-                const value = column.dataType === 'Date'
-                    ? // for Date columns use the display value, as we do a textual comparison
-                     (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId) : (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
+                var _a;
+                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });