@adaptabletools/adaptable 12.1.2 → 12.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.2",
+  "version": "12.1.5",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1658831451551;
+declare const _default: 1659522068928;
 export default _default;

package/publishTimestamp.js

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

package/src/Api/ColumnApi.d.ts

@@ -303,5 +303,11 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     isActionRowButtonColumn(columnId: string): boolean;
+    /**
+     * Returns the default Aggregation Function for a Column
+     * @param columnId Column to Check
+     */
     getDefaultAggFunc(columnId: string): string;
+    getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

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

@@ -2,6 +2,7 @@ import { BaseEventInfo } from './BaseEventInfo';
 import { AdaptableSortState } from '../../types';
 import { AdaptableSearchState } from './AdaptableSearchState';
 /**
+ * Deprecated Search Changed Event - use `QueryRun` or `FilterApplied` instead
  * @deprecated Use QueryRun and or FilterApplied
  */
 export interface SearchChangedInfo extends BaseEventInfo {

package/src/Api/FormatColumnApi.d.ts

@@ -1,4 +1,4 @@
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn, AdaptableFormat } from '../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
@@ -156,14 +156,16 @@ export interface FormatColumnApi {
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
     /**
      * Gets the Maximum Value to display for a Numeric Style
      * @param numericStyle Numeric Style to check
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     /**
      * Returns first Format Column that contains checkbox style
      * @param columnId column to check

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

@@ -70,4 +70,6 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
     isActionRowButtonColumn(columnId: string): boolean;
     getDefaultAggFunc(columnId: string): string;
+    getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -420,5 +420,19 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const agColumn = (_b = (_a = this.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
         return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
     }
+    getMinValueForNumericColumn(column) {
+        if (column.dataType !== 'Number') {
+            return undefined;
+        }
+        // can we cache this in some way?
+        return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
+    }
+    getMaxValueForNumericColumn(column) {
+        if (column.dataType !== 'Number') {
+            return undefined;
+        }
+        // can we cache this in some way?
+        return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

package/src/Api/Implementation/FilterApiImpl.js

@@ -208,6 +208,9 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
      * @param filter
      */
     isFilterActive(filter) {
+        if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
+            return false;
+        }
         const predicateDef = this.adaptable.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
         if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
             // values predicates have no inputs in the definition

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

@@ -1,7 +1,7 @@
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn, ColumnStyle, CellColorRange, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableFormat } from '../../types';
@@ -39,8 +39,10 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithDataTypeScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithColumnScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
-    getNumericStyleMinValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number;
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, rowNode: RowNode, cellValue: any): number | undefined;
+    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
+    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
     isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -180,7 +180,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnsWithColumnScope(formatColumns) {
         return formatColumns.filter((fc) => this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope));
     }
-    getNumericStyleMinValue(numericStyle, rowNode, cellValue) {
+    getNumericStyleMinValue(numericStyle, column, rowNode, cellValue) {
         var _a, _b;
         const columnComparison = numericStyle.GradientStyle
             ? numericStyle.GradientStyle.ColumnComparison
@@ -199,24 +199,28 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
                 }
             }
         }
-        // for percentbar we want to get the whole Ranges, for Gradident Column just range that contains cell value
+        // for Gradient Column we want just the range that contains cell value
         if (numericStyle.GradientStyle) {
             let range;
             numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
-                if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
-                    range = cellRange;
+                if (!range) {
+                    if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
+                        (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
+                        range = cellRange;
+                    }
                 }
             });
-            return range ? range.Min : undefined;
+            return this.getCellColorRangeMinValue(range, column);
         }
+        // for percentbar we want to get the whole Ranges
         if (numericStyle.PercentBarStyle) {
             const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
-                return ranges[0].Min;
+                return this.getCellColorRangeMinValue(ranges[0], column);
             }
         }
     }
-    getNumericStyleMaxValue(numericStyle, rowNode, cellValue) {
+    getNumericStyleMaxValue(numericStyle, column, rowNode, cellValue) {
         var _a, _b;
         const columnComparison = numericStyle.GradientStyle
             ? numericStyle.GradientStyle.ColumnComparison
@@ -238,19 +242,44 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         if (numericStyle.GradientStyle) {
             let range;
             numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
-                if (!range && cellValue >= cellRange.Min && cellValue <= cellRange.Max) {
-                    range = cellRange;
+                if (!range) {
+                    if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
+                        (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
+                        range = cellRange;
+                    }
                 }
             });
-            return range ? range.Max : undefined;
+            return this.getCellColorRangeMaxValue(range, column);
         }
         if (numericStyle.PercentBarStyle) {
             const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
-                return ranges[ranges.length - 1].Max;
+                return this.getCellColorRangeMaxValue(ranges[ranges.length - 1], column);
             }
         }
     }
+    getCellColorRangeMinValue(range, column) {
+        if (!range) {
+            return undefined;
+        }
+        if (range.Min == undefined) {
+            return undefined;
+        }
+        return range.Min == 'Col-Min'
+            ? this.getAdaptableApi().columnApi.getMinValueForNumericColumn(column)
+            : range.Min;
+    }
+    getCellColorRangeMaxValue(range, column) {
+        if (!range) {
+            return undefined;
+        }
+        if (range.Max == undefined) {
+            return undefined;
+        }
+        return range.Max == 'Col-Max'
+            ? this.getAdaptableApi().columnApi.getMaxValueForNumericColumn(column)
+            : range.Max;
+    }
     getCheckBoxStyleFormatColumn(column) {
         var _a;
         if (column.dataType != 'Boolean') {

package/src/PredefinedConfig/AlertState.d.ts

@@ -37,7 +37,7 @@ export interface AlertDefinition extends SuspendableObject {
      */
     MessageType: AdaptableMessageType;
     /**
-     * Alert Message - can be string or function; if not provided AdapTable creates dynamically using Rule & Scope
+     * Alert Message; if not provided AdapTable creates dynamically using Rule & Scope (Note: can be provided as a function in AlertOptions)
      */
     MessageText?: string;
     /**
@@ -126,4 +126,4 @@ export interface AlertProperties {
      */
     PreventEdit?: boolean;
 }
-export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';
+export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -59,7 +59,7 @@ exports.SystemPredicateDefs = [
                 return true;
             }
             if (column.dataType === 'Date') {
-                return inputs.some((input) => {
+                return inputs.every((input) => {
                     return !isSameDay_1.default(input, value);
                 });
             }
@@ -186,6 +186,14 @@ exports.SystemPredicateDefs = [
         icon: { text: '1' },
         columnScope: { DataTypes: ['Number'] },
         moduleScope: ['alert', 'flashingcell'],
+        handler: ({ value }) => !isNaN(Number(value)),
+    },
+    {
+        id: 'IsNotNumeric',
+        label: 'Is Not Numeric',
+        icon: { text: '1' },
+        columnScope: { DataTypes: ['Number'] },
+        moduleScope: ['alert', 'flashingcell'],
         handler: ({ value }) => isNaN(Number(value)),
     },
     // String System Filters

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

@@ -29,6 +29,7 @@ export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFi
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
 export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare const ALL_MODULES: AdaptableModule[];
 export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;

package/src/PredefinedConfig/Common/Types.js

@@ -3,7 +3,9 @@
 This page includes frequently used typed - particularly helpful for State and Api where we can strongly type stuff
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_TOOL_PANELS = exports.ALL_STATUS_SUB_PANELS = exports.ALL_TOOLBARS = void 0;
+exports.ALL_MODULES = exports.ALL_TOOL_PANELS = exports.ALL_STATUS_SUB_PANELS = exports.ALL_TOOLBARS = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 exports.ALL_TOOLBARS = [
     'Alert',
     'BulkUpdate',
@@ -72,3 +74,38 @@ exports.ALL_TOOL_PANELS = [
     'SystemStatus',
     'Theme',
 ];
+exports.ALL_MODULES = [
+    ModuleConstants.AlertModuleId,
+    ModuleConstants.BulkUpdateModuleId,
+    ModuleConstants.CalculatedColumnModuleId,
+    ModuleConstants.CellSummaryModuleId,
+    ModuleConstants.ChartingModuleId,
+    ModuleConstants.ConditionalStyleModuleId,
+    ModuleConstants.CustomSortModuleId,
+    ModuleConstants.DashboardModuleId,
+    ModuleConstants.DataChangeHistoryModuleId,
+    ModuleConstants.DataSetModuleId,
+    ModuleConstants.ExportModuleId,
+    ModuleConstants.FilterModuleId,
+    ModuleConstants.FlashingCellModuleId,
+    ModuleConstants.FormatColumnModuleId,
+    ModuleConstants.FreeTextColumnModuleId,
+    ModuleConstants.Glue42ModuleId,
+    ModuleConstants.GridInfoModuleId,
+    ModuleConstants.IPushPullModuleId,
+    ModuleConstants.LayoutModuleId,
+    ModuleConstants.OpenFinModuleId,
+    ModuleConstants.PlusMinusModuleId,
+    ModuleConstants.QueryModuleId,
+    ModuleConstants.QuickSearchModuleId,
+    ModuleConstants.ScheduleModuleId,
+    ModuleConstants.SettingsPanelModuleId,
+    ModuleConstants.ShortcutModuleId,
+    ModuleConstants.SmartEditModuleId,
+    ModuleConstants.StateManagementModuleId,
+    ModuleConstants.StatusBarModuleId,
+    ModuleConstants.SystemStatusModuleId,
+    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.ThemeModuleId,
+    ModuleConstants.ToolPanelModuleId,
+];

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -65,4 +65,4 @@ export interface FlashingCellDefinition extends SuspendableObject {
      */
     FlashDuration?: number | 'always';
 }
-export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'Any';
+export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'Any';

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -111,11 +111,11 @@ export interface CellColorRange {
     /**
      * Start number of Range
      */
-    Min: number;
+    Min: number | 'Col-Min';
     /**
      * End number of Range
      */
-    Max: number;
+    Max: number | 'Col-Max';
     /**
      * Cell colour to use for values that fall inside Range
      */

package/src/Redux/Store/AdaptableStore.js

@@ -899,6 +899,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             }
                         }
                     }
+                    // when changing current layout via the api, the layout should update
+                    if (returnAction.type == LayoutRedux.LAYOUT_SAVE) {
+                        const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                        const savingLayout = returnAction.layout;
+                        if (currentLayout.Name === savingLayout.Name) {
+                            adaptable.setLayout(savingLayout);
+                        }
+                    }
                     return returnAction;
                 }
                 /*******************

package/src/Strategy/AlertModule.js

@@ -20,7 +20,7 @@ const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.AlertModuleId, 'Alert', 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
+        super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {

package/src/Strategy/BulkUpdateModule.js

@@ -10,7 +10,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.BulkUpdateModuleId, 'Bulk Update', 'bulk-update', 'BulkUpdatePopup', 'Update multiple cell simultaneously with a new or existing value', api);
+        super(ModuleConstants.BulkUpdateModuleId, ModuleConstants.BulkUpdateFriendlyName, 'bulk-update', 'BulkUpdatePopup', 'Update multiple cell simultaneously with a new or existing value', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/CalculatedColumnModule.js

@@ -13,7 +13,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CalculatedColumnModuleId, 'Calculated Column', 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
+        super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
     }
     handleConfigReloaded(adaptableStateReloadedInfo) {
         // re-dispatch the CalculatedColumnReady action to recreate all the aggregated scalar columns

package/src/Strategy/CellSummaryModule.js

@@ -9,7 +9,7 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
 class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CellSummaryModuleId, 'Cell Summary', 'cell-summary', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
+        super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cell-summary', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/ChartingModule.js

@@ -6,7 +6,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
+        super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
     isModuleAvailable() {
         return this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();

package/src/Strategy/ConditionalStyleModule.js

@@ -15,7 +15,7 @@ const getStyleViewItems_1 = require("./Utilities/getStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ConditionalStyleModuleId, 'Conditional Style', 'conditional-style', 'ConditionalStylePopup', 'Style columns and rows dynamically based on rules and cell values', api);
+        super(ModuleConstants.ConditionalStyleModuleId, ModuleConstants.ConditionalStyleFriendlyName, 'conditional-style', 'ConditionalStylePopup', 'Style columns and rows dynamically based on rules and cell values', api);
     }
     getModuleAdaptableObjects(config) {
         return this.api.conditionalStyleApi.getAllConditionalStyle(config);

package/src/Strategy/CustomSortModule.js

@@ -11,7 +11,7 @@ const getCustomSortSortOrderViewItems_1 = require("./Utilities/CustomSort/getCus
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CustomSortModuleId, 'Custom Sort', 'custom-sort', 'CustomSortPopup', 'Provide bespoke sorting information for Columns (in place of alphabetical sorting)', api);
+        super(ModuleConstants.CustomSortModuleId, ModuleConstants.CustomSortFriendlyName, 'custom-sort', 'CustomSortPopup', 'Provide bespoke sorting information for Columns (in place of alphabetical sorting)', api);
     }
     getModuleAdaptableObjects(config) {
         return this.api.customSortApi.getAllCustomSort(config);

package/src/Strategy/DashboardModule.js

@@ -8,7 +8,7 @@ const DashboardRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/Da
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.DashboardModuleId, 'Dashboard', 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', 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);
     }
     updateOldConfig() {
         let dashboardState = this.api.dashboardApi.getDashboardState();

package/src/Strategy/DataChangeHistoryModule.js

@@ -8,7 +8,7 @@ const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const DataChangeHistoryStatusBarContent_1 = require("../View/DataChangeHistory/DataChangeHistoryStatusBarContent");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.DataChangeHistoryModuleId, 'Data Changes', 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
+        super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {

package/src/Strategy/DataSetModule.js

@@ -10,7 +10,7 @@ const Uuid_1 = require("../PredefinedConfig/Uuid");
 const DataSetSelector_1 = require("../View/DataSet/DataSetSelector");
 class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.DataSetModuleId, 'Data Set', 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
+        super(ModuleConstants.DataSetModuleId, ModuleConstants.DataSetFriendlyName, 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
     }
     handleAdaptableReady() {
         this.api.dataSetApi.getAllDataSets().forEach((ds) => {

package/src/Strategy/ExportModule.js

@@ -21,7 +21,7 @@ const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ExportSelector_1 = require("../View/Export/ExportSelector");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ExportModuleId, 'Export', 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
+        super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
     }
     getModuleAdaptableObjects() {
         return this.api.exportApi.getAllReports();

package/src/Strategy/FilterModule.js

@@ -11,7 +11,7 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FilterModuleId, 'Filter', 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
+        super(ModuleConstants.FilterModuleId, ModuleConstants.FilterFriendlyName, 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
     getModuleAdaptableObjects() {
         return this.api.filterApi.getColumnFilters();

package/src/Strategy/FlashingCellModule.js

@@ -17,7 +17,7 @@ const getFlashingTargetViewItems_1 = require("./Utilities/FlashingCell/getFlashi
 const getFlashingCellStyleViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellStyleViewItems");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FlashingCellModuleId, 'Flashing Cell', 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
+        super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {

package/src/Strategy/FormatColumnModule.js

@@ -15,7 +15,7 @@ const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFor
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FormatColumnModuleId, 'Format Column', 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
+        super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
         /**
          * Use Case: Data (cell/row) has changed
          * Action: Any CheckboxFormatColumns need to be updated, as their disabled state may have changed
@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/FreeTextColumnModule.js

@@ -9,7 +9,7 @@ const FreeTextColumnWizard_1 = require("../View/FreeTextColumn/Wizard/FreeTextCo
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FreeTextColumnModuleId, 'Free Text Column', 'freetext-column', 'FreeTextColumnPopup', 'Dynamic column showing custom content (stored in state and not with grid data)', api);
+        super(ModuleConstants.FreeTextColumnModuleId, ModuleConstants.FreeTextColumnFriendlyName, 'freetext-column', 'FreeTextColumnPopup', 'Dynamic column showing custom content (stored in state and not with grid data)', api);
     }
     isModuleAvailable() {
         // FreeTextColumn module doesn't support autogenerated primary keys

package/src/Strategy/GridInfoModule.js

@@ -6,7 +6,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, 'Grid Info', 'info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/LayoutModule.js

@@ -16,7 +16,7 @@ const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterVi
 const getLayoutSortViewItems_1 = require("./Utilities/Layout/getLayoutSortViewItems");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
+        super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -247,8 +247,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     values: [layout.Name],
                 },
                 {
-                    name: 'Pivot Layout',
-                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Yes' : 'No'],
+                    name: 'Layout Grid Type',
+                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Pivot' : 'Table'],
                 },
                 {
                     name: 'Columns',

package/src/Strategy/PlusMinusModule.js

@@ -14,7 +14,7 @@ const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.PlusMinusModuleId, 'Plus Minus', 'plus-minus', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
+        super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'plus-minus', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
         this.shouldHandleKeyDown = false;
         this.adaptable = api.internalApi.getAdaptableInstance();
     }

package/src/Strategy/QueryModule.js

@@ -10,7 +10,7 @@ const EditCurrentQueryButton_1 = require("../View/Query/EditCurrentQueryButton")
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.QueryModuleId, 'Query', 'query', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
+        super(ModuleConstants.QueryModuleId, ModuleConstants.QueryFriendlyName, 'query', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
     }
     getModuleAdaptableObjects() {
         return this.api.queryApi.getAllNamedQuery();

package/src/Strategy/QuickSearchModule.js

@@ -7,7 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const QuickSearchStatusBarContent_1 = require("../View/QuickSearch/QuickSearchStatusBarContent");
 class QuickSearchModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.QuickSearchModuleId, 'Quick Search', 'quick-search', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
+        super(ModuleConstants.QuickSearchModuleId, ModuleConstants.QuickSearchFriendlyName, 'quick-search', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
     }
     getViewProperties() {
         return {

package/src/Strategy/ScheduleModule.js

@@ -35,7 +35,7 @@ const NodeSchedule = {
 };
 class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ScheduleModuleId, 'Schedule', 'schedule', 'SchedulePopup', 'Schedule AdapTable functionality to run at times of your choosing (e.g. run reports)', api);
+        super(ModuleConstants.ScheduleModuleId, ModuleConstants.ScheduleFriendlyName, 'schedule', 'SchedulePopup', 'Schedule AdapTable functionality to run at times of your choosing (e.g. run reports)', api);
         this.scheduleJobs = [];
         this.addMidnightRefreshSchedule();
     }