@adaptabletools/adaptable 11.0.0-canary.1 → 11.0.0-canary.5

package/src/View/Query/QueryViewPanel.js

@@ -74,32 +74,37 @@ class QueryViewPanelComponent extends React.Component {
         let availableColumns = this.props.api.columnApi.getColumns().map((col) => {
             return {
                 label: col.friendlyName,
-                onClick: () => this.setState({ expression: this.state.expression + `[${col.columnId}]` }),
+                onClick: () => this.setState({
+                    expression: this.state.expression + `[${col.columnId}]`,
+                }),
             };
         });
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
+        const handleEnter = (e) => {
+            if (e.key === 'Enter') {
+                this.runQuery();
+            }
+        };
         const renderTextInput = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(FieldWrap_1.default, { marginRight: 1, width: 600 },
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
-                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 }, onKeyDown: (e) => {
-                        if (e.key === 'Enter') {
-                            this.runQuery();
-                        }
-                    } }),
+                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 } }),
                 isExpressionValid ? (React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: '', accessLevel: 'Full', variant: "text", tone: "neutral", disabled: this.state.expression == '' || this.state.expression == this.props.CurrentQuery, marginRight: 1 })) : (React.createElement(ButtonInvalid_1.ButtonInvalid, { variant: "text", tone: "neutral", tooltip: "Invalid Query", marginRight: 1 })),
                 ' ',
-                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.props.onRunQuery(''), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
+                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
         };
         const queryModuleAccessLevel = this.props.api.internalApi
             .getEntitlementService()
             .getEntitlementAccessLevelForModule(ModuleConstants_1.QueryModuleId);
+        const saveButton = (React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }));
         const renderButtons = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(React.Fragment, null,
-                React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }),
+                saveButton,
                 React.createElement(DropdownButton_1.default, { variant: "text", items: availableColumns, marginRight: 1, tooltip: "Pick Columns" },
                     React.createElement(icons_1.Icon, { name: 'list' })),
                 React.createElement(DropdownButton_1.default, { disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), variant: "text", items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" }),
                 ' ')) : (React.createElement(React.Fragment, null,
+                saveButton,
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
                 React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full', disabled: this.state.expression == '' }),
                 React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: "Run Query", accessLevel: 'Full', variant: "text", tone: "neutral", disabled: !isExpressionValid ||
@@ -107,12 +112,12 @@ class QueryViewPanelComponent extends React.Component {
                         this.state.expression == this.props.CurrentQuery, marginRight: 1 }),
                 React.createElement(DropdownButton_1.default, { variant: "text", disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" })));
         };
-        return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        return (React.createElement(rebass_1.Flex, { onKeyDown: handleEnter, flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null, renderTextInput()),
             React.createElement(rebass_1.Flex, null, renderButtons())));
     }
     clearQuery() {
-        this.setState({ expression: '' });
+        this.props.onRunQuery('');
     }
     saveQuery() {
         this.props.onShowNamedQueries(this.state.expression, this.props.moduleInfo.Popup);

package/src/View/Query/Wizard/NamedQueryWizard.js

@@ -14,9 +14,11 @@ const react_redux_1 = require("react-redux");
 const QueryRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/QueryRedux"));
 function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = react_1.useState(() => {
+        var _a, _b;
+        const value = (_b = (_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '';
         return props.data
             ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyNamedQuery();
+            : ObjectFactory_1.default.CreateEmptyNamedQuery(value);
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -18,8 +18,7 @@ const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = useQuickSearchDebounced_1.useQuickSearchDebounced(props);
     const [state, setState] = react_1.useState({
-        RunQueryAfterQuickSearch: props.api.internalApi.getAdaptableOptions().searchOptions
-            .filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.internalApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -28,7 +27,8 @@ const QuickSearchPopupComponent = (props) => {
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState(Object.assign(Object.assign({}, state), { RunQueryAfterQuickSearch: checked }));
-        props.api.internalApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch = checked;
+        props.api.internalApi.getAdaptableOptions().searchOptions.filterResultsAfterQuickSearch =
+            checked;
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel_1.default, { header: props.moduleInfo.FriendlyName + ' Text', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },

package/src/View/QuickSearch/useQuickSearchDebounced.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useQuickSearchDebounced = void 0;
 const tslib_1 = require("tslib");
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 exports.useQuickSearchDebounced = (props) => {
     var _a;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -64,11 +64,21 @@ exports.getScheduleSettingsValues = (data) => {
     }
     if (data.ScheduleType === Enums_1.ScheduleType.Glue42) {
         const report = data;
-        return [{ label: 'Report', value: (report === null || report === void 0 ? void 0 : report.Glue42Report.ReportName) || 'Not Specified' }];
+        return [
+            {
+                label: 'Report',
+                value: (report === null || report === void 0 ? void 0 : report.Glue42Report.ReportName) || 'Not Specified',
+            },
+        ];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.OpenFin) {
         const report = data;
-        return [{ label: 'Report', value: (report === null || report === void 0 ? void 0 : report.OpenFinReport.ReportName) || 'Not Specified' }];
+        return [
+            {
+                label: 'Report',
+                value: (report === null || report === void 0 ? void 0 : report.OpenFinReport.ReportName) || 'Not Specified',
+            },
+        ];
     }
     return [];
 };

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -13,39 +13,39 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ScheduleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ScheduleRedux"));
 exports.ScheduleWizard = (props) => {
-    var _a;
-    const scheduleType = props.data
-        ? props.data.ScheduleType
-        : (_a = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _a === void 0 ? void 0 : _a.name;
+    var _a, _b;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
+    const isNew = props.popupParams.action ? props.popupParams.action === 'New' : !props.data;
+    const scheduleType = data ? data.ScheduleType : (_b = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _b === void 0 ? void 0 : _b.name;
     const [schedule, setSchedule] = React.useState(() => {
-        if (props.data) {
-            return props.data;
+        if (data) {
+            return data;
         }
-        let data = null;
+        let scheduleState = null;
         switch (scheduleType) {
             case Enums_1.ScheduleType.Reminder:
-                data = ObjectFactory_1.default.CreateEmptyReminderSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReminderSchedule();
                 break;
             case Enums_1.ScheduleType.Report:
-                data = ObjectFactory_1.default.CreateEmptyReportSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReportSchedule();
                 break;
             case Enums_1.ScheduleType.ipushpull:
-                data = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
                 break;
             case Enums_1.ScheduleType.Glue42:
-                data = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
                 break;
             case Enums_1.ScheduleType.OpenFin:
-                data = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
                 break;
         }
-        return data;
+        return scheduleState;
     });
     const [isOneOff, setIsOneOff] = React.useState(false);
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
         let action = null;
-        if (props.data) {
+        if (!isNew) {
             switch (scheduleType) {
                 case Enums_1.ScheduleType.Reminder:
                     action = ScheduleRedux.ReminderScheduleEdit(schedule);

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecialColumnSettingsWizardStep = void 0;
 const tslib_1 = require("tslib");
-const chunk_1 = tslib_1.__importDefault(require("lodash-es/chunk"));
+const chunk_1 = tslib_1.__importDefault(require("lodash/chunk"));
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const CheckBox_1 = require("../components/CheckBox");

package/src/View/UIHelper.js

@@ -133,7 +133,10 @@ function getModalContainer(adaptableOptions, document) {
     let modalContainer;
     if (adaptableOptions.containerOptions.modalContainer) {
         // this has been set, so we use the property
-        modalContainer = document.getElementById(adaptableOptions.containerOptions.modalContainer);
+        modalContainer =
+            typeof adaptableOptions.containerOptions.modalContainer === 'string'
+                ? document.getElementById(adaptableOptions.containerOptions.modalContainer)
+                : adaptableOptions.containerOptions.modalContainer;
         if (modalContainer) {
             const modalContainerClassName = ' modal-container';
             if (!modalContainer.className.includes(modalContainerClassName)) {

package/src/View/Wizard/AdaptableWizard.js

@@ -9,7 +9,7 @@ const rebass_1 = require("rebass");
 const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash-es/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 exports.AdaptableWizardContext = React.createContext({
     data: null,
     updateGoBackState: () => { },
@@ -91,7 +91,10 @@ class AdaptableWizard extends React.Component {
         let bodyElement = wizardStepInfo.Element;
         let newElement = this.cloneWizardStep(bodyElement);
         this.stepName = wizardStepInfo.StepName;
-        this.setState({ ActiveState: newElement, IndexState: wizardStepInfo.Index });
+        this.setState({
+            ActiveState: newElement,
+            IndexState: wizardStepInfo.Index,
+        });
     }
     ForceUpdateGoBackState() {
         this.forceUpdate();
@@ -114,7 +117,10 @@ class AdaptableWizard extends React.Component {
                 let bodyElement = activeWizardInfo.Element;
                 let newElement = this.cloneWizardStep(bodyElement);
                 this.stepName = activeWizardInfo.StepName;
-                this.setState({ ActiveState: newElement, IndexState: this.state.IndexState - decrement });
+                this.setState({
+                    ActiveState: newElement,
+                    IndexState: this.state.IndexState - decrement,
+                });
             }
         }
     }
@@ -126,7 +132,10 @@ class AdaptableWizard extends React.Component {
             let bodyElement = activeWizardInfo.Element;
             let newElement = this.cloneWizardStep(bodyElement);
             this.stepName = activeWizardInfo.StepName;
-            this.setState({ ActiveState: newElement, IndexState: this.state.IndexState + increment });
+            this.setState({
+                ActiveState: newElement,
+                IndexState: this.state.IndexState + increment,
+            });
         }
     }
     handleClickFinish() {

package/src/View/Wizard/Interface/IAdaptableWizard.d.ts

@@ -2,6 +2,7 @@
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
+import { ModuleParams } from '../../Components/SharedProps/ModuleViewPopupProps';
 export interface AdaptableWizardStep {
     canNext(): boolean;
     canBack(): boolean;
@@ -44,4 +45,5 @@ export interface AdaptableOnePageWizardProps<T extends AdaptableObject> {
         name: string;
         label?: string;
     };
+    popupParams?: ModuleParams;
 }

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -9,7 +9,7 @@ const rebass_1 = require("rebass");
 const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash-es/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 const useProperty_1 = tslib_1.__importDefault(require("../../components/utils/useProperty"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const isMacLike_1 = require("../../Utilities/isMacLike");
@@ -191,7 +191,11 @@ exports.OnePageAdaptableWizard = (props) => {
                     React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 2, alignItems: "center", className: "ab-WizardDialog__footer ab-OnePageWizard__footer" },
                         React.createElement(SimpleButton_1.default, { tone: "neutral", variant: "text", "data-name": "close", onClick: () => { var _a; return (_a = props.onHide) === null || _a === void 0 ? void 0 : _a.call(props); }, tooltip: (_a = props.closeTooltip) !== null && _a !== void 0 ? _a : 'Close wizard', accessLevel: 'Full' }, (_b = props.closeText) !== null && _b !== void 0 ? _b : 'CLOSE'),
                         React.createElement(KeyHint_1.KeyHint, { ml: 2 }, "Esc"),
-                        React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, className: "ab-OnePageWizard__error", style: { flex: 1, color: 'var(--ab-color-error)', textAlign: 'end' } }, firstErrorMessage),
+                        React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, className: "ab-OnePageWizard__error", style: {
+                                flex: 1,
+                                color: 'var(--ab-color-error)',
+                                textAlign: 'end',
+                            } }, firstErrorMessage),
                         React.createElement(SimpleButton_1.default, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: 'Full' }, "Finish")))))));
 };
 exports.OnePageWizardSummary = () => {

package/src/agGrid/Adaptable.d.ts

@@ -129,8 +129,6 @@ export declare class Adaptable implements IAdaptable {
     private getAlertCellClass;
     private getAlertRowClass;
     private getAlertRowStyle;
-    private getFlashingCellRowStyle;
-    private getFlashingCellStyleFor;
     private getFlashingCellStyle;
     private getCellHighlightStyle;
     private getRowHighlightStyle;
@@ -167,9 +165,8 @@ export declare class Adaptable implements IAdaptable {
     private isInternallyRenderedColumn;
     getDisplayValue(id: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
-    getDisplayValueFromRowNode(row: RowNode, columnId: string): string | undefined;
-    getFormattedValueFromRawValue(rawValue: any, columnId: string): string | undefined;
-    getDisplayValueFromRawValue(columnId: string, rawValue: any, skipCellRenderers?: boolean): string | undefined;
+    getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
+    getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
     private getFormattedValue;
     private getNormalisedValueFromRowValue;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any;