@adaptabletools/adaptable 22.0.0-canary.2 → 22.0.0-canary.4

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -41,15 +41,6 @@ export class FormatColumnInternalApi extends ApiBase {
             .getFormatColumns(config)
             .filter((fc) => fc.Style);
     }
-    /**
-     * Retrieves all Format Columns in Adaptable State with the `Style` or the `CellAlignment` property set
-     * @returns format columns
-     */
-    getAllFormatColumnWithStyleAndCellAlignment(config) {
-        return this.getFormatColumnApi()
-            .getFormatColumns(config)
-            .filter((fc) => fc.Style || fc.CellAlignment);
-    }
     /**
      * Retrieves all Format Columns in Adaptable State with `DisplayFormat` property set
      * @returns format columns
@@ -59,15 +50,6 @@ export class FormatColumnInternalApi extends ApiBase {
             .getFormatColumns(config)
             .filter((fc) => fc.DisplayFormat);
     }
-    /**
-     * Retrieves all Format Columns in Adaptable State with `CellAlignment` property set
-     * @returns format columns
-     */
-    getAllFormatColumnWithCellAlignment(config) {
-        return this.getFormatColumnApi()
-            .getFormatColumns(config)
-            .filter((fc) => fc.CellAlignment);
-    }
     /**
      * Get all FormatColumns which are defined for this column and have a custom AdaptableStyle
      * @param column
@@ -75,7 +57,7 @@ export class FormatColumnInternalApi extends ApiBase {
      * @returns list of FormatColumn
      */
     getFormatColumnsWithStyleForColumn(column, config) {
-        const formatColumns = this.getAllFormatColumnWithStyleAndCellAlignment()
+        const formatColumns = this.getAllFormatColumnWithStyle()
             .filter((formatColumn) => {
             // FormatColumn default target is 'cell', so if no target is specified, we assume 'cell'
             const fcTarget = formatColumn.Target ?? 'cell';

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

@@ -168,11 +168,11 @@ export declare const getColumnFilterSelector: (state: AdaptableState, columnId:
     Predicates: import("../../types").ColumnFilterPredicate[];
     PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
-    Uuid?: import("../../AdaptableState/Uuid").TypeUuid;
     Source?: "InitialState" | "User";
     AdaptableVersion?: import("../../types").AdaptableVersion;
     IsReadOnly?: boolean;
     Tags?: import("../../types").AdaptableObjectTag[];
     Metadata?: any;
+    Uuid?: import("../../AdaptableState/Uuid").TypeUuid;
 };
 export declare const LayoutReducer: Redux.Reducer<LayoutState>;

package/src/Redux/ActionsReducers/NoteRedux.js

@@ -42,7 +42,7 @@ export const GetNoteSelector = (state, address) => {
             // happy check
             return true;
         }
-        // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
+        // Primary keys retrieved from the grid dom are always strings, so we must also consider them strings
         if ((typeof address.PrimaryKeyValue === 'number' && typeof note.PrimaryKeyValue === 'string') ||
             (typeof address.PrimaryKeyValue === 'string' && typeof note.PrimaryKeyValue === 'number')) {
             return (note.PrimaryKeyValue.toString() === address.PrimaryKeyValue.toString() &&

package/src/Strategy/AlertModule.js

@@ -183,6 +183,10 @@ export class AlertModule extends AdaptableModuleBase {
         const alertType = getAlertType(alert);
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [alert.Name],
+                },
                 getAlertTypeViewItems(alert),
                 alertType === 'DataChange' && {
                     ...getScopeViewItems(alert.Scope, this.api),

package/src/Strategy/CustomSortModule.js

@@ -47,6 +47,10 @@ export class CustomSortModule extends AdaptableModuleBase {
     toView(customSort) {
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [customSort.Name],
+                },
                 getCustomSortColumnViewItems(customSort, this.api),
                 getCustomSortSortOrderViewItems(customSort),
                 getObjectTagsViewItems(customSort, this.api),

package/src/Strategy/FlashingCellModule.js

@@ -182,6 +182,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
                 }
                 return [
                     this.createMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
+                        Name: `Any Change [${column.columnId}]`,
                         Scope: {
                             ColumnIds: [column.columnId],
                         },
@@ -247,6 +248,10 @@ export class FlashingCellModule extends AdaptableModuleBase {
     toView(flashingCell) {
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [flashingCell.Name],
+                },
                 { ...getScopeViewItems(flashingCell.Scope, this.api), label: 'Trigger' },
                 {
                     ...getRuleViewItems(flashingCell.Rule, this.api),

package/src/Strategy/FormatColumnModule.js

@@ -82,6 +82,10 @@ export class FormatColumnModule extends AdaptableModuleBase {
         return {
             abObject: formatColumn,
             items: [
+                {
+                    name: 'Name',
+                    values: [formatColumn.Name],
+                },
                 getScopeViewItems(formatColumn.Scope, this.api),
                 getFormatColumnSettingsTargetItems(formatColumn),
                 formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),

package/src/Strategy/LayoutModule.js

@@ -299,14 +299,14 @@ export class LayoutModule extends AdaptableModuleBase {
         }
         return {
             items: [
-                {
-                    name: 'Grid Type',
-                    values: [isPivotLayout(layout) ? 'Pivot' : 'Table'],
-                },
                 {
                     name: 'Name',
                     values: [layout.Name],
                 },
+                {
+                    name: 'Grid Type',
+                    values: [isPivotLayout(layout) ? 'Pivot' : 'Table'],
+                },
                 /**
                  * Hide pivot columns.
                  *

package/src/Strategy/PlusMinusModule.js

@@ -200,6 +200,10 @@ export class PlusMinusModule extends AdaptableModuleBase {
         return {
             abObject: plusMinus,
             items: [
+                {
+                    name: 'Name',
+                    values: [plusMinus.Name],
+                },
                 {
                     name: 'Target',
                     ...getScopeViewItems(plusMinus.Scope, this.api),

package/src/Strategy/ScheduleModule.js

@@ -132,6 +132,10 @@ export class ScheduleModule extends AdaptableModuleBase {
         return {
             abObject: schedule,
             items: [
+                {
+                    name: 'Name',
+                    values: [schedule.Name],
+                },
                 {
                     name: 'Settings',
                     values: getScheduleSettingsValues(schedule).map((description) => `${description.label}: ${description.value}`),

package/src/Strategy/ShortcutModule.js

@@ -82,6 +82,10 @@ export class ShortcutModule extends AdaptableModuleBase {
         return {
             abObject: shortcut,
             items: [
+                {
+                    name: 'Name',
+                    values: [shortcut.Name],
+                },
                 getScopeViewItems(shortcut.Scope, this.api),
                 getShortcutSettingsViewItems(shortcut),
                 getObjectTagsViewItems(shortcut, this.api),

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -1,8 +1,5 @@
 export const getFormatColumnSettingsViewItems = (formatColumn) => {
     let values = [];
-    if (formatColumn.CellAlignment) {
-        values.push(`Cell Alignment: ${formatColumn.CellAlignment}`);
-    }
     if (formatColumn.RowScope) {
         if (formatColumn.RowScope.ExcludeDataRows) {
             values.push('Exclude Data Rows');

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

@@ -12,7 +12,7 @@ export declare const PredicateDocsLink = "https://www.adaptabletools.com/docs/ad
 export declare const PrimaryKeyDocsLink = "https://www.adaptabletools.com/docs/getting-started-primary-key";
 export declare const LicenseDocsLink = "https://www.adaptabletools.com/buy/buying-adaptable-licensing";
 export declare const AdaptableOptionsDocsLink = "https://www.adaptabletools.com/docs/technical-reference-adaptable-options";
-export declare const AgGridModulesDocsLink = "https://www.adaptabletools.com/docs/dev-guide-aggrid-modules-overview";
+export declare const AgGridModulesDocsLink = "https://www.adaptabletools.com/docs/getting-started-aggrid-modules";
 export declare const AlertMessageDocsLink = "https://www.adaptabletools.com/docs/handbook-alerting-message";
 export declare const FormatColumnPlaceholderDocsLink = "https://www.adaptabletools.com/docs/handbook-column-formatting-display-format-placeholder";
-export declare const AgGridRequiredModulesDocsLink = "https://www.adaptabletools.com/docs/dev-guide-aggrid-modules-overview#mandatory-modules";
+export declare const AgGridRequiredModulesDocsLink = "https://www.adaptabletools.com/docs/getting-started-aggrid-modules#mandatory-modules";

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -13,7 +13,7 @@ export const PredicateDocsLink = `${HOST_URL_DOCS}/adaptable-predicate`;
 export const PrimaryKeyDocsLink = `${HOST_URL_DOCS}/getting-started-primary-key`;
 export const LicenseDocsLink = `${HOST_URL_ROOT}/buy/buying-adaptable-licensing`;
 export const AdaptableOptionsDocsLink = `${HOST_URL_DOCS}/technical-reference-adaptable-options`;
-export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/dev-guide-aggrid-modules-overview`;
+export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/getting-started-aggrid-modules`;
 export const AlertMessageDocsLink = `${HOST_URL_DOCS}/handbook-alerting-message`;
 export const FormatColumnPlaceholderDocsLink = `${HOST_URL_DOCS}/handbook-column-formatting-display-format-placeholder`;
-export const AgGridRequiredModulesDocsLink = `${HOST_URL_DOCS}/dev-guide-aggrid-modules-overview#mandatory-modules`;
+export const AgGridRequiredModulesDocsLink = `${HOST_URL_DOCS}/getting-started-aggrid-modules#mandatory-modules`;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -639,7 +639,7 @@ export const scalarExpressionFunctions = {
             }
             return result;
         },
-        description: "Returns the percentage difference between a cell's current value and its previous value.",
+        description: "Returns percentage difference between a cell's current value and previous value",
         signatures: [
             'PERCENT_CHANGE( [colName], <INCREASE|DECREASE> )',
             'PERCENT_CHANGE( COL(name: string), <INCREASE|DECREASE> )',
@@ -684,7 +684,7 @@ export const scalarExpressionFunctions = {
             }
             return result;
         },
-        description: "Returns the absolute difference between a cell's current value and its previous value.",
+        description: "Returns absolute difference between a cell's current value and previous value",
         signatures: [
             'ABSOLUTE_CHANGE( [colName] )',
             'ABSOLUTE_CHANGE( COL(name: string) )',
@@ -716,7 +716,7 @@ export const scalarExpressionFunctions = {
             const previousValue = context.dataChangedEvent.oldValue;
             return currentColumnValue !== previousValue;
         },
-        description: "Returns true if a cell's current value is different from its previous value, otherwise false. If no column is provided, it checks if any value has changed.",
+        description: "Returns true if cell's current value is different from previous value, otherwise false; if no column is provided, it checks if any value has changed",
         signatures: ['ANY_CHANGE( [colName] )', 'ANY_CHANGE()'],
         examples: ['ANY_CHANGE([col1])', 'ANY_CHANGE()'],
         category: 'changes',

package/src/Utilities/Extensions/StringExtensions.d.ts

@@ -17,6 +17,7 @@ export declare function Humanize(str: string): string;
 export declare function ReplaceEmptySpacesWithUnderscore(str?: string): string;
 export declare function IsNumeric(str: string): boolean;
 export declare function UnescapeHtmlEntities(str: string): string;
+export declare function ReplaceAllOccurencesExceptLastOne(str: string, searchTerm: string, replacement: string): string;
 export declare const StringExtensions: {
     IsNull: typeof IsNull;
     IsNotNull: typeof IsNotNull;
@@ -37,5 +38,6 @@ export declare const StringExtensions: {
     ReplaceEmptySpacesWithUnderscore: typeof ReplaceEmptySpacesWithUnderscore;
     IsNumeric: typeof IsNumeric;
     UnescapeHtmlEntities: typeof UnescapeHtmlEntities;
+    ReplaceAllOccurencesExceptLastOne: typeof ReplaceAllOccurencesExceptLastOne;
 };
 export default StringExtensions;

package/src/Utilities/Extensions/StringExtensions.js

@@ -92,6 +92,21 @@ export function UnescapeHtmlEntities(str) {
     }
     return preparedStr;
 }
+export function ReplaceAllOccurencesExceptLastOne(str, searchTerm, replacement) {
+    // Find the index of the last occurrence of the search string
+    const lastIndex = str.lastIndexOf(searchTerm);
+    // If the string is not found, return the original string
+    if (lastIndex === -1) {
+        return str;
+    }
+    // Slice the string into two parts: before and after the last occurrence
+    const partBeforeLast = str.slice(0, lastIndex);
+    const partAfterLast = str.slice(lastIndex);
+    // Replace all occurrences in the first part
+    const replacedPart = partBeforeLast.replaceAll(searchTerm, replacement);
+    // Recombine the modified first part with the untouched second part
+    return replacedPart + partAfterLast;
+}
 export const StringExtensions = {
     IsNull,
     IsNotNull,
@@ -112,5 +127,6 @@ export const StringExtensions = {
     ReplaceEmptySpacesWithUnderscore,
     IsNumeric,
     UnescapeHtmlEntities,
+    ReplaceAllOccurencesExceptLastOne,
 };
 export default StringExtensions;

package/src/Utilities/Helpers/FormatHelper.js

@@ -28,7 +28,6 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
     if (isNaN(n)) {
         return preparedInput.toString();
     }
-    const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
     if (options.Multiplier !== undefined) {
         n *= multiplier;
@@ -65,6 +64,7 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
     }
     let s;
     let digitsToUse;
+    const fractionsSepatator = options.FractionSeparator ?? '.';
     if (options.Truncate || options.Ceiling || options.Round || options.Floor) {
         digitsToUse = 0;
     }
@@ -84,7 +84,14 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
         s = s.replace(/\./g, options.FractionSeparator);
     }
     if (options.IntegerSeparator !== undefined) {
-        s = s.replace(/\,/g, options.IntegerSeparator);
+        // if fraction separator is not a comma then simply replace all instances
+        if (options.FractionSeparator !== ',') {
+            s = s.replace(/\,/g, options.IntegerSeparator);
+        }
+        else {
+            // otherwise don't replace the last instance
+            s = StringExtensions.ReplaceAllOccurencesExceptLastOne(s, ',', options.IntegerSeparator);
+        }
     }
     s = (options.Prefix || '') + s + (options.Suffix || '');
     if (options.Parentheses === true && preparedInput < 0) {

package/src/Utilities/Helpers/StyleHelper.js

@@ -80,6 +80,20 @@ export const convertAdaptableStyleToCSS = (style) => {
                 break;
         }
     }
+    if (style.Alignment) {
+        switch (style.Alignment) {
+            case 'Default':
+            case 'Left':
+                result.textAlign = 'left';
+                break;
+            case 'Right':
+                result.textAlign = 'right';
+                break;
+            case 'Center':
+                result.textAlign = 'center';
+                break;
+        }
+    }
     // assertion added to comply with the ag-Grid types
     return result;
 };

package/src/Utilities/ObjectFactory.js

@@ -6,7 +6,7 @@ import { Bounce, Flip, Slide, Zoom } from '../components/Toastify';
 import { BLACK, getHexForName, LIGHT_GRAY } from '../View/UIHelper';
 import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
 export function CreateEmptyCustomSort() {
-    return { Uuid: createUuid(), ColumnId: EMPTY_STRING, SortedValues: [] };
+    return { Uuid: createUuid(), Name: EMPTY_STRING, ColumnId: EMPTY_STRING, SortedValues: [] };
 }
 export function CreateAdaptableComment(text, api) {
     const comment = {
@@ -44,6 +44,7 @@ export function CreateEmptyNamedQuery(expression) {
 export function CreateEmptyPlusMinusNudge() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Rule: undefined,
         NudgeValue: PLUS_MINUS_DEFAULT_NUDGE_VALUE,
@@ -81,6 +82,7 @@ export function CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition
 export function CreateEmptyAlertDefinition() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: { All: true },
         Rule: {
             Predicates: [],
@@ -92,6 +94,7 @@ export function CreateEmptyAlertDefinition() {
 export function CreateEmptyFlashingCellDefinition() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: { ColumnIds: [] },
         Rule: {
             Predicates: [
@@ -108,6 +111,7 @@ export function CreateInternalAlertDefinitionForMessages(messageType, alertPrope
     };
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Rule: {
             Predicates: [],
@@ -129,6 +133,7 @@ export function CreateEmptyReport() {
 export function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: scheduleType,
         Schedule: CreateEmptySchedule(),
     };
@@ -136,6 +141,7 @@ export function CreateEmptyBaseSchedule(scheduleType) {
 export function CreateEmptyReminderSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Reminder,
         Schedule: CreateEmptySchedule(),
         Header: EMPTY_STRING,
@@ -148,6 +154,7 @@ export function CreateEmptyReminderSchedule() {
 export function CreateEmptyReportSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: EMPTY_STRING,
@@ -172,6 +179,7 @@ export function CreateEmptyOpenFinReport() {
 export function CreateEmptyIPushPullSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: CreateEmptyIPushPullReport(),
@@ -181,6 +189,7 @@ export function CreateEmptyIPushPullSchedule() {
 export function CreateEmptyOpenFinSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.OpenFin,
         Schedule: CreateEmptySchedule(),
         OpenFinReport: CreateEmptyOpenFinReport(),
@@ -190,6 +199,7 @@ export function CreateEmptyOpenFinSchedule() {
 export function CreateIPushPullSchedule(iPushPullReport) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: iPushPullReport,
@@ -199,6 +209,7 @@ export function CreateIPushPullSchedule(iPushPullReport) {
 export function CreateReportSchedule(reportName, reportFormat) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: reportName,
@@ -207,7 +218,6 @@ export function CreateReportSchedule(reportName, reportFormat) {
 }
 export function CreateEmptySchedule() {
     return {
-        Uuid: createUuid(),
         OneOffDate: undefined,
         DaysOfWeek: [],
         Hour: 0,
@@ -217,6 +227,7 @@ export function CreateEmptySchedule() {
 export function CreateEmptyShortcut() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         ShortcutKey: EMPTY_STRING,
         ShortcutValue: undefined,
@@ -225,10 +236,11 @@ export function CreateEmptyShortcut() {
 }
 export function CreateEmptyFormatColumn() {
     return {
+        Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
-        CellAlignment: undefined,
         RowScope: undefined,
         Target: 'cell',
     };
@@ -292,6 +304,7 @@ export function CreateEmptyStyle() {
         FontStyle: undefined,
         FontSize: undefined,
         ClassName: undefined,
+        Alignment: undefined,
     };
 }
 export function CreateSystemStatusMessageInfo(message, type, furtherInfo) {

package/src/Utilities/Services/AnnotationsService.js

@@ -28,7 +28,7 @@ export class AnnotationsService {
         if (a?.ColumnId === b?.ColumnId && a?.PrimaryKeyValue === b?.PrimaryKeyValue) {
             return true;
         }
-        // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
+        // Primary keys retrieved from the grid dom are always strings, so we must also consider them strings
         if ((typeof a.PrimaryKeyValue === 'number' && typeof b.PrimaryKeyValue === 'string') ||
             (typeof b.PrimaryKeyValue === 'string' && typeof a.PrimaryKeyValue === 'number')) {
             return (a.PrimaryKeyValue.toString() === b.PrimaryKeyValue.toString() && a.ColumnId === b.ColumnId);

package/src/Utilities/Services/ModuleService.js

@@ -114,13 +114,13 @@ export class ModuleService {
             case 'CalculatedColumn':
                 return url + 'handbook-calculated-column';
             case 'CellSummary':
-                return url + 'handbook-summarising';
+                return url + 'handbook-summarising-cells';
             case 'Charting':
                 return url + 'handbook-charts';
             case 'ColumnFilter':
                 return url + 'handbook-column-filter';
             case 'ColumnInfo':
-                return url + 'dev-guide-column-grid-column-info';
+                return url + 'dev-guide-columns-column-info';
             case 'Comment':
                 return url + 'handbook-comments';
             case 'CustomSort':
@@ -146,7 +146,7 @@ export class ModuleService {
             case 'GridFilter':
                 return url + 'handbook-grid-filter';
             case 'GridInfo':
-                return url + 'dev-guide-column-grid-column-info';
+                return url + 'dev-guide-support-monitoring';
             case 'Layout':
                 return url + 'handbook-layouts';
             case 'NamedQuery':

package/src/View/AdaptablePopover/index.d.ts

@@ -17,6 +17,7 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<React.Props
     popupPadding?: 0 | 2;
     alignPosition?: OverlayShowParams['alignPosition'];
     visible?: boolean;
+    disabled?: boolean;
 }
 export declare class AdaptablePopover extends React.Component<React.PropsWithChildren<AdaptablePopoverProps>, {}> {
     render(): React.JSX.Element;

package/src/View/AdaptablePopover/index.js

@@ -35,7 +35,7 @@ export class AdaptablePopover extends React.Component {
                 // showTriangle
                 visible: this.props.visible, render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
                     overflow: 'visible',
-                }, alignPosition: this.props.alignPosition }, useButton ? (React.createElement(ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
+                }, alignPosition: this.props.alignPosition }, useButton ? (React.createElement(ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText, disabled: this.props.disabled }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
                 this.props.children,
                 showIcon && React.createElement(Icon, { name: icon, style: iconStyle }))))));
     }

package/src/View/Alert/ActiveAlertsPanel.js

@@ -7,5 +7,13 @@ export const ActiveAlertsPanel = () => {
     const adaptable = useAdaptable();
     const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
     const alerts = useSelector((state) => state.Internal.AdaptableAlerts);
+    // map the suspended property from the underlying AlertDefinitions
+    alerts.forEach((alert) => {
+        const liveAlertDef = adaptable.api.alertApi.getAlertDefinitionById(alert.alertDefinition.Uuid);
+        if (liveAlertDef) {
+            // @ts-ignore theoretically AdaptableAlert is not Suspendable; practically <AdaptableObjectCompactList> expects it
+            alert.IsSuspended = liveAlertDef.IsSuspended;
+        }
+    });
     return React.createElement(AdaptableObjectCompactList, { abObjects: alerts, module: filterModule });
 };

package/src/View/Alert/AlertViewPanel.js

@@ -2,10 +2,11 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { AdaptablePopover } from '../AdaptablePopover';
-import UIHelper from '../UIHelper';
 import { getAlertButtonStyle } from './Utilities/getAlertButtonStyle';
 import { ActiveAlertsPanel } from './ActiveAlertsPanel';
 import { Flex } from '../../components/Flex';
+import { ButtonClear } from '../Components/Buttons/ButtonClear';
+import clsx from 'clsx';
 class AlertViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -20,7 +21,6 @@ class AlertViewPanelComponent extends React.Component {
         }
     }
     render() {
-        const messageType = UIHelper.getMessageTypeFromAdaptableAlerts(this.props.AdaptableAlerts);
         const { color: buttonTextColor, background: buttonBackground } = getAlertButtonStyle(this.props.AdaptableAlerts);
         const collapsedText = this.props.AdaptableAlerts.length == 0
             ? '0 Alerts'
@@ -28,13 +28,17 @@ class AlertViewPanelComponent extends React.Component {
                 ? '1 Alert'
                 : this.props.AdaptableAlerts.length + ' Alerts';
         const alertsPanel = React.createElement(ActiveAlertsPanel, null);
-        const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        return (React.createElement(Flex, { alignItems: "stretch", className: `ab-${elementType}__Alert__wrap` },
-            React.createElement(Flex, { className: `ab-${elementType}__Alert__text twa:rounded-standard twa:mr-2 twa:p-2 text-2`, style: { color: buttonTextColor, backgroundColor: buttonBackground }, alignItems: "center" }, collapsedText),
-            this.props.AdaptableAlerts.length > 0 && (React.createElement(Flex, { alignItems: "center" },
-                React.createElement(AdaptablePopover, { className: `ab-${elementType}__Alert__info`, headerText: "", 
-                    // tooltipText="Alerts"
-                    bodyText: [alertsPanel], MessageType: messageType, useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })))));
+        const isToolbar = this.props.viewType === 'Toolbar';
+        const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
+        return (React.createElement(Flex, { alignItems: "stretch", className: clsx(`ab-${elementType}__Alert__wrap twa:gap-1`, {
+                'twa:min-w-[140px] twa:w-[140px]': isToolbar,
+                [`twa:flex-1`]: !isToolbar,
+            }) },
+            React.createElement(Flex, { key: `${buttonTextColor}_${buttonBackground}_${collapsedText}`, className: `ab-${elementType}__Alert__text twa:flex-1 twa:rounded-standard twa:p-2 text-2 twa:items-center twa:justify-center twa:min-h-input`, style: { color: buttonTextColor, backgroundColor: buttonBackground } }, collapsedText),
+            this.props.AdaptableAlerts.length > 0 && (React.createElement(Flex, { className: 'twa:gap-1' },
+                React.createElement(Flex, { className: "twa:flex twa:box-border" },
+                    React.createElement(ButtonClear, { "aria-label": 'Clear All Alerts', variant: 'outlined', className: `ab-${elementType}__Alert__clear`, onClick: () => this.props.onDeleteAllAlert(this.state.Alerts), tooltip: "Clear All Alerts", showText: this.props.viewType === 'ToolPanel' }, 'Clear Alerts')),
+                React.createElement(AdaptablePopover, { className: `ab-${elementType}__Alert__info`, headerText: "Alerts Details", bodyText: [alertsPanel], MessageType: 'Info', useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })))));
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/Alert/Utilities/getAlertButtonStyle.d.ts

@@ -2,4 +2,5 @@ import { AdaptableAlert } from '../../../../types';
 export declare const getAlertButtonStyle: (alerts: AdaptableAlert[]) => {
     color: string;
     background: string;
+    cssClasses: string;
 };

package/src/View/Alert/Utilities/getAlertButtonStyle.js

@@ -4,8 +4,16 @@ export const getAlertButtonStyle = (alerts) => {
     const messageTypeColor = UIHelper.getColorByMessageType(messageType);
     const buttonBackground = UIHelper.getButtonColourForAdaptableAlerts(alerts, messageTypeColor);
     const buttonTextColor = UIHelper.getButtonTextColourForArrayandMessageType(alerts, messageType);
+    let cssClasses = '';
+    if (alerts?.length) {
+        const cssMessageType = UIHelper.getCSSColorByMessageType(messageType);
+        cssClasses = cssMessageType
+            ? `twa:bg-${cssMessageType} twa:text-text-on-${cssMessageType}`
+            : '';
+    }
     return {
         color: buttonTextColor,
         background: buttonBackground,
+        cssClasses,
     };
 };

package/src/View/Alert/Utilities/getDefaultAlertDefinition.d.ts

@@ -13,10 +13,11 @@ export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinitio
     MessageText?: string;
     AlertProperties?: import("../../../types").AlertProperties;
     AlertForm?: string | import("../../../types").AlertButtonForm;
-    IsSuspended?: boolean;
+    Name: string;
     Source?: "InitialState" | "User";
     AdaptableVersion?: import("../../../types").AdaptableVersion;
     IsReadOnly?: boolean;
     Tags?: import("../../../types").AdaptableObjectTag[];
     Metadata?: any;
+    IsSuspended?: boolean;
 };

package/src/View/Alert/Wizard/AlertTypeWizardSection.d.ts

@@ -1,9 +1,12 @@
 import * as React from 'react';
 import { AlertType } from '../Utilities/getAlertType';
+import { AdaptableApi, AlertDefinition } from '../../../types';
+export declare const isSettingsValid: (data: AlertDefinition, api: AdaptableApi) => true | "Name is required" | "An Alert already exists with that name";
 export declare const renderAlertTypeSummary: (alertType: AlertType) => React.JSX.Element;
-type AlertBehaviourWizardSectionProps = {
+type AlertTypeWizardSectionProps = {
     onAlertTypeChange: (alertType: AlertType) => void;
     alertType: AlertType | null;
+    onChange: (data: AlertDefinition) => void;
 };
-export declare const AlertTypeWizardSection: (props: AlertBehaviourWizardSectionProps) => React.JSX.Element;
+export declare const AlertTypeWizardSection: (props: AlertTypeWizardSectionProps) => React.JSX.Element;
 export {};