@adaptabletools/adaptable 15.0.3-canary.0 → 15.1.0-canary.0

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -21,6 +21,14 @@ const dateUtils_1 = require("./dateUtils");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const src_1 = require("../../parser/src");
+// useful for unary operators which expect a list of arguments
+// we extract the provided array elements into a list
+const flattenArguments = (values) => {
+    if (!Array.isArray(values)) {
+        return values;
+    }
+    return values.flat(Infinity);
+};
 const sanitizeArguments = (values, allowNaN) => {
     return values.filter((value) => value != undefined && value != null && value !== '' && (allowNaN || !isNaN(value)));
 };
@@ -113,7 +121,7 @@ exports.scalarExpressionFunctions = {
     },
     COALESCE: {
         handler(args) {
-            return args.find((arg) => !(arg === null || arg === undefined));
+            return flattenArguments(args).find((arg) => !(arg === null || arg === undefined));
         },
         description: 'Returns the first argument which is not null',
         signatures: ['COALESCE(value, value, ...value)'],
@@ -121,6 +129,16 @@ exports.scalarExpressionFunctions = {
         category: 'special',
         returnType: 'string',
     },
+    NULL: {
+        handler: () => {
+            return null;
+        },
+        description: 'Returns the NULL literal which represents the intentional absence of any object value',
+        category: 'special',
+        returnType: 'null',
+        signatures: ['NULL'],
+        examples: ['[status] = "accepted" ? 100 : NULL'],
+    },
     IS_BLANK: {
         handler(args) {
             return args[0] === undefined || args[0] === null || args[0] === '';
@@ -131,6 +149,85 @@ exports.scalarExpressionFunctions = {
         examples: ['IS_BLANK([col1])'],
         returnType: 'boolean',
     },
+    ABS: {
+        handler(args) {
+            return sanitizeNumericResult(Math.abs(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the absolute value of the given number',
+        signatures: ['ABS(a: number)'],
+        examples: ['ABS([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    CEILING: {
+        handler(args) {
+            return sanitizeNumericResult(Math.ceil(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the smaller integer greater than or equal to the given number',
+        signatures: ['CEILING(a: number)'],
+        examples: ['CEILING([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    FLOOR: {
+        handler(args) {
+            return sanitizeNumericResult(Math.floor(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the largest integer less than or equal to the given number',
+        signatures: ['FLOOR(a: number)'],
+        examples: ['FLOOR([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    ROUND: {
+        handler(args) {
+            return sanitizeNumericResult(Math.round(args[0]));
+        },
+        isHiddenFromMenu: true,
+        description: 'Returns the value of the given number rounded to the nearest integer',
+        signatures: ['ROUND(a: number)'],
+        examples: ['ROUND([columnName])'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    MIN: {
+        handler(args) {
+            return Math.min(...sanitizeArguments(flattenArguments(args)));
+        },
+        description: 'Returns the smallest of given numbers',
+        signatures: ['MIN(number, number, ...number)'],
+        examples: ['MIN([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    MAX: {
+        handler(args) {
+            return Math.max(...sanitizeArguments(flattenArguments(args)));
+        },
+        description: 'Returns the highest of given numbers',
+        signatures: ['MAX(number, number, ...number)'],
+        examples: ['MAX([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
+    AVG: {
+        handler(args) {
+            const sanitizedArguments = sanitizeArguments(flattenArguments(args));
+            if (args.length && !sanitizedArguments.length) {
+                // expression is syntactically valid, but operates with incompatible values
+                return;
+            }
+            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+        },
+        description: 'Returns the average of inputted numbers',
+        signatures: ['AVG(number, number, ...number)'],
+        examples: ['AVG([col1], 5)'],
+        category: 'maths',
+        returnType: 'number',
+    },
     ADD: {
         handler(args) {
             const sanitizedArguments = sanitizeArguments(args, true);
@@ -196,17 +293,6 @@ exports.scalarExpressionFunctions = {
         category: 'maths',
         returnType: 'number',
     },
-    POW: {
-        handler(args) {
-            return sanitizeNumericResult(Math.pow(args[0], args[1]));
-        },
-        isHiddenFromMenu: true,
-        description: 'Returns the pow of 2 numbers',
-        signatures: ['number ^ number', 'POW(a: number, b: number)'],
-        examples: ['[col1] ^ 5', 'POW([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
     IF: {
         handler(args) {
             return args[0] ? args[1] : args[2];
@@ -255,38 +341,14 @@ exports.scalarExpressionFunctions = {
         category: 'conditional',
         returnType: 'any',
     },
-    MIN: {
-        handler(args) {
-            return Math.min(...sanitizeArguments(args));
-        },
-        description: 'Returns the smallest of inputted numbers',
-        signatures: ['MIN(number, number, ...number)'],
-        examples: ['MIN([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
-    MAX: {
-        handler(args) {
-            return Math.max(...sanitizeArguments(args));
-        },
-        description: 'Returns the highest of inputted numbers',
-        signatures: ['MAX(number, number, ...number)'],
-        examples: ['MAX([col1], 5)'],
-        category: 'maths',
-        returnType: 'number',
-    },
-    AVG: {
+    POW: {
         handler(args) {
-            const sanitizedArguments = sanitizeArguments(args);
-            if (args.length && !sanitizedArguments.length) {
-                // expression is syntactically valid, but operates with incompatible values
-                return;
-            }
-            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+            return sanitizeNumericResult(Math.pow(args[0], args[1]));
         },
-        description: 'Returns the average of inputted numbers',
-        signatures: ['AVG(number, number, ...number)'],
-        examples: ['AVG([col1], 5)'],
+        isHiddenFromMenu: true,
+        description: 'Returns the pow of 2 numbers',
+        signatures: ['number ^ number', 'POW(a: number, b: number)'],
+        examples: ['[col1] ^ 5', 'POW([col1], 5)'],
         category: 'maths',
         returnType: 'number',
     },

package/src/Utilities/Extensions/NumberExtensions.d.ts

@@ -1,5 +1,7 @@
 export declare function abbreviateNumber(numberToAbbreviate: number): string;
+export declare function WrapInParentheses(numberToWrap: number): string;
 export declare const NumberExtensions: {
     abbreviateNumber: typeof abbreviateNumber;
+    WrapInParentheses: typeof WrapInParentheses;
 };
 export default NumberExtensions;

package/src/Utilities/Extensions/NumberExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberExtensions = exports.abbreviateNumber = void 0;
+exports.NumberExtensions = exports.WrapInParentheses = exports.abbreviateNumber = void 0;
 function abbreviateNumber(numberToAbbreviate) {
     let str = '';
     if (numberToAbbreviate >= 1000000000) {
@@ -18,7 +18,12 @@ function abbreviateNumber(numberToAbbreviate) {
     return str;
 }
 exports.abbreviateNumber = abbreviateNumber;
+function WrapInParentheses(numberToWrap) {
+    return ' (' + numberToWrap + ')';
+}
+exports.WrapInParentheses = WrapInParentheses;
 exports.NumberExtensions = {
     abbreviateNumber,
+    WrapInParentheses,
 };
 exports.default = exports.NumberExtensions;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.d.ts

@@ -25,6 +25,7 @@ export declare const AdaptableObjectListItemView: React.FunctionComponent<{
     suspendedEnabled?: boolean;
     teamSharingActivated?: boolean;
     disableDeleteConfirmation?: boolean;
+    module: IModule;
 }>;
 interface AdaptableObjectListItemProps {
     data: AdaptableObjectView;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -56,9 +56,16 @@ const AdaptableObjectListItemView = (props) => {
                     typeof tag.view === 'function'
                         ? React.createElement(tag.view, {
                             data: props.abObject,
+                            module: props.module,
                         })
                         : tag.view,
-                    Boolean((tag === null || tag === void 0 ? void 0 : tag.values) && ((_a = tag === null || tag === void 0 ? void 0 : tag.values) === null || _a === void 0 ? void 0 : _a.length)) && (React.createElement(ValueSelector_1.ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })))));
+                    Boolean((tag === null || tag === void 0 ? void 0 : tag.values) && ((_a = tag === null || tag === void 0 ? void 0 : tag.values) === null || _a === void 0 ? void 0 : _a.length)) && (React.createElement(ValueSelector_1.ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })),
+                    typeof tag.viewAfter === 'function'
+                        ? React.createElement(tag.viewAfter, {
+                            data: props.abObject,
+                            module: props.module,
+                        })
+                        : tag.viewAfter)));
         })),
         props.showActions && (React.createElement(rebass_1.Flex, { flexDirection: "column", className: `${baseClassName}__buttons` },
             React.createElement(rebass_1.Flex, { justifyContent: "end" },
@@ -121,7 +128,7 @@ const AdaptableObjectListItem = (props) => {
     const disableDeleteConfirmationState = (0, react_redux_1.useSelector)((adaptableState) => SystemRedux.SystemDisableDeleteConfirmationSelector(adaptableState.System));
     const disableDeleteConfirmation = disableDeleteConfirmationState || ((_h = adaptableOpttions === null || adaptableOpttions === void 0 ? void 0 : adaptableOpttions.generalOptions) === null || _h === void 0 ? void 0 : _h.disableDeleteConfirmation);
     return (React.createElement(React.Fragment, null,
-        React.createElement(exports.AdaptableObjectListItemView, { disableDeleteConfirmation: disableDeleteConfirmation, abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
+        React.createElement(exports.AdaptableObjectListItemView, { module: props.module, disableDeleteConfirmation: disableDeleteConfirmation, abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
         isEditWizardVisible && EditWizard && (React.createElement(EditWizard, { defaultCurrentSectionName: wizardStepName, moduleInfo: props.module.moduleInfo, data: props.data.abObject, configEntities: null, onCloseWizard: handleCloseWizard, onFinishWizard: handleCloseWizard }))));
 };
 exports.AdaptableObjectListItem = AdaptableObjectListItem;

package/src/View/Layout/Wizard/sections/FilterSection.js

@@ -78,7 +78,7 @@ const FilterSection = (props) => {
                         view: (React.createElement(PredicateEditor_1.PredicateEditor, { columnId: columnFilter.ColumnId, predicate: columnFilter.Predicate, predicateDefs: predicateDefs, onChange: (predicate) => handlePredicateEdit(predicate, columnFilter), onClear: () => handlePredicateEdit(null, columnFilter) })),
                     },
                 ];
-                return (React.createElement(AdaptableObjectList_1.AdaptableObjectListItemView, { abObject: columnFilter, entityType: "Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter), key: columnFilter.ColumnId }));
+                return (React.createElement(AdaptableObjectList_1.AdaptableObjectListItemView, { module: filterModule, abObject: columnFilter, entityType: "Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter), key: columnFilter.ColumnId }));
             }))))));
 };
 exports.FilterSection = FilterSection;

package/src/View/TeamSharing/SharedEntityObjectView.d.ts

@@ -1,9 +1,12 @@
+/// <reference types="node" />
 import * as React from 'react';
 import { AdaptableSharedEntity } from '../../../types';
+import { IModule } from '../../Strategy/Interface/IModule';
 export declare const SharedEntityTypeItemView: React.FunctionComponent<{
     data: AdaptableSharedEntity;
 }>;
 export declare const getSharedEntityActiveStatusObjectView: (isDependency: boolean) => (props: {
     data: AdaptableSharedEntity;
+    module?: IModule;
 }) => JSX.Element;
 export declare const getSharedEntityStaleDepsItemView: (staleDependencies: AdaptableSharedEntity[]) => () => JSX.Element;

package/src/View/Theme/ThemePopup.d.ts

@@ -11,7 +11,7 @@ interface ThemePopupProps extends ModuleViewPopupProps<ThemePopupComponent> {
 declare class ThemePopupComponent extends React.Component<ThemePopupProps, {}> {
     render(): JSX.Element;
     onChangeTheme(value: string): void;
-    handleCreateNewTheme: () => void;
+    handleCreateNewTheme: (variant: 'dark' | 'light') => void;
 }
 export declare let ThemePopup: import("react-redux").ConnectedComponent<typeof ThemePopupComponent, any>;
 export {};

package/src/View/Theme/ThemePopup.js

@@ -10,13 +10,13 @@ const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout")
 const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
 const ThemeEditor_1 = require("./ThemeEditor");
 const rebass_1 = require("rebass");
-const ButtonNew_1 = require("../Components/Buttons/ButtonNew");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const icons_1 = require("../../components/icons");
 class ThemePopupComponent extends React.Component {
     constructor() {
         super(...arguments);
-        this.handleCreateNewTheme = () => {
+        this.handleCreateNewTheme = (variant) => {
             let nthItem = this.props.UserThemes.length + 1;
             let name = 'Custom-Theme-' + nthItem;
             // make sure it is unique
@@ -25,6 +25,7 @@ class ThemePopupComponent extends React.Component {
                 name = 'Custom-Theme-' + nthItem;
             }
             const newTheme = ObjectFactory_1.default.CreateEmptyTheme(name);
+            newTheme.Variant = variant;
             this.props.api.themeApi.addUserTheme(newTheme);
             this.props.api.themeApi.loadTheme(newTheme.Name);
         };
@@ -50,11 +51,24 @@ class ThemePopupComponent extends React.Component {
         const isCustomTheme = this.props.api.themeApi
             .getUserThemes()
             .some((theme) => theme.Name === this.props.CurrentTheme);
+        const disabled = this.props.accessLevel === 'ReadOnly';
+        const newButton = (React.createElement(DropdownButton_1.default, { ml: 2, disabled: disabled, tone: "accent", variant: "raised", columns: ['label'], items: [
+                {
+                    label: 'Dark',
+                    onClick: () => this.handleCreateNewTheme('dark'),
+                },
+                {
+                    label: 'Light',
+                    onClick: () => this.handleCreateNewTheme('light'),
+                },
+            ] },
+            React.createElement(icons_1.Icon, { name: "plus" }),
+            " New"));
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), button: React.createElement(React.Fragment, null,
                 !this.props.hideShowInWindow && (React.createElement(SimpleButton_1.default, { icon: "open-in-new", onClick: () => {
                         this.props.api.themeApi.internalApi.openInWindow();
                     } })),
-                React.createElement(ButtonNew_1.ButtonNew, { ml: 2, onClick: this.handleCreateNewTheme, accessLevel: this.props.accessLevel })) },
+                newButton) },
             React.createElement(FormLayout_1.default, null,
                 React.createElement(FormLayout_1.FormRow, { label: "Current Theme:" },
                     React.createElement(DropdownButton_1.default, { "data-name": "select-theme-dropdown", columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription))),

package/src/agGrid/Adaptable.d.ts

@@ -196,6 +196,7 @@ export declare class Adaptable implements IAdaptable {
     setCellValue(cellDataChangedInfo: CellDataChangedInfo): void;
     cancelEdit(): void;
     isCellEditable(rowNode: IRowNode, column: Column): boolean;
+    getGridCellsForColumn(columnId: string): GridCell[] | undefined;
     getDistinctValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: IRowNode, permittedValues?: any[]): GridCell[];
     getDistinctFilterValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, filter: string, skipRowNode?: IRowNode): Promise<{
         suppressClientSideFilter?: boolean;
@@ -347,7 +348,6 @@ export declare class Adaptable implements IAdaptable {
     setDataSource(dataSource: any[]): void;
     getGridData(): any[];
     getFilteredData(): any[];
-    loadDataSource(dataSource: any[]): void;
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;

package/src/agGrid/Adaptable.js

@@ -1215,7 +1215,10 @@ class Adaptable {
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
-        if (!params.node || params.node.group) {
+        if (!params.node) {
+            return false;
+        }
+        if (!this.api.optionsApi.getSearchOptions().runQuickSearchOnRowGroups && params.node.group) {
             return false;
         }
         let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
@@ -1550,6 +1553,11 @@ class Adaptable {
     updateLayoutFromGrid() {
         var _a, _b;
         const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (currentLayout.IsReadOnly) {
+            // reaply the layout so the grid is reverted
+            this.setLayout();
+            return;
+        }
         const layout = Object.assign({}, currentLayout);
         let columnOrder = [];
         const columnFlexes = {};
@@ -1766,6 +1774,16 @@ class Adaptable {
         // it's safe to rely on the AG Grid implementation because we override the colDef.editable property, which is in this case the single source of truth
         return column === null || column === void 0 ? void 0 : column.isCellEditable(rowNode);
     }
+    getGridCellsForColumn(columnId) {
+        let returnValues = [];
+        this.gridOptions.api.forEachNode((rowNode) => {
+            const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
+            if (gridCell && gridCell.rawValue != undefined) {
+                returnValues.push(gridCell);
+            }
+        });
+        return returnValues;
+    }
     getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, permittedValues) {
         let returnValues = [];
         // this function does NOT look up for server values but actually it should...
@@ -2173,7 +2191,6 @@ class Adaptable {
         this.redrawRows([rowNode]);
     }
     redrawRows(rowNodes) {
-        // RedrawRowsParams
         const redrawRowsParams = {
             rowNodes,
         };
@@ -4100,12 +4117,6 @@ class Adaptable {
         });
         return data;
     }
-    loadDataSource(dataSource) {
-        if (this.hasAutogeneratedPrimaryKey()) {
-            this.addSyntheticPrimaryKey(dataSource);
-        }
-        this.setDataSource(dataSource);
-    }
     updateRows(dataRows, dataUpdateConfig) {
         if (this.hasAutogeneratedPrimaryKey()) {
             this.addSyntheticPrimaryKeyIfMissing(dataRows);