@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.1

package/src/Utilities/Services/ValidationService.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationService = void 0;
-const tslib_1 = require("tslib");
-const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
-const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
-const ModuleConstants_1 = require("../Constants/ModuleConstants");
-const GeneralConstants_1 = require("../Constants/GeneralConstants");
-class ValidationService {
+import { ArrayExtensions } from '../Extensions/ArrayExtensions';
+import StringExtensions from '../Extensions/StringExtensions';
+import { AlertModuleId } from '../Constants/ModuleConstants';
+import { SERVER_VALIDATION_HEADER, SERVER_VALIDATION_MESSAGE_TYPE, } from '../Constants/GeneralConstants';
+export class ValidationService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         this.adaptableApi = adaptableApi;
@@ -21,13 +17,13 @@ class ValidationService {
             .getAlertDefinitionsWithPreventEdit()
             .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
-        if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
+        if (ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
                 if (alertDefinition.Rule.BooleanExpression) {
                     let isSatisfiedExpression = cellDataChangedInfo.rowNode != null &&
                         this.adaptableApi.internalApi
                             .getQueryLanguageService()
-                            .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, ModuleConstants_1.AlertModuleId, cellDataChangedInfo.rowNode);
+                            .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, AlertModuleId, cellDataChangedInfo.rowNode);
                     if (isSatisfiedExpression) {
                         failedValidations.push(alertDefinition);
                     }
@@ -113,14 +109,14 @@ class ValidationService {
                     }
                     row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
                     this.adaptableApi.gridApi.updateGridData([row]);
-                    if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
+                    if (StringExtensions.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
                         this.adaptableApi.optionsApi.getEditOptions().displayServerValidationMessages) {
                         const validationHeader = validationResult.ValidationHeader
                             ? validationResult.ValidationHeader
-                            : GeneralConstants_1.SERVER_VALIDATION_HEADER;
+                            : SERVER_VALIDATION_HEADER;
                         const messageType = validationResult.MessageType
                             ? validationResult.MessageType
-                            : GeneralConstants_1.SERVER_VALIDATION_MESSAGE_TYPE;
+                            : SERVER_VALIDATION_MESSAGE_TYPE;
                         this.adaptableApi.alertApi.showAlert(validationHeader, validationResult.ValidationMessage, messageType);
                     }
                 }
@@ -146,4 +142,3 @@ class ValidationService {
         // TO DO
     }
 }
-exports.ValidationService = ValidationService;

package/src/Utilities/getScrollbarSize.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 let scrollbarWidth;
-exports.default = () => {
+export default () => {
     const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
     const document = globalObject ? globalObject.document : null;
     if (scrollbarWidth != null) {

package/src/Utilities/isAdaptableObject.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAdaptableObject = void 0;
 // pretty primitive type guard for AdaptableObject, but currently there is no better/safer way
-const isAdaptableObject = (object) => {
+export const isAdaptableObject = (object) => {
     return object != undefined && typeof object['Uuid'] === 'string';
 };
-exports.isAdaptableObject = isAdaptableObject;

package/src/Utilities/isMacLike.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMacLike = void 0;
-const isMacLike = () => {
+export const isMacLike = () => {
     const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
     return /(Mac|iPhone|iPod|iPad)/i.test(globalObject.navigator.platform);
 };
-exports.isMacLike = isMacLike;

package/src/Utilities/license/LicenseDetails.d.ts

@@ -1,4 +1,4 @@
-export declare type LicenseDetails = {
+export type LicenseDetails = {
     start: Date;
     end: Date;
     owner: string;

package/src/Utilities/license/LicenseDetails.js

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

package/src/Utilities/license/decode.js

@@ -1 +1,65 @@
-"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;
+import { compute_string } from './hashing';
+const getGenericError = () => new Error('Invalid License');
+export const GENERIC_APP_NAME = 'GenericAdaptableApp';
+export const fieldsToLicenseDetails = (fields) => {
+    var _a;
+    const fieldsMap = fields.reduce((acc, field) => {
+        acc.set(field.name, field.value);
+        return acc;
+    }, new Map());
+    const details = {
+        start: new Date(fieldsMap.get('StartDate')),
+        end: new Date(fieldsMap.get('EndDate')),
+        owner: fieldsMap.get('Owner'),
+        appName: fieldsMap.get('AppName') || GENERIC_APP_NAME,
+        timestamp: fieldsMap.get('TS') ? Number(fieldsMap.get('TS')) : 0,
+        trial: fieldsMap.get('Trial') === 'true' ? true : false,
+        ref: (_a = fieldsMap.get('Ref')) !== null && _a !== void 0 ? _a : '',
+    };
+    if (!details.start ||
+        !details.end ||
+        !details.owner ||
+        typeof details.trial !== 'boolean' ||
+        !details.ref) {
+        throw getGenericError();
+    }
+    return details;
+};
+export const decode = (licenseKey) => {
+    let crc = '';
+    let fields = licenseKey.split('|').map((part) => {
+        let [name, value] = part.split('=');
+        if (name === 'C') {
+            crc = value;
+        }
+        return {
+            name,
+            value,
+        };
+    });
+    if (!crc) {
+        throw getGenericError();
+    }
+    const crcParts = crc.split(',').reverse();
+    const overallCrc = crcParts.pop();
+    crcParts.forEach((fieldCrc, index) => {
+        const field = fields[index];
+        if (compute_string(field.value) !== fieldCrc) {
+            throw getGenericError();
+        }
+    });
+    const fieldsWithoutC = [...fields];
+    fieldsWithoutC.pop();
+    const fieldsWithoutCString = fieldsWithoutC
+        .map((field) => {
+        return `${field.name}=${field.value}`;
+    })
+        .join('|');
+    if (compute_string(fieldsWithoutCString) !== overallCrc) {
+        throw getGenericError();
+    }
+    fields = fields.map((f) => {
+        return Object.assign(Object.assign({}, f), { value: decodeURI(f.value) });
+    });
+    return fieldsToLicenseDetails(fields);
+};

package/src/Utilities/license/hashing.js

@@ -1 +1,43 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.compute_string=void 0;const r=3988292384;function t(t=r){var e,n,o,u=new Array;for(e=0;e<256;e++){for(o=e,n=8;n>0;n--)1==(1&o)?o=o>>>1^t:o>>>=1;u[e]=o}return u}function e(){return 4294967295}function n(r,t,e){return t=t>>>8^r[e^255&t]}function o(r){return r=(r=~r)<0?4294967295+r+1:r}function u(u,c=r){var i,f=t(c),s=0;for(s=e(),i=0;i<u.length;i++)s=n(f,s,u.charCodeAt(i));return`${s=o(s)}`}exports.compute_string=u;
+const DEFAULT_ReversedPolynomial = 0xedb88320;
+/*
+ * CRC-32 implementation
+ */
+function generate(reversedPolynomial = DEFAULT_ReversedPolynomial) {
+    var table = new Array();
+    var i, j, n;
+    for (i = 0; i < 256; i++) {
+        n = i;
+        for (j = 8; j > 0; j--) {
+            if ((n & 1) == 1) {
+                n = (n >>> 1) ^ reversedPolynomial;
+            }
+            else {
+                n = n >>> 1;
+            }
+        }
+        table[i] = n;
+    }
+    return table;
+}
+function crc32_initial() {
+    return 0xffffffff;
+}
+function crc32_add_byte(table, crc, byte) {
+    crc = (crc >>> 8) ^ table[byte ^ (crc & 0x000000ff)];
+    return crc;
+}
+function crc32_final(crc) {
+    crc = ~crc;
+    crc = crc < 0 ? 0xffffffff + crc + 1 : crc;
+    return crc;
+}
+export function compute_string(str, reversedPolynomial = DEFAULT_ReversedPolynomial) {
+    var table = generate(reversedPolynomial);
+    var crc = 0;
+    var i;
+    crc = crc32_initial();
+    for (i = 0; i < str.length; i++)
+        crc = crc32_add_byte(table, crc, str.charCodeAt(i));
+    crc = crc32_final(crc);
+    return `${crc}`;
+}

package/src/Utilities/logDeprecation.d.ts

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

package/src/Utilities/logDeprecation.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logDeprecationInternal = exports.logDeprecationExternal = exports.logDeprecation = void 0;
 const doOnceFlags = {};
 /**
  * If the key was passed before, then do NOT execute the func
@@ -12,18 +9,15 @@ const doOnce = (func, key) => {
     func();
     doOnceFlags[key] = true;
 };
-const logDeprecation = (logger, typeName, oldProp, newProp, message) => {
+export 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}`);
 };
-exports.logDeprecation = logDeprecation;
-const logDeprecationExternal = (logger, oldTypeName, oldProp, newTypeName, newProp, message) => {
+export 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}`);
 };
-exports.logDeprecationExternal = logDeprecationExternal;
-const logDeprecationInternal = (logger, typeName, oldProp) => {
+export const logDeprecationInternal = (logger, typeName, oldProp) => {
     doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.
         Please contact support if you need the missing functionality.`), `Deprecated_${oldProp}`);
 };
-exports.logDeprecationInternal = logDeprecationInternal;

package/src/Utilities/reorder.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.reorder = void 0;
-const reorder = (list, startIndex, endIndex) => {
+export const reorder = (list, startIndex, endIndex) => {
     const result = [...list];
     if (startIndex > list.length - 1) {
         // not much that we can do if the dragged item is out of bounds...
@@ -14,4 +11,3 @@ const reorder = (list, startIndex, endIndex) => {
     result.splice(endIndex, 0, removed);
     return result;
 };
-exports.reorder = reorder;

package/src/Utilities/runIfNotResolvedIn.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runIfNotResolvedIn = void 0;
 /**
  * Calls the callback if the promise does not resolve in a amount of time.
  *
@@ -8,7 +5,7 @@ exports.runIfNotResolvedIn = void 0;
  * @param callback Called if promise does not resolve in the time defined by 'delay'
  * @param delay Time after which if the promise was not resolved the callback (fn) is called.
  */
-const runIfNotResolvedIn = async (promise, callback, delay = 100) => {
+export const runIfNotResolvedIn = async (promise, callback, delay = 100) => {
     let isFulfilled = false;
     promise === null || promise === void 0 ? void 0 : promise.then(() => {
         isFulfilled = true;
@@ -21,4 +18,3 @@ const runIfNotResolvedIn = async (promise, callback, delay = 100) => {
     })();
     return promise;
 };
-exports.runIfNotResolvedIn = runIfNotResolvedIn;

package/src/Utilities/sortWithOrder.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortWithOrderArray = void 0;
-function sortWithOrderArray(arr, order, 
+export function sortWithOrderArray(arr, order, 
 /**
  *
  * The array can contain items which are not listed in the order array.
@@ -51,4 +48,3 @@ function sortWithOrderArray(arr, order,
     }
     return [].concat(arr).sort(compareItemsOfCustomSort);
 }
-exports.sortWithOrderArray = sortWithOrderArray;

package/src/Utilities/waitForCondition.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForCondition = void 0;
-const waitForCondition = (isReady, timeout = 5000) => {
+export const waitForCondition = (isReady, timeout = 5000) => {
     const startTime = Date.now();
     const ready = isReady();
     if (ready) {
@@ -26,4 +23,3 @@ const waitForCondition = (isReady, timeout = 5000) => {
         wait(resolve);
     });
 };
-exports.waitForCondition = waitForCondition;

package/src/Utilities/waitForTimeout.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForTimeout = void 0;
 // waits for the given ms milliseconds
-function waitForTimeout(ms) {
+export function waitForTimeout(ms) {
     return new Promise((resolve) => {
         setTimeout(() => {
             resolve();
         }, ms);
     });
 }
-exports.waitForTimeout = waitForTimeout;

package/src/View/AdaptableContext.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAdaptable = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
+import * as React from 'react';
 const AdaptableContext = React.createContext(null);
-exports.default = AdaptableContext;
-const useAdaptable = () => {
-    return React.useContext(AdaptableContext);
+export default AdaptableContext;
+export const useAdaptable = () => {
+    const context = React.useContext(AdaptableContext);
+    return context;
 };
-exports.useAdaptable = useAdaptable;

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

@@ -16,6 +16,7 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<React.Props
     popoverMaxWidth?: number;
     popupPadding?: number;
     alignPosition?: OverlayShowParams['alignPosition'];
+    visible?: boolean;
 }
 export declare class AdaptablePopover extends React.Component<React.PropsWithChildren<AdaptablePopoverProps>, {}> {
     render(): JSX.Element;

package/src/View/AdaptablePopover/index.js

@@ -1,48 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptablePopover = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const UIHelper_1 = require("../UIHelper");
-const ButtonInfo_1 = require("../Components/Buttons/ButtonInfo");
-const icons_1 = require("../../components/icons");
-const OverlayTrigger_1 = tslib_1.__importDefault(require("../../components/OverlayTrigger"));
-const rebass_1 = require("rebass");
-class AdaptablePopover extends React.Component {
+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 { Flex, Box, Text } from 'rebass';
+export 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;
         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)
+        const title = StringExtensions.IsNotNullOrEmpty(this.props.headerText)
             ? this.props.headerText
             : '';
-        const popoverClickRootClose = (React.createElement(rebass_1.Box, { className: "ab-Popover", style: {
+        const popoverClickRootClose = (React.createElement(Box, { className: "ab-Popover", style: {
                 margin: '0px',
                 padding: '0px',
                 minWidth: popoverMinWidth,
                 maxWidth: (_b = this.props.popoverMaxWidth) !== null && _b !== void 0 ? _b : 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))))));
+            title ? (React.createElement(Text, { fontSize: 4, padding: 2 }, title)) : null,
+            React.createElement(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))))));
         const icon = 'info'; // - think this is wrong - UIHelper.getGlyphByMessageType(messageType);
-        const color = UIHelper_1.UIHelper.getColorByMessageType(messageType);
+        const color = UIHelper.getColorByMessageType(messageType);
         const iconStyle = {
             color,
             fill: 'currentColor',
         };
-        return (React.createElement(rebass_1.Flex, { alignItems: "center", className: this.props.className },
-            React.createElement(OverlayTrigger_1.default
+        return (React.createElement(Flex, { alignItems: "center", className: this.props.className },
+            React.createElement(OverlayTrigger
             // showTriangle
             , { 
                 // showTriangle
-                render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
+                visible: this.props.visible, render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
                     overflow: 'visible',
-                }, defaultZIndex: 100000, alignPosition: this.props.alignPosition }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
+                }, defaultZIndex: 100000, alignPosition: this.props.alignPosition }, useButton ? (React.createElement(ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
                 this.props.children,
-                showIcon && React.createElement(icons_1.Icon, { name: icon, style: iconStyle }))))));
+                showIcon && React.createElement(Icon, { name: icon, style: iconStyle }))))));
     }
 }
-exports.AdaptablePopover = AdaptablePopover;

package/src/View/AdaptableView.js

@@ -1,47 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableApp = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
-const Toastify_1 = require("../components/Toastify");
-const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
-const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
-const AdaptablePopup_1 = require("./Components/Popups/AdaptablePopup");
-const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopupConfirmation");
-const AdaptablePopupPrompt_1 = require("./Components/Popups/AdaptablePopupPrompt");
-const FormPopups_1 = require("./Components/Popups/FormPopups/FormPopups");
-const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
-const Dashboard_1 = require("./Dashboard/Dashboard");
-const License_1 = require("./License");
-const NotesPopup_1 = require("./Notes/NotesPopup");
-const FloatingQuickSearch_1 = require("./QuickSearch/FloatingQuickSearch/FloatingQuickSearch");
-const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { ProgressIndicator } from '../components/ProgressIndicator/ProgressIndicator';
+import { ToastContainer } from '../components/Toastify';
+import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
+import { AdaptableLoadingScreen } from './Components/Popups/AdaptableLoadingScreen';
+import { AdaptablePopup } from './Components/Popups/AdaptablePopup';
+import { AdaptablePopupConfirmation } from './Components/Popups/AdaptablePopupConfirmation';
+import { AdaptablePopupPrompt } from './Components/Popups/AdaptablePopupPrompt';
+import { FormPopups } from './Components/Popups/FormPopups/FormPopups';
+import { WindowPopups } from './Components/Popups/WindowPopups/WindowPopups';
+import { Dashboard } from './Dashboard/Dashboard';
+import { LicenseWatermark } from './License';
+import { NotePopup } from './Notes/NotesPopup';
+import { QuickSearchDrawer } from './QuickSearch/FloatingQuickSearch/FloatingQuickSearch';
+import { renderWithAdaptableContext } from './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 adaptableOptions = this.props.AdaptableApi.optionsApi.getAdaptableOptions();
         return (React.createElement("div", null,
-            React.createElement(NotesPopup_1.NotePopup, null),
-            React.createElement(FloatingQuickSearch_1.QuickSearchDrawer, null),
-            this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
-            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
-            this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
-            Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
-            Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
-            React.createElement(Toastify_1.ToastContainer
+            React.createElement(NotePopup, null),
+            React.createElement(QuickSearchDrawer, null),
+            this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard, { api: this.props.AdaptableApi })),
+            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
+            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
             // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the 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
                 containerId: adaptableOptions.adaptableId, enableMultiContainer: true, 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),
-            React.createElement(WindowPopups_1.WindowPopups, null),
-            React.createElement(FormPopups_1.FormPopups, null),
-            React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
+            (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
+            React.createElement(WindowPopups, null),
+            React.createElement(FormPopups, null),
+            React.createElement(ProgressIndicator, null)));
     }
 }
 function mapStateToProps(state, ownProps) {
@@ -62,6 +58,5 @@ function mapDispatchToProps(dispatch) {
         onClearPopupParams: () => dispatch(PopupRedux.PopupClearParam()),
     };
 }
-let AdaptableWrapper = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(AdaptableView);
-const AdaptableApp = ({ Adaptable }) => (0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);
-exports.AdaptableApp = AdaptableApp;
+let AdaptableWrapper = connect(mapStateToProps, mapDispatchToProps)(AdaptableView);
+export const AdaptableApp = ({ Adaptable }) => renderWithAdaptableContext(React.createElement(AdaptableWrapper, { Adaptable: Adaptable }), Adaptable);