@adaptabletools/adaptable-cjs 22.0.0-canary.1 → 22.0.0-canary.3

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -4,9 +4,10 @@ exports.CalculatedColumnExpressionService = void 0;
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
 class CalculatedColumnExpressionService {
+    adaptableApi;
+    aggregatedScalarLiveValuesMap = new Map();
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.aggregatedScalarLiveValuesMap = new Map();
         this.adaptableApi = adaptableApi;
     }
     listentoCellDataChange(cellDataChangedInfo) {

package/src/Utilities/Services/ChartingService.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 class ChartingService {
+    api;
     constructor(api) {
         this.api = api;
     }

package/src/Utilities/Services/DataService.js

@@ -8,10 +8,16 @@ const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
 // ~ 8 hours
 const MAX_TIMEFRAME_SIZE = 86400000;
 class DataService {
+    adaptable;
+    emitter;
+    cellDataChangeLogSubject$;
+    cellDataChangeLog$;
+    rowDataChangeLogSubject$;
+    rowDataChangeLog$;
+    undoChangeLog;
+    undoChangeTimers;
     constructor(adaptable) {
         this.adaptable = adaptable;
-        this.on = (eventName, callback) => this.emitter.on(eventName, callback);
-        this.emit = (eventName, data) => this.emitter.emit(eventName, data);
         this.adaptable = adaptable;
         this.emitter = new Emitter_1.default();
         this.cellDataChangeLogSubject$ = new rxjs_1.Subject();
@@ -35,6 +41,8 @@ class DataService {
         this.undoChangeTimers.clear();
         this.undoChangeTimers = null;
     }
+    on = (eventName, callback) => this.emitter.on(eventName, callback);
+    emit = (eventName, data) => this.emitter.emit(eventName, data);
     CreateCellDataChangedEvent(cellDataChangedInfo) {
         if (cellDataChangedInfo.newValue != cellDataChangedInfo.oldValue) {
             this.emitter.emitSync('CellDataChanged', cellDataChangedInfo);

package/src/Utilities/Services/Fdc3Service.js

@@ -4,11 +4,13 @@ exports.Fdc3Service = void 0;
 const Fdc3Context_1 = require("../../AdaptableState/Common/Fdc3Context");
 const Fdc3Intent_1 = require("../../AdaptableState/Common/Fdc3Intent");
 class Fdc3Service {
+    adaptableApi;
+    contextHandlerSubscriptions = [];
+    intentHandlerSubscriptions = [];
+    loggedAgentError = false;
+    uiControlsDefaultConfiguration;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.contextHandlerSubscriptions = [];
-        this.intentHandlerSubscriptions = [];
-        this.loggedAgentError = false;
         // 1. Subscribe to FDC3 events
         const adaptableHandleIntentFn = this.getFdc3Options().intents?.handleIntent;
         const listenForIntents = this.getFdc3Options().intents?.listensFor ?? [];

package/src/Utilities/Services/FlashingCellService.js

@@ -6,6 +6,11 @@ exports.FLASHING_CELL_ROW_KEY = '__ROW';
  * This service manages Flashing Cells
  */
 class FlashingCellService {
+    api;
+    // map of rowPrimaryKey -> ColIdOrRowId -> FlashingCellUuid
+    gridCellsCurrentlyFlashing;
+    // map of FlashingCellUuid -> FlashingCell
+    flashingCellsMapping;
     constructor(api) {
         this.api = api;
         this.gridCellsCurrentlyFlashing = {};

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("lodash/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{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=e.__importDefault(require("lodash/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;

package/src/Utilities/Services/MetamodelService.js

@@ -9,9 +9,9 @@ const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const DefaultAdaptableOptions_1 = require("../../AdaptableOptions/DefaultAdaptableOptions");
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 class MetamodelService {
+    gridInfoOptions = new Map();
+    getAdaptableOptions = () => null;
     constructor(getAdaptableOptions, validateOptions) {
-        this.gridInfoOptions = new Map();
-        this.getAdaptableOptions = () => null;
         this.getAdaptableOptions = getAdaptableOptions;
         this.gridInfoOptions = this.buildGridInfoOptions();
         if (validateOptions) {

package/src/Utilities/Services/ModuleService.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 class ModuleService {
+    adaptableApi;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         this.adaptableApi = adaptableApi;
@@ -117,13 +118,13 @@ 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':
@@ -149,7 +150,7 @@ 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/Utilities/Services/QueryLanguageService.js

@@ -13,13 +13,14 @@ const scalarExpressionFunctions_1 = require("../ExpressionFunctions/scalarExpres
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
 class QueryLanguageService {
+    adaptableApi;
+    cacheBooleanValidation = new Map();
+    cacheObservableValidation = new Map();
+    cacheAggregatedBooleanValidation = new Map();
+    cacheAggregatedScalarValidation = new Map();
+    cacheModuleSpecificExpressionFunctions = new Map();
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.cacheBooleanValidation = new Map();
-        this.cacheObservableValidation = new Map();
-        this.cacheAggregatedBooleanValidation = new Map();
-        this.cacheAggregatedScalarValidation = new Map();
-        this.cacheModuleSpecificExpressionFunctions = new Map();
     }
     evaluateBooleanExpression(expression, module, rowNode, evalContext) {
         if (expression == undefined) {

package/src/Utilities/Services/RowFormService.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RowFormService = void 0;
 class RowFormService {
+    adaptableApi;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         if (adaptableApi.optionsApi.getRowFormOptions().autoHandle) {

package/src/Utilities/Services/RowSummaryService.js

@@ -14,15 +14,12 @@ const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
  * The logic is extracted here to make it easier to follow
  */
 class RowSummaryService {
+    api;
+    cachedCellSummary = new Map();
+    previousRowSummaries;
+    previousLayout;
     constructor(api) {
         this.api = api;
-        this.cachedCellSummary = new Map();
-        this._throttleAcumulatedColumnsThatChanged = new Set();
-        /**
-         *
-         * @param colId optional to evaluate only one column
-         */
-        this._throttledEvaluateRowSummary = (0, throttle_1.default)(this.evaluateRowSummary, 300);
     }
     onAdaptableReady() {
         this.rowSummariesSubscriptions();
@@ -70,12 +67,18 @@ class RowSummaryService {
             this.throttledEvaluateRowSummary();
         });
     }
+    _throttleAcumulatedColumnsThatChanged = new Set();
     throttledEvaluateRowSummary(reason) {
         if (reason) {
             reason.columnIds.forEach((col) => this._throttleAcumulatedColumnsThatChanged.add(col));
         }
         this._throttledEvaluateRowSummary(reason);
     }
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    _throttledEvaluateRowSummary = (0, throttle_1.default)(this.evaluateRowSummary, 300);
     evaluateRowSummary(reason) {
         if (this._throttleAcumulatedColumnsThatChanged.size > 0) {
             const columnIds = Array.from(this._throttleAcumulatedColumnsThatChanged.values());

package/src/Utilities/Services/TeamSharingService.js

@@ -5,9 +5,11 @@ const tslib_1 = require("tslib");
 const Uuid_1 = require("../../AdaptableState/Uuid");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 class TeamSharingService {
+    adaptableApi;
+    dismissedNotifications = [];
+    updateCheckTimerId;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.dismissedNotifications = [];
         const teamSharingOptions = adaptableApi.optionsApi.getTeamSharingOptions();
         if (teamSharingOptions.updateInterval > 0) {
             // convert minutes to millis

package/src/Utilities/Services/ThemeService.js

@@ -2,16 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeService = void 0;
 class ThemeService {
+    api;
+    unsubscribe = () => { };
+    styleSheetObject;
     constructor(api) {
-        this.unsubscribe = () => { };
-        this.onThemeChanged = () => {
-            let currentTheme = this.api.themeApi.getCurrentThemeObject();
-            currentTheme = this.mapOsTheme(currentTheme);
-            this.applyNewThemeVariables(currentTheme);
-            // this needs to be called after variables are set
-            // as it may show the warning for a custom/runtime theme
-            this.showMissingThemeFiles(currentTheme);
-        };
         this.api = api;
         this.subscribe();
         if (!this.styleSheetObject) {
@@ -36,6 +30,14 @@ class ThemeService {
             prefferedColorSchemeUnsubscribe();
         };
     }
+    onThemeChanged = () => {
+        let currentTheme = this.api.themeApi.getCurrentThemeObject();
+        currentTheme = this.mapOsTheme(currentTheme);
+        this.applyNewThemeVariables(currentTheme);
+        // this needs to be called after variables are set
+        // as it may show the warning for a custom/runtime theme
+        this.showMissingThemeFiles(currentTheme);
+    };
     applyNewThemeVariables(theme) {
         const variables = theme.CSSVariables;
         if (!variables || Object.keys(variables).length === 0) {

package/src/Utilities/Services/ValidationService.js

@@ -8,6 +8,7 @@ const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 class ValidationService {
+    adaptableApi;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         this.adaptableApi = adaptableApi;

package/src/Utilities/createAgStatusPanelComponent.js

@@ -23,6 +23,9 @@ const createAgStatusPanelComponent = (component, adaptable, context) => {
         };
     }
     return class StatusBarRenderer {
+        params;
+        eGui;
+        unmountReactRoot;
         init(params) {
             this.params = params;
             this.eGui = document.createElement('div');

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

@@ -39,7 +39,7 @@ 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_1.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_1.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(icons_1.Icon, { name: icon, style: iconStyle }))))));
     }

package/src/View/Alert/ActiveAlertsPanel.js

@@ -11,6 +11,14 @@ const ActiveAlertsPanel = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
     const alerts = (0, react_redux_1.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_1.AdaptableObjectCompactList, { abObjects: alerts, module: filterModule });
 };
 exports.ActiveAlertsPanel = ActiveAlertsPanel;

package/src/View/Alert/AlertViewPanel.js

@@ -6,10 +6,11 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const AdaptablePopover_1 = require("../AdaptablePopover");
-const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 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);
@@ -24,7 +25,6 @@ class AlertViewPanelComponent extends React.Component {
         }
     }
     render() {
-        const messageType = UIHelper_1.default.getMessageTypeFromAdaptableAlerts(this.props.AdaptableAlerts);
         const { color: buttonTextColor, background: buttonBackground } = (0, getAlertButtonStyle_1.getAlertButtonStyle)(this.props.AdaptableAlerts);
         const collapsedText = this.props.AdaptableAlerts.length == 0
             ? '0 Alerts'
@@ -32,13 +32,17 @@ class AlertViewPanelComponent extends React.Component {
                 ? '1 Alert'
                 : this.props.AdaptableAlerts.length + ' Alerts';
         const alertsPanel = React.createElement(ActiveAlertsPanel_1.ActiveAlertsPanel, null);
-        const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        return (React.createElement(Flex_1.Flex, { alignItems: "stretch", className: `ab-${elementType}__Alert__wrap` },
-            React.createElement(Flex_1.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_1.Flex, { alignItems: "center" },
-                React.createElement(AdaptablePopover_1.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_1.Flex, { alignItems: "stretch", className: (0, clsx_1.default)(`ab-${elementType}__Alert__wrap twa:gap-1`, {
+                'twa:min-w-[140px] twa:w-[140px]': isToolbar,
+                [`twa:flex-1`]: !isToolbar,
+            }) },
+            React.createElement(Flex_1.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_1.Flex, { className: 'twa:gap-1' },
+                React.createElement(Flex_1.Flex, { className: "twa:flex twa:box-border" },
+                    React.createElement(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' }, 'Clear Alerts')),
+                React.createElement(AdaptablePopover_1.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

@@ -8,9 +8,17 @@ const getAlertButtonStyle = (alerts) => {
     const messageTypeColor = UIHelper_1.default.getColorByMessageType(messageType);
     const buttonBackground = UIHelper_1.default.getButtonColourForAdaptableAlerts(alerts, messageTypeColor);
     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}`
+            : '';
+    }
     return {
         color: buttonTextColor,
         background: buttonBackground,
+        cssClasses,
     };
 };
 exports.getAlertButtonStyle = getAlertButtonStyle;

package/src/View/BulkUpdate/BulkUpdateViewPanel.js

@@ -17,6 +17,7 @@ const react_redux_1 = require("react-redux");
 const Flex_1 = require("../../components/Flex");
 const clsx_1 = tslib_1.__importDefault(require("clsx"));
 class BulkUpdateViewPanelComponent extends React.Component {
+    cleanupEvent;
     constructor(props) {
         super(props);
         this.state = {
@@ -41,24 +42,36 @@ class BulkUpdateViewPanelComponent extends React.Component {
         let statusColour = this.getStatusColour();
         let selectedColumn = this.props.BulkUpdateValidationResult.Column;
         let previewPanel = (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: selectedColumn, showPanel: true, showHeader: false }));
-        let shouldDisable = this.props.accessLevel == 'ReadOnly' ||
+        const valueSelectorDisabled = this.props.accessLevel == 'ReadOnly' ||
             !this.props.BulkUpdateValidationResult.IsValid ||
-            this.props.api.layoutApi.isCurrentLayoutPivot() == true;
+            this.props.api.layoutApi.isCurrentLayoutPivot();
+        const valueOperationDisabled = valueSelectorDisabled ||
+            StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
+            (this.props.PreviewInfo != null &&
+                this.props.PreviewInfo.previewValidationSummary.validationResult == 'All');
         const applyStyle = {
             color: statusColour,
             fill: 'currentColor',
         };
-        const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__BulkUpdate__wrap twa:min-w-[150px]`), flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-            React.createElement(Flex_1.Flex, null,
+        const isToolbar = this.props.viewType === 'Toolbar';
+        const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
+        const messageStyle = UIHelper_1.UIHelper.getMessageTypeByStatusColour(statusColour);
+        const infoStyle = messageStyle === 'Success' ? 'Info' : messageStyle;
+        return (React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)(valueSelectorDisabled ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__BulkUpdate__wrap twa:gap-1 twa:flex-row`, {
+                'twa:min-w-[300px] twa:max-w-[300px] twa:w-[300px] twa:flex-nowrap': isToolbar,
+                'twa:flex-1 twa:flex-wrap': !isToolbar,
+            }), flexWrap: isToolbar ? 'nowrap' : 'wrap' },
+            React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)('twa:flex-1', {
+                    'twa:min-w-[100px]': !isToolbar,
+                    'twa:min-w-0': isToolbar,
+                }) },
                 React.createElement(BulkUpdateValueSelector_1.BulkUpdateValueSelector, { selectedGridCells: this.props.SelectedGridCells, newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
                         listMinWidth: 160,
-                    }, className: `ab-${elementType}__BulkUpdate__select`, disabled: shouldDisable, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: selectedColumn, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns) })),
-            React.createElement(Flex_1.Flex, null,
-                !shouldDisable && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue) && (React.createElement(ButtonApply_1.ButtonApply, { className: `ab-${elementType}__BulkUpdate__apply twa:ml-2`, onClick: () => this.onApplyClick(), style: applyStyle, tooltip: "Apply Bulk Update", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
-                        (this.props.PreviewInfo != null &&
-                            this.props.PreviewInfo.previewValidationSummary.validationResult == 'All'), accessLevel: this.props.accessLevel }, this.props.viewType === 'ToolPanel' && 'Update')),
-                !shouldDisable && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue) && (React.createElement(AdaptablePopover_1.AdaptablePopover, { popoverMinWidth: 360, className: `ab-${elementType}__BulkUpdate__info`, headerText: "Preview Results", bodyText: [previewPanel], MessageType: UIHelper_1.UIHelper.getMessageTypeByStatusColour(statusColour), useButton: true, showEvent: 'focus', hideEvent: "blur" })))));
+                    }, className: `ab-${elementType}__BulkUpdate__select twa:w-full`, disabled: valueSelectorDisabled, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: selectedColumn, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns) })),
+            React.createElement(Flex_1.Flex, { className: "twa:flex-shrink-0 twa:gap-1" },
+                React.createElement(Flex_1.Flex, { className: "twa:flex twa:box-border twa:items-center" },
+                    React.createElement(ButtonApply_1.ButtonApply, { className: `ab-${elementType}__BulkUpdate__apply twa:h-full`, onClick: () => this.onApplyClick(), style: applyStyle, tooltip: "Apply Bulk Update", disabled: valueOperationDisabled, accessLevel: this.props.accessLevel }, 'Apply')),
+                React.createElement(AdaptablePopover_1.AdaptablePopover, { popoverMinWidth: 360, className: `ab-${elementType}__BulkUpdate__info`, headerText: "Preview Results", bodyText: [previewPanel], MessageType: infoStyle, useButton: true, showEvent: 'focus', hideEvent: "blur", disabled: valueSelectorDisabled || StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) }))));
     }
     onColumnValueSelectedChanged(selectedColumnValue) {
         this.props.onBulkUpdateValueChange(selectedColumnValue);

package/src/View/CalculatedColumn/CalculatedColumnSummary.js

@@ -13,14 +13,6 @@ const CalculatedColumnWizard_1 = require("./Wizard/CalculatedColumnWizard");
 class CalculatedColumnSummaryComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.onFinishWizard = (calculatedColumn) => {
-            this.props.onEdit(calculatedColumn);
-            this.setState({
-                editedAdaptableObject: null,
-                wizardStartIndex: 0,
-                wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
-            });
-        };
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
@@ -48,6 +40,14 @@ class CalculatedColumnSummaryComponent extends React.Component {
             wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
         });
     }
+    onFinishWizard = (calculatedColumn) => {
+        this.props.onEdit(calculatedColumn);
+        this.setState({
+            editedAdaptableObject: null,
+            wizardStartIndex: 0,
+            wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
+        });
+    };
 }
 exports.CalculatedColumnSummaryComponent = CalculatedColumnSummaryComponent;
 function mapStateToProps(state) {

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -22,11 +22,11 @@ const isValidCalculatedColumnExpression = (data, api) => {
     const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
     const expression = api.expressionApi.getAdaptableQueryExpression(data.Query)?.trim();
     if (!expression) {
-        return 'Calculated column expression cannot be empty';
+        return 'Calculated Column Expression cannot be empty';
     }
     const isValid = calculatedColumnExpressionService.isCalculatedColumnQueryValid(data.Query);
     if (!isValid) {
-        return 'Calculated column expression is not valid';
+        return 'Calculated Column Expression is not valid';
     }
     return true;
 };

package/src/View/CellSummary/CellSummaryViewPanel.js

@@ -13,7 +13,9 @@ const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/
 const react_redux_1 = require("react-redux");
 const Select_1 = require("../../components/Select");
 const Flex_1 = require("../../components/Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 class CellSummaryViewPanelComponent extends React.Component {
+    cleanupEvent;
     constructor(props) {
         super(props);
     }
@@ -47,30 +49,27 @@ class CellSummaryViewPanelComponent extends React.Component {
             });
         let cellSummaryPopover = React.createElement(CellSummaryPopover_1.CellSummaryPopover, { CellSummary: this.props.CellSummary });
         let shouldDisable = this.props.accessLevel == 'ReadOnly' || this.props.CellSummary == null;
-        const renderOperationValue = () => {
-            if (shouldDisable) {
-                return;
-            }
-            const operationValue = this.getOperationValue();
-            if (operationValue == undefined) {
-                return;
-            }
-            return this.props.viewType === 'ToolPanel' ? (React.createElement(Flex_1.Flex, { className: `ab-${elementType}__CellSummary__value twa:rounded-standard twa:mr-2 twa:p-2 twa:text-text-on-info twa:bg-info twa:text-2` }, operationValue)) : (React.createElement(Flex_1.Flex, { justifyContent: "center", className: `ab-${elementType}__CellSummary__value twa:flex-1 twa:mr-2 twa:ml-1 text-text-on-primary` }, operationValue));
-        };
-        const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: shouldDisable ? GeneralConstants.READ_ONLY_STYLE : `ab-${elementType}__CellSummary__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        const isToolbar = this.props.viewType === 'Toolbar';
+        const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
+        const operationValue = this.getOperationValue() ?? 'N/A';
+        return (React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__CellSummary__wrap twa:gap-2 twa:flex-row`, {
+                'twa:min-w-[215px] twa:max-w-[215px] twa:w-[215px] twa:flex-nowrap': isToolbar,
+                'twa:flex-1 twa:flex-wrap': !isToolbar,
+            }) },
             React.createElement(Flex_1.Flex, { className: "twa:flex-1" },
                 React.createElement(Select_1.Select, { "aria-label": "Cell Summary Operation Selector", className: `ab-${elementType}__CellSummary__select twa:w-full`, disabled: shouldDisable, options: [...operationMenuItems, ...operationDefinitions], onChange: (x) => this.props.onCellSummaryOperationChange(x), value: this.props.CellSummaryOperation })),
-            React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" }, React.createElement(React.Fragment, null,
-                renderOperationValue(),
-                this.props.CellSummary != null && this.props.CellSummary.Count > 0 && (React.createElement(AdaptablePopover_1.AdaptablePopover, { popoverMaxWidth: 360, className: "ab-ToolPanel__CellSummary__info", bodyText: [cellSummaryPopover], useButton: true, showEvent: 'focus', hideEvent: "blur", tooltipText: 'Show Cell Summaries' }))))));
+            React.createElement(Flex_1.Flex, { className: "twa:items-center twa:gap-1" }, React.createElement(React.Fragment, null,
+                React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)(`ab-${elementType}__CellSummary__value twa:min-w-[50px]`, {
+                        'twa:rounded-standard twa:text-color-text-on-info twa:bg-color-info twa:text-2': !isToolbar,
+                        'twa:flex-1 twa:text-color-text-on-primary twa:justify-center': isToolbar,
+                    }) }, operationValue),
+                React.createElement(AdaptablePopover_1.AdaptablePopover, { popoverMaxWidth: 360, className: "ab-ToolPanel__CellSummary__info", bodyText: [cellSummaryPopover], useButton: true, showEvent: 'focus', hideEvent: "blur", tooltipText: 'Show Cell Summaries', disabled: !this.props.CellSummary?.Count })))));
     }
     checkSelectedCells() {
         this.props.onCreateCellSummary();
     }
     getOperationValue() {
-        const api = this.props.api;
-        return api.cellSummaryApi.getCellSummaryOperationValue(this.props.CellSummaryOperation);
+        return this.props.api.cellSummaryApi.getCellSummaryOperationValue(this.props.CellSummaryOperation);
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/Components/AdaptableDateInput/index.js

@@ -11,7 +11,7 @@ const AdaptableDateInput = React.forwardRef(function AdaptableDateInputCmp(props
     const { value: _, defaultValue: __, onChange, required, disabled, showClearButton, ...inputProps } = props;
     const [value, setValue] = (0, useProperty_1.default)(props, 'value', undefined, {
         onChange: (dateString) => 
-        // wrap date value in FormEvent in order to keep the external API unchanged
+        // wrap date value in ChangeEvent in order to keep the external API unchanged
         props.onChange?.({
             target: {
                 // ALWAYS trigger onChange with the ISO format

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

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 class ButtonApply extends React.Component {
     render() {
-        return (React.createElement(SimpleButton_1.default, { "data-name": "apply", tooltip: "Apply", iconSize: 20, icon: "check", variant: "text", ...this.props }));
+        return (React.createElement(SimpleButton_1.default, { "data-name": "apply", tooltip: "Apply", iconSize: 20, icon: "check", variant: "outlined", ...this.props }));
     }
 }
 exports.ButtonApply = ButtonApply;

package/src/View/Components/Buttons/ButtonBase/index.js

@@ -11,6 +11,15 @@ const Glyphicon = ({ glyph, style }) => {
 };
 const baseClassName = 'ab-Button twa:text-current';
 class ButtonBase extends React.Component {
+    static defaultProps = {
+        overrideDisableButton: false,
+        toolTipAndText: '',
+        glyph: '',
+        displayMode: 'Glyph+Text',
+        transformGlyph: false,
+        accessLevel: 'Full',
+        showDefaultStyle: false,
+    };
     render() {
         let isDisabled;
         isDisabled = this.props.accessLevel == 'Hidden';
@@ -64,12 +73,3 @@ class ButtonBase extends React.Component {
     }
 }
 exports.ButtonBase = ButtonBase;
-ButtonBase.defaultProps = {
-    overrideDisableButton: false,
-    toolTipAndText: '',
-    glyph: '',
-    displayMode: 'Glyph+Text',
-    transformGlyph: false,
-    accessLevel: 'Full',
-    showDefaultStyle: false,
-};