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

package/src/{Strategy/Utilities → Utilities}/getObjectTagsViewItems.js

@@ -3,24 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectTagsViewItems = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const react_redux_1 = require("react-redux");
+const SimpleButton_1 = tslib_1.__importDefault(require("../components/SimpleButton"));
 const getObjectTagsViewItems = (object, api) => {
-    var _a, _b, _c, _d;
-    if (!api.internalApi.shouldDisplayTagSections() || !((_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (!api.internalApi.shouldDisplayTagSections() || !object?.Tags?.length) {
         return;
     }
     const currentLayoutName = api.layoutApi.getCurrentLayoutName();
-    const hasCurrentLayoutAsTag = (_c = ((_b = object === null || object === void 0 ? void 0 : object.Tags) !== null && _b !== void 0 ? _b : [])) === null || _c === void 0 ? void 0 : _c.includes(currentLayoutName);
+    const hasCurrentLayoutAsTag = (object?.Tags ?? [])?.includes(currentLayoutName);
     return {
         name: 'Tags',
-        values: (_d = object === null || object === void 0 ? void 0 : object.Tags) === null || _d === void 0 ? void 0 : _d.map((tag) => api.internalApi.getLabelForTag(tag)),
+        values: object?.Tags?.map((tag) => api.internalApi.getLabelForTag(tag)),
         viewAfter: (props) => {
             const dispatch = (0, react_redux_1.useDispatch)();
             const viewOptions = props.module.getViewProperties();
             const handleToggleTag = react_1.default.useCallback(() => {
-                var _a;
-                let tags = (_a = props.data.Tags) !== null && _a !== void 0 ? _a : [];
+                let tags = props.data.Tags ?? [];
                 if (hasCurrentLayoutAsTag) {
                     // remove layout
                     tags = tags.filter((tag) => tag !== currentLayoutName);
@@ -28,7 +26,10 @@ const getObjectTagsViewItems = (object, api) => {
                 else {
                     tags.push(currentLayoutName);
                 }
-                const newObject = Object.assign(Object.assign({}, props.data), { Tags: tags });
+                const newObject = {
+                    ...props.data,
+                    Tags: tags,
+                };
                 const editAction = viewOptions.getEditAction(newObject);
                 dispatch(editAction);
             }, [hasCurrentLayoutAsTag, props.data]);

package/src/{Strategy/Utilities → Utilities}/getRuleViewItems.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableApi } from '../../../types';
+import { AdaptableApi } from '../../types';
 export declare const getRuleViewItems: (rule: any, api: AdaptableApi) => {
     name: string;
     values: any[];

package/src/Utilities/getRuleViewItems.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRuleViewItems = void 0;
+const getRuleViewItems = (rule, api) => {
+    return {
+        name: 'Condition',
+        values: [
+            rule?.Predicates?.length
+                ? rule?.Predicates?.map((predicate) => api.predicateApi.predicateToString(predicate)).join(' AND ')
+                : api.internalApi.getAdaptableQueryExpressionText(rule) ?? 'No condition',
+        ],
+    };
+};
+exports.getRuleViewItems = getRuleViewItems;

package/src/Utilities/getScopeViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from "../Strategy/Interface/IModule";
+import { ColumnScope, AdaptableApi } from "../types";
+export declare const getScopeViewItems: (scope: ColumnScope, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Utilities/isPivotLayout.d.ts

@@ -0,0 +1,2 @@
+import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
+export { isPivotLayout };

package/src/Utilities/isPivotLayout.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPivotLayout = void 0;
+const LayoutHelpers_1 = require("../Api/Implementation/LayoutHelpers");
+Object.defineProperty(exports, "isPivotLayout", { enumerable: true, get: function () { return LayoutHelpers_1.isPivotLayout; } });

package/src/Utilities/license/decode.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{var r;const s=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),o={start:new Date(s.get("StartDate")),end:new Date(s.get("EndDate")),owner:s.get("Owner"),appName:s.get("AppName")||exports.GENERIC_APP_NAME,timestamp:s.get("TS")?Number(s.get("TS")):0,trial:"true"===s.get("Trial"),ref:null!==(r=s.get("Ref"))&&void 0!==r?r:""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const s=r=>{let s="",o=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(s=r),{name:t,value:r}}));if(!s)throw t();const a=s.split(",").reverse(),n=a.pop();a.forEach(((r,s)=>{const a=o[s];if((0,e.compute_string)(a.value)!==r)throw t()}));const i=[...o];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(p)!==n)throw t();return o=o.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(o)};exports.decode=s;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),o={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||exports.GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:r.get("Ref")??""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const o=r=>{let o="",s=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(o=r),{name:t,value:r}}));if(!o)throw t();const a=o.split(",").reverse(),n=a.pop();a.forEach(((r,o)=>{const a=s[o];if((0,e.compute_string)(a.value)!==r)throw t()}));const p=[...s];p.pop();const i=p.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(i)!==n)throw t();return s=s.map((e=>({...e,value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(s)};exports.decode=o;

package/src/Utilities/logDeprecation.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
 type StringKey<T> = Extract<keyof T, string>;
-export declare const logDeprecation: <T>(logger: AdaptableLogger, typeName: string, oldProp: Extract<keyof T, string>, newProp?: Extract<keyof T, string>, message?: string) => void;
-export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(logger: AdaptableLogger, oldTypeName: string, oldProp: Extract<keyof OLD_TYPE, string>, newTypeName: string, newProp: Extract<keyof NEW_TYPE, string>, message?: string) => void;
-export declare const logDeprecationInternal: <T>(logger: AdaptableLogger, typeName: string, oldProp: Extract<keyof T, string>) => void;
+export declare const logDeprecation: <T>(logger: AdaptableLogger, typeName: string, oldProp: StringKey<T>, newProp?: StringKey<T>, message?: string) => void;
+export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(logger: AdaptableLogger, oldTypeName: string, oldProp: StringKey<OLD_TYPE>, newTypeName: string, newProp: StringKey<NEW_TYPE>, message?: string) => void;
+export declare const logDeprecationInternal: <T>(logger: AdaptableLogger, typeName: string, oldProp: StringKey<T>) => void;
 export {};

package/src/Utilities/logDeprecation.js

@@ -14,12 +14,12 @@ const doOnce = (func, key) => {
 };
 const logDeprecation = (logger, typeName, oldProp, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${typeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 exports.logDeprecation = logDeprecation;
 const logDeprecationExternal = (logger, oldTypeName, oldProp, newTypeName, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${newTypeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 exports.logDeprecationExternal = logDeprecationExternal;
 const logDeprecationInternal = (logger, typeName, oldProp) => {

package/src/Utilities/runIfNotResolvedIn.js

@@ -10,7 +10,7 @@ exports.runIfNotResolvedIn = void 0;
  */
 const runIfNotResolvedIn = async (promise, callback, delay = 100) => {
     let isFulfilled = false;
-    promise === null || promise === void 0 ? void 0 : promise.then(() => {
+    promise?.then(() => {
         isFulfilled = true;
     });
     (async () => {

package/src/{Strategy/Utilities → Utilities}/updateSingleToMultiplePredicates.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSingleToMultiplePredicates = void 0;
 function updateSingleToMultiplePredicates(rule) {
-    var _a;
     if ('Predicate' in rule && rule.Predicate) {
-        rule.Predicates = [rule.Predicate, ...((_a = rule.Predicates) !== null && _a !== void 0 ? _a : [])];
+        rule.Predicates = [rule.Predicate, ...(rule.Predicates ?? [])];
         delete rule.Predicate;
     }
     return rule;

package/src/{agGrid → Utilities}/weightedAverage.d.ts

@@ -1,4 +1,4 @@
-import { IAggFuncParams } from '@ag-grid-community/core';
+import { IAggFuncParams } from 'ag-grid-enterprise';
 export declare const getNumericValue: (input: unknown) => number | null;
 export declare const weightedAverage: (params: IAggFuncParams, columnId: string, weightColumnId: string) => {
     [x: string]: number | (() => number | "");

package/src/{agGrid → Utilities}/weightedAverage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.weightedAverage = exports.getNumericValue = void 0;
 const tslib_1 = require("tslib");
 const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
-const AgGridAdapter_1 = require("./AgGridAdapter");
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;
@@ -19,9 +18,9 @@ const weightedAverage = (params, columnId, weightColumnId) => {
     // TODO AFL: improve performance by using the intermediary aggregated values (for nested groups)
     groupRowNode.allLeafChildren.forEach((rowNode) => {
         // when editing values might be converted to strings
-        const rawColumnValue = (0, AgGridAdapter_1._agGridApi_getValue)(columnId, rowNode, gridApi);
+        const rawColumnValue = gridApi.getCellValue({ colKey: columnId, rowNode });
         const columnValue = (0, exports.getNumericValue)(rawColumnValue);
-        const rawWeightedColumnValue = (0, AgGridAdapter_1._agGridApi_getValue)(weightColumnId, rowNode, gridApi);
+        const rawWeightedColumnValue = gridApi.getCellValue({ colKey: weightColumnId, rowNode });
         const weightedColumnValue = (0, exports.getNumericValue)(rawWeightedColumnValue);
         if (weightedColumnValue !== null) {
             weightedColumnValueSum += weightedColumnValue;

package/src/View/AdaptablePopover/index.d.ts

@@ -19,5 +19,5 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<React.Props
     visible?: boolean;
 }
 export declare class AdaptablePopover extends React.Component<React.PropsWithChildren<AdaptablePopoverProps>, {}> {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/src/View/AdaptablePopover/index.js

@@ -11,9 +11,8 @@ const OverlayTrigger_1 = tslib_1.__importDefault(require("../../components/Overl
 const rebass_1 = require("rebass");
 class AdaptablePopover extends React.Component {
     render() {
-        var _a, _b, _c;
         let messageType = this.props.MessageType != null ? this.props.MessageType : 'Info';
-        const showIcon = (_a = this.props.showIcon) !== null && _a !== void 0 ? _a : true;
+        const showIcon = this.props.showIcon ?? true;
         let useButton = this.props.useButton != null ? this.props.useButton : false;
         let popoverMinWidth = this.props.popoverMinWidth != null ? this.props.popoverMinWidth.toString() + 'px' : 'auto';
         const title = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.headerText)
@@ -23,10 +22,10 @@ class AdaptablePopover extends React.Component {
                 margin: '0px',
                 padding: '0px',
                 minWidth: popoverMinWidth,
-                maxWidth: (_b = this.props.popoverMaxWidth) !== null && _b !== void 0 ? _b : 300,
+                maxWidth: this.props.popoverMaxWidth ?? 300,
             } },
             title ? (React.createElement(rebass_1.Text, { fontSize: 4, padding: 2 }, title)) : null,
-            React.createElement(rebass_1.Box, { className: "ab-Popover__body", padding: (_c = this.props.popupPadding) !== null && _c !== void 0 ? _c : 2 }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
+            React.createElement(rebass_1.Box, { className: "ab-Popover__body", padding: this.props.popupPadding ?? 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 = {

package/src/View/AdaptableView.js

@@ -19,8 +19,7 @@ const FloatingQuickSearch_1 = require("./QuickSearch/FloatingQuickSearch/Floatin
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 class AdaptableView extends React.Component {
     render() {
-        var _a, _b, _c, _d;
-        const watermark = (_d = (_c = (_b = (_a = this.props.AdaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi) === null || _b === void 0 ? void 0 : _b.getSystemState()) === null || _c === void 0 ? void 0 : _c.License) === null || _d === void 0 ? void 0 : _d.watermark;
+        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),
@@ -30,13 +29,11 @@ class AdaptableView extends React.Component {
             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
-            // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
-            // instance is destroyed and re-created many times
+            // Ensure to set containerId to avoid memory leaks when Adaptable instance is destroyed and re-created many times
             , { 
-                // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
-                // instance is destroyed and re-created many times
+                // 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 === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
+            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)));
@@ -45,7 +42,7 @@ class AdaptableView extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         PopupState: state.Popup,
-        SystemState: state.System,
+        InternalState: state.Internal,
         AdaptableApi: ownProps.Adaptable.api,
     };
 }
@@ -61,5 +58,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)(React.createElement(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);
 exports.AdaptableApp = AdaptableApp;

package/src/View/AdaptableViewFactory.js

@@ -61,7 +61,7 @@ exports.AdaptableViewPanelFactory = new Map([
     [ModuleConstants.CellSummaryModuleId, CellSummaryViewPanel_1.CellSummaryViewPanelControl],
     [ModuleConstants.ColumnFilterModuleId, FilterViewPanel_1.FilterViewPanelControl],
     [ModuleConstants.DashboardModuleId, DashboardViewPanel_1.DashboardViewPanelControl],
-    [ModuleConstants.ExportModuleId, ExportViewPanel_1.ExportViewPanelControl],
+    [ModuleConstants.ExportModuleId, ExportViewPanel_1.ExportViewPanel],
     [ModuleConstants.LayoutModuleId, LayoutViewPanel_1.LayoutViewPanelControl],
     [ModuleConstants.GridFilterModuleId, GridFilterViewPanel_1.GridFilterPanelControl],
     [ModuleConstants.QuickSearchModuleId, QuickSearchViewPanel_1.QuickSearchViewPanelControl],

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableConfig.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableOptions } from '../../../AdaptableOptions/AdaptableOptions';
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions } from 'ag-grid-enterprise';
 /**
  * Config used by No Code Plugin to set up AdapTable
  */

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

@@ -15,14 +15,14 @@ const LABEL_WIDTH = 250;
 const SUPPORTED_PRIMITEVE_TYPES = ['s', 'n', 'b'];
 const OptionInput = (props) => {
     const { name, defaultValue, value, description, uiLabel } = props.option;
-    const label = uiLabel !== null && uiLabel !== void 0 ? uiLabel : StringExtensions_1.default.Humanize(name);
+    const label = uiLabel ?? StringExtensions_1.default.Humanize(name);
     let input = React.createElement(React.Fragment, null);
     const info = (React.createElement(rebass_1.Box, { ml: 2 },
         React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: null, bodyText: [description] })));
-    const handleInputChange = (event) => props.onChange(Object.assign(Object.assign({}, props.option), { value: event.currentTarget.value }));
-    const handleCheckboxChange = (checked) => props.onChange(Object.assign(Object.assign({}, props.option), { value: checked }));
+    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
-    const option = Object.assign({}, props.option);
+    const option = { ...props.option };
     const isOptionNonHomogenusUnion = (option) => {
         const isUnion = option.kind.includes('|');
         return isUnion && option.kind.split('|').some((unionEl) => !/['"]/.test(unionEl));
@@ -37,7 +37,7 @@ const OptionInput = (props) => {
             option.kind = newKind;
     }
     const inputProps = {
-        value: value !== null && value !== void 0 ? value : defaultValue,
+        value: value ?? defaultValue,
         minWidth: 200,
         fontSize: 3,
         mr: 2,
@@ -48,17 +48,17 @@ const OptionInput = (props) => {
             .map((str) => str.trim().replace(/['"]/g, ''))
             .map((str) => ({
             label: StringExtensions_1.default.Humanize(str),
-            onClick: () => props.onChange(Object.assign(Object.assign({}, option), { value: str })),
+            onClick: () => props.onChange({ ...option, value: str }),
         }));
-        input = (React.createElement(DropdownButton_1.default, Object.assign({}, inputProps, { columns: ['label'], items: options }), StringExtensions_1.default.Humanize(value)));
+        input = (React.createElement(DropdownButton_1.default, { ...inputProps, columns: ['label'], items: options }, StringExtensions_1.default.Humanize(value)));
     }
     else {
         switch (option.kind) {
             case 'n':
-                input = React.createElement(Input_1.default, Object.assign({ type: "number", onChange: handleInputChange }, inputProps));
+                input = React.createElement(Input_1.default, { type: "number", onChange: handleInputChange, ...inputProps });
                 break;
             case 's':
-                input = React.createElement(Input_1.default, Object.assign({ type: "text", onChange: handleInputChange }, inputProps));
+                input = React.createElement(Input_1.default, { type: "text", onChange: handleInputChange, ...inputProps });
                 break;
             case 'b':
                 input = (React.createElement(CheckBox_1.CheckBox, { onChange: handleCheckboxChange, checked: Boolean(value), type: "date" }, label));
@@ -80,12 +80,11 @@ const OptionInput = (props) => {
     return (React.createElement(rebass_1.Flex, { mb: 2, pl: 1 }, content));
 };
 const OptionsSection = (props) => {
-    var _a;
     if (!props.options.length) {
         return React.createElement(React.Fragment, null);
     }
     return (React.createElement(rebass_1.Box, { mb: 2 },
-        React.createElement(HelpBlock_1.default, { mb: 2 }, (_a = props.name) !== null && _a !== void 0 ? _a : props.id),
+        React.createElement(HelpBlock_1.default, { mb: 2 }, props.name ?? props.id),
         props.options.map((option, index) => (React.createElement(OptionInput, { key: index, option: option, onChange: props.onChange })))));
 };
 const AdaptableOptionsForm = (props) => {
@@ -94,14 +93,18 @@ const AdaptableOptionsForm = (props) => {
         return [...metamodelService.getGridInfoNoCodeOptions()];
     }, [props.adaptableOptions]);
     const handleOptionChange = (sectionName) => (option) => {
-        const adaptableOptions = Object.assign({}, props.adaptableOptions);
+        const adaptableOptions = { ...props.adaptableOptions };
         if (sectionName === 'baseOptions') {
             // @ts-ignore
             adaptableOptions[option.name] = option.value;
         }
         else {
             // @ts-ignore
-            adaptableOptions[sectionName] = Object.assign(Object.assign({}, adaptableOptions[sectionName]), { [option.name]: option.value });
+            adaptableOptions[sectionName] = {
+                // @ts-ignore
+                ...adaptableOptions[sectionName],
+                [option.name]: option.value,
+            };
         }
         props.onChangedAdaptableOptions(adaptableOptions);
     };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ColDef } from '@ag-grid-community/core';
+import { ColDef } from 'ag-grid-enterprise';
 export interface NocodeColumn extends Partial<ColDef> {
     field?: string;
     type?: string | string[];
@@ -15,5 +15,5 @@ declare const _default: React.MemoExoticComponent<({ columns: cols, handle, onVa
     selectedColumns?: {
         [key: string]: boolean;
     };
-}) => JSX.Element>;
+}) => React.JSX.Element>;
 export default _default;

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

@@ -14,16 +14,16 @@ const rebass_1 = require("rebass");
 const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
 const dataTypes = [
     {
-        value: 'abColDefString',
+        value: 'text',
         label: 'Text (string)',
     },
-    { value: 'abColDefNumber', label: 'Number' },
+    { value: 'number', label: 'Number' },
     {
-        value: 'abColDefDate',
+        value: 'date',
         label: 'Date',
     },
     {
-        value: 'abColDefBoolean',
+        value: 'boolean',
         label: 'Boolean',
     },
 ];
@@ -63,7 +63,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
     const columnsRef = (0, react_1.useRef)(cols);
     const silentSetColumns = (columns) => {
         columnsRef.current = columns;
-        onChange === null || onChange === void 0 ? void 0 : onChange(columns);
+        onChange?.(columns);
     };
     const setColumns = (columns) => {
         silentSetColumns(columns);
@@ -72,7 +72,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
     const getColumns = () => columnsRef.current;
     const columns = columnsRef.current;
     const onColumnChange = (col, value, property) => {
-        col = Object.assign(Object.assign({}, col), { [property]: value });
+        col = { ...col, [property]: value };
         const cols = getColumns().map((c) => {
             if (c.field === col.field) {
                 return col;
@@ -82,13 +82,13 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
         setColumns(cols);
     };
     const onColumnBatchChange = (value, property) => {
-        const cols = getColumns().map((c) => (Object.assign(Object.assign({}, c), { [property]: value })));
+        const cols = getColumns().map((c) => ({ ...c, [property]: value }));
         setColumns(cols);
     };
     const setColumnCaption = (caption, field) => {
         const cols = getColumns().map((c) => {
             if (c.field === field) {
-                const newCol = Object.assign(Object.assign({}, c), { caption });
+                const newCol = { ...c, caption };
                 return newCol;
             }
             return c;
@@ -98,14 +98,14 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
     const onColumnTypeChange = (col, type) => {
         const cols = getColumns().map((c) => {
             if (c.field === col.field) {
-                return Object.assign(Object.assign({}, c), { type });
+                return { ...c, type };
             }
             return c;
         });
         setColumns(cols);
     };
     const [primaryKeyField, setPrimaryKeyField] = React.useState(columns[0].field);
-    const { selected: includedColumnsMap, isSelected: isIncludedColumn, isAllSelected: isAllIncludedColumns, isNoneSelected: isNoneIncludedColumns, selectColumn: includeColumn, deselectColumn: excludeColumn, selectAll: includeAllColumns, deselectAll: excludeAllColumns, } = (0, useSelection_1.default)(columns, selectedColumns !== null && selectedColumns !== void 0 ? selectedColumns : true, null, { onChange: onSelectionChange });
+    const { selected: includedColumnsMap, isSelected: isIncludedColumn, isAllSelected: isAllIncludedColumns, isNoneSelected: isNoneIncludedColumns, selectColumn: includeColumn, deselectColumn: excludeColumn, selectAll: includeAllColumns, deselectAll: excludeAllColumns, } = (0, useSelection_1.default)(columns, selectedColumns ?? true, null, { onChange: onSelectionChange });
     handle.current = {
         getColumns: () => getColumns().filter((col) => isIncludedColumn(col.field)),
         getPrimaryKey: () => primaryKeyField,
@@ -158,12 +158,21 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
     const rowHeight = 40;
     const data = columns;
     const CellWrapper = (props) => {
-        return (React.createElement(rebass_1.Flex, Object.assign({}, props, { style: Object.assign(Object.assign({}, props.style), { position: 'absolute', textAlign: 'center', top: 0, left: 0, height: '100%', width: '100%', whiteSpace: 'normal' }), justifyContent: "center", alignItems: "center" }), props.children));
+        return (React.createElement(rebass_1.Flex, { ...props, style: {
+                ...props.style,
+                position: 'absolute',
+                textAlign: 'center',
+                top: 0,
+                left: 0,
+                height: '100%',
+                width: '100%',
+                whiteSpace: 'normal',
+            }, justifyContent: "center", alignItems: "center" }, props.children));
     };
-    const HeaderCellWrapper = (props) => (React.createElement(CellWrapper, Object.assign({}, props, { fontSize: 3, style: { fontWeight: 600 } })));
+    const HeaderCellWrapper = (props) => (React.createElement(CellWrapper, { ...props, fontSize: 3, style: { fontWeight: 600 } }));
     const HeaderWithCheckbox = (props) => {
-        const { label, onChange, checked } = props, flexProps = tslib_1.__rest(props, ["label", "onChange", "checked"]);
-        return (React.createElement(HeaderCellWrapper, Object.assign({}, flexProps, { flexDirection: "column" }),
+        const { label, onChange, checked, ...flexProps } = props;
+        return (React.createElement(HeaderCellWrapper, { ...flexProps, flexDirection: "column" },
             React.createElement(rebass_1.Box, null, label),
             React.createElement(rebass_1.Box, { style: { textAlign: 'center' } },
                 React.createElement(CheckBox_1.CheckBox, { checked: checked, onChange: onChange }))));
@@ -177,7 +186,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             render: (params) => {
                 const { data } = params;
                 const column = data;
-                const isPrimaryKey = (column === null || column === void 0 ? void 0 : column.field) === primaryKeyField;
+                const isPrimaryKey = column?.field === primaryKeyField;
                 return (React.createElement(Radio_1.default, { checked: isPrimaryKey, onChange: (checked) => {
                         if (checked && isIncludedColumn(column.field)) {
                             setPrimaryKeyField(column.field);
@@ -229,10 +238,9 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             maxWidth: 140,
             renderMenuIcon: false,
             render: (params) => {
-                var _a;
                 const column = params.data;
                 return (React.createElement(CellWrapper, { paddingLeft: 1, paddingRight: 1 },
-                    React.createElement(Dropdown_1.default, { style: inputStyle, showClearButton: false, options: dataTypes, value: (_a = column === null || column === void 0 ? void 0 : column.type) !== null && _a !== void 0 ? _a : '', onChange: onColumnTypeChange.bind(null, column) })));
+                    React.createElement(Dropdown_1.default, { style: inputStyle, showClearButton: false, options: dataTypes, value: column?.type ?? '', onChange: onColumnTypeChange.bind(null, column) })));
             },
         },
         sortable: {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/Components/FormBox.js

@@ -5,5 +5,5 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
-const NocodeWizardFormBox = (props) => (React.createElement(rebass_1.Box, Object.assign({}, props, { padding: 2, mb: 2, className: (0, join_1.default)('ab-NocodeWizardFormBox', props.className) })));
+const NocodeWizardFormBox = (props) => (React.createElement(rebass_1.Box, { ...props, padding: 2, mb: 2, className: (0, join_1.default)('ab-NocodeWizardFormBox', props.className) }));
 exports.NocodeWizardFormBox = NocodeWizardFormBox;

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

@@ -20,24 +20,29 @@ const ConfigurationWizard = (props) => {
                 toolPanels: ['columns', 'filters', 'adaptable'],
             },
         };
-        const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
+        const gridOptions = {
+            ...gridOptionDefaults,
+            ...props.adaptableConfig.gridOptions,
+        };
         const adaptableOptions = (0, DefaultAdaptableOptions_1.applyDefaultAdaptableOptions)(props.adaptableConfig.adaptableOptions);
         return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {
-        var _a, _b;
-        return (_b = (_a = props.adaptableConfig.gridOptions) === null || _a === void 0 ? void 0 : _a.columnDefs) === null || _b === void 0 ? void 0 : _b.reduce((acc, col) => {
+        return props.adaptableConfig.gridOptions?.columnDefs?.reduce((acc, col) => {
             acc[col.field] = true;
             return acc;
         }, {});
     });
-    const columnsHandle = React.useRef();
+    const columnsHandle = React.useRef(null);
     const handleFinish = () => {
-        const newAdaptableOptions = Object.assign({}, adaptableConfig.adaptableOptions);
-        const newGridOptions = Object.assign({}, adaptableConfig.gridOptions);
+        const newAdaptableOptions = { ...adaptableConfig.adaptableOptions };
+        const newGridOptions = { ...adaptableConfig.gridOptions };
         if (columnsHandle.current) {
             adaptableConfig.gridOptions.columnDefs = columnsHandle.current.getColumns().map((column) => {
-                const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
+                const newColumn = {
+                    ...column,
+                    headerName: column.caption || StringExtensions_1.default.Humanize(column.field),
+                };
                 delete newColumn.caption;
                 return newColumn;
             });
@@ -54,20 +59,29 @@ const ConfigurationWizard = (props) => {
         setIsValid(newIsValid);
     }, []);
     const handleColumnsChange = React.useCallback((columns) => {
-        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { gridOptions: Object.assign(Object.assign({}, adaptableConfig.gridOptions), { columnDefs: columns }) })));
+        setAdaptableConfig((adaptableConfig) => ({
+            ...adaptableConfig,
+            gridOptions: { ...adaptableConfig.gridOptions, columnDefs: columns },
+        }));
     }, []);
     const handleColumnSelectionChange = React.useCallback((col, flag) => {
         setSelectedColumns((selectedColumns) => {
-            const newSelectedColumns = selectedColumns !== null && selectedColumns !== void 0 ? selectedColumns : {};
+            const newSelectedColumns = selectedColumns ?? {};
             newSelectedColumns[col.field] = flag;
             return newSelectedColumns;
         });
     }, []);
     const handleAdaptableOptionsChange = React.useCallback((adaptableOptions) => {
-        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { adaptableOptions: adaptableOptions })));
+        setAdaptableConfig((adaptableConfig) => ({
+            ...adaptableConfig,
+            adaptableOptions: adaptableOptions,
+        }));
     }, []);
     const handleGridOptionsChange = React.useCallback((gridOptions) => {
-        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { gridOptions: gridOptions })));
+        setAdaptableConfig((adaptableConfig) => ({
+            ...adaptableConfig,
+            gridOptions: gridOptions,
+        }));
     }, []);
     let sections = [
         {

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

@@ -5,14 +5,13 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const ColumnsList_1 = tslib_1.__importDefault(require("./ColumnsList"));
 const ConfigurationWizardColumnsStep = (props) => {
-    var _a, _b;
     let theme = 'light';
     if (typeof props.adaptableConfig.adaptableOptions.predefinedConfig === 'object' &&
-        ((_a = props.adaptableConfig.adaptableOptions.predefinedConfig.Theme) === null || _a === void 0 ? void 0 : _a.CurrentTheme)) {
+        props.adaptableConfig.adaptableOptions.predefinedConfig.Theme?.CurrentTheme) {
         theme = props.adaptableConfig.adaptableOptions.predefinedConfig.Theme.CurrentTheme;
     }
     return (React.createElement(ColumnsList_1.default, { theme: theme, handle: props.columnsHandle, onValidityChange: (valid) => {
             props.setPrimaryKeyIsNotSelected(valid);
-        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: (_b = props.adaptableConfig.gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs }));
+        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: props.adaptableConfig.gridOptions?.columnDefs }));
 };
 exports.ConfigurationWizardColumnsStep = ConfigurationWizardColumnsStep;