@adaptabletools/adaptable-cjs 18.1.2 → 18.1.4-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.1.2",
+  "version": "18.1.4-canary.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -49,7 +49,7 @@ export interface DistinctColumnValuesParams {
     skipRowNode?: IRowNode;
     permittedValues?: any[];
 }
-export type AdaptableVariant = 'vanilla' | 'react' | 'angular';
+export type AdaptableVariant = 'vanilla' | 'react' | 'angular' | 'vue';
 /**
  *  The only interface for Adaptable
  *

package/src/AdaptableOptions/AdaptableFrameworkComponent.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { ReactElement } from 'react';
-import { AdaptableSystemIconName, BaseContext } from '../types';
+import { BaseContext } from '../types';
 /**
  * Base Component for Bespoke Components - Can be Angular or React
  */
-export type AdaptableFrameworkComponent = AngularFrameworkComponent | ReactFrameworkComponent;
+export type AdaptableFrameworkComponent = AngularFrameworkComponent | ReactFrameworkComponent | VueFrameworkComponent;
 /**
  * Angular component defined by its type and (optional) initialisation callback
  */
@@ -31,6 +31,9 @@ export type AngularFrameworkComponent<T = unknown> = {
 export type ReactFrameworkComponent = ({ adaptableApi, }: {
     adaptableApi: AdaptableApi;
 }) => ReactElement;
+export type VueFrameworkComponent<Component extends unknown = unknown> = ({ adaptableApi, }: {
+    adaptableApi: AdaptableApi;
+}) => Component;
 /**
  * Context provided for any custom rendering
  */
@@ -59,14 +62,3 @@ export interface CustomRenderFunction {
      */
     (customRenderContext: CustomRenderContext): string | null;
 }
-/**
- * Config used to open a custom window
- */
-export interface CustomWindowConfig {
-    id: string;
-    title?: string;
-    icon?: AdaptableSystemIconName;
-    render?: (customRenderContext: CustomRenderContext) => string | null;
-    frameworkComponent?: AdaptableFrameworkComponent;
-    onFrameworkComponentDestroyed?: () => void;
-}

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -22,6 +22,11 @@ export interface CommentOptions<TData = any> {
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */
     dateFormat?: string;
+    /**
+     * Show the Close Button in the Comments Popup
+     * @defaultValue true
+     */
+    showPopupCloseButton?: boolean;
 }
 /**
  * Context used when determining if a cell can show Comments

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -13,6 +13,12 @@ export interface NoteOptions<TData = any> {
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */
     dateFormat?: string;
+    /**
+     * Show the Close Button in the Notes Popup
+     *
+     * @defaultValue true
+     */
+    showPopupCloseButton?: boolean;
 }
 /**
  * Context used when determining if a Note can be added to a Cell

package/src/Api/CommentApi.d.ts

@@ -53,4 +53,8 @@ export interface CommentApi {
      * Clear all Comment Threads in the grid
      */
     clearGridComments(): void;
+    /**
+     * Close the Comment Popup
+     */
+    hideCommentsPopup(): void;
 }

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

@@ -15,4 +15,5 @@ export declare class CommentsApiImpl extends ApiBase implements CommentApi {
     deleteCommentThread(cellAddress: CellAddress): void;
     setGridComments(cellComments: CommentThread[]): void;
     clearGridComments(): void;
+    hideCommentsPopup(): void;
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -48,5 +48,8 @@ class CommentsApiImpl extends ApiBase_1.ApiBase {
     clearGridComments() {
         this.setGridComments([]);
     }
+    hideCommentsPopup() {
+        this.adaptable.api.internalApi.getCellPopupService().hidePopup();
+    }
 }
 exports.CommentsApiImpl = CommentsApiImpl;

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

@@ -2,9 +2,10 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableFrameworkComponent, AdaptableObjectTag, CustomRenderFunction, CustomWindowConfig, GridCell } from '../../types';
+import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
 import { UserInterfaceApi } from '../UserInterfaceApi';
+import { ProgressIndicatorConfig } from '../../PredefinedConfig/Common/ProgressIndicatorConfig';
 import { ApiBase } from './ApiBase';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     internalApi: UserInterfaceInternalApi;
@@ -30,13 +31,7 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showLoadingScreen(): void;
     hideLoadingScreen(): void;
-    showProgressIndicator(config: {
-        text: string;
-        message?: string;
-        render?: CustomRenderFunction;
-        frameworkComponent?: AdaptableFrameworkComponent;
-        delay?: number;
-    }): void;
+    showProgressIndicator(config: ProgressIndicatorConfig): void;
     hideProgressIndicator(): void;
     openCustomWindowPopup(config: CustomWindowConfig): {
         close: () => void;

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -145,6 +145,7 @@ export declare class AlertInternalApi extends ApiBase {
     showAlertsForGridDataChanges(gridDataChangedInfo: GridDataChangedInfo, alertDefinitions: AlertDefinition[]): void;
     shouldFireAlertOnClient(alertDefinition: AlertDefinition): boolean;
     getDefaultAlertNotificationForm(): AlertButtonForm;
+    getDefaultButton(): AlertButton<AlertFormContext<any>>;
     /**
      * Supported tokens:
      * - column-that-changed-name -> [column]

package/src/Api/Internal/AlertInternalApi.js

@@ -606,14 +606,15 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         // (i.e. to be able to display the AlertForm with the default buttons when the user has not defined any buttons)
         return {
             fields: [],
-            Buttons: [
-                {
-                    Label: 'OK',
-                    ButtonStyle: {
-                        variant: 'raised',
-                    },
-                },
-            ],
+            Buttons: [this.getDefaultButton()],
+        };
+    }
+    getDefaultButton() {
+        return {
+            Label: 'OK',
+            ButtonStyle: {
+                variant: 'raised',
+            },
         };
     }
     /**

package/src/Api/UserInterfaceApi.d.ts

@@ -3,8 +3,9 @@ import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableFrameworkComponent, AdaptableIcon } from '../types';
-import { CustomRenderFunction, CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
+import { AdaptableIcon } from '../types';
+import { CustomWindowConfig } from '../PredefinedConfig/Common/CustomWindowConfig';
+import { ProgressIndicatorConfig } from '../PredefinedConfig/Common/ProgressIndicatorConfig';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -87,12 +88,7 @@ export interface UserInterfaceApi {
      * @param config.frameworkComponent - the framework (React/Angular) component to render as progress indicator
      * @param config.delay - delay before showing the progress indicator (in milliseconds)
      */
-    showProgressIndicator(config: {
-        text?: string;
-        render?: CustomRenderFunction;
-        frameworkComponent?: AdaptableFrameworkComponent;
-        delay?: number;
-    }): void;
+    showProgressIndicator(config: ProgressIndicatorConfig): void;
     /**
      * Hides the progress indicator
      */

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

@@ -0,0 +1,13 @@
+import { AdaptableSystemIconName } from '../../types';
+import { CustomRenderContext, AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFrameworkComponent';
+/**
+ * Config used to open a custom window
+ */
+export interface CustomWindowConfig {
+    id: string;
+    title?: string;
+    icon?: AdaptableSystemIconName;
+    render?: (customRenderContext: CustomRenderContext) => string | null;
+    frameworkComponent?: AdaptableFrameworkComponent;
+    onFrameworkComponentDestroyed?: () => void;
+}

package/src/PredefinedConfig/Common/CustomWindowConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,23 @@
+import { AdaptableFrameworkComponent } from '../../types';
+import { CustomRenderFunction } from '../../AdaptableOptions/AdaptableFrameworkComponent';
+/**
+ * Config when displaying a Progress Indicator
+ */
+export interface ProgressIndicatorConfig {
+    /**
+     * Text to display
+     */
+    text?: string;
+    /**
+     * Render function
+     */
+    render?: CustomRenderFunction;
+    /**
+     * A React or Angular Framework component to use
+     */
+    frameworkComponent?: AdaptableFrameworkComponent;
+    /**
+     * Length of Delay
+     */
+    delay?: number;
+}

package/src/PredefinedConfig/Common/ProgressIndicatorConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,8 +1,10 @@
 import { SuspendableObject } from './SuspendableObject';
+import { TypeHint } from './Types';
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
 export declare const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = "WEIGHTED_AVERAGE";
 export declare const summarySupportedExpressions: readonly ["MIN", "MAX", "SUM", "AVG", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION", "WEIGHTED_AVERAGE"];
-export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
+export type SystemSummarySupportedExpression = (typeof summarySupportedExpressions)[number];
+export type SummarySupportedExpression = TypeHint<string, SystemSummarySupportedExpression>;
 /**
  * Position of Row Summary - 'Top' or 'Bottom'
  */
@@ -19,4 +21,9 @@ export interface RowSummary extends SuspendableObject {
      * Map of Columns with Summary Expressions
      */
     ColumnsMap: Record<string, SummarySupportedExpression>;
+    /**
+     * Whether to include only filtered rows in the summary.
+     * @defauts true
+     */
+    IncludeOnlyFilteredRows?: boolean;
 }

package/src/PredefinedConfig/SystemState.d.ts

@@ -1,7 +1,7 @@
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
-import { AdaptableFrameworkComponent, CellAddress, CellDataChangedInfo, CustomRenderFunction, GridCell, SmartEditOperation } from '../types';
+import { CellAddress, CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
 import { AdaptableAlert } from './Common/AdaptableAlert';
@@ -14,6 +14,7 @@ import { SummaryOperation } from './Common/Enums';
 import { ChartModel } from '@ag-grid-community/core';
 import { ExternalChartDefinition } from './ChartingState';
 import { CachedQuery } from './NamedQueryState';
+import { ProgressIndicatorConfig } from './Common/ProgressIndicatorConfig';
 export type { IPushPullReport, IPushPullDomain };
 export type { OpenFinReport };
 type ROW_PRIMARY_KEY = string;
@@ -110,9 +111,6 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
         rowSummaries?: SystemRowSummary[];
     };
 }
-export interface ProgressIndicator {
+export interface ProgressIndicator extends ProgressIndicatorConfig {
     active: boolean;
-    text?: string;
-    render?: CustomRenderFunction;
-    frameworkComponent?: AdaptableFrameworkComponent;
 }

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

@@ -13,9 +13,10 @@ import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
-import { DataImportedInfo, DataSet, CellAddress, CustomRenderFunction, AdaptableFrameworkComponent } from '../../types';
+import { DataImportedInfo, DataSet, CellAddress } from '../../types';
 import { ChartModel } from '@ag-grid-community/core';
 import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
+import { ProgressIndicatorConfig } from '../../PredefinedConfig/Common/ProgressIndicatorConfig';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
@@ -200,9 +201,7 @@ export interface SystemCellSummaryChangeOperationAction extends Redux.Action {
     cellSummaryOperation: SummaryOperation | string;
 }
 export interface SystemProgressIndicatorShowAction extends Redux.Action {
-    text?: string;
-    render?: CustomRenderFunction;
-    frameworkComponent?: AdaptableFrameworkComponent;
+    progressIndicatorConfig: ProgressIndicatorConfig;
 }
 export interface SystemProgressIndicatorHideAction extends Redux.Action {
 }
@@ -304,11 +303,7 @@ export declare const SetNewColumnListOrder: (VisibleColumnList: string[]) => Set
 export declare const SetLastAppliedShortcut: (gridCell: GridCell | undefined) => SetLastAppliedShortcutAction;
 export declare const SystemCachedQueryAdd: (cachedQuery: CachedQuery) => SystemCachedQueryAddAction;
 export declare const SystemCellSummaryChangeOperation: (cellSummaryOperation: SummaryOperation | string) => SystemCellSummaryChangeOperationAction;
-export declare const SystemProgressIndicatorShow: (config: {
-    text?: string;
-    render?: CustomRenderFunction;
-    frameworkComponent?: AdaptableFrameworkComponent;
-}) => SystemProgressIndicatorShowAction;
+export declare const SystemProgressIndicatorShow: (progressIndicatorConfig: ProgressIndicatorConfig) => SystemProgressIndicatorShowAction;
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -257,11 +257,9 @@ const SystemCellSummaryChangeOperation = (cellSummaryOperation) => ({
     cellSummaryOperation: cellSummaryOperation,
 });
 exports.SystemCellSummaryChangeOperation = SystemCellSummaryChangeOperation;
-const SystemProgressIndicatorShow = (config) => ({
+const SystemProgressIndicatorShow = (progressIndicatorConfig) => ({
     type: exports.SYSTEM_PROGRESS_INDICATOR_SHOW,
-    text: config.text,
-    render: config.render,
-    frameworkComponent: config.frameworkComponent,
+    progressIndicatorConfig: progressIndicatorConfig,
 });
 exports.SystemProgressIndicatorShow = SystemProgressIndicatorShow;
 const SystemProgressIndicatorHide = () => ({
@@ -702,9 +700,9 @@ const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: true,
-                    text: actionTypedAdd.text,
-                    render: actionTypedAdd.render,
-                    frameworkComponent: actionTypedAdd.frameworkComponent,
+                    text: actionTypedAdd.progressIndicatorConfig.text,
+                    render: actionTypedAdd.progressIndicatorConfig.render,
+                    frameworkComponent: actionTypedAdd.progressIndicatorConfig.frameworkComponent,
                 },
             };
             return Object.assign({}, state, updatedState);

package/src/Strategy/LayoutModule.js

@@ -393,8 +393,10 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .getModuleById('Schedule')
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn
-        // we need to refresh the column defs, as some configs may have changed
-        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
+        // we need to re-setup the column defs, as some colDefs properties may be changed
+        this.api.internalApi
+            .getAdaptableInstance()
+            .updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
     }
     getReferencedNamedQueryNames(layout) {
         var _a;

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.js

@@ -6,7 +6,7 @@ const getFilterPreview = (columnFilter, api) => {
     const columnIdToFriendlyName = (columnId) => {
         return api.columnApi.getFriendlyNameForColumnId(columnId);
     };
-    return `[${columnIdToFriendlyName(columnFilter.ColumnId)}: ${(_a = columnFilter === null || columnFilter === void 0 ? void 0 : columnFilter.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId} ${((_c = (_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.Inputs) !== null && _c !== void 0 ? _c : [])
+    return `[${columnIdToFriendlyName(columnFilter.ColumnId)}: ${(_a = columnFilter === null || columnFilter === void 0 ? void 0 : columnFilter.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId}${((_c = (_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.Inputs) !== null && _c !== void 0 ? _c : [])
         .map((input) => {
         if (typeof input === 'string') {
             return input;

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

@@ -10,3 +10,6 @@
 export declare function setInPath<T>(obj: any, path: string[], value: any): T;
 export declare function isObjectEmpty(obj?: any): boolean;
 export declare const deepClone: (obj: any) => any;
+export declare const diff: <T extends {
+    [key: string]: unknown;
+}>(obj1: T, obj2: T) => (keyof T)[];

package/src/Utilities/Extensions/ObjectExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deepClone = exports.isObjectEmpty = exports.setInPath = void 0;
+exports.diff = exports.deepClone = exports.isObjectEmpty = exports.setInPath = void 0;
 /**
  * Returns a new object with the property updated.
  * The property is identified by the path.
@@ -26,3 +26,13 @@ const deepClone = (obj) => {
     return JSON.parse(JSON.stringify(obj));
 };
 exports.deepClone = deepClone;
+const diff = (obj1, obj2) => {
+    let changed = [];
+    for (const key of Object.keys(obj1)) {
+        if (obj1[key] !== obj2[key]) {
+            changed.push(key);
+        }
+    }
+    return changed;
+};
+exports.diff = diff;

package/src/Utilities/Services/QueryLanguageService.js

@@ -441,6 +441,7 @@ class QueryLanguageService {
                 },
                 description: customExpressionDefinition.description,
                 signatures: customExpressionDefinition.signatures,
+                inputs: customExpressionDefinition.inputTypes,
             };
             acc[expressionName] = expression;
             return acc;

package/src/Utilities/Services/RowSummaryService.js

@@ -100,7 +100,10 @@ class RowSummaryService {
         const rowSummaries = (_a = this.api.layoutApi.getCurrentLayout().RowSummaries) !== null && _a !== void 0 ? _a : [];
         const rowSummariesResults = rowSummaries
             .filter((rowSummary) => !rowSummary.IsSuspended)
-            .map(({ ColumnsMap, Position }) => {
+            .map((rowSummary) => {
+            const { ColumnsMap, Position, 
+            // it defaults to true
+            IncludeOnlyFilteredRows = true, } = rowSummary;
             return {
                 Position,
                 RowData: Object.entries(ColumnsMap !== null && ColumnsMap !== void 0 ? ColumnsMap : {}).reduce((acc, [columnId, expression]) => {
@@ -108,7 +111,7 @@ class RowSummaryService {
                     if (columnId === 'Uuid' || columnId === 'Source') {
                         return acc;
                     }
-                    const key = `${columnId}-${expression}`;
+                    const key = `${columnId}-${expression}-IncludeOnlyFilteredRows=${IncludeOnlyFilteredRows ? 'filtered' : 'all'}`;
                     let expressionLiveValue = this.cachedCellSummary.get(key);
                     if (expressionLiveValue) {
                         if (!reason) {
@@ -134,7 +137,13 @@ class RowSummaryService {
                             expressionLiveValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
                                 aggregatedScalarExpression,
                             }, ModuleConstants.LayoutModuleId, this.api, () => {
-                                return this.api.gridApi.getVisibleRowNodes();
+                                var _a;
+                                if ((_a = rowSummary.IncludeOnlyFilteredRows) !== null && _a !== void 0 ? _a : true) {
+                                    return this.api.gridApi.getVisibleRowNodes();
+                                }
+                                else {
+                                    return this.api.gridApi.getAllRowNodes();
+                                }
                             });
                         }
                         catch (e) {

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

@@ -29,9 +29,10 @@ const AlertPreview = (_a) => {
         return button;
     }, [alertDefinition === null || alertDefinition === void 0 ? void 0 : alertDefinition.MessageType]);
     const alertToPreview = React.useMemo(() => {
+        var _a;
         const alertForm = alertDefinition.AlertForm || api.alertApi.internalApi.getDefaultAlertNotificationForm();
         if (typeof alertForm !== 'string') {
-            alertForm.Buttons = alertForm.Buttons.map(mapButtons);
+            alertForm.Buttons = ((_a = alertForm.Buttons) !== null && _a !== void 0 ? _a : []).map(mapButtons);
         }
         const result = {
             alertType: 'generic',
@@ -62,6 +63,7 @@ const AlertNotificationWizardSection = (props) => {
             React.createElement(Tabs_1.Tabs.Tab, null, "Notification Options"),
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(CheckBox_1.CheckBox, { checked: (_a = data.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification, onChange: (DisplayNotification) => {
+                        var _a, _b, _c;
                         const newAlertDefinition = Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), { DisplayNotification }) });
                         if (!DisplayNotification && typeof newAlertDefinition.AlertForm === 'object') {
                             delete newAlertDefinition.AlertForm.Buttons;
@@ -70,6 +72,12 @@ const AlertNotificationWizardSection = (props) => {
                             newAlertDefinition.AlertForm =
                                 api.alertApi.internalApi.getDefaultAlertNotificationForm();
                         }
+                        // make sure we have at least one button
+                        if (typeof newAlertDefinition.AlertForm === 'object' && (!((_a = newAlertDefinition.AlertForm) === null || _a === void 0 ? void 0 : _a.Buttons) || ((_c = (_b = newAlertDefinition.AlertForm) === null || _b === void 0 ? void 0 : _b.Buttons) === null || _c === void 0 ? void 0 : _c.length) === 0)) {
+                            newAlertDefinition.AlertForm.Buttons = [
+                                api.alertApi.internalApi.getDefaultButton()
+                            ];
+                        }
                         props.onChange(newAlertDefinition);
                     } }, "Display a Notification when Alert is triggered (with action buttons)"),
                 ((_b = data.AlertProperties) === null || _b === void 0 ? void 0 : _b.DisplayNotification) ? (typeof data.AlertForm === 'string' ? (React.createElement(rebass_1.Text, { fontSize: 2 }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor_1.AlertButtonsEditor, { alertType: props.alertType, AlertButtons: (_c = data.AlertForm) === null || _c === void 0 ? void 0 : _c.Buttons, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {

package/src/View/Comments/CommentsEditor.js

@@ -22,7 +22,9 @@ const AdaptableInput_1 = tslib_1.__importDefault(require("../Components/Adaptabl
 // [text]
 // [show-all-comments-button]
 const CommentsEditor = (props) => {
+    var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const showCloseButton = (_b = (_a = adaptable.adaptableOptions.commentOptions) === null || _a === void 0 ? void 0 : _a.showPopupCloseButton) !== null && _b !== void 0 ? _b : true;
     const cellAddress = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesSelector)(state.System));
     const userId = React.useMemo(() => {
         return adaptable.api.optionsApi.getUserName();
@@ -52,7 +54,17 @@ const CommentsEditor = (props) => {
     if (!commentThread) {
         return null;
     }
-    return (React.createElement(Panel_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup" },
+    return (React.createElement(Panel_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup", onKeyDown: (event) => {
+            if (event.key === 'Escape') {
+                adaptable.api.commentApi.hideCommentsPopup();
+            }
+        } },
+        showCloseButton && (React.createElement(rebass_1.Flex, null,
+            React.createElement(rebass_1.Box, { flex: 1 }),
+            React.createElement(SimpleButton_1.default, { onClick: (event) => {
+                    event.stopPropagation();
+                    adaptable.api.commentApi.hideCommentsPopup();
+                }, variant: "text", icon: "close" }))),
         React.createElement(rebass_1.Flex, { style: {
                 overflow: 'auto',
                 maxHeight: 300,