@adaptabletools/adaptable 11.1.3 → 11.1.4

package/src/View/SmartEdit/SmartEditPopup.js

@@ -27,6 +27,7 @@ class SmartEditPopupComponent extends React.Component {
         this.props.onSmartEditCheckSelectedCells();
     }
     render() {
+        var _a, _b, _c;
         let col;
         if (this.props.PreviewInfo) {
             col = this.props.PreviewInfo.column;
@@ -34,7 +35,7 @@ class SmartEditPopupComponent extends React.Component {
         let globalValidationMessage = PreviewHelper_1.PreviewHelper.GetValidationMessage(this.props.PreviewInfo, `${this.props.SmartEditValue}`);
         let showPanel = this.props.PreviewInfo && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(`${this.props.SmartEditValue}`);
         let previewPanel = showPanel ? (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { style: { flex: '1 1 100%', overflow: 'initial', height: '100%' }, previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: col, showPanel: showPanel, showHeader: true })) : null;
-        let operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
+        const operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
             return {
                 label: mathOperation,
                 onClick: () => {
@@ -42,6 +43,15 @@ class SmartEditPopupComponent extends React.Component {
                 },
             };
         });
+        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+            operationMenuItems.push(...customOperations.map((operation) => {
+                return {
+                    onClick: () => this.props.onSmartEditOperationChange(operation),
+                    label: operation.Name,
+                };
+            }));
+        }
         return (React.createElement(PanelWithImage_1.PanelWithImage, { flex: 1, style: { height: '100%' }, variant: "primary", bodyProps: {
                 style: { display: 'flex', flexFlow: 'column' },
             }, bodyScroll: true, glyphicon: this.props.moduleInfo.Glyph, header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), onKeyDown: (e) => {
@@ -50,7 +60,9 @@ class SmartEditPopupComponent extends React.Component {
                 }
             } },
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 2, "data-name": "smart-edit-operation" },
-                React.createElement(DropdownButton_1.default, { items: operationMenuItems, columns: ['label'], onMouseDown: preventDefault }, Enums_1.MathOperation[this.props.MathOperation]),
+                React.createElement(DropdownButton_1.default, { items: operationMenuItems, columns: ['label'], onMouseDown: preventDefault }, typeof this.props.SmartEditOperation === 'object'
+                    ? this.props.SmartEditOperation.Name
+                    : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { value: this.props.SmartEditValue.toString(), marginLeft: 2, marginRight: 2, type: "number", placeholder: "Enter a Number", onChange: (e) => this.onSmartEditValueChange(e) }),
                 React.createElement(SimpleButton_1.default, { tone: this.getButtonStyle(), variant: "raised", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(`${this.props.SmartEditValue}`) ||
                         (this.props.PreviewInfo &&
@@ -87,7 +99,7 @@ class SmartEditPopupComponent extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         SmartEditValue: state.System.SmartEditValue,
-        MathOperation: state.System.SmartEditOperation,
+        SmartEditOperation: state.System.SmartEditOperation,
         PreviewInfo: state.System.SmartEditPreviewInfo,
     };
 }

package/src/View/SmartEdit/SmartEditViewPanel.d.ts

@@ -2,16 +2,16 @@ import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import * as React from 'react';
+import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
 export interface SmartEditViewPanelComponentProps extends ViewPanelProps {
     SmartEditValue: number | undefined;
-    MathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | undefined;
+    SmartEditOperation: SmartEditOperation | undefined;
     IsValidSelection: boolean;
     PreviewInfo: PreviewInfo;
     InPivotMode: Boolean;
     onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
-    onSmartEditOperationChange: (MathOperation: MathOperation) => SystemRedux.SmartEditChangeOperationAction;
+    onSmartEditOperationChange: (MathOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
     onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
     onRunSmartEdit: () => SmartEditRedux.SmartEditRunAction;
 }
@@ -28,7 +28,6 @@ declare class SmartEditViewPanelComponent extends React.Component<SmartEditViewP
     private onSmartEditValueChange;
     private getStatusColour;
     private onApplyClick;
-    private onchangeMathOperation;
     onApplySmartEdit(): any;
 }
 export declare let SmartEditViewPanelControl: import("react-redux").ConnectedComponent<typeof SmartEditViewPanelComponent, any>;

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -39,17 +39,27 @@ class SmartEditViewPanelComponent extends React.Component {
         (_a = this.cleanupEvent) === null || _a === void 0 ? void 0 : _a.call(this);
     }
     render() {
+        var _a, _b, _c;
         let statusColour = this.getStatusColour();
         let selectedColumn = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.SelectedColumnId)
             ? this.props.api.columnApi.getColumnFromId(this.state.SelectedColumnId)
             : null;
         let previewPanel = (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: selectedColumn, showPanel: true, showHeader: false }));
-        let operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
+        const operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
             return {
                 onClick: () => this.props.onSmartEditOperationChange(mathOperation),
                 label: mathOperation,
             };
         });
+        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+            operationMenuItems.push(...customOperations.map((operation) => {
+                return {
+                    onClick: () => this.props.onSmartEditOperationChange(operation),
+                    label: operation.Name,
+                };
+            }));
+        }
         const applyButtonStyle = {
             color: statusColour,
             fill: 'currentColor',
@@ -60,7 +70,9 @@ class SmartEditViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__SmartEdit__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null,
-                React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__SmartEdit__select`, marginRight: 2, items: operationMenuItems, style: { fontSize: 'small' }, columns: ['label'], disabled: shouldDisable, variant: "outlined" }, this.props.MathOperation),
+                React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__SmartEdit__select`, marginRight: 2, items: operationMenuItems, style: { fontSize: 'small' }, columns: ['label'], disabled: shouldDisable, variant: "outlined" }, typeof this.props.SmartEditOperation === 'object'
+                    ? this.props.SmartEditOperation.Name
+                    : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { style: {
                         width: '5rem',
                     }, className: `ab-${elementType}__SmartEdit__select-value`, value: this.props.SmartEditValue.toString(), type: "number", placeholder: "Enter a Number", step: "any", onChange: (e) => this.onSmartEditValueChange(e), disabled: shouldDisable, marginRight: 2 })),
@@ -94,9 +106,6 @@ class SmartEditViewPanelComponent extends React.Component {
     onApplyClick() {
         this.onApplySmartEdit();
     }
-    onchangeMathOperation(mathOperation) {
-        this.props.onSmartEditOperationChange(mathOperation);
-    }
     onApplySmartEdit() {
         this.props.onRunSmartEdit();
     }
@@ -104,7 +113,7 @@ class SmartEditViewPanelComponent extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         SmartEditValue: state.System.SmartEditValue,
-        MathOperation: state.System.SmartEditOperation,
+        SmartEditOperation: state.System.SmartEditOperation,
         IsValidSelection: state.System.IsValidSmartEditSelection,
         PreviewInfo: state.System.SmartEditPreviewInfo,
         InPivotMode: state.Grid.IsGridInPivotMode,

package/src/agGrid/Adaptable.d.ts

@@ -166,8 +166,8 @@ export declare class Adaptable implements IAdaptable {
         [key: string]: boolean;
     }): GridCell[];
     private addDistinctColumnValue;
-    private isInternallyRenderedColumn;
-    getDisplayValue(id: any, columnId: string): string | undefined;
+    private isCustomRenderedColumn;
+    getDisplayValue(primaryKey: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
@@ -314,7 +314,7 @@ export declare class Adaptable implements IAdaptable {
     getGridData(): any[];
     getFilteredData(): any[];
     loadDataSource(dataSource: any[]): void;
-    updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[] | null | undefined>;
+    updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     getFirstGroupedColumn(): AdaptableColumn | undefined;
@@ -330,7 +330,7 @@ export declare class Adaptable implements IAdaptable {
     showQuickFilter(): void;
     hideQuickFilter(): void;
     getAgGridColumnType(columnId: string): string | string[];
-    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): ((valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number) | undefined;
+    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number | undefined;
     getAgGridLightThemeName(): string;
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;

package/src/agGrid/Adaptable.js

@@ -57,6 +57,7 @@ const MetamodelService_1 = require("../Utilities/Services/MetamodelService");
 const DocumentationLinkConstants_1 = require("../Utilities/Constants/DocumentationLinkConstants");
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const CheckboxRenderer_1 = require("./CheckboxRenderer");
+const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
 const tinycolor = require('tinycolor2');
 all_modules_1.ModuleRegistry.registerModules(all_modules_1.AllCommunityModules);
 const GROUP_PATH_SEPARATOR = '/';
@@ -1691,27 +1692,27 @@ class Adaptable {
             return undefined;
         }
     }
-    isInternallyRenderedColumn(column) {
+    isCustomRenderedColumn(column) {
         if (!column || column.isGrouped) {
-            return true;
+            return false;
         }
-        // we need to return false if the column has a cell rendeerer i think...
+        // we need to return false if the column has a cell renderer i think...
         const colDef = this.gridOptions.api.getColumnDef(column.columnId);
         if (colDef && colDef.cellRenderer != null) {
-            return false;
+            return true;
         }
         if (this.api.columnApi.isFormatNumericStyleColumn(column)) {
-            return false;
+            return true;
         }
         if (this.api.columnApi.isBooleanColumn(column)) {
-            return false;
+            return true;
         }
-        return true;
+        return false;
     }
-    getDisplayValue(id, columnId) {
+    getDisplayValue(primaryKey, columnId) {
         let returnValue;
         if (this.useRowNodeLookUp) {
-            const rowNode = this.gridOptions.api.getRowNode(id);
+            const rowNode = this.getRowNodeForPrimaryKey(primaryKey);
             return this.getDisplayValueFromRowNode(rowNode, columnId);
         }
         else {
@@ -1719,7 +1720,7 @@ class Adaptable {
             this.gridOptions.api.getModel().forEachNode((rowNode) => {
                 if (!foundRow) {
                     const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
-                    if (id == primaryKeyValue) {
+                    if (primaryKey == primaryKeyValue) {
                         returnValue = this.getDisplayValueFromRowNode(rowNode, columnId);
                     }
                     foundRow = true;
@@ -1802,10 +1803,17 @@ class Adaptable {
         return formatterFn(params);
     }
     getNormalisedValueFromRowValue(rawValue, displayValue, column) {
+        // not sure if the current implementation is correct:
+        // the returned "normalised value" is actually the displayed value in almost all cases?!
+        // ex. how to read the following: if 'rawValue' is NOT a number, return normalised version of rawValue, but if rawValue IS a number, return displayedValue of it (which will almost certainly will NOT be a number)
+        //   if (dataType === 'Number') {
+        //     return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
+        //   }
+        // anyway, it seems to work so far (as of v11.1.3), so I'm leaving it for now :)
         if (!column) {
             return rawValue;
         }
-        const returnValue = this.isInternallyRenderedColumn(column) ? displayValue : rawValue;
+        const returnValue = this.isCustomRenderedColumn(column) ? rawValue : displayValue;
         if (returnValue === undefined || returnValue === null) {
             return rawValue;
         }
@@ -1819,13 +1827,15 @@ class Adaptable {
         if (dataType === 'Boolean') {
             return typeof rawValue !== 'boolean' ? Boolean(rawValue) : returnValue;
         }
-        // Do not normalize dates to Date type
-        // - breaks when rendering in filter-form
-        // - breaks quick-search; the Date is transformed to string;
-        // -- an incorrect comparison is made (new Date().toString).incudes('query)
+        if (dataType === 'Date') {
+            return rawValue instanceof Date ? rawValue : DateHelper_1.parseDateValue(rawValue);
+        }
         return returnValue;
     }
     getRawValueFromRowNode(rowNode, columnId) {
+        if (rowNode == null) {
+            return undefined;
+        }
         return this.gridOptions.api.getValue(columnId, rowNode);
     }
     getDataRowFromRowNode(rowNode) {

package/src/metamodel/adaptable.metamodel.js

@@ -4287,7 +4287,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "buttonsLocation",
                 "kind": "unknown",
-                "description": "Position in the Dashboard to show the Module and Custom Buttons",
+                "description": "Where in Dashboard to display Module and Custom Buttons",
                 "uiLabel": "Buttons Location",
                 "isOptional": true,
                 "defaultValue": "'right'"

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.1.3";
+declare const _default: "11.1.4";
 export default _default;

package/version.js

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

package/src/View/Export/ExportCustomDestinationDialog.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="react" />
-import { CustomDestination } from '../../AdaptableOptions/ExportOptions';
-import { Report } from '../../PredefinedConfig/ExportState';
-interface ExportCustomDestinationDialogProps {
-    report: Report;
-    customDestination: CustomDestination;
-    isOpen: boolean;
-    onDismiss: () => void;
-}
-export declare function ExportCustomDestinationDialog({ report, customDestination, isOpen, onDismiss, }: ExportCustomDestinationDialogProps): JSX.Element;
-export {};

package/src/View/Export/ExportCustomDestinationDialog.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportCustomDestinationDialog = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const AdaptableForm_1 = require("../../PredefinedConfig/Common/AdaptableForm");
-const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
-const AdaptableFormComponent_1 = require("../../components/AdaptableFormComponent");
-const AdaptableContext_1 = require("../AdaptableContext");
-function ExportCustomDestinationDialog({ report, customDestination, 
-//onSubmit,
-isOpen, onDismiss, }) {
-    const [data, setData] = React.useState({});
-    const adaptable = AdaptableContext_1.useAdaptable();
-    const context = React.useMemo(() => {
-        return {
-            adaptableApi: adaptable.api,
-            report,
-            reportData: undefined,
-            customDestination,
-            formData: data,
-        };
-    }, [data]);
-    const formDef = customDestination === null || customDestination === void 0 ? void 0 : customDestination.form;
-    React.useEffect(() => {
-        if (formDef) {
-            setData(Object.assign(Object.assign({}, AdaptableForm_1.getDefaultAdaptableFormData(formDef)), data));
-        }
-    }, [formDef]);
-    return (React.createElement(Dialog_1.default, { isOpen: isOpen, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400 }, onDismiss: () => {
-            onDismiss();
-        } }, isOpen && (React.createElement(rebass_1.Box, { padding: 4 },
-        React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { formDef: formDef, data: data, context: context, onChange: setData, api: adaptable.api, displayTitle: true, onButtonClick: (button) => {
-                onDismiss();
-                // we want to give the current popup time to close
-                // and we reopen with a delay in case this button action causes another popup
-                setTimeout(() => {
-                    var _a;
-                    context.reportData = adaptable.api.internalApi
-                        .getReportService()
-                        .getReportData(report);
-                    (_a = button.onClick) === null || _a === void 0 ? void 0 : _a.call(button, button, context);
-                }, 20);
-            } })))));
-}
-exports.ExportCustomDestinationDialog = ExportCustomDestinationDialog;

package/src/View/Export/ExportCustomDestinationFormPopups.d.ts

@@ -1,5 +0,0 @@
-import * as React from 'react';
-import { AdaptableApi } from '../../types';
-export declare const ExportCustomDestinationFormPopups: React.FunctionComponent<{
-    api: AdaptableApi;
-}>;

package/src/View/Export/ExportCustomDestinationFormPopups.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportCustomDestinationFormPopups = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const ExportCustomDestinationDialog_1 = require("./ExportCustomDestinationDialog");
-exports.ExportCustomDestinationFormPopups = (props) => {
-    var _a;
-    const dispatch = react_redux_1.useDispatch();
-    const customDestinationPopups = react_redux_1.useSelector(SystemRedux.getSystemExportCustomDestinationPopups);
-    const handleDismiss = React.useCallback((config) => dispatch(SystemRedux.SystemExportCustomDestinationPopupHide(config)), []);
-    return (React.createElement(React.Fragment, null, (_a = (customDestinationPopups || [])) === null || _a === void 0 ? void 0 : _a.map((customDestinationPopup) => customDestinationPopup && (React.createElement(ExportCustomDestinationDialog_1.ExportCustomDestinationDialog, { isOpen: true, key: `${customDestinationPopup.ReportName}-${customDestinationPopup.ExportDestination.name}`, report: props.api.exportApi.getReportByName(customDestinationPopup.ReportName), customDestination: customDestinationPopup.ExportDestination, onDismiss: () => handleDismiss(customDestinationPopup) })))));
-};