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

package/src/Utilities/Helpers/styledColumnRowKindSupport.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeStyledColumnRowScope = exports.getStyledColumnRowKindForNode = exports.getStyledColumnRowKindDisabledReason = exports.isStyledColumnRowKindSupported = exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY = exports.STYLED_COLUMN_ROW_KINDS = void 0;
+exports.STYLED_COLUMN_ROW_KINDS = ['Data', 'Group', 'Summary', 'Total'];
+exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY = {
+    Data: 'ExcludeDataRows',
+    Group: 'ExcludeGroupRows',
+    Summary: 'ExcludeSummaryRows',
+    Total: 'ExcludeTotalRows',
+};
+const isStyledColumnRowKindSupported = (styledColumn, kind) => {
+    if (styledColumn.SparklineStyle) {
+        return kind === 'Data';
+    }
+    return true;
+};
+exports.isStyledColumnRowKindSupported = isStyledColumnRowKindSupported;
+const getStyledColumnRowKindDisabledReason = (styledColumn, kind) => {
+    if ((0, exports.isStyledColumnRowKindSupported)(styledColumn, kind)) {
+        return undefined;
+    }
+    if (styledColumn.SparklineStyle) {
+        return 'Sparklines only apply to leaf data rows (cells with a numeric array of points).';
+    }
+    return undefined;
+};
+exports.getStyledColumnRowKindDisabledReason = getStyledColumnRowKindDisabledReason;
+/**
+ * Classifies the AG Grid row node into a single {@link StyledColumnRowKind}.
+ * Order matches {@link shouldRenderStyledColumnOnRow}: total before summary,
+ * summary before group.
+ */
+const getStyledColumnRowKindForNode = (node, api) => {
+    if (api.gridApi.isGrandTotalRowNode(node)) {
+        return 'Total';
+    }
+    if (api.gridApi.isSummaryNode(node)) {
+        return 'Summary';
+    }
+    if (api.gridApi.isGroupRowNode(node)) {
+        return 'Group';
+    }
+    return 'Data';
+};
+exports.getStyledColumnRowKindForNode = getStyledColumnRowKindForNode;
+/**
+ * Forces `Exclude*` to `true` for row kinds that do not apply to the current
+ * Styled Column type, so persisted state cannot contradict the capability
+ * matrix. Returns `undefined` when no change is needed.
+ */
+const sanitizeStyledColumnRowScope = (styledColumn) => {
+    const scope = styledColumn.RowScope;
+    if (!scope) {
+        return undefined;
+    }
+    let next = { ...scope };
+    let changed = false;
+    for (const kind of exports.STYLED_COLUMN_ROW_KINDS) {
+        if ((0, exports.isStyledColumnRowKindSupported)(styledColumn, kind)) {
+            continue;
+        }
+        const key = exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY[kind];
+        if (next[key] !== true) {
+            next = { ...next, [key]: true };
+            changed = true;
+        }
+    }
+    return changed ? next : undefined;
+};
+exports.sanitizeStyledColumnRowScope = sanitizeStyledColumnRowScope;

package/src/Utilities/ObjectFactory.d.ts

@@ -1,24 +1,19 @@
-import { AlertDefinition, AlertProperties } from '../AdaptableState/AlertState';
+import { AlertDefinition, RuleAlertProperties, RuleBasedAlertDefinition } from '../AdaptableState/AlertState';
 import { CalculatedColumn } from '../AdaptableState/CalculatedColumnState';
 import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../AdaptableState/Common/AdaptableAlert';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
 import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
 import { CellDataChangedInfo } from '../AdaptableState/Common/CellDataChangedInfo';
-import { ScheduleType } from '../AdaptableState/Common/Enums';
-import { BaseSchedule, Schedule } from '../AdaptableState/Common/Schedule';
+import { Schedule } from '../AdaptableState/Common/Schedule';
 import { SystemStatusMessageInfo } from '../AdaptableState/Common/SystemStatusMessageInfo';
 import { CustomSort } from '../AdaptableState/CustomSortState';
 import { Report, ReportFormatType, ReportNameType, ReportSchedule } from '../AdaptableState/ExportState';
 import { FormatColumn } from '../AdaptableState/FormatColumnState';
 import { FreeTextColumn } from '../AdaptableState/FreeTextColumnState';
-import { IPushPullSchedule } from '../AdaptableState/IPushPullState';
 import { Layout } from '../AdaptableState/LayoutState';
-import { OpenFinReport, OpenFinSchedule } from '../AdaptableState/OpenFinState';
 import { PlusMinusNudge } from '../AdaptableState/PlusMinusState';
-import { ReminderSchedule } from '../AdaptableState/ScheduleState';
 import { Shortcut } from '../AdaptableState/ShortcutState';
-import { IPushPullReport } from '../AdaptableState/InternalState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmaryInfo } from '../AdaptableState/Common/CellSummary';
 import { AdaptableTheme, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, RowDataChangedInfo, SpecialColumnSettings, SystemFilterPredicateId } from '../types';
@@ -34,20 +29,11 @@ export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
 export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
 export declare function CreateCellChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, cellDataChangedInfo: CellDataChangedInfo): AdaptableCellChangedAlert;
 export declare function CreateRowChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, rowDataChangedInfo: RowDataChangedInfo): AdaptableRowChangedAlert;
-export declare function CreateEmptyAlertDefinition(): AlertDefinition;
+export declare function CreateEmptyAlertDefinition(): RuleBasedAlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
-export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
+export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: RuleAlertProperties): RuleBasedAlertDefinition;
 export declare function CreateEmptyReport(): Report;
-export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
-export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
-export declare function CreateEmptyReportSchedule(): ReportSchedule;
-export declare function CreateEmptyIPushPullReport(): IPushPullReport;
-export declare function CreateEmptyOpenFinReport(): OpenFinReport;
-export declare function CreateEmptyIPushPullSchedule(): IPushPullSchedule;
-export declare function CreateEmptyOpenFinSchedule(): OpenFinSchedule;
-export declare function CreateIPushPullSchedule(iPushPullReport: IPushPullReport): IPushPullSchedule;
-export declare function CreateReportSchedule(reportName: ReportNameType, reportFormat: ReportFormatType): ReportSchedule;
-export declare function CreateEmptySchedule(): Schedule;
+export declare function CreateEmptyReportSchedule(reportFormat?: ReportFormatType, reportName?: ReportNameType): ReportSchedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
 export declare function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): FreeTextColumn;
@@ -76,6 +62,7 @@ export declare function CreateToastOptions(notificationsOptions: NotificationsOp
 }, overides?: {
     duration: number | 'always';
 }): ToastOptions;
+export declare function CreateDefaultSchedule(): Schedule;
 export declare const ObjectFactory: {
     CreateEmptyCustomSort: typeof CreateEmptyCustomSort;
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
@@ -88,16 +75,7 @@ export declare const ObjectFactory: {
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
     CreateEmptyReport: typeof CreateEmptyReport;
-    CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
-    CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;
     CreateEmptyReportSchedule: typeof CreateEmptyReportSchedule;
-    CreateEmptyIPushPullSchedule: typeof CreateEmptyIPushPullSchedule;
-    CreateEmptyIPushPullReport: typeof CreateEmptyIPushPullReport;
-    CreateIPushPullSchedule: typeof CreateIPushPullSchedule;
-    CreateReportSchedule: typeof CreateReportSchedule;
-    CreateEmptyOpenFinReport: typeof CreateEmptyOpenFinReport;
-    CreateEmptyOpenFinSchedule: typeof CreateEmptyOpenFinSchedule;
-    CreateEmptySchedule: typeof CreateEmptySchedule;
     CreateEmptyShortcut: typeof CreateEmptyShortcut;
     CreateEmptyFormatColumn: typeof CreateEmptyFormatColumn;
     CreateEmptyFreeTextColumn: typeof CreateEmptyFreeTextColumn;
@@ -116,5 +94,6 @@ export declare const ObjectFactory: {
     CreateEmptyTheme: typeof CreateEmptyTheme;
     CreateEmptyCommentThread: typeof CreateEmptyCommentThread;
     CreateAdaptableComment: typeof CreateAdaptableComment;
+    CreateDefaultSchedule: typeof CreateDefaultSchedule;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -13,16 +13,7 @@ exports.CreateEmptyAlertDefinition = CreateEmptyAlertDefinition;
 exports.CreateEmptyFlashingCellDefinition = CreateEmptyFlashingCellDefinition;
 exports.CreateInternalAlertDefinitionForMessages = CreateInternalAlertDefinitionForMessages;
 exports.CreateEmptyReport = CreateEmptyReport;
-exports.CreateEmptyBaseSchedule = CreateEmptyBaseSchedule;
-exports.CreateEmptyReminderSchedule = CreateEmptyReminderSchedule;
 exports.CreateEmptyReportSchedule = CreateEmptyReportSchedule;
-exports.CreateEmptyIPushPullReport = CreateEmptyIPushPullReport;
-exports.CreateEmptyOpenFinReport = CreateEmptyOpenFinReport;
-exports.CreateEmptyIPushPullSchedule = CreateEmptyIPushPullSchedule;
-exports.CreateEmptyOpenFinSchedule = CreateEmptyOpenFinSchedule;
-exports.CreateIPushPullSchedule = CreateIPushPullSchedule;
-exports.CreateReportSchedule = CreateReportSchedule;
-exports.CreateEmptySchedule = CreateEmptySchedule;
 exports.CreateEmptyShortcut = CreateEmptyShortcut;
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
 exports.CreateEmptyFreeTextColumn = CreateEmptyFreeTextColumn;
@@ -40,8 +31,10 @@ exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContex
 exports.CreateEmptyTheme = CreateEmptyTheme;
 exports.CreateEmptyCommentThread = CreateEmptyCommentThread;
 exports.CreateToastOptions = CreateToastOptions;
+exports.CreateDefaultSchedule = CreateDefaultSchedule;
 const Enums_1 = require("../AdaptableState/Common/Enums");
 const Uuid_1 = require("../AdaptableState/Uuid");
+const ScheduleHelper_1 = require("./Helpers/ScheduleHelper");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const ObjectDefaultConstants_1 = require("./Constants/ObjectDefaultConstants");
 const Toastify_1 = require("../components/Toastify");
@@ -172,100 +165,16 @@ function CreateEmptyReport() {
         Query: undefined,
     };
 }
-function CreateEmptyBaseSchedule(scheduleType) {
+function CreateEmptyReportSchedule(reportFormat, reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
         Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: scheduleType,
-        Schedule: CreateEmptySchedule(),
-    };
-}
-function CreateEmptyReminderSchedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.Reminder,
-        Schedule: CreateEmptySchedule(),
-        Header: GeneralConstants_1.EMPTY_STRING,
-        Message: GeneralConstants_1.EMPTY_STRING,
-        MessageType: 'Info',
-        DisplayNotification: true,
-        DisplaySystemStatusMessage: false,
-    };
-}
-function CreateEmptyReportSchedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.Report,
-        Schedule: CreateEmptySchedule(),
-        ReportName: GeneralConstants_1.EMPTY_STRING,
-        ReportFormat: GeneralConstants_1.EMPTY_STRING,
+        ReportName: reportName ?? GeneralConstants_1.EMPTY_STRING,
+        Schedule: CreateDefaultSchedule(),
+        ReportFormat: reportFormat ?? GeneralConstants_1.EMPTY_STRING,
         ExportDestination: 'Download',
     };
 }
-function CreateEmptyIPushPullReport() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ReportName: GeneralConstants_1.EMPTY_STRING,
-        Folder: GeneralConstants_1.EMPTY_STRING,
-        Page: GeneralConstants_1.EMPTY_STRING,
-    };
-}
-function CreateEmptyOpenFinReport() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ReportName: GeneralConstants_1.EMPTY_STRING,
-    };
-}
-function CreateEmptyIPushPullSchedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.ipushpull,
-        Schedule: CreateEmptySchedule(),
-        IPushPullReport: CreateEmptyIPushPullReport(),
-        Transmission: 'Snapshot',
-    };
-}
-function CreateEmptyOpenFinSchedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.OpenFin,
-        Schedule: CreateEmptySchedule(),
-        OpenFinReport: CreateEmptyOpenFinReport(),
-        Transmission: 'Live Data',
-    };
-}
-function CreateIPushPullSchedule(iPushPullReport) {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.ipushpull,
-        Schedule: CreateEmptySchedule(),
-        IPushPullReport: iPushPullReport,
-        Transmission: 'Snapshot',
-    };
-}
-function CreateReportSchedule(reportName, reportFormat) {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Name: GeneralConstants_1.EMPTY_STRING,
-        ScheduleType: Enums_1.ScheduleType.Report,
-        Schedule: CreateEmptySchedule(),
-        ReportName: reportName,
-        ReportFormat: reportFormat,
-    };
-}
-function CreateEmptySchedule() {
-    return {
-        OneOffDate: undefined,
-        DaysOfWeek: [],
-        Hour: 0,
-        Minute: 0,
-    };
-}
 function CreateEmptyShortcut() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -386,15 +295,16 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
 function CreateEmptyStyledColumn() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ColumnId: GeneralConstants_1.EMPTY_STRING,
     };
 }
 function CreateDefaultStyledColumnBadge() {
     return {
-        Style: {
-            BackColor: (0, UIHelper_1.getHexForName)(UIHelper_1.LIGHT_GRAY),
-            ForeColor: (0, UIHelper_1.getHexForName)(UIHelper_1.BLACK),
-            BorderRadius: 6,
+        Shape: 'Rounded',
+        PillStyle: {
+            BackColor: (0, UIHelper_1.getSwatchColorVar)(3), // light gray by default (for styled column badge)
+            ForeColor: (0, UIHelper_1.getSwatchColorVar)(1), // black by default (for styled column badge)
         },
     };
 }
@@ -479,6 +389,12 @@ function CreateToastOptions(notificationsOptions, { onClose, containerId }, over
     };
     return toastProps;
 }
+function CreateDefaultSchedule() {
+    return {
+        IsOneOff: false,
+        CronExpression: (0, ScheduleHelper_1.buildCronExpression)('weekdays', 9, 0),
+    };
+}
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
     CreateEmptyCalculatedColumn,
@@ -491,16 +407,7 @@ exports.ObjectFactory = {
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
     CreateEmptyReport,
-    CreateEmptyBaseSchedule,
-    CreateEmptyReminderSchedule,
     CreateEmptyReportSchedule,
-    CreateEmptyIPushPullSchedule,
-    CreateEmptyIPushPullReport,
-    CreateIPushPullSchedule,
-    CreateReportSchedule,
-    CreateEmptyOpenFinReport,
-    CreateEmptyOpenFinSchedule,
-    CreateEmptySchedule,
     CreateEmptyShortcut,
     CreateEmptyFormatColumn,
     CreateEmptyFreeTextColumn,
@@ -519,5 +426,6 @@ exports.ObjectFactory = {
     CreateEmptyTheme,
     CreateEmptyCommentThread,
     CreateAdaptableComment,
+    CreateDefaultSchedule,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/AlertService.js

@@ -27,6 +27,9 @@ class AlertService {
     createReactiveAlert(alertDefinition) {
         // if there is already a reactive alert for this definition, delete it (possible in case of editing definitions),
         this.deleteReactiveAlert(alertDefinition);
+        if (!('Rule' in alertDefinition)) {
+            return;
+        }
         if (!alertDefinition.Rule.ObservableExpression) {
             return;
         }

package/src/Utilities/Services/ModuleService.js

@@ -159,8 +159,6 @@ class ModuleService {
                 return url + 'handbook-editing-plus-minus';
             case 'QuickSearch':
                 return url + 'handbook-quick-search';
-            case 'Schedule':
-                return url + 'handbook-scheduling';
             case 'SettingsPanel':
                 return url + 'ui-settings-panel';
             case 'Shortcut':

package/src/Utilities/Services/QueryLanguageService.js

@@ -273,7 +273,7 @@ class QueryLanguageService {
             result = result.split(columnId).join(columnFriendlyName);
         });
         // replace $SCOPE() with friendly name as well
-        result = result.split(`$SCOPE()`).join(`"<Column Scope>"`);
+        result = result.split(`$SCOPE()`).join(`$Column_Scope`);
         return result;
     }
     // Returns the ExpressionFunctions available for the given Module as specified in the `QueryLanguageOptions.moduleExpressionFunctions`

package/src/Utilities/Services/ValidationService.js

@@ -94,7 +94,10 @@ class ValidationService {
             column: dataChangedEvent.column,
             ...this.adaptableApi.internalApi.buildBaseContext(),
         };
-        return this.adaptableApi.predicateApi.handlePredicates(alertDefinition.Rule?.Predicates, predicateDefHandlerContext, false);
+        if (!('Rule' in alertDefinition)) {
+            return false;
+        }
+        return this.adaptableApi.predicateApi.handlePredicates(alertDefinition.Rule.Predicates, predicateDefHandlerContext, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
         const serverValidationContext = {
@@ -137,13 +140,16 @@ class ValidationService {
         };
     }
     createValidationDescription(alertDefinition) {
+        if (!('Scope' in alertDefinition) || !('Rule' in alertDefinition)) {
+            return alertDefinition.Name;
+        }
         return (this.adaptableApi.columnScopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
-            alertDefinition.Rule?.Predicates?.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND '));
+            alertDefinition.Rule.Predicates?.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND '));
     }
     createValidationMessage(alertDefinition) {
         let returnMessage = this.createValidationDescription(alertDefinition);
-        if (alertDefinition.Rule.BooleanExpression) {
+        if ('Rule' in alertDefinition && alertDefinition.Rule.BooleanExpression) {
             returnMessage += ' when ' + alertDefinition.Rule.BooleanExpression;
         }
         return returnMessage;

package/src/Utilities/createAgStatusPanelComponent.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAgStatusPanelComponent = void 0;
 const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const renderWithAdaptableContext_1 = require("../View/renderWithAdaptableContext");
 const createAgStatusPanelComponent = (component, adaptable, context) => {
@@ -12,14 +13,14 @@ const createAgStatusPanelComponent = (component, adaptable, context) => {
                 adaptableApi: adaptable.api,
                 context,
             }), adaptable);
-            return (React.createElement("div", { className: "ab-StatusBar", ref: (node) => {
+            return ((0, jsx_runtime_1.jsx)("div", { className: "ab-StatusBar", ref: (node) => {
                     if (node) {
                         // in React rendering, AG Grid renders an additional extra div
                         // around the status panel container, with className of 'ag-react-container'
                         // which needs to be stretched in order to fill the status panel
                         node.parentElement.style.display = 'flex';
                     }
-                } }, children));
+                }, children: children }));
         };
     }
     return class StatusBarRenderer {

package/src/Utilities/getExpressionViewItems.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const ExpressionPreview_1 = require("../components/ExpressionEditor/ExpressionPreview");
 const Tag_1 = require("../components/Tag");
 const getExpressionViewItems = (query, api) => {
@@ -10,8 +9,7 @@ const getExpressionViewItems = (query, api) => {
     return {
         name: 'Expression',
         // values: [],
-        view: (React.createElement(Tag_1.Tag, null,
-            React.createElement(ExpressionPreview_1.ExpressionPreview, { query: query }))),
+        view: ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: (0, jsx_runtime_1.jsx)(ExpressionPreview_1.ExpressionPreview, { query: query }) })),
     };
 };
 exports.getExpressionViewItems = getExpressionViewItems;

package/src/Utilities/getObjectTagsViewItems.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectTagsViewItems = void 0;
 const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = tslib_1.__importDefault(require("react"));
 const react_redux_1 = require("react-redux");
 const SimpleButton_1 = tslib_1.__importDefault(require("../components/SimpleButton"));
@@ -33,7 +34,7 @@ const getObjectTagsViewItems = (object, api) => {
                 const editAction = viewOptions.getEditAction(newObject);
                 dispatch(editAction);
             }, [hasCurrentLayoutAsTag, props.data]);
-            return (react_1.default.createElement(SimpleButton_1.default, { onClick: handleToggleTag, className: "twa:mt-1", icon: hasCurrentLayoutAsTag ? 'minus' : 'plus' }, hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout'));
+            return ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { onClick: handleToggleTag, className: "twa:mt-1", icon: hasCurrentLayoutAsTag ? 'minus' : 'plus', children: hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout' }));
         },
     };
 };

package/src/View/AdaptableComputedCSSVarsContext.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useAdaptableComputedCSSVar = exports.useAdaptableComputedCSSVars = exports.WithAdaptableComputedCSSVars = exports.AdaptableComputedCSSVarsContext = void 0;
 const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const CSSNumericVariableWatch_1 = require("../components/Select/CSSNumericVariableWatch");
 const debounce_1 = tslib_1.__importDefault(require("../Utilities/utils/debounce"));
@@ -18,11 +19,9 @@ const WithAdaptableComputedCSSVars = ({ children }) => {
     const setComputedCSSVars = (0, react_1.useMemo)(() => {
         return (0, debounce_1.default)(doSetComputedCSSVars, 300, { leading: false, trailing: true });
     }, [doSetComputedCSSVars]);
-    return (React.createElement(exports.AdaptableComputedCSSVarsContext.Provider, { value: computedCSSVars },
-        children,
-        computedCSSVarNames.map((varName) => (React.createElement(CSSNumericVariableWatch_1.CSSNumericVariableWatch, { key: varName, varName: varName, onChange: (value) => {
-                setComputedCSSVars((prev) => ({ ...prev, [varName]: value }));
-            } })))));
+    return ((0, jsx_runtime_1.jsxs)(exports.AdaptableComputedCSSVarsContext.Provider, { value: computedCSSVars, children: [children, computedCSSVarNames.map((varName) => ((0, jsx_runtime_1.jsx)(CSSNumericVariableWatch_1.CSSNumericVariableWatch, { varName: varName, onChange: (value) => {
+                    setComputedCSSVars((prev) => ({ ...prev, [varName]: value }));
+                } }, varName)))] }));
 };
 exports.WithAdaptableComputedCSSVars = WithAdaptableComputedCSSVars;
 const useAdaptableComputedCSSVars = () => {

package/src/View/AdaptablePopover/index.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptablePopover = void 0;
 const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const UIHelper_1 = require("../UIHelper");
 const ButtonInfo_1 = require("../Components/Buttons/ButtonInfo");
 const icons_1 = require("../../components/icons");
-const OverlayTrigger_1 = tslib_1.__importDefault(require("../../components/OverlayTrigger"));
+const popover_1 = require("../../components/ui/popover");
 const Flex_1 = require("../../components/Flex");
 class AdaptablePopover extends React.Component {
     render() {
@@ -18,30 +19,20 @@ class AdaptablePopover extends React.Component {
         const title = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.headerText)
             ? this.props.headerText
             : '';
-        const popoverClickRootClose = (React.createElement(Flex_1.Box, { className: "ab-Popover", style: {
-                margin: '0px',
-                padding: '0px',
-                minWidth: popoverMinWidth,
-                maxWidth: this.props.popoverMaxWidth ?? 300,
-            } },
-            title ? React.createElement(Flex_1.Box, { className: "twa:text-4 twa:p-2" }, title) : null,
-            React.createElement(Flex_1.Box, { className: `ab-Popover__body ${(this.props.popupPadding ?? 2) === 0 ? 'twa:p-0' : 'twa:p-2'}` }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
         const icon = 'info'; // - think this is wrong - UIHelper.getGlyphByMessageType(messageType);
         const color = UIHelper_1.UIHelper.getColorByMessageType(messageType);
         const iconStyle = {
             color,
             fill: 'currentColor',
         };
-        return (React.createElement(Flex_1.Flex, { alignItems: "center", className: this.props.className },
-            React.createElement(OverlayTrigger_1.default
-            // showTriangle
-            , { 
-                // 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, 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 }))))));
+        const showEvent = this.props.showEvent || 'mouseenter';
+        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: {
+                            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))) })] })] }) }));
     }
 }
 exports.AdaptablePopover = AdaptablePopover;

package/src/View/AdaptableView.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableApp = void 0;
 const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
@@ -21,24 +22,13 @@ class AdaptableView extends React.Component {
     render() {
         const watermark = this.props.AdaptableApi?.internalApi?.getInternalState()?.License?.watermark;
         const adaptableOptions = this.props.AdaptableApi.optionsApi.getAdaptableOptions();
-        return (React.createElement("div", null,
-            React.createElement(GridCellPopup_1.GridCellPopup, null),
-            React.createElement(FloatingQuickSearch_1.QuickSearchDrawer, null),
-            this.props.AdaptableApi.internalApi
-                .getModuleService()
-                .isAdapTableModulePresent('Dashboard') && React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi }),
-            this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
-            Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
-            Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
-            React.createElement(Toastify_1.ToastContainer
-            // Ensure to set containerId to avoid memory leaks when Adaptable instance is destroyed and re-created many times
-            , { 
+        return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(GridCellPopup_1.GridCellPopup, {}), (0, jsx_runtime_1.jsx)(FloatingQuickSearch_1.QuickSearchDrawer, {}), this.props.AdaptableApi.internalApi
+                    .getModuleService()
+                    .isAdapTableModulePresent('Dashboard') && (0, jsx_runtime_1.jsx)(Dashboard_1.Dashboard, { api: this.props.AdaptableApi }), this.props.PopupState.PromptPopup.ShowPromptPopup && ((0, jsx_runtime_1.jsx)(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })), Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && ((0, jsx_runtime_1.jsx)(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })), Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && ((0, jsx_runtime_1.jsx)(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })), (0, jsx_runtime_1.jsx)(Toastify_1.ToastContainer
                 // Ensure to set containerId to avoid memory leaks when Adaptable instance is destroyed and re-created many times
-                containerId: `Toastify-${adaptableOptions.adaptableId}`, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
-            watermark?.show && React.createElement(License_1.LicenseWatermark, null, watermark?.text),
-            React.createElement(WindowPopups_1.WindowPopups, null),
-            React.createElement(FormPopups_1.FormPopups, null),
-            React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
+                , { 
+                    // Ensure to set containerId to avoid memory leaks when Adaptable instance is destroyed and re-created many times
+                    containerId: `Toastify-${adaptableOptions.adaptableId}`, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }), watermark?.show && (0, jsx_runtime_1.jsx)(License_1.LicenseWatermark, { children: watermark?.text }), (0, jsx_runtime_1.jsx)(WindowPopups_1.WindowPopups, {}), (0, jsx_runtime_1.jsx)(FormPopups_1.FormPopups, {}), (0, jsx_runtime_1.jsx)(ProgressIndicator_1.ProgressIndicator, {})] }));
     }
 }
 function mapStateToProps(state, ownProps) {
@@ -60,5 +50,5 @@ function mapDispatchToProps(dispatch) {
     };
 }
 let AdaptableWrapper = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(AdaptableView);
-const AdaptableApp = ({ Adaptable, }) => (0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);
+const AdaptableApp = ({ Adaptable, }) => (0, renderWithAdaptableContext_1.renderWithAdaptableContext)((0, jsx_runtime_1.jsx)(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);
 exports.AdaptableApp = AdaptableApp;