@adaptabletools/adaptable 15.3.2 → 15.3.3-canary.1

package/src/Strategy/StyledColumnModule.js

@@ -9,6 +9,7 @@ const StyledColumnWizard_1 = require("../View/StyledColumn/Wizard/StyledColumnWi
 const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const StyledColumnBadgePreview_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview");
 class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
@@ -72,71 +73,106 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
-        const config = {
-            defaultCurrentSectionName: 'Style',
-        };
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
+            let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
             // First look at Sparkline Columns - needs to be editable array type
             if (this.api.columnApi.hasArrayDataType(column.columnId) &&
                 column.IsReadOnly !== true &&
                 this.api.styledColumnApi.canDisplaySparklines()) {
-                let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
                 let sparklineColumnExists = column.isSparkline && Boolean(styledColumn);
                 if (column.isSparkline && !sparklineColumnExists) {
                     // do nothing as we only want to continue if there is no sparkline column or if its in state
                     // because if just one then it was created in AG Grid and we dont want to edit it
                 }
                 else {
-                    if (!sparklineColumnExists) {
-                        styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
-                            // set sparkline style
-                            SparkLineStyle: {} });
-                    }
-                    else {
-                        styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
+                    const hasSparklineStyle = styledColumn != null && styledColumn.SparkLineStyle != null;
+                    if (!hasSparklineStyle) {
+                        styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, SparkLineStyle: {} });
                     }
-                    let label = sparklineColumnExists ? 'Edit ' : 'Create ';
+                    let label = hasSparklineStyle ? 'Edit ' : 'Create ';
                     let popupParam = {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
-                        config,
+                        config: {
+                            defaultCurrentSectionName: 'Settings',
+                        },
                     };
-                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
+                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
                 }
             }
             // Next do non sparkline
-            if (!column.isSparkline) {
-                // First do numeric (Gradient and Percent Bar)
-                if (column.dataType === 'Number') {
-                    let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
-                    let styledColumnExists = Boolean(styledColumn);
-                    if (!styledColumn) {
-                        const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
-                            ColumnIds: [column.columnId],
-                        });
-                        styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
-                            // numbers default to gradient
-                            GradientStyle: {
-                                CellRanges: emptyRanges,
-                            } });
+            else if (!column.isSparkline) {
+                // Edit is common
+                if (styledColumn) {
+                    if (!styledColumn.IsReadOnly && !styledColumn.CheckBoxStyle) {
+                        let defaultCurrentSectionName = undefined;
+                        if (styledColumn.BadgeStyle) {
+                            defaultCurrentSectionName = 'Badges';
+                        }
+                        else {
+                            defaultCurrentSectionName = 'Style';
+                        }
+                        const popupParam = {
+                            action: 'Edit',
+                            source: 'ColumnMenu',
+                            value: styledColumn,
+                            config: {
+                                defaultCurrentSectionName,
+                            },
+                        };
+                        const icon = this.getGlyphForStyledColumn(styledColumn);
+                        const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
+                        returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label, this.moduleInfo.Popup, icon, popupParam));
                     }
-                    if (styledColumn && styledColumn.IsReadOnly && styledColumn.IsReadOnly == true) {
-                        styledColumnExists = false;
-                    }
-                    let label = styledColumnExists ? 'Edit ' : 'Create ';
-                    let popupParam = {
-                        action: styledColumnExists ? 'Edit' : 'New',
+                }
+                else {
+                    const newStyledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId });
+                    const popupParam = {
+                        action: 'New',
                         source: 'ColumnMenu',
-                        value: styledColumn,
-                        config,
+                        value: newStyledColumn,
+                        config: {},
                     };
-                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
+                    const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
+                    const newBadgeButton = this.createColumnMenuItemShowPopup(badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
+                                Badges: [ObjectFactory_1.default.CreateDefaultStyledColumnBadge()],
+                            } }), config: {
+                            defaultCurrentSectionName: 'Badges',
+                        } }));
+                    switch (column.dataType) {
+                        // Number
+                        // Create Styled Column - Gradient | Percent Bar | Badge
+                        case 'Number':
+                            const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
+                                ColumnIds: [column.columnId],
+                            });
+                            const newGrandientButton = this.createColumnMenuItemShowPopup('Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                                        CellRanges: emptyRanges,
+                                    } }), config: {
+                                    defaultCurrentSectionName: 'Style',
+                                } }));
+                            const newPrecentBarButton = this.createColumnMenuItemShowPopup('Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                                        CellRanges: emptyRanges,
+                                    } }), config: {
+                                    defaultCurrentSectionName: 'Style',
+                                } }));
+                            returnColumnMenuItems.push({
+                                label: 'Create Styled Column',
+                                module: this.moduleInfo.ModuleName,
+                                isVisible: true,
+                                icon: { name: this.moduleInfo.Glyph },
+                                subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
+                            });
+                            break;
+                        case 'String':
+                            returnColumnMenuItems.push(newBadgeButton);
+                            break;
+                    }
                 }
                 // Then do Checkbox
                 if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
-                    let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
                     const hasCheckBox = styledColumn && (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.CheckBoxStyle);
                     if (hasCheckBox) {
                         returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
@@ -154,6 +190,24 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return returnColumnMenuItems;
     }
+    getGlyphForStyledColumn(styledColumn) {
+        if (styledColumn.GradientStyle) {
+            return 'gradient';
+        }
+        else if (styledColumn.PercentBarStyle) {
+            return 'percent';
+        }
+        else if (styledColumn.CheckBoxStyle) {
+            return 'check-circle';
+        }
+        else if (styledColumn.SparkLineStyle) {
+            return 'spark-line';
+        }
+        else if (styledColumn.BadgeStyle) {
+            return 'badge';
+        }
+        return this.moduleInfo.Glyph;
+    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.styledColumnApi.getStyledColumns(),
@@ -162,40 +216,40 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(styledColumn) {
-        let type = null;
-        if (styledColumn.GradientStyle) {
-            type = 'Gradient';
-        }
-        else if (styledColumn.PercentBarStyle) {
-            type = 'Percent Bar';
+        const specificTypeItems = [];
+        if (styledColumn.GradientStyle || styledColumn.PercentBarStyle || styledColumn.CheckBoxStyle) {
+            specificTypeItems.push({
+                name: 'Style',
+                view: () => {
+                    return (0, StyledColumnWizardStyleSection_1.renderStyledColumnStyleSummary)(styledColumn, this.api);
+                },
+            });
         }
-        else if (styledColumn.CheckBoxStyle) {
-            type = 'Check Box';
+        if (!styledColumn.BadgeStyle) {
+            specificTypeItems.push({
+                name: 'Settings',
+                values: [`Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`],
+            });
         }
-        else if (styledColumn.SparkLineStyle) {
-            type = 'Spark Line';
+        if (styledColumn.BadgeStyle) {
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnBadgePreview_1.StyledColumnBadgePreview,
+            });
         }
         return {
             abObject: styledColumn,
             items: [
                 {
                     name: 'Type',
-                    values: [type],
+                    values: [this.getTypeLabel(styledColumn)],
                 },
                 {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameForColumnId(styledColumn.ColumnId)],
                 },
-                !styledColumn.SparkLineStyle && {
-                    name: 'Style',
-                    view: () => {
-                        return (0, StyledColumnWizardStyleSection_1.renderStyledColumnStyleSummary)(styledColumn, this.api);
-                    },
-                },
-                {
-                    name: 'Settings',
-                    values: [`Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`],
-                },
+                ...specificTypeItems,
+                ,
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(styledColumn, this.api),
             ].filter(Boolean),
         };
@@ -221,5 +275,24 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     canBeAssociatedWithLayouts() {
         return true;
     }
+    getTypeLabel(styledColumn) {
+        let type = null;
+        if (styledColumn.GradientStyle) {
+            type = 'Gradient';
+        }
+        else if (styledColumn.PercentBarStyle) {
+            type = 'Percent Bar';
+        }
+        else if (styledColumn.CheckBoxStyle) {
+            type = 'Check Box';
+        }
+        else if (styledColumn.SparkLineStyle) {
+            type = 'Spark Line';
+        }
+        else if (styledColumn.BadgeStyle) {
+            type = 'Badge';
+        }
+        return type;
+    }
 }
 exports.StyledColumnModule = StyledColumnModule;

package/src/Strategy/SystemStatusModule.js

@@ -7,7 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const SystemStatusStatusBarContent_1 = require("../View/SystemStatus/SystemStatusStatusBarContent");
 class SystemStatusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.SystemStatusModuleId, ModuleConstants.SystemStatusFriendlyName, 'system-status', 'SystemStatusPopup', 'Provide messages about the Status of your application', api);
+        super(ModuleConstants.SystemStatusModuleId, ModuleConstants.SystemStatusFriendlyName, 'traffic-lights', 'SystemStatusPopup', 'Provide messages about the Status of your application', api);
     }
     addColumnMenuItems(column) {
         if (this.isModuleAvailable()) {

package/src/Strategy/TeamSharingModule.js

@@ -16,7 +16,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
 class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.TeamSharingModuleId, ModuleConstants.TeamSharingFriendlyName, 'team-share', 'TeamSharingPopup', 'Team Sharing allows users to share - at run-time - Adaptable Objects between colleagues.', api);
+        super(ModuleConstants.TeamSharingModuleId, ModuleConstants.TeamSharingFriendlyName, 'folder-shared', 'TeamSharingPopup', 'Team Sharing allows users to share - at run-time - Adaptable Objects between colleagues.', api);
         this.SKIP_TEAMSHARING_UPDATE_ACTIONS = [
             TeamSharingRedux_1.TEAMSHARING_GET,
             TeamSharingRedux_1.TEAMSHARING_SET,

package/src/Strategy/ToolPanelModule.js

@@ -8,7 +8,7 @@ const Types_1 = require("../PredefinedConfig/Common/Types");
 const ToolPanelRedux_1 = require("../Redux/ActionsReducers/ToolPanelRedux");
 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);
+        super(ModuleConstants.ToolPanelModuleId, ModuleConstants.ToolPanelFriendlyName, 'clipboard', '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);
     }
     isModuleAvailable() {
         if (!super.isModuleAvailable()) {

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -38,6 +38,8 @@ export declare const CELL_SUMMARY_DEFAULT_OPERATION: SummaryOperation | string;
 export declare const SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE: AdaptableMessageType;
 export declare const THEME_DEFAULT_CURRENT_THEME: string;
 export declare const DEFAULT_LIVE_REPORT_THROTTLE_TIME: number;
+export declare const SERVER_VALIDATION_HEADER: string;
+export declare const SERVER_VALIDATION_MESSAGE_TYPE: AdaptableMessageType;
 /**
  * Object Factory
  */

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = void 0;
+exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -53,6 +53,8 @@ exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = 'Info';
 exports.THEME_DEFAULT_CURRENT_THEME = exports.LIGHT_THEME;
 // Live Report Throttle Time (used in OpenFin, IPushPull, Glue42 etc.)
 exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = 2000;
+exports.SERVER_VALIDATION_HEADER = 'Server Validation Message';
+exports.SERVER_VALIDATION_MESSAGE_TYPE = 'Info';
 /**
  * Object Factory
  */

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -105,6 +105,7 @@ exports.DefaultAdaptableOptions = {
             position: 'pinnedLeft',
             autoHandle: true,
             setPrimaryKeyValue: undefined,
+            disableInlineEditing: false,
             actionRowFormOptions: {
                 formTitle: undefined,
                 formDescription: undefined,

package/src/Utilities/Helpers/StyleHelper.js

@@ -31,6 +31,25 @@ const convertAdaptableStyleToCSS = (style) => {
     if (style.BorderColor !== undefined && style.BorderColor !== null) {
         result.borderColor = style.BorderColor;
     }
+    if (style.BorderRadius !== undefined && style.BorderRadius !== null) {
+        const preparedRadious = typeof style.BorderRadius === 'number' ? `${style.BorderRadius}px` : style.BorderRadius;
+        result.borderRadius = preparedRadious;
+    }
+    if (style.TextDecoration !== undefined && style.TextDecoration !== null) {
+        switch (style.TextDecoration) {
+            case 'None':
+                break;
+            case 'Underline':
+                result.textDecoration = 'underline';
+                break;
+            case 'Overline':
+                result.textDecoration = 'overline';
+                break;
+            case 'LineThrough':
+                result.textDecoration = 'line-through';
+                break;
+        }
+    }
     // assertion added to comply with the ag-Grid types
     return result;
 };

package/src/Utilities/ObjectFactory.d.ts

@@ -25,7 +25,7 @@ import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
 import { AdaptableTheme, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
-import { AdaptableApi } from '../../types';
+import { AdaptableApi, BadgeStyleDefinition } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
@@ -64,6 +64,7 @@ export declare function CreateSystemStatusMessageInfo(message: string, type: Ada
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
 export declare function CreateEmptyStyledColumn(): StyledColumn;
+export declare function CreateDefaultStyledColumnBadge(): BadgeStyleDefinition;
 export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefinition): ChartDefinition;
 export declare function CreateCustomDisplayFormatterContext(value: any, node: IRowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare function CreateEmptyTheme(name?: string): AdaptableTheme;
@@ -110,6 +111,7 @@ export declare const ObjectFactory: {
     CreateToastOptions: typeof CreateToastOptions;
     CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
     CreateEmptyStyledColumn: typeof CreateEmptyStyledColumn;
+    CreateDefaultStyledColumnBadge: typeof CreateDefaultStyledColumnBadge;
     CreateEmptyChartDefinition: typeof CreateEmptyChartDefinition;
     CreateEmptyTheme: typeof CreateEmptyTheme;
 };

package/src/Utilities/ObjectFactory.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
 const Toastify_1 = require("../components/Toastify");
+const UIHelper_1 = require("../View/UIHelper");
 function CreateEmptyCustomSort() {
     return { Uuid: (0, Uuid_1.createUuid)(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
@@ -363,9 +364,20 @@ function CreateEmptyStyledColumn() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
+        IncludeGroupedRows: false,
     };
 }
 exports.CreateEmptyStyledColumn = CreateEmptyStyledColumn;
+function CreateDefaultStyledColumnBadge() {
+    return {
+        Style: {
+            BackColor: (0, UIHelper_1.getHexForName)(UIHelper_1.LIGHT_GRAY),
+            ForeColor: (0, UIHelper_1.getHexForName)(UIHelper_1.BLACK),
+            BorderRadius: 6,
+        },
+    };
+}
+exports.CreateDefaultStyledColumnBadge = CreateDefaultStyledColumnBadge;
 function CreateEmptyChartDefinition(chartDefinition) {
     return Object.assign({ Uuid: (0, Uuid_1.createUuid)() }, chartDefinition);
 }
@@ -478,6 +490,7 @@ exports.ObjectFactory = {
     CreateToastOptions,
     CreateCustomDisplayFormatterContext,
     CreateEmptyStyledColumn,
+    CreateDefaultStyledColumnBadge,
     CreateEmptyChartDefinition,
     CreateEmptyTheme,
 };

package/src/Utilities/Services/EntitlementService.js

@@ -27,11 +27,13 @@ class EntitlementService {
         let adaptableOptions = this.adaptableApi.optionsApi.getAdaptableOptions();
         let entitlementOptions = adaptableOptions.entitlementOptions;
         if (entitlementOptions) {
+            const defaultAccessLevelContext = {
+                userName: adaptableOptions.userName,
+                adaptableId: adaptableOptions.adaptableId,
+                adaptableApi: this.adaptableApi
+            };
             const defaultAccessLevel = typeof entitlementOptions.defaultAccessLevel === 'function'
-                ? entitlementOptions.defaultAccessLevel({
-                    userName: adaptableOptions.userName,
-                    adaptableId: adaptableOptions.adaptableId,
-                })
+                ? entitlementOptions.defaultAccessLevel(defaultAccessLevelContext)
                 : entitlementOptions.defaultAccessLevel;
             const moduleEntitlements = entitlementOptions.moduleEntitlements;
             if (moduleEntitlements) {
@@ -41,6 +43,7 @@ class EntitlementService {
                         userName: adaptableOptions.userName,
                         adaptableId: adaptableOptions.adaptableId,
                         defaultAccessLevel,
+                        adaptableApi: this.adaptableApi
                     };
                     const dynamicModuleEntitlement = moduleEntitlements(entitlementContext);
                     return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;

package/src/Utilities/Services/ValidationService.js

@@ -6,6 +6,7 @@ const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
+const GeneralConstants_1 = require("../Constants/GeneralConstants");
 class ValidationService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -72,10 +73,14 @@ class ValidationService {
         }, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
+        const serverValidationContext = {
+            cellDataChangedInfo: cellDataChangedInfo,
+            adaptableApi: this.adaptableApi,
+        };
         return () => {
             this.adaptableApi.optionsApi
                 .getEditOptions()
-                .validateOnServer(cellDataChangedInfo)
+                .validateOnServer(serverValidationContext)
                 .then((validationResult) => {
                 var _a, _b;
                 if (validationResult.NewValue === undefined) {
@@ -94,7 +99,13 @@ class ValidationService {
                     this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
                         this.adaptableApi.optionsApi.getEditOptions().displayServerValidationMessages) {
-                        this.adaptableApi.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
+                        const validationHeader = validationResult.ValidationHeader
+                            ? validationResult.ValidationHeader
+                            : GeneralConstants_1.SERVER_VALIDATION_HEADER;
+                        const messageType = validationResult.MessageType
+                            ? validationResult.MessageType
+                            : GeneralConstants_1.SERVER_VALIDATION_MESSAGE_TYPE;
+                        this.adaptableApi.alertApi.showAlert(validationHeader, validationResult.ValidationMessage, messageType);
                     }
                 }
                 config.onServerValidationCompleted();

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -20,7 +20,6 @@ const AlertButtonsEditor = (props) => {
     const alertDefinition = adaptableAlert.alertDefinition;
     const rowAddedAlert = api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
     const rowRemovedAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
-    const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
     // except row change
     const hasHighlightCell = props.alertType !== 'RowChange';
     // all, except row removed
@@ -56,7 +55,7 @@ const AlertButtonsEditor = (props) => {
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between" },
             React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "Add buttons to Alert, and Actions to perform when button is clicked"),
-            React.createElement(SimpleButton_1.default, { icon: "add", onClick: () => {
+            React.createElement(SimpleButton_1.default, { icon: "plus", onClick: () => {
                     onChange([
                         ...(AlertButtons || []),
                         {
@@ -71,11 +70,13 @@ const AlertButtonsEditor = (props) => {
             var _a, _b;
             let buttonStyle = button.ButtonStyle;
             let buttonLabel = button.Label;
-            const btnActions = button.Action && typeof button.Action === 'string'
-                ? !Array.isArray(button.Action)
-                    ? [button.Action]
-                    : button.Action
-                : [];
+            let btnActions = [];
+            if (button.Action && typeof button.Action === 'string') {
+                btnActions = [button.Action];
+            }
+            else if (button.Action && Array.isArray(button.Action)) {
+                btnActions = button.Action;
+            }
             // filter out the adaptable standard actions
             const btnUserFunctions = btnActions.filter((action) => !buttonActions.includes(action));
             const setVariant = (variant) => {
@@ -103,11 +104,27 @@ const AlertButtonsEditor = (props) => {
                     return btn;
                 }));
             };
+            const handleActionChange = (checked, actionName) => {
+                let actions = btnActions;
+                if (!checked) {
+                    // remove current action
+                    actions = actions.filter((a) => a !== actionName);
+                }
+                else {
+                    actions = [...actions, actionName];
+                }
+                onChange(AlertButtons.map((btn, i) => {
+                    if (i === index) {
+                        return Object.assign(Object.assign({}, btn), { Action: actions.length ? actions : undefined });
+                    }
+                    return btn;
+                }));
+            };
             return (React.createElement(rebass_1.Box, { key: index, marginLeft: 3, style: {
                     borderTop: index ? '1px dashed var(--ab-color-inputborder)' : '',
                 } },
                 React.createElement(FormLayout_1.default, { marginBottom: 2, paddingTop: 2 },
-                    React.createElement(FormLayout_1.FormRow, { label: React.createElement(rebass_1.Text, { fontSize: 2, style: { whiteSpace: 'nowrap' } }, "Button text") },
+                    React.createElement(FormLayout_1.FormRow, { label: React.createElement(rebass_1.Text, { fontSize: 2, style: { whiteSpace: 'nowrap' } }, "Button Text") },
                         React.createElement(rebass_1.Flex, { flexDirection: "row" },
                             React.createElement(Input_1.default, { value: buttonLabel, style: { width: 80 }, onChange: (e) => {
                                     onChange(AlertButtons.map((btn, i) => {
@@ -146,27 +163,12 @@ const AlertButtonsEditor = (props) => {
                                     "Tone:",
                                     ' ',
                                     StringExtensions_1.default.CapitaliseFirstLetter((_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _b !== void 0 ? _b : 'Use alert tone'))),
-                            React.createElement(SimpleButton_1.default, { icon: "clear", tone: "error", disabled: AlertButtons.length <= 1, marginLeft: 1, variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
+                            React.createElement(SimpleButton_1.default, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, marginLeft: 1, variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
                                     onChange(AlertButtons.filter((btn) => btn !== button));
                                 } }))),
                     React.createElement(FormLayout_1.FormRow, { label: React.createElement(rebass_1.Text, { fontSize: 2 }, "Actions") },
                         buttonActions.map((actionName) => {
-                            return (React.createElement(CheckBox_1.CheckBox, { key: actionName, marginRight: 3, onChange: (checked) => {
-                                    let actions = btnActions;
-                                    if (!checked) {
-                                        // remove current action
-                                        actions = actions.filter((a) => a !== actionName);
-                                    }
-                                    else {
-                                        actions = [...actions, actionName];
-                                    }
-                                    onChange(AlertButtons.map((btn, i) => {
-                                        if (i === index) {
-                                            return Object.assign(Object.assign({}, btn), { Action: actions.length ? actions : undefined });
-                                        }
-                                        return btn;
-                                    }));
-                                }, checked: button.Action === actionName ||
+                            return (React.createElement(CheckBox_1.CheckBox, { key: actionName, marginRight: 3, onChange: (checked) => handleActionChange(checked, actionName), checked: button.Action === actionName ||
                                     (Array.isArray(button.Action) && button.Action.includes(actionName)) },
                                 React.createElement(rebass_1.Text, { fontSize: 2 }, (0, sentence_case_1.sentenceCase)(actionName))));
                         }),

package/src/View/Charting/ShowChartButton.js

@@ -18,7 +18,7 @@ const ShowChartButton = (props) => {
         return (React.createElement(SimpleButton_1.default, { "data-name": "close-chart-button", onClick: closeChart, variant: "text", tone: "error", icon: "visibility-off", tooltip: "Hide Chart" }));
     }
     if (!(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length)) {
-        return (React.createElement(SimpleButton_1.default, { "data-name": "show-chart-button", onClick: () => showChart(), variant: "text", tone: "success", icon: "visibility", tooltip: "Show Chart" }));
+        return (React.createElement(SimpleButton_1.default, { "data-name": "show-chart-button", onClick: () => showChart(), variant: "text", tone: "success", icon: "visibility-on", tooltip: "Show Chart" }));
     }
     const containerOptions = [
         {

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -71,7 +71,7 @@ const AdaptableObjectListItemView = (props) => {
             React.createElement(rebass_1.Flex, { justifyContent: "end" },
                 props.actions,
                 props.teamSharingActivated && (React.createElement(ButtonShare_1.ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare })),
-                props.onDelete && (React.createElement(SimpleButton_1.default, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "trash", onClick: props.onDelete, variant: "text" })),
+                props.onDelete && (React.createElement(SimpleButton_1.default, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "delete", onClick: props.onDelete, variant: "text" })),
                 props.deleteAction && deleteActionButton,
                 props.showEditButton && (React.createElement(ButtonEdit_1.ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, onClick: () => props.handleOnEdit() }))),
             React.createElement(rebass_1.Box, { flex: 1 }),

package/src/View/Components/Buttons/ButtonClear.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 class ButtonClear extends React.Component {
     render() {
-        return (React.createElement(SimpleButton_1.default, Object.assign({ "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: this.props.showIcon == false ? '' : 'clear' }, this.props, { variant: "text" }), this.props.showText ? 'Clear' : ''));
+        return (React.createElement(SimpleButton_1.default, Object.assign({ "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: this.props.showIcon == false ? '' : 'close' }, this.props, { variant: "text" }), this.props.showText ? 'Clear' : ''));
     }
 }
 exports.ButtonClear = ButtonClear;