@adaptabletools/adaptable 15.0.2 → 15.1.0-canary.0

package/src/Redux/Store/AdaptableStore.js

@@ -36,7 +36,6 @@ const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBa
 const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
@@ -107,7 +106,7 @@ class AdaptableStore {
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
             }, (e) => {
-                (0, LoggingHelper_1.LogAdaptableError)('Failed to load previous Adaptable State : ', e);
+                adaptable.logger.error('Failed to load previous Adaptable State : ', e);
                 //for now i'm still initializing Adaptable even if loading state has failed....
                 //we may revisit that later
                 this.TheStore.dispatch((0, exports.InitState)());
@@ -169,12 +168,12 @@ class AdaptableStore {
                     Object.keys(State).forEach((key) => {
                         // this check should be removed in version 12 !!!
                         if (key === 'Chart') {
-                            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
+                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
 
             Please contact 'support@adaptabletools.com' if you require any charting features that are not currently available.`);
                         }
                         if (key === 'SparklineColumn') {
-                            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
+                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
 
             Please contact 'support@adaptabletools.com' if you require any sparklines features that are not currently available.`);
                         }
@@ -189,7 +188,6 @@ class AdaptableStore {
         // If the user has remote storage set then we use Remote Engine, otherwise we use Local Enginge
         // not sure we can do this as we need to be backwardly compatible with existing users so need to stick with adaptable id (which should be unique)
         // const localStorageKey =  'adaptable-adaptable-state-' + adaptable.adaptableOptions.primaryKey;
-        const predefinedConfig = adaptable.adaptableOptions.predefinedConfig;
         storageEngine = (0, AdaptableReduxLocalStorageEngine_1.createEngine)({
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
@@ -753,7 +751,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let returnAction;
                     // needs to be called before 'next' so previous and next column filters are known
                     const shouldTriggerGridFiltering = adaptable.api.filterApi.internalApi.shouldNewColumnFilterTriggerGridFiltering(action);
-                    if ((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) {
+                    const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                    if (((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) &&
+                        !currentLayout.IsReadOnly) {
                         returnAction = next(action);
                     }
                     else {
@@ -1193,7 +1193,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing get error : ' + error.message);
+                        adaptable.logger.error('TeamSharing get error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1234,11 +1234,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     })
                         .then(() => {
                         if (shareSuccessful) {
-                            (0, LoggingHelper_1.LogAdaptableInfo)(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
+                            adaptable.logger.info(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
                         }
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
                     });
                     return returnAction;
                 }
@@ -1291,7 +1291,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1334,7 +1334,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(newSharedEntities);
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing remove error : ' + error.message);
+                        adaptable.logger.error('TeamSharing remove error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1355,7 +1355,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .getTeamSharingService()
                         .buildSharedEntityImportActions(actionTyped.SharedEntity);
                     const processImportAction = TeamSharingRedux.TeamSharingProcessImport(importStepActions);
-                    if (needsOverwriteConfirmation) {
+                    if (needsOverwriteConfirmation &&
+                        !adaptable.api.optionsApi.getTeamSharingOptions().suppressOverrideConfigWarning) {
                         let confirmation = {
                             CancelButtonText: 'Cancel Import',
                             Header: 'Overwriting Existing Object',
@@ -1391,7 +1392,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             }
                         }
                         else {
-                            (0, LoggingHelper_1.LogAdaptableError)('Team Sharing Import Error: Unknown item type', sharedEntity);
+                            adaptable.logger.error('Team Sharing Import Error: Unknown item type', sharedEntity);
                         }
                     }
                     if (activeSharedEntities.length) {
@@ -1440,7 +1441,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(updatedSharedEntities);
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing update active item error : ' + error.message);
+                        adaptable.logger.error('TeamSharing update active item error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',
@@ -1460,7 +1461,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         adaptable.api.internalApi.getTeamSharingService().showUpdateNotifications();
                     })
                         .catch((error) => {
-                        (0, LoggingHelper_1.LogAdaptableError)('TeamSharing update error : ' + error.message);
+                        adaptable.logger.error('TeamSharing update error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                             alertType: 'generic',
                             header: 'Team Sharing',

package/src/Strategy/AlertModule.js

@@ -244,6 +244,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             getDeleteAction: AlertRedux.AlertDefinitionDelete,
+            getEditAction: AlertRedux.AlertDefinitionEdit,
             getSuspendAction: AlertRedux.AlertDefinitionSuspend,
             getUnSuspendAction: AlertRedux.AlertDefinitionUnSuspend,
             getSuspendAllAction: AlertRedux.AlertDefinitionSuspendAll,

package/src/Strategy/CalculatedColumnModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const CalculatedColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/CalculatedColumnRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getExpressionViewItems_1 = require("./Utilities/getExpressionViewItems");
 const CalculatedColumnWizard_1 = require("../View/CalculatedColumn/Wizard/CalculatedColumnWizard");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -32,14 +31,14 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 };
                 cc.ColumnExpression = undefined;
                 oldCalculatedColumns.push(cc);
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
+                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
             }
             if (!cc.CalculatedColumnSettings) {
                 cc.CalculatedColumnSettings = {
                     DataType: 'Number',
                 };
                 oldCalculatedColumns.push(cc);
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
+                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
             }
         });
         oldCalculatedColumns.forEach((oldCalcCol) => this.api.calculatedColumnApi.editCalculatedColumn(oldCalcCol));

package/src/Strategy/CustomSortModule.d.ts

@@ -20,6 +20,7 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): {
+        getEditAction: (customSort: CustomSort) => CustomSortRedux.CustomSortEditAction;
         getDeleteAction: (customSort: CustomSort) => CustomSortRedux.CustomSortDeleteAction;
         getSuspendAction: (customSort: CustomSort) => CustomSortRedux.CustomSortDeleteAction;
         getUnSuspendAction: (customSort: CustomSort) => CustomSortRedux.CustomSortDeleteAction;

package/src/Strategy/CustomSortModule.js

@@ -67,6 +67,7 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            getEditAction: CustomSortRedux.CustomSortEdit,
             getDeleteAction: CustomSortRedux.CustomSortDelete,
             getSuspendAction: CustomSortRedux.CustomSortSuspend,
             getUnSuspendAction: CustomSortRedux.CustomSortUnSuspend,

package/src/Strategy/DashboardModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const DashboardRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/DashboardRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DashboardModuleId, ModuleConstants.DashboardFriendlyName, 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', api);
@@ -13,7 +12,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     updateOldConfig() {
         let dashboardState = this.api.dashboardApi.getDashboardState();
         if (dashboardState.VisibleButtons) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
+            this.api.logWarn(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
             this.api.dashboardApi.setModuleButtons(dashboardState.VisibleButtons);
         }
     }

package/src/Strategy/DataChangeHistoryModule.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const DataChangeHistoryStatusBarContent_1 = require("../View/DataChangeHistory/DataChangeHistoryStatusBarContent");
 const core_1 = require("@ag-grid-community/core");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
@@ -27,7 +26,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
             .getAdaptableInstance()
             .isAgGridModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
+            this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
         }
         return isAdaptableModuleAvailable && isAgGridModuleAvailable;
     }

package/src/Strategy/FilterModule.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -29,7 +28,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const columnFilters = this.api.filterApi.getColumnFilters();
         columnFilters.forEach((cf) => {
             if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
-                (0, LoggingHelper_1.LogAdaptableError)('Column Filter contains missing column: ' + cf.ColumnId);
+                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
             }
         });
     }

package/src/Strategy/FlashingCellModule.js

@@ -252,6 +252,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            getEditAction: FlashingCellRedux.FlashingCellDefinitionEdit,
             getSuspendAction: FlashingCellRedux.FlashingCellDefinitionSuspend,
             getUnSuspendAction: FlashingCellRedux.FlashingCellDefinitionUnSuspend,
             getSuspendAllAction: FlashingCellRedux.FlashingCellDefinitionSuspendAll,

package/src/Strategy/FormatColumnModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const FormatColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FormatColumnRedux"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnFormatWizardSection");
@@ -94,7 +93,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!(oldConditionalStyles === null || oldConditionalStyles === void 0 ? void 0 : oldConditionalStyles.length)) {
             return;
         }
-        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
+        this.api.logWarn(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
         // remove conditional styles
         this.api.internalApi.deleteConditionalStyles(oldConditionalStyles);
         const transformedFormatColumns = oldConditionalStyles.map((conditionalStyle) => {
@@ -159,6 +158,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             actions: [MoveFormatColumn_1.MoveFormatColumn],
+            getEditAction: FormatColumnRedux.FormatColumnEdit,
             getDeleteAction: FormatColumnRedux.FormatColumnDelete,
             getSuspendAction: FormatColumnRedux.FormatColumnSuspend,
             getUnSuspendAction: FormatColumnRedux.FormatColumnUnSuspend,

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

@@ -44,6 +44,11 @@ export interface AdaptableObjectItemView {
      */
     view?: React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
+        module?: IModule;
+    }>> | React.ReactElement;
+    viewAfter?: React.FunctionComponent<React.PropsWithChildren<{
+        data: AdaptableObject | SuspendableObject;
+        module?: IModule;
     }>> | React.ReactElement;
     /**
      * Values used for the component.
@@ -96,6 +101,7 @@ export interface AdaptableModuleView {
     getUnSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
     getCompactSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
     getCompactUnSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
+    getEditAction?: (abObject: AdaptableObject) => Redux.Action;
     getSuspendAllAction?: () => Redux.Action;
     getUnSuspendAllAction?: () => Redux.Action;
     getDeleteAllAction?: () => Redux.Action;

package/src/Strategy/PlusMinusModule.js

@@ -207,6 +207,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            getEditAction: PlusMinusRedux.PlusMinusNudgeEdit,
             getDeleteAction: PlusMinusRedux.PlusMinusNudgeDelete,
             getSuspendAction: PlusMinusRedux.PlusMinusNudgeSuspend,
             getUnSuspendAction: PlusMinusRedux.PlusMinusNudgeUnSuspend,

package/src/Strategy/ScheduleModule.js

@@ -196,6 +196,27 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return {
             abObjectTypes,
+            getEditAction: (schedule) => {
+                let editAction = null;
+                switch (schedule.ScheduleType) {
+                    case Enums_1.ScheduleType.Reminder:
+                        editAction = ScheduleRedux.ReminderScheduleEdit(schedule);
+                        break;
+                    case Enums_1.ScheduleType.Report:
+                        editAction = ScheduleRedux.ReportScheduleEdit(schedule);
+                        break;
+                    case Enums_1.ScheduleType.ipushpull:
+                        editAction = ScheduleRedux.IPushPullScheduleEdit(schedule);
+                        break;
+                    case Enums_1.ScheduleType.Glue42:
+                        editAction = ScheduleRedux.Glue42ScheduleEdit(schedule);
+                        break;
+                    case Enums_1.ScheduleType.OpenFin:
+                        editAction = ScheduleRedux.OpenFinScheduleEdit(schedule);
+                        break;
+                }
+                return editAction;
+            },
             getDeleteAction: (schedule) => {
                 let deleteAction = null;
                 switch (schedule.ScheduleType) {

package/src/Strategy/ShortcutModule.js

@@ -89,6 +89,7 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            getEditAction: ShortcutRedux.ShortcutEdit,
             getDeleteAction: ShortcutRedux.ShortcutDelete,
             getSuspendAction: ShortcutRedux.ShortcutSuspend,
             getUnSuspendAction: ShortcutRedux.ShortcutUnSuspend,

package/src/Strategy/StyledColumnModule.js

@@ -8,7 +8,6 @@ const StyledColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers
 const StyledColumnWizard_1 = require("../View/StyledColumn/Wizard/StyledColumnWizard");
 const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -43,7 +42,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!formatColumnsWithColumnStyles.length) {
             return;
         }
-        (0, LoggingHelper_1.ConsoleLogInfo)(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
+        this.api.logInfo(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
         formatColumnsWithColumnStyles.forEach((formatColumn) => {
             this.api.formatColumnApi.deleteFormatColumn(formatColumn);
         });
@@ -208,6 +207,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            getEditAction: StyledColumnRedux.StyledColumnEdit,
             getDeleteAction: StyledColumnRedux.StyledColumnDelete,
             getSuspendAction: StyledColumnRedux.StyledColumnSuspend,
             getUnSuspendAction: StyledColumnRedux.StyledColumnUnSuspend,

package/src/Strategy/ToolPanelModule.js

@@ -6,7 +6,6 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const Types_1 = require("../PredefinedConfig/Common/Types");
 const ToolPanelRedux_1 = require("../Redux/ActionsReducers/ToolPanelRedux");
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ToolPanelModuleId, ModuleConstants.ToolPanelFriendlyName, 'tool-panel', 'ToolPanelPopup', 'An alternative to using the Dashboard is the AdapTable Tool Panel, the Tool Panel is the collapsible area to the right of the Grid.', api);
@@ -20,7 +19,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     updateOldConfig() {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
         if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
+            this.api.logWarn(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
             const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
                 Name: toolPanel,
                 State: 'collapsed',
@@ -29,7 +28,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {
             // no predefined config provided, we will display all the panels collapsed (custom & module)
-            (0, LoggingHelper_1.LogAdaptableInfo)(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
+            this.api.logInfo(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
             const defaultConfig = [];
             this.api.toolPanelApi
                 .getCustomToolPanels()

package/src/Strategy/Utilities/Alert/getAlertBehaviourViewItems.d.ts

@@ -1,8 +1,3 @@
-import * as React from 'react';
-import { AdaptableApi, AlertDefinition } from '../../../types';
-export declare const getAlertBehaviourViewItems: (api: AdaptableApi) => {
-    name: string;
-    view: React.FunctionComponent<React.PropsWithChildren<{
-        data: AlertDefinition;
-    }>>;
-};
+import { AdaptableApi } from '../../../types';
+import { AdaptableObjectItemView } from '../../Interface/IModule';
+export declare const getAlertBehaviourViewItems: (api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/getObjectTagsViewItems.js

@@ -1,14 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectTagsViewItems = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importDefault(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const react_redux_1 = require("react-redux");
 const getObjectTagsViewItems = (object, api) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (!api.internalApi.shouldDisplayTagSections() || !((_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.length)) {
         return;
     }
+    const currentLayoutName = api.layoutApi.getCurrentLayoutName();
+    const hasCurrentLayoutAsTag = (_c = ((_b = object === null || object === void 0 ? void 0 : object.Tags) !== null && _b !== void 0 ? _b : [])) === null || _c === void 0 ? void 0 : _c.includes(currentLayoutName);
     return {
         name: 'Tags',
-        values: (_b = object === null || object === void 0 ? void 0 : object.Tags) === null || _b === void 0 ? void 0 : _b.map((tag) => api.internalApi.getLabelForTag(tag)),
+        values: (_d = object === null || object === void 0 ? void 0 : object.Tags) === null || _d === void 0 ? void 0 : _d.map((tag) => api.internalApi.getLabelForTag(tag)),
+        viewAfter: (props) => {
+            const dispatch = (0, react_redux_1.useDispatch)();
+            const viewOptions = props.module.getViewProperties();
+            const handleToggleTag = react_1.default.useCallback(() => {
+                var _a;
+                let tags = (_a = props.data.Tags) !== null && _a !== void 0 ? _a : [];
+                if (hasCurrentLayoutAsTag) {
+                    // remove layout
+                    tags = tags.filter((tag) => tag !== currentLayoutName);
+                }
+                else {
+                    tags.push(currentLayoutName);
+                }
+                const newObject = Object.assign(Object.assign({}, props.data), { Tags: tags });
+                const editAction = viewOptions.getEditAction(newObject);
+                dispatch(editAction);
+            }, [hasCurrentLayoutAsTag, props.data]);
+            return (react_1.default.createElement(SimpleButton_1.default, { onClick: handleToggleTag, mt: 1, icon: hasCurrentLayoutAsTag ? 'minus' : 'plus' }, hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout'));
+        },
     };
 };
 exports.getObjectTagsViewItems = getObjectTagsViewItems;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -214,9 +214,11 @@ exports.DefaultAdaptableOptions = {
         showSuspendFilterButton: false,
         quickFilterWildcards: {},
         quickFilterDebounce: 250,
+        showValuesCount: undefined,
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
+        runQuickSearchOnRowGroups: false,
         clearSearchesOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
@@ -237,6 +239,7 @@ exports.DefaultAdaptableOptions = {
         saveSharedEntities: (sharedEntities) => sharedEntities,
         updateInterval: 0,
         updateNotification: undefined,
+        suppressOverrideConfigWarning: false,
     },
     userInterfaceOptions: {
         applicationIcon: undefined,

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -17,7 +17,7 @@ exports.booleanExpressionFunctions = {
         category: 'logical',
         returnType: 'boolean',
         signatures: ['TRUE'],
-        examples: ['TRUE'],
+        examples: ['[column] = TRUE'],
     },
     FALSE: {
         handler: () => {
@@ -27,7 +27,7 @@ exports.booleanExpressionFunctions = {
         category: 'logical',
         returnType: 'boolean',
         signatures: ['FALSE'],
-        examples: ['FALSE'],
+        examples: ['[column] = FALSE'],
     },
     AND: {
         handler(args) {

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK';
+export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];