@adaptabletools/adaptable 12.1.0-canary.0 → 12.1.0-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.0-canary.0",
+  "version": "12.1.0-canary.1",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1658482740823;
+declare const _default: 1658495234609;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1658482740823;
+exports.default = 1658495234609;

package/src/Utilities/ObjectFactory.d.ts

@@ -25,9 +25,9 @@ import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatus
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
 import { ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
-import { ToastOptions } from 'react-toastify/dist/react-toastify.js';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../../types';
+import type { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;

package/src/Utilities/ObjectFactory.js

@@ -4,7 +4,7 @@ exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplay
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
-const react_toastify_js_1 = require("react-toastify/dist/react-toastify.js");
+const { toast, Bounce, Flip, Slide, Zoom } = require('react-toastify/dist/react-toastify.js');
 function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
@@ -393,29 +393,29 @@ exports.CreateToastOptions = CreateToastOptions;
 function getToastPosition(position) {
     switch (position) {
         case 'BottomLeft':
-            return react_toastify_js_1.toast.POSITION.BOTTOM_LEFT;
+            return toast.POSITION.BOTTOM_LEFT;
         case 'BottomCenter':
-            return react_toastify_js_1.toast.POSITION.BOTTOM_CENTER;
+            return toast.POSITION.BOTTOM_CENTER;
         case 'BottomRight':
-            return react_toastify_js_1.toast.POSITION.BOTTOM_RIGHT;
+            return toast.POSITION.BOTTOM_RIGHT;
         case 'TopLeft':
-            return react_toastify_js_1.toast.POSITION.TOP_LEFT;
+            return toast.POSITION.TOP_LEFT;
         case 'TopCenter':
-            return react_toastify_js_1.toast.POSITION.TOP_CENTER;
+            return toast.POSITION.TOP_CENTER;
         case 'TopRight':
-            return react_toastify_js_1.toast.POSITION.TOP_RIGHT;
+            return toast.POSITION.TOP_RIGHT;
     }
 }
 function getToastTransition(transition) {
     switch (transition) {
         case 'Bounce':
-            return react_toastify_js_1.Bounce;
+            return Bounce;
         case 'Slide':
-            return react_toastify_js_1.Slide;
+            return Slide;
         case 'Zoom':
-            return react_toastify_js_1.Zoom;
+            return Zoom;
         case 'Flip':
-            return react_toastify_js_1.Flip;
+            return Flip;
     }
 }
 exports.ObjectFactory = {

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -122,12 +122,17 @@ class CalculatedColumnExpressionService {
         }
     }
     createAggregatedScalarCalculatedColumn(calculatedColumn) {
-        var _a;
+        var _a, _b;
         // if there is already an aggregated scalar, delete it (possible when editing)
         this.destroyAggregatedScalarCalculatedColumn(calculatedColumn);
         if ((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression) {
-            const aggregatedScalarCalculatedColumn = new AggregatedScalarCalculatedColumn(calculatedColumn, this.adaptableApi);
-            this.aggregatedScalarCalculatedColumnsMap.set(calculatedColumn.Uuid, aggregatedScalarCalculatedColumn);
+            try {
+                const aggregatedScalarCalculatedColumn = new AggregatedScalarCalculatedColumn(calculatedColumn, this.adaptableApi);
+                this.aggregatedScalarCalculatedColumnsMap.set(calculatedColumn.Uuid, aggregatedScalarCalculatedColumn);
+            }
+            catch (e) {
+                LoggingHelper_1.LogAdaptableError(`Creating CalculatedColumn ('${(_b = calculatedColumn.Query) === null || _b === void 0 ? void 0 : _b.AggregatedScalarExpression}') failed!\n${e.message}`);
+            }
         }
     }
     destroyAggregatedScalarCalculatedColumn(calculatedColumn) {

package/src/View/AdaptableView.js

@@ -13,10 +13,9 @@ const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingSc
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 const License_1 = require("./License");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
-//@ts-ignore - we need to avoid the esm from react-toastify for now
-const react_toastify_js_1 = require("react-toastify/dist/react-toastify.js");
 const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
 const FormPopups_1 = require("./Components/Popups/FormPopups/FormPopups");
+const { ToastContainer } = require('react-toastify/dist/react-toastify.js');
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d;
@@ -28,7 +27,7 @@ class AdaptableView extends React.Component {
             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 })),
             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(react_toastify_js_1.ToastContainer
+            React.createElement(ToastContainer
             // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
             // instance is destroyed and re-created many times
             , { 

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

@@ -5,14 +5,13 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const AdaptablePopupAlert_1 = require("./AdaptablePopupAlert");
-//@ts-ignore - we need to avoid the esm from react-toastify for now
-const react_toastify_js_1 = require("react-toastify/dist/react-toastify.js");
+const { toast } = require('react-toastify/dist/react-toastify.js');
 const showToast = (props) => {
     // we're doing this hack and not simply using props.api in order not to have a memory
     // leak where the api is still kept around in memory by the toaster
     let api = props.api;
     const off = api.eventApi.on('AdaptableDestroy', () => {
-        react_toastify_js_1.toast.dismiss(toastId);
+        toast.dismiss(toastId);
         api = null;
     });
     const adaptableOptions = props.api.internalApi.getAdaptableOptions();
@@ -28,21 +27,21 @@ const showToast = (props) => {
         },
     });
     const content = (React.createElement(AdaptablePopupAlert_1.AdaptablePopupAlert, { headless: true, adaptableAlert: props.adaptableAlert, onClose: () => {
-            react_toastify_js_1.toast.dismiss(toastId);
+            toast.dismiss(toastId);
         } }));
     let toastId;
     switch (props.adaptableAlert.alertDefinition.MessageType) {
         case 'Info':
-            toastId = react_toastify_js_1.toast.info(content, toastProps);
+            toastId = toast.info(content, toastProps);
             break;
         case 'Error':
-            toastId = react_toastify_js_1.toast.error(content, toastProps);
+            toastId = toast.error(content, toastProps);
             break;
         case 'Success':
-            toastId = react_toastify_js_1.toast.success(content, toastProps);
+            toastId = toast.success(content, toastProps);
             break;
         case 'Warning':
-            toastId = react_toastify_js_1.toast.warn(content, toastProps);
+            toastId = toast.warn(content, toastProps);
             break;
     }
 };

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "12.1.0-canary.0";
+declare const _default: "12.1.0-canary.1";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '12.1.0-canary.0'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '12.1.0-canary.1'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version