@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.0

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupModuleView.js

@@ -12,25 +12,30 @@ const ButtonNew_1 = require("../../Buttons/ButtonNew");
 const PopupPanel_1 = require("./PopupPanel");
 const rebass_1 = require("rebass");
 const CheckBox_1 = require("../../../../components/CheckBox");
-const SystemRedux_1 = require("../../../../Redux/ActionsReducers/SystemRedux");
+const InternalRedux_1 = require("../../../../Redux/ActionsReducers/InternalRedux");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
+const AdaptableContext_1 = require("../../../AdaptableContext");
+const react_1 = require("react");
+const useRerender_1 = require("../../../../components/utils/useRerender");
 const AdaptablePopupModuleView = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     /**
-     * This triggers a render for each redux change.
-     * Not sure yet how to trigger this component to render when an item is edited.
+     * This triggers a render for each state change.
+     * NOT sure this is still needed... It is here for historical reasons.
      */
-    (0, react_redux_1.useSelector)((state) => state);
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const rerender = (0, useRerender_1.useRerender)();
+    (0, react_1.useEffect)(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
     const [abObjectType, setAbObjectType] = React.useState(null);
     const moduleInfo = props.module.moduleInfo;
-    const items = (_a = props.module) === null || _a === void 0 ? void 0 : _a.toViewAll();
-    const moduleViewProperties = (_d = (_c = (_b = props.module) === null || _b === void 0 ? void 0 : _b.getViewProperties) === null || _c === void 0 ? void 0 : _c.call(_b)) !== null && _d !== void 0 ? _d : {};
-    const EditWizard = (_e = moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.getEditWizard) === null || _e === void 0 ? void 0 : _e.call(moduleViewProperties);
+    const items = props.module?.toViewAll();
+    const moduleViewProperties = props.module?.getViewProperties?.() ?? {};
+    const EditWizard = moduleViewProperties?.getEditWizard?.();
     const [isWizardOpen, setIsWizardOpen] = React.useState(() => {
-        var _a, _b, _c;
-        return (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'New' ||
-            ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'Edit' ||
-            ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) === 'Clone');
+        return (props.popupParams?.action === 'New' ||
+            props.popupParams?.action === 'Edit' ||
+            props.popupParams?.action === 'Clone');
     });
     const handleOpenEditPopup = React.useCallback(() => {
         if (EditWizard) {
@@ -41,15 +46,15 @@ const AdaptablePopupModuleView = (props) => {
         }
     }, []);
     React.useEffect(() => {
-        var _a;
-        (_a = moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.onMount) === null || _a === void 0 ? void 0 : _a.call(moduleViewProperties);
+        moduleViewProperties?.onMount?.();
     }, []);
     React.useEffect(() => {
-        var _a, _b;
-        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'New' || ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'Edit') {
+        if (props.popupParams?.action === 'New' ||
+            props.popupParams?.action === 'Edit' ||
+            props.popupParams?.action === 'Clone') {
             handleOpenEditPopup();
         }
-    }, [(_f = props.popupParams) === null || _f === void 0 ? void 0 : _f.action]);
+    }, [props.popupParams?.action]);
     const emptyView = moduleViewProperties.emptyView;
     let emptyContent = null;
     if (typeof emptyView === 'function') {
@@ -58,20 +63,19 @@ const AdaptablePopupModuleView = (props) => {
     else if (typeof emptyView === 'string') {
         emptyContent = emptyView;
     }
-    const toolTipText = (_g = moduleViewProperties.newTooltipText) !== null && _g !== void 0 ? _g : `Create ${moduleInfo.FriendlyName}`;
+    const toolTipText = moduleViewProperties.newTooltipText ?? `Create ${moduleInfo.FriendlyName}`;
     // Some modules do not have new button
     // e.g. filter
     let newButton = null;
-    if ((_h = moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.abObjectTypes) === null || _h === void 0 ? void 0 : _h.length) {
-        const items = moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.abObjectTypes.map((abObjectType) => {
-            var _a;
+    if (moduleViewProperties?.abObjectTypes?.length) {
+        const items = moduleViewProperties?.abObjectTypes.map((abObjectType) => {
             return {
-                disabled: (abObjectType === null || abObjectType === void 0 ? void 0 : abObjectType.accessLevel) === 'ReadOnly',
+                disabled: abObjectType?.accessLevel === 'ReadOnly',
                 onClick: () => {
                     setAbObjectType(abObjectType);
                     handleOpenEditPopup();
                 },
-                label: (_a = abObjectType.label) !== null && _a !== void 0 ? _a : abObjectType.name,
+                label: abObjectType.label ?? abObjectType.name,
             };
         });
         newButton = (React.createElement(DropdownButton_1.default, { tone: "accent", variant: "raised", columns: ['label'], items: items, tooltip: toolTipText },
@@ -83,13 +87,12 @@ const AdaptablePopupModuleView = (props) => {
         newButton = (React.createElement(ButtonNew_1.ButtonNew, { onClick: () => handleOpenEditPopup(), tooltip: toolTipText, accessLevel: props.accessLevel }));
     }
     let suspendButton = null;
-    const editableObjects = (items).filter(item => !item.abObject.IsReadOnly);
+    const editableObjects = items.filter((item) => !item.abObject.IsReadOnly);
     if (editableObjects.length &&
-        (moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.getSuspendAllAction) &&
-        (moduleViewProperties === null || moduleViewProperties === void 0 ? void 0 : moduleViewProperties.getUnSuspendAllAction)) {
+        moduleViewProperties?.getSuspendAllAction &&
+        moduleViewProperties?.getUnSuspendAllAction) {
         const isAtLeastOneAbObjectActive = editableObjects.some((item) => {
-            var _a;
-            return !((_a = item.abObject) === null || _a === void 0 ? void 0 : _a.IsSuspended);
+            return !item.abObject?.IsSuspended;
         });
         const handleSuspendUnsuspendAll = () => {
             if (isAtLeastOneAbObjectActive) {
@@ -104,10 +107,9 @@ const AdaptablePopupModuleView = (props) => {
         suspendButton = (React.createElement(SimpleButton_1.default, { mr: 2, onMouseDown: () => handleSuspendUnsuspendAll(), tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: props.accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All'));
     }
     const handleWizardClose = () => {
-        var _a;
         setAbObjectType(null);
         setIsWizardOpen(false);
-        if (['Toolbar', 'ContextMenu', 'ColumnMenu'].includes((_a = props === null || props === void 0 ? void 0 : props.popupParams) === null || _a === void 0 ? void 0 : _a.source)) {
+        if (['Toolbar', 'ContextMenu', 'ColumnMenu'].includes(props?.popupParams?.source)) {
             props.onClosePopup();
         }
     };
@@ -115,16 +117,16 @@ const AdaptablePopupModuleView = (props) => {
         .getModuleService()
         .getModuleById(props.module.moduleInfo.ModuleName);
     const dispatch = (0, react_redux_1.useDispatch)();
-    const showLayoutNotAssociatedObjects = (0, react_redux_1.useSelector)((state) => state.System.ShowLayoutNotAssociatedObjects);
+    const showLayoutNotAssociatedObjects = (0, react_redux_1.useSelector)((state) => state.Internal.Layout.ShowLayoutNotAssociatedObjects);
     const toggleButtonShowLayoutAssociatedObjects = () => {
-        if (!(adaptableModule === null || adaptableModule === void 0 ? void 0 : adaptableModule.canBeAssociatedWithLayouts())) {
+        if (!adaptableModule?.canBeAssociatedWithLayouts()) {
             return;
         }
         if (!props.api.layoutApi.internalApi.hasLayoutSpecificObjects()) {
             return;
         }
         return (React.createElement(rebass_1.Flex, { justifyContent: "flex-start" },
-            React.createElement(CheckBox_1.CheckBox, { padding: 0, margin: 0, checked: showLayoutNotAssociatedObjects, onChange: (checked) => dispatch((0, SystemRedux_1.SystemLayoutShowNotAssociatedObjects)(checked)) },
+            React.createElement(CheckBox_1.CheckBox, { padding: 0, margin: 0, checked: showLayoutNotAssociatedObjects, onChange: (checked) => dispatch((0, InternalRedux_1.LayoutShowNotAssociatedObjects)(checked)) },
                 "Show ",
                 moduleInfo.FriendlyName,
                 "s not available in current Layout")));
@@ -135,7 +137,7 @@ const AdaptablePopupModuleView = (props) => {
             newButton), infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         moduleViewProperties.HeaderComponent && React.createElement(moduleViewProperties.HeaderComponent, null),
         toggleButtonShowLayoutAssociatedObjects(),
-        (items === null || items === void 0 ? void 0 : items.length) ? (React.createElement(AdaptableObjectList_1.AdaptableObjectList, { module: props.module, items: items })) : (React.createElement(EmptyContent_1.default, null, emptyContent !== null && emptyContent !== void 0 ? emptyContent : `Click 'New' to create a new ${moduleInfo.FriendlyName}`)),
+        items?.length ? (React.createElement(AdaptableObjectList_1.AdaptableObjectList, { module: props.module, items: items })) : (React.createElement(EmptyContent_1.default, null, emptyContent ?? `Click 'New' to create a new ${moduleInfo.FriendlyName}`)),
         isWizardOpen && EditWizard && (React.createElement(EditWizard, { abObjectType: abObjectType, moduleInfo: moduleInfo, data: null, popupParams: props.popupParams, configEntities: null, onCloseWizard: handleWizardClose, onFinishWizard: handleWizardClose }))));
 };
 exports.AdaptablePopupModuleView = AdaptablePopupModuleView;

package/src/View/Components/Popups/AdaptablePopup/Navigation.js

@@ -13,7 +13,7 @@ const Navigation = (props) => {
         if ((event.ctrlKey || event.metaKey) &&
             (event.code === 'ArrowUp' || event.code === 'ArrowDown')) {
             const isKeyUp = event.code === 'ArrowUp';
-            const currentIndex = props.menuItems.findIndex((item) => item !== '-' && (item.module === props.activeItem || item.label === props.activeItem));
+            const currentIndex = props.menuItems.findIndex((item) => item !== '-' && (item.category === props.activeItem || item.label === props.activeItem));
             let nextMenuItem = null;
             if (isKeyUp) {
                 let candidate = props.menuItems[currentIndex - 1] !== '-'
@@ -35,22 +35,22 @@ const Navigation = (props) => {
     (0, useGlobalEvent_1.useGlobalEvent)('keydown', handleKeyPress);
     return (React.createElement("nav", { className: "ab-Adaptable-Popup__Navigation" },
         React.createElement("ul", { className: "ab-Adaptable-Popup__Navigation__List" }, props.menuItems.map((menuItem, index) => {
-            var _a, _b, _c, _d, _e;
             const baseClassName = 'ab-Adaptable-Popup__Navigation__List__Item';
             if (menuItem === '-') {
                 return React.createElement("li", { key: `separator-${index}`, className: `${baseClassName}__Separator` });
             }
-            const isActive = props.activeItem === menuItem.module || menuItem.label === props.activeItem;
+            const isActive = props.activeItem === menuItem.category || menuItem.label === props.activeItem;
             const className = (0, join_1.default)(baseClassName, isActive && `${baseClassName}--active`);
-            let customIcon = (_d = (_c = (_b = (_a = props.customSettingsPanels) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (customSettingPanel) => customSettingPanel.name === menuItem.label)) === null || _c === void 0 ? void 0 : _c.icon) !== null && _d !== void 0 ? _d : null;
-            const dataName = menuItem.module === 'CustomSettingsPanel'
+            let customIcon = props.customSettingsPanels?.find?.((customSettingPanel) => customSettingPanel.name === menuItem.label)?.icon ?? null;
+            const dataName = menuItem.category === 'CustomSettingsPanel'
                 ? `CSP-${menuItem.label}`
-                : (_e = menuItem.module) !== null && _e !== void 0 ? _e : menuItem.label;
+                : menuItem.category ?? menuItem.label;
             return (React.createElement("li", { className: className, key: menuItem.label },
                 React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
                         dispatch(menuItem.reduxAction);
                     }, "data-name": dataName },
-                    props.api.optionsApi.getSettingsPanelOptions().showModuleIcons && menuItem.icon && (React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
+                    props.api.optionsApi.getSettingsPanelOptions().showModuleIcons &&
+                        menuItem.icon && (React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
                     customIcon && React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: customIcon }),
                     menuItem.label)));
         }))));

package/src/View/Components/Popups/AdaptablePopup/TopBar.js

@@ -7,10 +7,9 @@ const rebass_1 = require("rebass");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const AdaptableIconComponent_1 = require("../../AdaptableIconComponent");
 const TopBar = (props) => {
-    var _a;
     const baseClassName = 'ab-Adaptable-Popup__TopBar';
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const applicationIcon = (_a = adaptable.api.optionsApi.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.applicationIcon;
+    const applicationIcon = adaptable.api.optionsApi.getUserInterfaceOptions()?.applicationIcon;
     let icon = React.createElement(React.Fragment, null);
     const iconClassName = `${baseClassName}__Icon`;
     if (props.icon === 'ConfigurationIcon') {

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.js

@@ -11,39 +11,37 @@ const GeneralConstants_1 = require("../../../../Utilities/Constants/GeneralConst
 const useMenuItems = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
-    const allMenuItems = (0, react_redux_1.useSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.Grid) === null || _a === void 0 ? void 0 : _a.SettingPanelModuleMenuItems; });
+    const allMenuItems = (0, react_redux_1.useSelector)((state) => state?.Internal?.SettingsPanelModuleEntries);
     return React.useMemo(() => {
-        var _a;
-        let navigationItems = (_a = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.navigation) === null || _a === void 0 ? void 0 : _a.items;
+        let navigationItems = settingsPanelOptions?.navigation?.items;
         if (!navigationItems) {
             navigationItems = [...DefaultSettingsPanel_1.DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS];
             if (settingsPanelOptions.customSettingsPanels) {
                 navigationItems.push(...settingsPanelOptions.customSettingsPanels.map((panel) => panel.name));
             }
         }
-        const visibleItems = allMenuItems.filter((item) => item.module !== 'General' &&
-            item.module !== 'CustomSettingsPanel' &&
-            item.module !== 'Group' &&
-            !GeneralConstants_1.STANDALONE_MODULE_POPUPS.includes(item.module) &&
+        const visibleItems = allMenuItems.filter((item) => item.category !== 'General' &&
+            item.category !== 'CustomSettingsPanel' &&
+            item.category !== 'Group' &&
+            !GeneralConstants_1.STANDALONE_MODULE_POPUPS.includes(item.category) &&
             item.isVisible);
         let navItems = navigationItems
             .map((moduleName) => {
-            var _a, _b;
             if (moduleName === '-') {
                 return moduleName;
             }
-            const customSettingsPanel = (_b = (_a = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.customSettingsPanels) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (panel) => panel.name === moduleName);
+            const customSettingsPanel = settingsPanelOptions?.customSettingsPanels?.find?.((panel) => panel.name === moduleName);
             let customPanelMenuItem = null;
             if (customSettingsPanel) {
                 // @ts-ignore
                 customPanelMenuItem = {
-                    module: 'CustomSettingsPanel',
+                    category: 'CustomSettingsPanel',
                     label: customSettingsPanel.name,
                     isVisible: true,
                     reduxAction: PopupRedux.PopupShowScreen(null, customSettingsPanel.name),
                 };
             }
-            return customPanelMenuItem || visibleItems.find((item) => item.module === moduleName);
+            return customPanelMenuItem || visibleItems.find((item) => item.category === moduleName);
         })
             .filter(Boolean);
         // remove sequential '-' items

package/src/View/Components/Popups/AdaptablePopupAlert.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AdaptableAlert } from '../../../PredefinedConfig/Common/AdaptableAlert';
 export interface AdaptablePopupAlertProps {
     onClose: () => void;
@@ -6,4 +6,4 @@ export interface AdaptablePopupAlertProps {
     headless?: boolean;
     focusFirstButton?: boolean;
 }
-export declare const AdaptablePopupAlert: (props: AdaptablePopupAlertProps) => JSX.Element;
+export declare const AdaptablePopupAlert: (props: AdaptablePopupAlertProps) => React.JSX.Element;

package/src/View/Components/Popups/AdaptablePopupAlert.js

@@ -12,9 +12,8 @@ const react_1 = require("react");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 const AdaptablePopupAlert = (props) => {
-    var _a;
     const messageType = props.adaptableAlert.alertDefinition.MessageType || 'Error';
-    const msg = (_a = props.adaptableAlert.message) !== null && _a !== void 0 ? _a : '';
+    const msg = props.adaptableAlert.message ?? '';
     const headerColor = UIHelper_1.UIHelper.getColorByMessageType(messageType);
     let header = messageType;
     const { api, adaptableOptions } = (0, AdaptableContext_1.useAdaptable)();
@@ -28,7 +27,11 @@ const AdaptablePopupAlert = (props) => {
     }, []);
     const [formData, setFormData] = (0, react_1.useState)({});
     const context = React.useMemo(() => {
-        return Object.assign(Object.assign({ alert: props.adaptableAlert }, api.internalApi.buildBaseContext()), { formData: formData });
+        return {
+            alert: props.adaptableAlert,
+            ...api.internalApi.buildBaseContext(),
+            formData: formData,
+        };
     }, [JSON.stringify(formData), props.adaptableAlert]);
     const adaptableForm = React.useMemo(() => {
         if (api.isDestroyed()) {
@@ -62,8 +65,7 @@ const AdaptablePopupAlert = (props) => {
                     // we want to give the current popup time to close
                     // and we reopen with a delay in case this button action causes another popup
                     setTimeout(() => {
-                        var _a;
-                        (_a = button.onClick) === null || _a === void 0 ? void 0 : _a.call(button, button, context);
+                        button.onClick?.(button, context);
                     }, 20);
                 } })) : null))));
     return props.headless ? (content) : (React.createElement(Dialog_1.default, { "data-name": `alert-popup alert-popup-${messageType.toLowerCase()}`, showCloseButton: false, isOpen: true, onDismiss: props.onClose, style: {

package/src/View/Components/Popups/AdaptablePopupConfirmation.js

@@ -11,7 +11,7 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/Simp
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
 const CheckBox_1 = require("../../../components/CheckBox");
-const SystemRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/InternalRedux"));
 const react_redux_1 = require("react-redux");
 const AdaptablePopupConfirmation = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
@@ -27,7 +27,7 @@ const AdaptablePopupConfirmation = (props) => {
         props.onConfirm(promptText);
         setPromptText('');
         if (disableDeleteConfirmation) {
-            dispatch(SystemRedux.SystemDisableDeleteConfirmation());
+            dispatch(InternalRedux.DisableDeleteConfirmation());
         }
     }
     function changeContent(e) {
@@ -60,6 +60,6 @@ const AdaptablePopupConfirmation = (props) => {
                 React.createElement(rebass_1.Flex, { marginTop: 3, padding: 2, "data-name": "footer" },
                     React.createElement(SimpleButton_1.default, { tone: "error", "data-name": "delete", variant: "raised", disabled: !canConfirm(), onClick: () => onConfirmmForm() }, props.confirmButtonText),
                     React.createElement("div", { style: { flex: 1 } }),
-                    React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => onCancelForm() }, props.cancelButtonText))))));
+                    props.cancelButtonText != null ? (React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => onCancelForm() }, props.cancelButtonText)) : null)))));
 };
 exports.AdaptablePopupConfirmation = AdaptablePopupConfirmation;

package/src/View/Components/Popups/AdaptablePopupPrompt.js

@@ -10,9 +10,8 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/Simp
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const react_redux_1 = require("react-redux");
 const AdaptablePopupPrompt = (props) => {
-    var _a;
     const dispatch = (0, react_redux_1.useDispatch)();
-    const [promptText, setPromptText] = React.useState((_a = props.defaultValue) !== null && _a !== void 0 ? _a : '');
+    const [promptText, setPromptText] = React.useState(props.defaultValue ?? '');
     const onCloseForm = () => {
         setPromptText('');
         props.onClose();

package/src/View/Components/Popups/AdaptablePopupTeamSharing.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
 import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import * as React from 'react';
 export interface AdaptablePopupTeamSharingProps {
     showPopup: boolean;
     header: string;
     onClose: () => void;
     onConfirm: (config: AdaptableSharedEntityConfig) => void;
 }
-export declare const AdaptablePopupTeamSharing: (props: AdaptablePopupTeamSharingProps) => JSX.Element;
+export declare const AdaptablePopupTeamSharing: (props: AdaptablePopupTeamSharingProps) => React.JSX.Element;

package/src/View/Components/Popups/AdaptablePopupTeamSharing.js

@@ -34,12 +34,12 @@ const AdaptablePopupTeamSharing = (props) => {
                             ": a \"live\" share that is automatically updated with every local change"))),
                 React.createElement(FormLayout_1.default, { padding: 2 },
                     React.createElement(FormLayout_1.FormRow, { label: "Name: " },
-                        React.createElement(Input_1.default, { "data-name": "teamsharing-entity-name", autoFocus: true, value: config.description, type: "string", width: 300, placeholder: "Enter text", onChange: (e) => setConfig(Object.assign(Object.assign({}, config), { description: e.target.value })) })),
+                        React.createElement(Input_1.default, { "data-name": "teamsharing-entity-name", autoFocus: true, value: config.description, type: "string", width: 300, placeholder: "Enter text", onChange: (e) => setConfig({ ...config, description: e.target.value }) })),
                     React.createElement(FormLayout_1.FormRow, { label: "Share: " },
                         React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-snapshot", checked: config.type === 'Snapshot', onChange: () => setConfig(Object.assign(Object.assign({}, config), { type: 'Snapshot' })) }, "Snapshot"),
+                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-snapshot", checked: config.type === 'Snapshot', onChange: () => setConfig({ ...config, type: 'Snapshot' }) }, "Snapshot"),
                             ' ',
-                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-active", marginLeft: 3, checked: config.type === 'Active', onChange: () => setConfig(Object.assign(Object.assign({}, config), { type: 'Active' })) }, "Active"),
+                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-active", marginLeft: 3, checked: config.type === 'Active', onChange: () => setConfig({ ...config, type: 'Active' }) }, "Active"),
                             ' '))),
                 React.createElement(rebass_1.Box, { marginTop: 3 },
                     React.createElement(rebass_1.Flex, { padding: 2 },

package/src/View/Components/Popups/FormPopups/FormPopups.js

@@ -19,14 +19,17 @@ const FormDialog = ({ id, formProps, form, prepareContext, }) => {
     const handleDismiss = () => {
         dispatch((0, PopupRedux_1.PopupHideForm)(id));
     };
-    const context = Object.assign({ adaptableApi: adaptable.api, formData: data }, formProps);
+    const context = {
+        adaptableApi: adaptable.api,
+        formData: data,
+        ...formProps,
+    };
     return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400, maxHeight: '80vh' }, onDismiss: handleDismiss },
         React.createElement(rebass_1.Flex, { flexDirection: 'column', "data-name": "form-dialog", padding: 4, height: '100%' },
             React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { formDef: form, data: data, context: context, onChange: setData, api: adaptable.api, displayTitle: true, onButtonClick: async (button) => {
-                    var _a;
                     handleDismiss();
                     const preparedContext = typeof prepareContext === 'function' ? await prepareContext(context) : context;
-                    (_a = button.onClick) === null || _a === void 0 ? void 0 : _a.call(button, button, preparedContext);
+                    button.onClick?.(button, preparedContext);
                 } }))));
 };
 exports.FormDialog = FormDialog;

package/src/View/Components/Popups/GridCellPopup/GridCellPopup.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const NoteRedux_1 = require("../../../../Redux/ActionsReducers/NoteRedux");
-const SystemRedux_1 = require("../../../../Redux/ActionsReducers/SystemRedux");
+const InternalRedux_1 = require("../../../../Redux/ActionsReducers/InternalRedux");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const CommentsEditor_1 = require("../../../Comments/CommentsEditor");
 const NoteEditor_1 = require("../../../Note/NoteEditor");
@@ -14,9 +14,9 @@ const CellPopup_1 = require("../../CellPopup");
 const ConnectedNoteEditor = ({ enableEditMode }) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Note');
-    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesEditModeSelector)(state.System));
-    const cellPopupService = api.internalApi.getCellPopupService();
-    const cellAddress = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesSelector)(state.System));
+    const editMode = (0, react_redux_1.useSelector)((state) => (0, InternalRedux_1.CommentsAndNotesEditModeSelector)(state.Internal));
+    const annotationsService = api.internalApi.getAnnotationsService();
+    const cellAddress = (0, react_redux_1.useSelector)((state) => (0, InternalRedux_1.CommentsAndNotesSelector)(state.Internal));
     const note = (0, react_redux_1.useSelector)((state) => {
         return cellAddress ? (0, NoteRedux_1.GetNoteSelector)(state.Note, cellAddress) : null;
     });
@@ -24,30 +24,29 @@ const ConnectedNoteEditor = ({ enableEditMode }) => {
         api.noteApi.updateNoteText(value, note);
     }, [note]);
     return (React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotePopup" },
-        React.createElement(NoteEditor_1.NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note === null || note === void 0 ? void 0 : note.Uuid, onClose: () => cellPopupService.hidePopup(), note: note === null || note === void 0 ? void 0 : note.Text, onNoteChange: (value) => handleNoteChange(value) })));
+        React.createElement(NoteEditor_1.NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note?.Uuid, onClose: () => annotationsService.hidePopup(), note: note?.Text, onNoteChange: (value) => handleNoteChange(value) })));
 };
 const GridCellPopup = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const cellPopupRef = React.useRef(null);
-    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesEditModeSelector)(state.System));
-    const focusedEntity = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesFocusedEntitySelector)(state.System));
-    const cellAddress = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsAndNotesSelector)(state.System));
+    const editMode = (0, react_redux_1.useSelector)((state) => (0, InternalRedux_1.CommentsAndNotesEditModeSelector)(state.Internal));
+    const focusedEntity = (0, react_redux_1.useSelector)((state) => (0, InternalRedux_1.CommentsAndNotesFocusedEntitySelector)(state.Internal));
+    const cellAddress = (0, react_redux_1.useSelector)((state) => (0, InternalRedux_1.CommentsAndNotesSelector)(state.Internal));
     const enableEditMode = (entity) => {
         if (!editMode) {
-            const cellPopupService = api.internalApi.getCellPopupService();
-            cellPopupService.showPopup(cellAddress, true);
-            cellPopupService.editFocusedEntity(entity);
+            const annotationsService = api.internalApi.getAnnotationsService();
+            annotationsService.showPopup(cellAddress, true);
+            annotationsService.editFocusedEntity(entity);
         }
     };
     React.useEffect(() => {
-        var _a, _b;
-        (_b = (_a = cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current) === null || _a === void 0 ? void 0 : _a.refreshContent) === null || _b === void 0 ? void 0 : _b.call(_a);
+        cellPopupRef?.current?.refreshContent?.();
     }, [focusedEntity]);
     if (!cellAddress) {
         return React.createElement(React.Fragment, null);
     }
     const noteEditor = React.createElement(ConnectedNoteEditor, { enableEditMode: () => enableEditMode('Note') });
-    const commentEditor = (React.createElement(CommentsEditor_1.CommentsEditor, { onRefreshContent: () => { var _a, _b; return (_b = (_a = cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current) === null || _a === void 0 ? void 0 : _a.refreshContent) === null || _b === void 0 ? void 0 : _b.call(_a); }, enableEditMode: () => enableEditMode('Comment') }));
+    const commentEditor = (React.createElement(CommentsEditor_1.CommentsEditor, { onRefreshContent: () => cellPopupRef?.current?.refreshContent?.(), enableEditMode: () => enableEditMode('Comment') }));
     return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${cellAddress.PrimaryKeyValue}-${cellAddress.ColumnId}`, isOpen: true, primaryKeyValue: cellAddress.PrimaryKeyValue, columnId: cellAddress.ColumnId }, (() => {
         switch (focusedEntity) {
             case 'Note':

package/src/View/Components/Popups/WindowPopups/WindowPopups.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { AdaptableApi } from '../../../../../types';
 export interface WindowPopupChildProps {
     onDismiss: () => void;
-    popupProps: any;
+    popupProps?: any;
     api: AdaptableApi;
 }
 export declare const CUSTOM_WINDOW_FACTORY_ID = "CUSTOM_WINDOW_FACTORY_ID";

package/src/View/Components/Popups/WindowPopups/WindowPopups.js

@@ -20,15 +20,18 @@ const WindowPopups = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const dispatch = (0, react_redux_1.useDispatch)();
     const windowItems = (0, react_redux_1.useSelector)((state) => state.Popup.WindowPopup.PopupList);
-    return (React.createElement(React.Fragment, null, windowItems === null || windowItems === void 0 ? void 0 : windowItems.map((windowItem) => {
-        var _a, _b, _c, _d, _e, _f;
-        let Component = (_a = windowFactory_1.windowFactory[windowItem.FactoryId]) !== null && _a !== void 0 ? _a : null;
-        const _g = (_b = windowItem === null || windowItem === void 0 ? void 0 : windowItem.PopupProps) !== null && _b !== void 0 ? _b : {}, { windowModalProps } = _g, restPopupProps = tslib_1.__rest(_g, ["windowModalProps"]);
+    return (React.createElement(React.Fragment, null, windowItems?.map((windowItem) => {
+        let Component = windowFactory_1.windowFactory[windowItem.FactoryId] ?? null;
+        const { windowModalProps, ...restPopupProps } = windowItem?.PopupProps ?? {};
         const handleDismiss = () => {
             dispatch((0, PopupRedux_1.PopupHideWindow)(windowItem.Id));
         };
-        const size = (_d = (_c = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _c === void 0 ? void 0 : _c.size) !== null && _d !== void 0 ? _d : (0, Utilities_1.getWindowPopupSize)();
-        const position = (_f = (_e = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _e === void 0 ? void 0 : _e.position) !== null && _f !== void 0 ? _f : (0, Utilities_1.getMiddlePosition)(size);
+        const size = windowModalSettings?.[windowItem.Id]?.size ??
+            windowItem?.PopupProps?.size ??
+            (0, Utilities_1.getWindowPopupSize)();
+        const position = windowModalSettings?.[windowItem.Id]?.position ??
+            windowItem?.PopupProps?.position ??
+            (0, Utilities_1.getMiddlePosition)(size);
         let componentNode = null;
         if (!Component &&
             (windowItem.PopupProps.render || windowItem.PopupProps.frameworkComponent)) {
@@ -39,12 +42,21 @@ const WindowPopups = () => {
                 style: { height: '100%' }, render: windowItem.PopupProps.render, frameworkComponent: windowItem.PopupProps.frameworkComponent, onDestroy: windowItem.PopupProps.onFrameworkComponentDestroyed }));
         }
         else {
-            Component = Component !== null && Component !== void 0 ? Component : NoopComponent;
+            Component = Component ?? NoopComponent;
             componentNode = (React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }));
         }
-        return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, style: { height: '100%' }, className: "ab-Window-Modal", key: windowItem.Id, windowModal: true, windowModalProps: Object.assign(Object.assign({}, windowModalProps), { onChange: (settings) => {
-                    setWindowModalSettings((settingsMap) => (Object.assign(Object.assign({}, settingsMap), { [windowItem.Id]: settings })));
-                }, handleSelector: '.ab-Window-Modal .ab-Panel__header', size: size, position: position }), fixed: false, padding: 0, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
+        return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, style: { height: '100%' }, className: "ab-Window-Modal", key: windowItem.Id, windowModal: true, windowModalProps: {
+                ...windowModalProps,
+                onChange: (settings) => {
+                    setWindowModalSettings((settingsMap) => ({
+                        ...settingsMap,
+                        [windowItem.Id]: settings,
+                    }));
+                },
+                handleSelector: '.ab-Window-Modal .ab-Panel__header',
+                size: size,
+                position: position,
+            }, fixed: false, padding: 0, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
             React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" }, componentNode)));
     })));
 };

package/src/View/Components/Popups/WindowPopups/windowFactory.d.ts

@@ -2,7 +2,7 @@
 import { WindowPopupChildProps } from './WindowPopups';
 export declare const WINDOW_GRID_FILTER_EDITOR = "WINDOW_GRID_FILTER_EDITOR";
 export declare const SHOW_PIVOT_COLUMN_DETAILS = "SHOW_PIVOT_COLUMN_DETAILS";
-export declare const SHOW_EXPORT_TABLE = "SHOW_EXPORT_TABLE";
 export declare const SHOW_THEME_EDITOR = "SHOW_THEME_EDITOR";
 export declare const WINDOW_SHOW_TRANSPOSED_VIEW = "WINDOW_SHOW_TRANSPOSED_VIEW";
+export declare const COLUMN_FILTER_WINDOW = "COLUMN_FILTER_WINDOW";
 export declare const windowFactory: Record<string, React.FunctionComponent<WindowPopupChildProps>>;

package/src/View/Components/Popups/WindowPopups/windowFactory.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.windowFactory = exports.WINDOW_SHOW_TRANSPOSED_VIEW = exports.SHOW_THEME_EDITOR = exports.SHOW_EXPORT_TABLE = exports.SHOW_PIVOT_COLUMN_DETAILS = exports.WINDOW_GRID_FILTER_EDITOR = void 0;
+exports.windowFactory = exports.COLUMN_FILTER_WINDOW = exports.WINDOW_SHOW_TRANSPOSED_VIEW = exports.SHOW_THEME_EDITOR = exports.SHOW_PIVOT_COLUMN_DETAILS = exports.WINDOW_GRID_FILTER_EDITOR = void 0;
 const GridFilterWindowPopup_1 = require("../../../GridFilter/GridFilterWindowPopup");
 const PivotDetailsPopoup_1 = require("../../../Layout/PivotDetailsPopoup");
-const ExportTablePopup_1 = require("../../../Export/ExportTablePopup");
 const ThemeEditorWindow_1 = require("../../../Theme/ThemeEditorWindow");
 const TransposedPopup_1 = require("../../../Layout/TransposedPopup");
+const ColumnFilterWindow_1 = require("../../ColumnFilter/ColumnFilterWindow");
 exports.WINDOW_GRID_FILTER_EDITOR = 'WINDOW_GRID_FILTER_EDITOR';
 exports.SHOW_PIVOT_COLUMN_DETAILS = 'SHOW_PIVOT_COLUMN_DETAILS';
-exports.SHOW_EXPORT_TABLE = 'SHOW_EXPORT_TABLE';
 exports.SHOW_THEME_EDITOR = 'SHOW_THEME_EDITOR';
 exports.WINDOW_SHOW_TRANSPOSED_VIEW = 'WINDOW_SHOW_TRANSPOSED_VIEW';
+exports.COLUMN_FILTER_WINDOW = 'COLUMN_FILTER_WINDOW';
 exports.windowFactory = {
     [exports.WINDOW_GRID_FILTER_EDITOR]: GridFilterWindowPopup_1.GridFilterWindowPopup,
     [exports.SHOW_PIVOT_COLUMN_DETAILS]: PivotDetailsPopoup_1.PivotDetailsPopoup,
-    [exports.SHOW_EXPORT_TABLE]: ExportTablePopup_1.ExportTablePopup,
     [exports.SHOW_THEME_EDITOR]: ThemeEditorWindow_1.ThemeEditorWindow,
     [exports.WINDOW_SHOW_TRANSPOSED_VIEW]: TransposedPopup_1.TransposedPopup,
+    [exports.COLUMN_FILTER_WINDOW]: ColumnFilterWindow_1.ColumnFilterWindow,
 };