@adaptabletools/adaptable 18.1.2 → 18.1.4-canary.0

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

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Box, Flex } from 'rebass';
+import { CheckBox } from '../../../../components/CheckBox';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import Panel from '../../../../components/Panel';
 import { Select } from '../../../../components/Select';
@@ -9,12 +10,13 @@ import { Tag } from '../../../../components/Tag';
 import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
+import { aggregatedExpressionFunctions } from '../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
+import { SuspendToggleButton } from '../../../Components/Buttons/SuspendToggleButton';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
-import { SuspendToggleButton } from '../../../Components/Buttons/SuspendToggleButton';
 export const areSummaryRowsValid = (layout) => {
     var _a;
     if (!layout.RowSummaries)
@@ -31,22 +33,37 @@ export const areSummaryRowsValid = (layout) => {
     });
     return valid;
 };
+const availableExpressionsForColumnTypeCache = new Map();
 const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
-    const inputType = mapColumnDataTypeToExpressionFunctionType(columnType);
-    return summarySupportedExpressions
-        .filter((expression) => availableScalarExpressions[expression])
+    const key = columnType;
+    if (availableExpressionsForColumnTypeCache.has(key)) {
+        return availableExpressionsForColumnTypeCache.get(key);
+    }
+    const columnInputType = mapColumnDataTypeToExpressionFunctionType(columnType);
+    const expressions = Object.keys(availableScalarExpressions)
+        .filter((availableExpression) => {
+        if (!aggregatedExpressionFunctions.includes(availableExpression)) {
+            // is custom
+            return true;
+        }
+        return Boolean(summarySupportedExpressions.includes(availableExpression));
+    })
         .map((expression) => {
         var _a, _b;
         const expressionDef = availableScalarExpressions[expression];
         let firstArg = null;
+        // filter out expressions without inputs defined
+        if (!(expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs)) {
+            return null;
+        }
         if (Array.isArray((_a = expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs) === null || _a === void 0 ? void 0 : _a[0])) {
             // @ts-ignore
-            firstArg = (_b = expressionDef.inputs.find((input) => input.includes(inputType))) === null || _b === void 0 ? void 0 : _b[0];
+            firstArg = (_b = expressionDef.inputs.find((input) => input.includes(columnInputType))) === null || _b === void 0 ? void 0 : _b[0];
         }
         else {
             firstArg = expressionDef.inputs[0];
         }
-        if (inputType === firstArg) {
+        if (columnInputType === firstArg) {
             return expression;
         }
         else {
@@ -54,6 +71,8 @@ const getAvailableExpressionsForColumnType = (columnType, availableScalarExpress
         }
     })
         .filter(Boolean);
+    availableExpressionsForColumnTypeCache.set(key, expressions);
+    return expressions;
 };
 export const RowGroupingSectionSummary = () => {
     var _a;
@@ -61,7 +80,8 @@ export const RowGroupingSectionSummary = () => {
     const { data: layout } = useOnePageAdaptableWizardContext();
     return (React.createElement(Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag, null, "No Row Grouping"))));
 };
-const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, onDelete, }) => {
+const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpressions, onDelete, }) => {
+    var _a;
     const { data: layout } = useOnePageAdaptableWizardContext();
     const adaptable = useAdaptable();
     const columns = React.useMemo(() => {
@@ -102,7 +122,11 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
                         },
                     ], value: rowSummary.Position, onChange: (position) => {
                         onChange(Object.assign(Object.assign({}, rowSummary), { Position: position }));
-                    } }))),
+                    } })),
+            React.createElement(FormRow, { label: "" },
+                React.createElement(CheckBox, { checked: (_a = rowSummary.IncludeOnlyFilteredRows) !== null && _a !== void 0 ? _a : true, onChange: (IncludeOnlyFilteredRows) => {
+                        onChange(Object.assign(Object.assign({}, rowSummary), { IncludeOnlyFilteredRows }));
+                    } }, "Include Only Filtered Rows"))),
         React.createElement(Flex, { flexDirection: 'column', mt: 2, mb: 1 },
             React.createElement(Flex, { alignItems: "center", flex: 1, mb: 2 }, "Column Aggregations"),
             React.createElement(Panel, { bodyProps: { maxHeight: '100%' }, style: { height: 360 } },
@@ -120,7 +144,9 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
                         }));
                         // check out if this layout has a aggregation with wighted column
                         const aggregation = (_c = layout.AggregationColumns) === null || _c === void 0 ? void 0 : _c[column.columnId];
-                        if (aggregation && typeof aggregation === 'object' && aggregation.weightedColumnId) {
+                        if (aggregation &&
+                            typeof aggregation === 'object' &&
+                            aggregation.weightedColumnId) {
                             expressionOptions.push({
                                 label: 'WEIGHTERD_AVG',
                                 value: WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
@@ -140,15 +166,16 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
                         });
                         onChange(Object.assign(Object.assign({}, rowSummary), { ColumnsMap: newColumnsMap }));
                     } })))));
-};
+});
 export const RowSummarySection = (props) => {
     var _a;
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const availableScalarExpressions = React.useMemo(() => {
-        return adaptable.api.internalApi
+        const sytemExpressions = adaptable.api.internalApi
             .getQueryLanguageService()
             .getModuleExpressionFunctionsMap(LayoutModuleId).aggregatedScalarFunctions;
+        return sytemExpressions;
     }, []);
     return (React.createElement(Tabs, { style: { height: '100%' } },
         React.createElement(Tabs.Tab, null, "Row Summaries"),
@@ -163,6 +190,7 @@ export const RowSummarySection = (props) => {
                                     {
                                         Position: 'Top',
                                         ColumnsMap: {},
+                                        IncludeOnlyFilteredRows: true,
                                     },
                                 ] }));
                         }, icon: "plus" }, "Add Row Summary")),

package/src/View/Note/NoteEditor.js

@@ -1,7 +1,12 @@
 import throttle from 'lodash/throttle';
 import * as React from 'react';
 import Textarea from '../../components/Textarea';
+import SimpleButton from '../../components/SimpleButton';
+import { useAdaptable } from '../AdaptableContext';
 export const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }) => {
+    var _a, _b;
+    const { api } = useAdaptable();
+    const showPopupCloseButton = (_b = (_a = api.optionsApi.getNoteOptions()) === null || _a === void 0 ? void 0 : _a.showPopupCloseButton) !== null && _b !== void 0 ? _b : true;
     const textAreaRef = React.useRef(null);
     const [liveValue, setLiveValue] = React.useState(note || '');
     const throttledOnChange = React.useMemo(() => {
@@ -20,9 +25,11 @@ export const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }
     if (note === undefined || note === null) {
         return null;
     }
-    return (React.createElement(Textarea, { readOnly: isReadonly, ref: textAreaRef, width: "100%", minWidth: 180, minHeight: 120, value: liveValue, onBlur: () => onClose(), onKeyDown: (event) => {
-            if (event.key === 'Escape') {
-                onClose();
-            }
-        }, onChange: (event) => throttledOnChange(event.target.value) }));
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Textarea, { readOnly: isReadonly, ref: textAreaRef, width: "100%", minWidth: 180, minHeight: 120, style: { paddingRight: showPopupCloseButton ? 30 : 0 }, value: liveValue, onBlur: () => onClose(), onKeyDown: (event) => {
+                if (event.key === 'Escape') {
+                    onClose();
+                }
+            }, onChange: (event) => throttledOnChange(event.target.value) }),
+        showPopupCloseButton && (React.createElement(SimpleButton, { variant: "text", style: { position: 'absolute', right: 5, top: 5 }, icon: "close" }))));
 };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -2,7 +2,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType } from '@ag-grid-community/core';
 import { AdaptableLogger } from './AdaptableLogger';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { DistinctColumnValuesParams, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
@@ -25,7 +25,7 @@ import { AgGridMenuAdapter } from './AgGridMenuAdapter';
 import { AdaptableColumn, AdaptableTheme, ChartDefinition, ColumnSort, DataUpdateConfig, GridCell, Layout, ReportData, SelectedCellInfo, SelectedRowInfo } from '../types';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
-import { AdaptableVariant, AgGridColumnAdapter } from './AgGridColumnAdapter';
+import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
 export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
@@ -257,7 +257,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): void;
-    getAgGridRowModelType(): RowModelType;
+    getAgGridRowModelType(gridOptions?: GridOptions): RowModelType;
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;

package/src/agGrid/AdaptableAgGrid.js

@@ -78,7 +78,7 @@ import { AdaptableApp } from '../View/AdaptableView';
 import { renderReactRoot as defaultRenderReactRoot } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { parseDateValue } from '../Utilities/Helpers/DateHelper';
-import { AgGridColumnAdapter, getEditorsForColumnTypes, } from './AgGridColumnAdapter';
+import { AgGridColumnAdapter, getEditorsForColumnTypes } from './AgGridColumnAdapter';
 import uniqBy from 'lodash/uniqBy';
 import getScrollbarSize from '../Utilities/getScrollbarSize';
 import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../PredefinedConfig/Common/AggregationColumns';
@@ -719,7 +719,8 @@ export class AdaptableAgGrid {
          */
         // Build the default group sort comparator - will get custom sort values (but not functions) in real time
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
-        if (this.adaptableOptions.groupingOptions.autoOrderGroupedColumns) {
+        if (this.getAgGridRowModelType(gridOptions) === 'clientSide' &&
+            this.adaptableOptions.groupingOptions.autoOrderGroupedColumns) {
             this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'initialGroupOrderComparator', (original_initialGroupOrderComparator) => {
                 if (original_initialGroupOrderComparator) {
                     return original_initialGroupOrderComparator;
@@ -2467,11 +2468,14 @@ export class AdaptableAgGrid {
             }
         });
     }
-    getAgGridRowModelType() {
-        var _a;
+    getAgGridRowModelType(gridOptions) {
         // it seems that this can be null so we need explicitly to return "clientSide" in this case
         // need to check that for ServerSideRowModel it is ALWAYS returned...
-        return (_a = this.agGridAdapter.getAgGridApi().getGridOption('rowModelType')) !== null && _a !== void 0 ? _a : 'clientSide';
+        var _a, _b;
+        if (gridOptions) {
+            return (_a = gridOptions.rowModelType) !== null && _a !== void 0 ? _a : 'clientSide';
+        }
+        return (_b = this.agGridAdapter.getAgGridApi().getGridOption('rowModelType')) !== null && _b !== void 0 ? _b : 'clientSide';
     }
     getAllRowNodes(config) {
         let rowNodes = [];

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { ColumnSetupInfo } from './ColumnSetupInfo';
 import { ColDef, Column } from '@ag-grid-community/core';
-export type AdaptableVariant = 'vanilla' | 'react' | 'angular';
+import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
 export declare function getEditorsForColumnTypes(variant: AdaptableVariant): Record<string, ColDef['cellEditor']>;
 export declare class AgGridColumnAdapter {
     private adaptableInstance;

package/src/agGrid/defaultAdaptableOptions.js

@@ -322,6 +322,12 @@ const DefaultAdaptableOptions = {
             intents: {},
         },
     },
+    commentOptions: {
+        showPopupCloseButton: true,
+    },
+    noteOptions: {
+        showPopupCloseButton: true,
+    },
 };
 export function applyDefaultAdaptableOptions(adaptableOptions) {
     var _a;

package/src/components/ExpressionEditor/ExpressionPreview.js

@@ -11,10 +11,16 @@ export const ExpressionPreview = (props) => {
     // '[Column Name] > 2' => ['[Column Name]', '>', '2']
     // not the prettiest
     const strWithMarkedGroupes = expressionWithFriendlyNames.replace(/\]/gi, '],').split(',');
-    return (React.createElement(React.Fragment, null, strWithMarkedGroupes.map((part, index) => {
-        const partEl = part.includes('[') ? React.createElement("i", null, part.replace(/[\[\]]/g, '')) : part;
-        return React.createElement(React.Fragment, { key: index },
-            "\u00A0",
-            partEl);
-    })));
+    return (
+        /**
+         * The etra wrapper is neede because the tag has display inline-flex and makes the content inside <i> to be displayed on
+         * multiple lines when the expression is too long.
+         *
+         * The div allows the text to flow normally.
+         */
+        (React.createElement("div", null, strWithMarkedGroupes.map((part, index) => {
+            const partEl = part.includes('[') ? React.createElement("i", null, part.replace(/[\[\]]/g, '')) : part;
+            return React.createElement(React.Fragment, { key: index }, partEl);
+        })))
+    );
 };

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js

@@ -39,8 +39,20 @@ export const PrimitiveColumnOrFieldSelector = (props) => {
             } }));
     }
     const typeOptions = [
-        { label: 'Column', value: 'column', icon: 'grid' },
-        { label: 'Field', value: 'field', icon: 'column-outline' },
+        {
+            label: (React.createElement(Flex, { alignItems: "center" },
+                React.createElement(Icon, { name: "grid" }),
+                React.createElement(Text, { ml: 2 }, "Column"))),
+            value: 'column',
+            icon: 'grid',
+        },
+        {
+            label: (React.createElement(Flex, { alignItems: "center" },
+                React.createElement(Icon, { name: "column-outline" }),
+                React.createElement(Text, { ml: 2 }, "Field"))),
+            value: 'field',
+            icon: 'column-outline',
+        },
     ];
     return !hasFieldsOrValueIsField || props.hideFields ? (React.createElement(Box, null, input)) : (React.createElement(InputGroup, { Component: Flex, "data-id": "query-first-arg-wrapper" },
         React.createElement(Select, { renderSingleValue: (value) => {
@@ -130,14 +142,14 @@ export const PrimiteValueInput = (props) => {
     }
     const options = [
         {
-            label: (React.createElement(Flex, null,
+            label: (React.createElement(Flex, { alignItems: "center" },
                 React.createElement(Icon, { name: "columns" }),
                 React.createElement(Text, { ml: 2 }, "Column"))),
             icon: 'columns',
             value: 'column-name',
         },
         {
-            label: (React.createElement(Flex, null,
+            label: (React.createElement(Flex, { alignItems: "center" },
                 React.createElement(Icon, { name: "edit" }),
                 React.createElement(Text, { ml: 2 }, "Value"))),
             icon: 'edit',
@@ -146,7 +158,7 @@ export const PrimiteValueInput = (props) => {
     ];
     if (hasFieldsOrValueIsField || type === 'field') {
         options.push({
-            label: (React.createElement(Flex, null,
+            label: (React.createElement(Flex, { alignItems: "center" },
                 React.createElement(Icon, { name: "column-outline" }),
                 React.createElement(Text, { ml: 2 }, "Field"))),
             icon: 'column-outline',

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1718367349733 || Date.now(),
-    VERSION: "18.1.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1718815651314 || Date.now(),
+    VERSION: "18.1.4-canary.0" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -4354,6 +4354,24 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    ProgressIndicatorConfig: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
+    };
     QueryableColumnContext: {
         name: string;
         kind: string;
@@ -4727,6 +4745,12 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt?: undefined;
             ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;