@adaptabletools/adaptable 22.1.1 → 23.0.0-canary.1

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

@@ -1,9 +1,10 @@
-import { MathOperation, ScheduleType } from '../AdaptableState/Common/Enums';
+import { MathOperation, } from '../AdaptableState/Common/Enums';
 import { createUuid } from '../AdaptableState/Uuid';
+import { buildCronExpression } from './Helpers/ScheduleHelper';
 import { EMPTY_STRING } from './Constants/GeneralConstants';
 import { ALERT_DEFAULT_MESSAGE_TYPE, ALERT_DEFAULT_SHOW_POPUP, PLUS_MINUS_DEFAULT_NUDGE_VALUE, } from './Constants/ObjectDefaultConstants';
 import { Bounce, Flip, Slide, Zoom } from '../components/Toastify';
-import { BLACK, getHexForName, LIGHT_GRAY } from '../View/UIHelper';
+import { getSwatchColorVar } from '../View/UIHelper';
 import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
 export function CreateEmptyCustomSort() {
     return { Uuid: createUuid(), Name: EMPTY_STRING, ColumnId: EMPTY_STRING, SortedValues: [] };
@@ -130,100 +131,16 @@ export function CreateEmptyReport() {
         Query: undefined,
     };
 }
-export function CreateEmptyBaseSchedule(scheduleType) {
+export function CreateEmptyReportSchedule(reportFormat, reportName) {
     return {
         Uuid: createUuid(),
         Name: EMPTY_STRING,
-        ScheduleType: scheduleType,
-        Schedule: CreateEmptySchedule(),
-    };
-}
-export function CreateEmptyReminderSchedule() {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.Reminder,
-        Schedule: CreateEmptySchedule(),
-        Header: EMPTY_STRING,
-        Message: EMPTY_STRING,
-        MessageType: 'Info',
-        DisplayNotification: true,
-        DisplaySystemStatusMessage: false,
-    };
-}
-export function CreateEmptyReportSchedule() {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.Report,
-        Schedule: CreateEmptySchedule(),
-        ReportName: EMPTY_STRING,
-        ReportFormat: EMPTY_STRING,
+        ReportName: reportName ?? EMPTY_STRING,
+        Schedule: CreateDefaultSchedule(),
+        ReportFormat: reportFormat ?? EMPTY_STRING,
         ExportDestination: 'Download',
     };
 }
-export function CreateEmptyIPushPullReport() {
-    return {
-        Uuid: createUuid(),
-        ReportName: EMPTY_STRING,
-        Folder: EMPTY_STRING,
-        Page: EMPTY_STRING,
-    };
-}
-export function CreateEmptyOpenFinReport() {
-    return {
-        Uuid: createUuid(),
-        ReportName: EMPTY_STRING,
-    };
-}
-export function CreateEmptyIPushPullSchedule() {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.ipushpull,
-        Schedule: CreateEmptySchedule(),
-        IPushPullReport: CreateEmptyIPushPullReport(),
-        Transmission: 'Snapshot',
-    };
-}
-export function CreateEmptyOpenFinSchedule() {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.OpenFin,
-        Schedule: CreateEmptySchedule(),
-        OpenFinReport: CreateEmptyOpenFinReport(),
-        Transmission: 'Live Data',
-    };
-}
-export function CreateIPushPullSchedule(iPushPullReport) {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.ipushpull,
-        Schedule: CreateEmptySchedule(),
-        IPushPullReport: iPushPullReport,
-        Transmission: 'Snapshot',
-    };
-}
-export function CreateReportSchedule(reportName, reportFormat) {
-    return {
-        Uuid: createUuid(),
-        Name: EMPTY_STRING,
-        ScheduleType: ScheduleType.Report,
-        Schedule: CreateEmptySchedule(),
-        ReportName: reportName,
-        ReportFormat: reportFormat,
-    };
-}
-export function CreateEmptySchedule() {
-    return {
-        OneOffDate: undefined,
-        DaysOfWeek: [],
-        Hour: 0,
-        Minute: 0,
-    };
-}
 export function CreateEmptyShortcut() {
     return {
         Uuid: createUuid(),
@@ -344,15 +261,16 @@ export function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
 export function CreateEmptyStyledColumn() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ColumnId: EMPTY_STRING,
     };
 }
 export function CreateDefaultStyledColumnBadge() {
     return {
-        Style: {
-            BackColor: getHexForName(LIGHT_GRAY),
-            ForeColor: getHexForName(BLACK),
-            BorderRadius: 6,
+        Shape: 'Rounded',
+        PillStyle: {
+            BackColor: getSwatchColorVar(3), // light gray by default (for styled column badge)
+            ForeColor: getSwatchColorVar(1), // black by default (for styled column badge)
         },
     };
 }
@@ -437,6 +355,12 @@ export function CreateToastOptions(notificationsOptions, { onClose, containerId
     };
     return toastProps;
 }
+export function CreateDefaultSchedule() {
+    return {
+        IsOneOff: false,
+        CronExpression: buildCronExpression('weekdays', 9, 0),
+    };
+}
 export const ObjectFactory = {
     CreateEmptyCustomSort,
     CreateEmptyCalculatedColumn,
@@ -449,16 +373,7 @@ export const ObjectFactory = {
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
     CreateEmptyReport,
-    CreateEmptyBaseSchedule,
-    CreateEmptyReminderSchedule,
     CreateEmptyReportSchedule,
-    CreateEmptyIPushPullSchedule,
-    CreateEmptyIPushPullReport,
-    CreateIPushPullSchedule,
-    CreateReportSchedule,
-    CreateEmptyOpenFinReport,
-    CreateEmptyOpenFinSchedule,
-    CreateEmptySchedule,
     CreateEmptyShortcut,
     CreateEmptyFormatColumn,
     CreateEmptyFreeTextColumn,
@@ -477,5 +392,6 @@ export const ObjectFactory = {
     CreateEmptyTheme,
     CreateEmptyCommentThread,
     CreateAdaptableComment,
+    CreateDefaultSchedule,
 };
 export default ObjectFactory;

package/src/Utilities/Services/AlertService.js

@@ -23,6 +23,9 @@ export 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

@@ -155,8 +155,6 @@ export 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

@@ -269,7 +269,7 @@ export 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

@@ -90,7 +90,10 @@ export 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 = {
@@ -133,13 +136,16 @@ export 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

@@ -1,3 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 export const createAgStatusPanelComponent = (component, adaptable, context) => {
@@ -8,14 +9,14 @@ export const createAgStatusPanelComponent = (component, adaptable, context) => {
                 adaptableApi: adaptable.api,
                 context,
             }), adaptable);
-            return (React.createElement("div", { className: "ab-StatusBar", ref: (node) => {
+            return (_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,4 +1,4 @@
-import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { ExpressionPreview } from '../components/ExpressionEditor/ExpressionPreview';
 import { Tag } from '../components/Tag';
 export const getExpressionViewItems = (query, api) => {
@@ -6,7 +6,6 @@ export const getExpressionViewItems = (query, api) => {
     return {
         name: 'Expression',
         // values: [],
-        view: (React.createElement(Tag, null,
-            React.createElement(ExpressionPreview, { query: query }))),
+        view: (_jsx(Tag, { children: _jsx(ExpressionPreview, { query: query }) })),
     };
 };

package/src/Utilities/getObjectTagsViewItems.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import SimpleButton from '../components/SimpleButton';
@@ -29,7 +30,7 @@ export const getObjectTagsViewItems = (object, api) => {
                 const editAction = viewOptions.getEditAction(newObject);
                 dispatch(editAction);
             }, [hasCurrentLayoutAsTag, props.data]);
-            return (React.createElement(SimpleButton, { onClick: handleToggleTag, className: "twa:mt-1", icon: hasCurrentLayoutAsTag ? 'minus' : 'plus' }, hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout'));
+            return (_jsx(SimpleButton, { onClick: handleToggleTag, className: "twa:mt-1", icon: hasCurrentLayoutAsTag ? 'minus' : 'plus', children: hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout' }));
         },
     };
 };

package/src/View/AdaptableComputedCSSVarsContext.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { CSSNumericVariableWatch } from '../components/Select/CSSNumericVariableWatch';
 import debounce from '../Utilities/utils/debounce';
@@ -14,11 +15,9 @@ export const WithAdaptableComputedCSSVars = ({ children }) => {
     const setComputedCSSVars = useMemo(() => {
         return debounce(doSetComputedCSSVars, 300, { leading: false, trailing: true });
     }, [doSetComputedCSSVars]);
-    return (React.createElement(AdaptableComputedCSSVarsContext.Provider, { value: computedCSSVars },
-        children,
-        computedCSSVarNames.map((varName) => (React.createElement(CSSNumericVariableWatch, { key: varName, varName: varName, onChange: (value) => {
-                setComputedCSSVars((prev) => ({ ...prev, [varName]: value }));
-            } })))));
+    return (_jsxs(AdaptableComputedCSSVarsContext.Provider, { value: computedCSSVars, children: [children, computedCSSVarNames.map((varName) => (_jsx(CSSNumericVariableWatch, { varName: varName, onChange: (value) => {
+                    setComputedCSSVars((prev) => ({ ...prev, [varName]: value }));
+                } }, varName)))] }));
 };
 export const useAdaptableComputedCSSVars = () => {
     const context = React.useContext(AdaptableComputedCSSVarsContext);

package/src/View/AdaptablePopover/index.js

@@ -1,9 +1,10 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { UIHelper } from '../UIHelper';
 import { ButtonInfo } from '../Components/Buttons/ButtonInfo';
 import { Icon } from '../../components/icons';
-import OverlayTrigger from '../../components/OverlayTrigger';
+import { Popover, PopoverContent, PopoverTrigger } from '../../components/ui/popover';
 import { Box, Flex } from '../../components/Flex';
 export class AdaptablePopover extends React.Component {
     render() {
@@ -14,29 +15,19 @@ export class AdaptablePopover extends React.Component {
         const title = StringExtensions.IsNotNullOrEmpty(this.props.headerText)
             ? this.props.headerText
             : '';
-        const popoverClickRootClose = (React.createElement(Box, { className: "ab-Popover", style: {
-                margin: '0px',
-                padding: '0px',
-                minWidth: popoverMinWidth,
-                maxWidth: this.props.popoverMaxWidth ?? 300,
-            } },
-            title ? React.createElement(Box, { className: "twa:text-4 twa:p-2" }, title) : null,
-            React.createElement(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.getColorByMessageType(messageType);
         const iconStyle = {
             color,
             fill: 'currentColor',
         };
-        return (React.createElement(Flex, { alignItems: "center", className: this.props.className },
-            React.createElement(OverlayTrigger
-            // 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, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText, disabled: this.props.disabled }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
-                this.props.children,
-                showIcon && React.createElement(Icon, { name: icon, style: iconStyle }))))));
+        const showEvent = this.props.showEvent || 'mouseenter';
+        const openOnHover = showEvent === 'mouseenter';
+        const triggerElement = useButton ? (_jsx(ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText, disabled: this.props.disabled, children: this.props.children })) : (_jsxs("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' }, children: [this.props.children, showIcon && _jsx(Icon, { name: icon, style: iconStyle })] }));
+        const controlledProps = this.props.visible !== undefined ? { open: this.props.visible } : {};
+        return (_jsx(Flex, { alignItems: "center", className: this.props.className, children: _jsxs(Popover, { ...controlledProps, children: [_jsx(PopoverTrigger, { nativeButton: !!useButton, openOnHover: openOnHover, delay: 0, closeDelay: 0, render: triggerElement }), _jsxs(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 ? _jsx(Box, { className: "twa:text-4 twa:p-2", children: title }) : null, _jsx(Box, { className: `ab-Popover__body ${(this.props.popupPadding ?? 2) === 0 ? 'twa:p-0' : 'twa:p-2'}`, children: this.props.bodyText.map((textOrHTML, index) => (_jsx("span", { children: textOrHTML }, index))) })] })] }) }));
     }
 }

package/src/View/AdaptableView.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { ProgressIndicator } from '../components/ProgressIndicator/ProgressIndicator';
@@ -17,24 +18,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, null),
-            React.createElement(QuickSearchDrawer, null),
-            this.props.AdaptableApi.internalApi
-                .getModuleService()
-                .isAdapTableModulePresent('Dashboard') && React.createElement(Dashboard, { api: this.props.AdaptableApi }),
-            this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(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, { 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, { 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(ToastContainer
-            // Ensure to set containerId to avoid memory leaks when Adaptable instance is destroyed and re-created many times
-            , { 
+        return (_jsxs("div", { children: [_jsx(GridCellPopup, {}), _jsx(QuickSearchDrawer, {}), this.props.AdaptableApi.internalApi
+                    .getModuleService()
+                    .isAdapTableModulePresent('Dashboard') && _jsx(Dashboard, { api: this.props.AdaptableApi }), this.props.PopupState.PromptPopup.ShowPromptPopup && (_jsx(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) && (_jsx(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) && (_jsx(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 })), _jsx(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(LicenseWatermark, null, watermark?.text),
-            React.createElement(WindowPopups, null),
-            React.createElement(FormPopups, null),
-            React.createElement(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 && _jsx(LicenseWatermark, { children: watermark?.text }), _jsx(WindowPopups, {}), _jsx(FormPopups, {}), _jsx(ProgressIndicator, {})] }));
     }
 }
 function mapStateToProps(state, ownProps) {
@@ -56,4 +46,4 @@ function mapDispatchToProps(dispatch) {
     };
 }
 let AdaptableWrapper = connect(mapStateToProps, mapDispatchToProps)(AdaptableView);
-export const AdaptableApp = ({ Adaptable, }) => renderWithAdaptableContext(React.createElement(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);
+export const AdaptableApp = ({ Adaptable, }) => renderWithAdaptableContext(_jsx(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);

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

@@ -1,3 +1,4 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { CheckBox } from '../../../components/CheckBox';
 import DropdownButton from '../../../components/DropdownButton';
@@ -11,9 +12,8 @@ const SUPPORTED_PRIMITEVE_TYPES = ['s', 'n', 'b'];
 const OptionInput = (props) => {
     const { name, defaultValue, value, description, uiLabel } = props.option;
     const label = uiLabel ?? StringExtensions.Humanize(name);
-    let input = React.createElement(React.Fragment, null);
-    const info = (React.createElement(Box, { className: "twa:ml-2" },
-        React.createElement(AdaptablePopover, { headerText: null, bodyText: [description] })));
+    let input = _jsx(_Fragment, {});
+    const info = (_jsx(Box, { className: "twa:ml-2", children: _jsx(AdaptablePopover, { headerText: null, bodyText: [description] }) }));
     const handleInputChange = (event) => props.onChange({ ...props.option, value: event.currentTarget.value });
     const handleCheckboxChange = (checked) => props.onChange({ ...props.option, value: checked });
     // option is mutated to acomodate complex types overrides
@@ -45,42 +45,32 @@ const OptionInput = (props) => {
             label: StringExtensions.Humanize(str),
             onClick: () => props.onChange({ ...option, value: str }),
         }));
-        input = (React.createElement(DropdownButton, { ...inputProps, columns: ['label'], items: options }, StringExtensions.Humanize(value)));
+        input = (_jsx(DropdownButton, { ...inputProps, columns: ['label'], items: options, children: StringExtensions.Humanize(value) }));
     }
     else {
         switch (option.kind) {
             case 'n':
-                input = React.createElement(Input, { type: "number", onChange: handleInputChange, ...inputProps });
+                input = _jsx(Input, { type: "number", onChange: handleInputChange, ...inputProps });
                 break;
             case 's':
-                input = React.createElement(Input, { type: "text", onChange: handleInputChange, ...inputProps });
+                input = _jsx(Input, { type: "text", onChange: handleInputChange, ...inputProps });
                 break;
             case 'b':
-                input = (React.createElement(CheckBox, { onChange: handleCheckboxChange, checked: Boolean(value), type: "date" }, label));
+                input = (_jsx(CheckBox, { onChange: handleCheckboxChange, checked: Boolean(value), type: "date", children: label }));
                 break;
         }
     }
-    let content = (React.createElement(React.Fragment, null,
-        React.createElement(Flex, { alignItems: "center", className: "twa:min-w-[250px]" },
-            label,
-            " ",
-            info),
-        input));
+    let content = (_jsxs(_Fragment, { children: [_jsxs(Flex, { alignItems: "center", className: "twa:min-w-[250px]", children: [label, " ", info] }), input] }));
     if (option.kind === 'b') {
-        content = (React.createElement(Flex, { alignItems: "center" },
-            input,
-            " ",
-            info));
+        content = (_jsxs(Flex, { alignItems: "center", children: [input, " ", info] }));
     }
-    return React.createElement(Flex, { className: "twa:mb-2 twa:pl-1" }, content);
+    return _jsx(Flex, { className: "twa:mb-2 twa:pl-1", children: content });
 };
 const OptionsSection = (props) => {
     if (!props.options.length) {
-        return React.createElement(React.Fragment, null);
+        return _jsx(_Fragment, {});
     }
-    return (React.createElement(Box, { className: "twa:mb-2" },
-        React.createElement(HelpBlock, { className: "twa:mb-2" }, props.name ?? props.id),
-        props.options.map((option, index) => (React.createElement(OptionInput, { key: index, option: option, onChange: props.onChange })))));
+    return (_jsxs(Box, { className: "twa:mb-2", children: [_jsx(HelpBlock, { className: "twa:mb-2", children: props.name ?? props.id }), props.options.map((option, index) => (_jsx(OptionInput, { option: option, onChange: props.onChange }, index)))] }));
 };
 export const AdaptableOptionsForm = (props) => {
     const nocodeOptions = React.useMemo(() => {
@@ -103,7 +93,7 @@ export const AdaptableOptionsForm = (props) => {
         }
         props.onChangedAdaptableOptions(adaptableOptions);
     };
-    return (React.createElement(Box, { className: "twa:p-2" }, nocodeOptions.map(([sectionName, { containerLabel, items }]) => {
-        return (React.createElement(OptionsSection, { onChange: handleOptionChange(sectionName), key: sectionName, id: sectionName, name: containerLabel, options: items }));
-    })));
+    return (_jsx(Box, { className: "twa:p-2", children: nocodeOptions.map(([sectionName, { containerLabel, items }]) => {
+            return (_jsx(OptionsSection, { onChange: handleOptionChange(sectionName), id: sectionName, name: containerLabel, options: items }, sectionName));
+        }) }));
 };