@adaptabletools/adaptable-cjs 23.0.0-canary.0 → 23.0.0-canary.10

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnExpressionService = void 0;
+exports.buildSyntheticCellDataChangedInfosForCalcColumns = buildSyntheticCellDataChangedInfosForCalcColumns;
+exports.expandCellDataChangedInfosWithCalculatedColumns = expandCellDataChangedInfosWithCalculatedColumns;
+const tslib_1 = require("tslib");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
+const parser = tslib_1.__importStar(require("../../parser/src"));
+const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
 class CalculatedColumnExpressionService {
     adaptableApi;
     aggregatedScalarLiveValuesMap = new Map();
@@ -10,7 +15,13 @@ class CalculatedColumnExpressionService {
         this.adaptableApi = adaptableApi;
         this.adaptableApi = adaptableApi;
     }
+    buildSyntheticCellDataChangedInfosForCalcColumns(cellDataChangedInfo) {
+        return buildSyntheticCellDataChangedInfosForCalcColumns(this.adaptableApi, cellDataChangedInfo);
+    }
     listentoCellDataChange(cellDataChangedInfo) {
+        if (cellDataChangedInfo.trigger === 'calculatedColumnChange') {
+            return;
+        }
         const refreshedCalculatedColumns = [];
         this.aggregatedScalarLiveValuesMap.forEach((aggregatedScalarLiveValue, calculatedColumnId) => {
             const calculatedColumn = this.adaptableApi.calculatedColumnApi.getCalculatedColumnById(calculatedColumnId);
@@ -136,3 +147,115 @@ class CalculatedColumnExpressionService {
     }
 }
 exports.CalculatedColumnExpressionService = CalculatedColumnExpressionService;
+function isScalarCalculatedColumn(calculatedColumn) {
+    return !!calculatedColumn.Query?.ScalarExpression;
+}
+function collectDependentScalarCalculatedColumns(adaptableApi, rootColumnId) {
+    const collected = [];
+    const seenCalcColumnIds = new Set();
+    const queue = [rootColumnId];
+    while (queue.length > 0) {
+        const columnId = queue.shift();
+        const adaptableColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
+        if (!adaptableColumn) {
+            continue;
+        }
+        const dependentColumnIds = adaptableApi.calculatedColumnApi.internalApi.getCalculatedColumnsDependentOnColumn(adaptableColumn);
+        dependentColumnIds.forEach((dependentColumnId) => {
+            if (seenCalcColumnIds.has(dependentColumnId)) {
+                return;
+            }
+            const calculatedColumn = adaptableApi.calculatedColumnApi.getCalculatedColumnForColumnId(dependentColumnId);
+            if (!calculatedColumn || !isScalarCalculatedColumn(calculatedColumn)) {
+                return;
+            }
+            seenCalcColumnIds.add(dependentColumnId);
+            collected.push(calculatedColumn);
+            queue.push(dependentColumnId);
+        });
+    }
+    return collected;
+}
+function buildShadowRowData(adaptableApi, info) {
+    const shadowData = Helper_1.default.cloneObject(info.rowNode?.data ?? info.rowData ?? {});
+    const fieldName = info.column.field ?? info.column.columnId;
+    adaptableApi.internalApi.setValueUsingField(shadowData, fieldName, info.oldValue);
+    return shadowData;
+}
+function evaluateScalarExpressionWithShadowData(adaptableApi, calculatedColumn, rowNode, shadowData) {
+    const internalApi = adaptableApi.internalApi;
+    const moduleFns = internalApi
+        .getQueryLanguageService()
+        .getModuleExpressionFunctionsMap(ModuleConstants_1.CalculatedColumnModuleId);
+    const baseFunctions = { ...moduleFns.booleanFunctions, ...moduleFns.scalarFunctions };
+    const resolveColumnValue = (columnId) => {
+        const childCalculatedColumn = adaptableApi.calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+        if (childCalculatedColumn?.Query?.ScalarExpression) {
+            return evaluateScalarExpressionWithShadowData(adaptableApi, childCalculatedColumn, rowNode, shadowData);
+        }
+        const adaptableColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
+        return internalApi.getValueUsingField(shadowData, adaptableColumn?.field ?? columnId);
+    };
+    const customFunctions = {
+        ...baseFunctions,
+        COL: {
+            ...baseFunctions.COL,
+            handler: (args) => resolveColumnValue(args[0]),
+        },
+        FIELD: {
+            ...baseFunctions.FIELD,
+            handler: (args) => internalApi.getValueUsingField(shadowData, args[0]),
+        },
+    };
+    return parser.evaluate(calculatedColumn.Query.ScalarExpression, {
+        node: { ...rowNode, data: shadowData },
+        functions: customFunctions,
+        ...internalApi.buildBaseContext(),
+    });
+}
+function buildSyntheticCellDataChangedInfosForCalcColumns(adaptableApi, info) {
+    if (!info.rowNode ||
+        info.preventEdit ||
+        info.trigger === 'undo' ||
+        info.trigger === 'aggChange' ||
+        info.trigger === 'calculatedColumnChange') {
+        return [];
+    }
+    const calculatedColumns = collectDependentScalarCalculatedColumns(adaptableApi, info.column.columnId);
+    if (!calculatedColumns.length) {
+        return [];
+    }
+    const shadowData = buildShadowRowData(adaptableApi, info);
+    const expressionService = adaptableApi.internalApi.getCalculatedColumnExpressionService();
+    const syntheticEvents = [];
+    calculatedColumns.forEach((calculatedColumn) => {
+        const oldValue = evaluateScalarExpressionWithShadowData(adaptableApi, calculatedColumn, info.rowNode, shadowData);
+        const newValue = expressionService.evaluateCalculatedColumnQuery(calculatedColumn, info.rowNode);
+        if (oldValue == newValue) {
+            return;
+        }
+        const column = adaptableApi.columnApi.getColumnWithColumnId(calculatedColumn.ColumnId);
+        if (!column) {
+            return;
+        }
+        syntheticEvents.push(adaptableApi.internalApi.buildCellDataChangedInfo({
+            oldValue,
+            newValue,
+            column,
+            primaryKeyValue: info.primaryKeyValue,
+            rowNode: info.rowNode,
+            trigger: 'calculatedColumnChange',
+        }));
+    });
+    return syntheticEvents;
+}
+function expandCellDataChangedInfosWithCalculatedColumns(adaptableApi, cellDataChangedInfos) {
+    if (!cellDataChangedInfos.length) {
+        return cellDataChangedInfos;
+    }
+    const syntheticEvents = cellDataChangedInfos.flatMap((info) => buildSyntheticCellDataChangedInfosForCalcColumns(adaptableApi, info));
+    if (!syntheticEvents.length) {
+        return cellDataChangedInfos;
+    }
+    return [...cellDataChangedInfos, ...syntheticEvents];
+}

package/src/Utilities/Services/Interface/ICalculatedColumnExpressionService.d.ts

@@ -11,4 +11,5 @@ export interface ICalculatedColumnExpressionService extends IAdaptableService {
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     listentoCellDataChange(cellDataChangedInfo: CellDataChangedInfo): void;
     listentoRowDataChange(rowDataChangedInfo: RowDataChangedInfo): void;
+    buildSyntheticCellDataChangedInfosForCalcColumns(cellDataChangedInfo: CellDataChangedInfo): CellDataChangedInfo[];
 }

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("../../utils/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{adaptable;licenseKey;packageDetails;constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.default)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=require("../../Extensions/NumberExtensions"),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{adaptable;licenseKey;packageDetails;constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.clamp)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;

package/src/Utilities/Services/RowSummaryService.d.ts

@@ -19,7 +19,7 @@ export declare class RowSummaryService {
      *
      * @param colId optional to evaluate only one column
      */
-    _throttledEvaluateRowSummary: import("../utils/debounce").DebouncedFunction<(reason?: {
+    _throttledEvaluateRowSummary: import("../Helpers/TimingHelper").DebouncedFunction<(reason?: {
         columnIds: string[];
     }) => void>;
     private evaluateRowSummary;

package/src/Utilities/Services/RowSummaryService.js

@@ -5,11 +5,11 @@ const tslib_1 = require("tslib");
 const RowSummary_1 = require("../../AdaptableState/Common/RowSummary");
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
+const NumberExtensions_1 = require("../Extensions/NumberExtensions");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
 const ObjectExtensions_1 = require("../Extensions/ObjectExtensions");
-const throttle_1 = tslib_1.__importDefault(require("../utils/throttle"));
-const isEqual_1 = tslib_1.__importDefault(require("../utils/isEqual"));
+const TimingHelper_1 = require("../Helpers/TimingHelper");
+const ObjectExtensions_2 = require("../Extensions/ObjectExtensions");
 /**
  * The logic is extracted here to make it easier to follow
  */
@@ -78,7 +78,7 @@ class RowSummaryService {
      *
      * @param colId optional to evaluate only one column
      */
-    _throttledEvaluateRowSummary = (0, throttle_1.default)(this.evaluateRowSummary, 300);
+    _throttledEvaluateRowSummary = (0, TimingHelper_1.throttle)(this.evaluateRowSummary, 300);
     evaluateRowSummary(reason) {
         if (this._throttleAcumulatedColumnsThatChanged.size > 0) {
             const columnIds = Array.from(this._throttleAcumulatedColumnsThatChanged.values());
@@ -159,7 +159,7 @@ class RowSummaryService {
                     if (expressionLiveValue) {
                         value = expressionLiveValue.getGlobalAggregatedValue();
                         if (typeof value === 'number' && !isNaN(value)) {
-                            value = Helper_1.default.roundNumber(value, 2);
+                            value = (0, NumberExtensions_1.roundNumber)(value, 2);
                         }
                     }
                     const column = this.api.columnApi.getColumnWithColumnId(columnId);
@@ -171,7 +171,7 @@ class RowSummaryService {
                 }),
             };
         });
-        if (this.previousRowSummaries && (0, isEqual_1.default)(rowSummariesResults, this.previousRowSummaries)) {
+        if (this.previousRowSummaries && (0, ObjectExtensions_2.isEqual)(rowSummariesResults, this.previousRowSummaries)) {
             return;
         }
         this.api.internalApi.dispatchReduxAction((0, InternalRedux_1.RowSummarySet)(rowSummariesResults));

package/src/Utilities/Services/ThemeService.js

@@ -23,7 +23,7 @@ class ThemeService {
         document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
     }
     subscribe() {
-        const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
+        const themeChangedUnsubscribe = this.api.eventApi.on('ThemeSelected', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
         this.unsubscribe = () => {
             themeChangedUnsubscribe();

package/src/Utilities/getScopeViewItems.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getScopeViewItems = void 0;
 const tslib_1 = require("tslib");
 const StringExtensions_1 = tslib_1.__importDefault(require("./Extensions/StringExtensions"));
+const columnScopeTagHelpers_1 = require("../components/Tag/columnScopeTagHelpers");
 const getScopeViewItems = (scope, api) => {
     let values = [];
     if ('ColumnIds' in scope && Array.isArray(scope.ColumnIds)) {
@@ -24,6 +25,7 @@ const getScopeViewItems = (scope, api) => {
         label: 'Columns',
         name: 'Target',
         values,
+        tagVariant: (0, columnScopeTagHelpers_1.getScopeViewItemsTagVariant)(scope),
     };
 };
 exports.getScopeViewItems = getScopeViewItems;

package/src/Utilities/wizardSelection.d.ts

@@ -0,0 +1,10 @@
+import type { SimpleButtonProps } from '../components/SimpleButton';
+/** Selected wizard option — Tailwind overrides SimpleButton outlined defaults. */
+export declare const WIZARD_SELECTION_ACTIVE_CLASSES: string;
+/** Unselected wizard option — muted so the active choice reads immediately. */
+export declare const WIZARD_SELECTION_INACTIVE_CLASSES: string;
+export type CollapsibleWizardCardSurface = 'popup' | 'panel';
+export declare const getCollapsibleWizardCardCollapsedClasses: (surface?: CollapsibleWizardCardSurface) => string;
+export declare const getCollapsibleWizardCardExpandedClasses: (surface?: CollapsibleWizardCardSurface) => string;
+export declare const wizardSelectionButtonClassName: (selected: boolean, className?: string) => string;
+export declare const wizardSelectionSimpleButtonProps: (selected: boolean, className?: string) => Pick<SimpleButtonProps, "variant" | "tone" | "className">;

package/src/Utilities/wizardSelection.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wizardSelectionSimpleButtonProps = exports.wizardSelectionButtonClassName = exports.getCollapsibleWizardCardExpandedClasses = exports.getCollapsibleWizardCardCollapsedClasses = exports.WIZARD_SELECTION_INACTIVE_CLASSES = exports.WIZARD_SELECTION_ACTIVE_CLASSES = void 0;
+const utils_1 = require("../lib/utils");
+/** Selected wizard option — Tailwind overrides SimpleButton outlined defaults. */
+exports.WIZARD_SELECTION_ACTIVE_CLASSES = (0, utils_1.cn)('ab-WizardSelection--active', 'twa:!border-[var(--ab-cmp-wizard-selection__border)]', 'twa:!bg-[var(--ab-cmp-wizard-selection__background)]', 'twa:!text-accent', 'twa:font-medium');
+/** Unselected wizard option — muted so the active choice reads immediately. */
+exports.WIZARD_SELECTION_INACTIVE_CLASSES = (0, utils_1.cn)('twa:!border-[color-mix(in_srgb,var(--ab-color-primarydark)_40%,transparent)]', 'twa:!text-[color-mix(in_srgb,var(--ab-color-foreground)_55%,transparent)]');
+const getCollapsibleWizardCardCollapsedClasses = (surface = 'popup') => (0, utils_1.cn)(surface === 'panel'
+    ? 'twa:border-[var(--ab-cmp-collapsible-wizard-card__collapsed-border)] twa:bg-card'
+    : 'twa:border-[var(--ab-cmp-collapsible-wizard-card__collapsed-border-popup)]');
+exports.getCollapsibleWizardCardCollapsedClasses = getCollapsibleWizardCardCollapsedClasses;
+const getCollapsibleWizardCardExpandedClasses = (surface = 'popup') => (0, utils_1.cn)('ab-CollapsibleWizardCard--expanded', 'twa:border-[var(--ab-cmp-collapsible-wizard-card__expanded-border)]', surface === 'panel' && 'twa:bg-card', 'twa:p-0');
+exports.getCollapsibleWizardCardExpandedClasses = getCollapsibleWizardCardExpandedClasses;
+const wizardSelectionButtonClassName = (selected, className) => (0, utils_1.cn)('ab-WizardSelection', selected ? exports.WIZARD_SELECTION_ACTIVE_CLASSES : exports.WIZARD_SELECTION_INACTIVE_CLASSES, className);
+exports.wizardSelectionButtonClassName = wizardSelectionButtonClassName;
+const wizardSelectionSimpleButtonProps = (selected, className) => ({
+    variant: 'outlined',
+    tone: 'none',
+    className: (0, exports.wizardSelectionButtonClassName)(selected, className),
+});
+exports.wizardSelectionSimpleButtonProps = wizardSelectionSimpleButtonProps;

package/src/View/AdaptablePopover/index.js

@@ -29,7 +29,7 @@ class AdaptablePopover extends React.Component {
         const openOnHover = showEvent === 'mouseenter';
         const triggerElement = useButton ? ((0, jsx_runtime_1.jsx)(ButtonInfo_1.ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText, disabled: this.props.disabled, children: this.props.children })) : ((0, jsx_runtime_1.jsxs)("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' }, children: [this.props.children, showIcon && (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: icon, style: iconStyle })] }));
         const controlledProps = this.props.visible !== undefined ? { open: this.props.visible } : {};
-        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: this.props.className, children: (0, jsx_runtime_1.jsxs)(popover_1.Popover, { ...controlledProps, children: [(0, jsx_runtime_1.jsx)(popover_1.PopoverTrigger, { nativeButton: !!useButton, openOnHover: openOnHover, delay: 0, closeDelay: 0, render: triggerElement }), (0, jsx_runtime_1.jsxs)(popover_1.PopoverContent, { align: "start", sideOffset: 10, className: "ab-Popover twa:w-auto twa:gap-0 twa:p-0", style: {
+        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: this.props.className, children: (0, jsx_runtime_1.jsxs)(popover_1.Popover, { ...controlledProps, children: [(0, jsx_runtime_1.jsx)(popover_1.PopoverTrigger, { nativeButton: !!useButton, openOnHover: openOnHover, delay: 0, closeDelay: 0, render: triggerElement }), (0, jsx_runtime_1.jsxs)(popover_1.PopoverContent, { align: "start", sideOffset: 10, className: "ab-Popover twa:border twa:border-primarylight twa:w-auto twa:gap-0 twa:p-0", style: {
                             minWidth: popoverMinWidth,
                             maxWidth: this.props.popoverMaxWidth ?? 300,
                         }, children: [title ? (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-4 twa:p-2", children: title }) : null, (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: `ab-Popover__body ${(this.props.popupPadding ?? 2) === 0 ? 'twa:p-0' : 'twa:p-2'}`, children: this.props.bodyText.map((textOrHTML, index) => ((0, jsx_runtime_1.jsx)("span", { children: textOrHTML }, index))) })] })] }) }));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableOptionsForm.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const CheckBox_1 = require("../../../components/CheckBox");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
+const DropdownButton_1 = require("../../../components/DropdownButton");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
@@ -49,7 +49,7 @@ const OptionInput = (props) => {
             label: StringExtensions_1.default.Humanize(str),
             onClick: () => props.onChange({ ...option, value: str }),
         }));
-        input = ((0, jsx_runtime_1.jsx)(DropdownButton_1.default, { ...inputProps, columns: ['label'], items: options, children: StringExtensions_1.default.Humanize(value) }));
+        input = ((0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { className: "twa:min-w-[200px] twa:mr-2", items: options, children: StringExtensions_1.default.Humanize(value) }));
     }
     else {
         switch (option.kind) {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -12,7 +12,7 @@ const react_1 = require("react");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const InfiniteTable_1 = require("../../../components/InfiniteTable");
 const Flex_1 = require("../../../components/Flex");
-const throttle_1 = tslib_1.__importDefault(require("../../../Utilities/utils/throttle"));
+const TimingHelper_1 = require("../../../Utilities/Helpers/TimingHelper");
 const twMerge_1 = require("../../../twMerge");
 const dataTypes = [
     {
@@ -42,7 +42,7 @@ const useForceRender = () => {
 };
 const ThrottledInput = React.memo((props) => {
     const [stateValue, setStateValue] = (0, react_1.useState)(props.value);
-    const throttleOnChange = React.useRef((0, throttle_1.default)(props.onChange, 600, { leading: false }));
+    const throttleOnChange = React.useRef((0, TimingHelper_1.throttle)(props.onChange, 600, { leading: false }));
     const handleChange = React.useCallback((event) => {
         const newValue = event.target.value;
         setStateValue(newValue);

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -4,7 +4,7 @@ exports.UIOptionsSidebarForm = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const CheckBox_1 = require("../../../../components/CheckBox");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components/DropdownButton"));
+const DropdownButton_1 = require("../../../../components/DropdownButton");
 const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../../components/HelpBlock"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/StringExtensions"));
@@ -77,7 +77,7 @@ const UIOptionsSidebarForm = (props) => {
         };
         props.onChange(newGridOptions);
     };
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsx)(HelpBlock_1.default, { children: "Tool Panels" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:m-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:mb-2", children: ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox) }), (0, jsx_runtime_1.jsx)(FormLayout_1.default, { columns: [{ name: 'label' }, { name: 'children' }], children: (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Position", children: (0, jsx_runtime_1.jsx)(DropdownButton_1.default, { columns: ['label'], items: [
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsx)(HelpBlock_1.default, { children: "Tool Panels" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:m-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:mb-2", children: ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox) }), (0, jsx_runtime_1.jsx)(FormLayout_1.default, { columns: [{ name: 'label' }, { name: 'children' }], children: (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Position", children: (0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { items: [
                                     { label: 'Left', onClick: () => handleSidebarPositionChange('left') },
                                     { label: 'Right', onClick: () => handleSidebarPositionChange('right') },
                                 ], children: sidebarPosition === 'left' ? 'Left' : 'Right' }) }) })] })] }));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -8,8 +8,8 @@ const ModuleManager_1 = require("../../../../components/DragAndDropContext/Modul
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../../components/HelpBlock"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
 const Input_1 = tslib_1.__importDefault(require("../../../../components/Input"));
-const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components/DropdownButton"));
+const ButtonNew_1 = require("../../../Components/Buttons/ButtonNew");
+const DropdownButton_1 = require("../../../../components/DropdownButton");
 const FormBox_1 = require("../Components/FormBox");
 const Flex_1 = require("../../../../components/Flex");
 const UIOptionsStatusbarForm = (props) => {
@@ -95,7 +95,7 @@ const UIOptionsStatusbarForm = (props) => {
             },
         });
     };
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsx)(HelpBlock_1.default, { children: "Status Bar" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:p-2", children: [(0, jsx_runtime_1.jsxs)(FormBox_1.NocodeWizardFormBox, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "b", children: "Create Adaptable Statusbar Panel" }), (0, jsx_runtime_1.jsxs)(FormLayout_1.default, { className: "twa:mt-2", children: [(0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Panel Name", children: (0, jsx_runtime_1.jsx)(Input_1.default, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) }) }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Align", children: (0, jsx_runtime_1.jsx)(DropdownButton_1.default, { columns: ['label'], items: alignOptions, children: alignOptions.find((option) => option.value === adaptablePanelAlign)?.label }) }), (0, jsx_runtime_1.jsxs)(FormLayout_1.FormRow, { label: "", children: [(0, jsx_runtime_1.jsx)(SimpleButton_1.default, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, icon: "plus", variant: "raised", children: "Add" }), !isAdaptablePanelTitleAvailable && ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mt-2 twa:text-error", children: "Adaptable panel name must be unique." }))] })] })] }), (0, jsx_runtime_1.jsx)(ModuleManager_1.ModuleManager, { permittedActions: {
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsx)(HelpBlock_1.default, { children: "Status Bar" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:p-2", children: [(0, jsx_runtime_1.jsxs)(FormBox_1.NocodeWizardFormBox, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "b", children: "Create Adaptable Statusbar Panel" }), (0, jsx_runtime_1.jsxs)(FormLayout_1.default, { className: "twa:mt-2", children: [(0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Panel Name", children: (0, jsx_runtime_1.jsx)(Input_1.default, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) }) }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Align", children: (0, jsx_runtime_1.jsx)(DropdownButton_1.NewDropdownButton, { items: alignOptions, children: alignOptions.find((option) => option.value === adaptablePanelAlign)?.label }) }), (0, jsx_runtime_1.jsxs)(FormLayout_1.FormRow, { label: "", children: [(0, jsx_runtime_1.jsx)(ButtonNew_1.ButtonNew, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, children: "Add" }), !isAdaptablePanelTitleAvailable && ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mt-2 twa:text-destructive", children: "Adaptable panel name must be unique." }))] })] })] }), (0, jsx_runtime_1.jsx)(ModuleManager_1.ModuleManager, { permittedActions: {
                             createTab: false,
                             dragAndDropTab: false,
                             deleteTab: false,

package/src/View/Alert/AlertViewPanel.js

@@ -4,6 +4,7 @@ exports.AlertViewPanelControl = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
+const utils_1 = require("../../lib/utils");
 const react_redux_1 = require("react-redux");
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const AdaptablePopover_1 = require("../AdaptablePopover");
@@ -11,7 +12,6 @@ const getAlertButtonStyle_1 = require("./Utilities/getAlertButtonStyle");
 const ActiveAlertsPanel_1 = require("./ActiveAlertsPanel");
 const Flex_1 = require("../../components/Flex");
 const ButtonClear_1 = require("../Components/Buttons/ButtonClear");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
 class AlertViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -35,7 +35,7 @@ class AlertViewPanelComponent extends React.Component {
         const alertsPanel = (0, jsx_runtime_1.jsx)(ActiveAlertsPanel_1.ActiveAlertsPanel, {});
         const isToolbar = this.props.viewType === 'Toolbar';
         const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
-        return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "stretch", className: (0, clsx_1.default)(`ab-${elementType}__Alert__wrap twa:gap-1`, {
+        return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "stretch", className: (0, utils_1.cn)(`ab-${elementType}__Alert__wrap twa:gap-1`, {
                 'twa:min-w-[140px] twa:w-[140px]': isToolbar,
                 [`twa:flex-1`]: !isToolbar,
             }), children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { 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 }, children: collapsedText }, `${buttonTextColor}_${buttonBackground}_${collapsedText}`), this.props.AdaptableAlerts.length > 0 && ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: 'twa:gap-1', children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:flex twa:box-border", children: (0, jsx_runtime_1.jsx)(ButtonClear_1.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', children: 'Clear Alerts' }) }), (0, jsx_runtime_1.jsx)(AdaptablePopover_1.AdaptablePopover, { className: `ab-${elementType}__Alert__info`, headerText: "Alerts Details", bodyText: [alertsPanel], MessageType: 'Info', useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })] }))] }));

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

@@ -10,10 +10,13 @@ const getAlertButtonStyle = (alerts) => {
     const buttonTextColor = UIHelper_1.default.getButtonTextColourForArrayandMessageType(alerts, messageType);
     let cssClasses = '';
     if (alerts?.length) {
-        const cssMessageType = UIHelper_1.default.getCSSColorByMessageType(messageType);
-        cssClasses = cssMessageType
-            ? `twa:bg-${cssMessageType} twa:text-text-on-${cssMessageType}`
-            : '';
+        cssClasses =
+            {
+                Info: `twa:bg-info twa:text-info-foreground`,
+                Success: `twa:bg-success twa:text-success-foreground`,
+                Warning: `twa:bg-warning twa:text-warning-foreground`,
+                Error: `twa:bg-destructive twa:text-destructive-foreground`,
+            }[messageType] || '';
     }
     return {
         color: buttonTextColor,

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlertTypeText = exports.getAlertType = exports.AlertType = void 0;
 const GeneralConstants_1 = require("./../../../Utilities/Constants/GeneralConstants");
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 var AlertType;
 (function (AlertType) {
     AlertType["DataChange"] = "DataChange";

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultAlertDefinition = void 0;
 const tslib_1 = require("tslib");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const getAlertType_1 = require("./getAlertType");
 /**
  * This logic should be moved into Object factory once we have types on alert definitions

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapAlertDefinition = void 0;
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const mapAlertDefinition = (api, alertDefinition) => {
     if (!(0, ScheduledAlertHelper_1.isRuleBasedAlertDefinition)(alertDefinition)) {
         return alertDefinition;

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

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => React.JSX.Element;
 export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => React.JSX.Element;
 type AlertBehaviourWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlertBehaviourWizardSection = exports.renderAlertBehaviourSummary = exports.renderAlertBehaviourWizardSummary = void 0;
+exports.AlertBehaviourWizardSection = exports.renderAlertBehaviourSummary = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
-const Tabs_1 = require("../../../components/Tabs");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CheckBox_1 = require("../../../components/CheckBox");
 const CodeBlock_1 = require("../../../components/CodeBlock");
@@ -17,6 +16,7 @@ const getAlertType_1 = require("../Utilities/getAlertType");
 const Flex_1 = require("../../../components/Flex");
 const Tag_1 = require("../../../components/Tag/Tag");
 const NewSelect_1 = require("../../../components/NewSelect");
+const Card_1 = require("../../../components/Card");
 const HighlightStyle = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const options = [
@@ -43,11 +43,6 @@ const HighlightStyle = (props) => {
                             props.onChange(style);
                         } }) }) }))] }));
 };
-const renderAlertBehaviourWizardSummary = (alertDefinition) => {
-    const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (0, exports.renderAlertBehaviourSummary)(alertDefinition, api);
-};
-exports.renderAlertBehaviourWizardSummary = renderAlertBehaviourWizardSummary;
 const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
     const ruleProperties = (0, ScheduledAlertHelper_1.isRuleBasedAlertDefinition)(alert)
@@ -90,6 +85,7 @@ const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
 exports.renderAlertBehaviourSummary = renderAlertBehaviourSummary;
 const AlertBehaviourWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const behaviourSpellingVariant = api.internalApi.getCorrectEnglishVariant('Behaviour');
     const presentationProperties = data.AlertProperties ?? {};
     const ruleProperties = (0, ScheduledAlertHelper_1.isRuleBasedAlertDefinition)(data)
         ? (data.AlertProperties ?? {})
@@ -113,20 +109,20 @@ const AlertBehaviourWizardSection = (props) => {
             },
         });
     };
-    return ((0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: api.internalApi.getCorrectEnglishVariant('Behaviour') }), (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs.Content, { className: "twa:flex twa:flex-col twa:gap-1", children: [hasPreventCellEdit && ((0, jsx_runtime_1.jsxs)(CheckBox_1.CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: ruleProperties.PreventEdit, disabled: true, children: ["Prevent Cell Edit", (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-2 twa:mt-1", children: "(automatically undo data change which triggered Alert)" })] })), hasHighlightCell && ((0, jsx_runtime_1.jsx)(HighlightStyle, { dataName: "highlight-cell", highlight: ruleProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
-                            onChange({ HighlightCell });
-                        } })), hasHighlightRow && ((0, jsx_runtime_1.jsx)(HighlightStyle, { dataName: "highlight-row", highlight: ruleProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
-                            onChange({ HighlightRow });
-                        } })), hasJumpToCell && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: ruleProperties.JumpToCell, onChange: (JumpToCell) => {
-                            onChange({ JumpToCell });
-                        }, children: "Jump To Cell" })), hasJumpToRow && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: ruleProperties.JumpToRow, onChange: (JumpToRow) => {
-                            onChange({ JumpToRow });
-                        }, children: "Jump To Row" })), showInSeparateDiv && ((0, jsx_runtime_1.jsxs)(CheckBox_1.CheckBox, { "data-name": "show-in-div", checked: presentationProperties.ShowInDiv, onChange: (ShowInDiv) => {
-                            onChange({ ShowInDiv });
-                        }, children: ["Show in separate ", (0, jsx_runtime_1.jsx)(CodeBlock_1.CodeBlock, { children: `<div />` }), " element"] })), logToConsole && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "log-to-console", checked: presentationProperties.LogToConsole, onChange: (LogToConsole) => {
-                            onChange({ LogToConsole });
-                        }, children: "Log To Console" })), showSystemStatusMessage && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "system-status-message", checked: presentationProperties.DisplaySystemStatusMessage, onChange: (DisplaySystemStatusMessage) => {
-                            onChange({ DisplaySystemStatusMessage });
-                        }, children: "Show as System Status Message" }))] })] }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: behaviourSpellingVariant }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: ["Configure ", behaviourSpellingVariant.toLowerCase(), "s for the Alert when it fires"] })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card.Body, { className: "twa:gap-1", children: [hasPreventCellEdit && ((0, jsx_runtime_1.jsxs)(CheckBox_1.CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: ruleProperties.PreventEdit, disabled: true, children: ["Prevent Cell Edit", (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-2 twa:mt-1", children: "(automatically undo data change which triggered Alert)" })] })), hasHighlightCell && ((0, jsx_runtime_1.jsx)(HighlightStyle, { dataName: "highlight-cell", highlight: ruleProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
+                                onChange({ HighlightCell });
+                            } })), hasHighlightRow && ((0, jsx_runtime_1.jsx)(HighlightStyle, { dataName: "highlight-row", highlight: ruleProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
+                                onChange({ HighlightRow });
+                            } })), hasJumpToCell && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: ruleProperties.JumpToCell, onChange: (JumpToCell) => {
+                                onChange({ JumpToCell });
+                            }, children: "Jump To Cell" })), hasJumpToRow && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: ruleProperties.JumpToRow, onChange: (JumpToRow) => {
+                                onChange({ JumpToRow });
+                            }, children: "Jump To Row" })), showInSeparateDiv && ((0, jsx_runtime_1.jsxs)(CheckBox_1.CheckBox, { "data-name": "show-in-div", checked: presentationProperties.ShowInDiv, onChange: (ShowInDiv) => {
+                                onChange({ ShowInDiv });
+                            }, children: ["Show in separate ", (0, jsx_runtime_1.jsx)(CodeBlock_1.CodeBlock, { children: `<div />` }), " element"] })), logToConsole && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "log-to-console", checked: presentationProperties.LogToConsole, onChange: (LogToConsole) => {
+                                onChange({ LogToConsole });
+                            }, children: "Log To Console" })), showSystemStatusMessage && ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": "system-status-message", checked: presentationProperties.DisplaySystemStatusMessage, onChange: (DisplaySystemStatusMessage) => {
+                                onChange({ DisplaySystemStatusMessage });
+                            }, children: "Show as System Status Message" }))] })] }) }));
 };
 exports.AlertBehaviourWizardSection = AlertBehaviourWizardSection;