@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/View/GridFilter/GridFilterViewPanel.js

@@ -49,7 +49,7 @@ const QueryViewPanelComponent = (props) => {
                         paddingTop: 6,
                         overflow: 'hidden',
                         zIndex: 100,
-                    }, placehoder: "Grid Filter", onChange: (x) => setExpression(x.target.value), value: expression })),
+                    }, placeholder: "Grid Filter", onChange: (x) => setExpression(x.target.value), value: expression })),
             isExpressionValid && (React.createElement(ButtonPlay, { onClick: () => runQuery(), tooltip: '', accessLevel: gridFilterAccessLevel, variant: "text", tone: "neutral", disabled: disabled || expression == '' || expression == (gridFilter === null || gridFilter === void 0 ? void 0 : gridFilter.Expression), marginRight: 1 })),
             gridFilter && !isExpressionValid && (React.createElement(ButtonInvalid, { variant: "text", tone: "neutral", tooltip: "Invalid Grid Filter", marginRight: 1 })),
             ' ',
@@ -75,11 +75,11 @@ const QueryViewPanelComponent = (props) => {
                         zIndex: 100,
                         height: '100%',
                         overflow: 'hidden',
-                    }, placehoder: "Grid Filter", onChange: (x) => setExpression(x.target.value), value: expression }))));
+                    }, placeholder: "Grid Filter", onChange: (x) => setExpression(x.target.value), value: expression }))));
     };
     const saveButton = (React.createElement(ButtonSave, { onClick: () => saveQuery(), tooltip: "Save as Named Query", accessLevel: namedQueryModuleAccessLevel, disabled: disabled || !isExpressionValid || isExpressionNamedQuery || expression == '', variant: "text", tone: "neutral", marginRight: 1 }));
     const suspendButton = (React.createElement(ButtonPause, { onClick: () => suspendGridFilter(), tooltip: "Suspend Grid Filter", accessLevel: gridFilterAccessLevel, disabled: disabled || !isExpressionValid, variant: "text", tone: "neutral", marginRight: 1 }));
-    const unSuspendButton = (React.createElement(ButtonUnsuspend, { onClick: () => unSuspendGridFilter(), tooltip: "Unsuspend Grid Filter", accessLevel: gridFilterAccessLevel, disabled: disabled || !isExpressionValid, variant: "text", tone: "neutral", marginRight: 1 }));
+    const unSuspendButton = (React.createElement(ButtonUnsuspend, { onClick: () => unSuspendGridFilter(), tooltip: "Unsuspend Grid Filter", accessLevel: gridFilterAccessLevel, disabled: !isExpressionValid, variant: "text", tone: "neutral", marginRight: 1 }));
     const namedQuerySelector = (React.createElement(NamedQuerySelector, { namedQueries: namedQueries, cachedQueries: cachedQueries, currentQuery: gridFilter === null || gridFilter === void 0 ? void 0 : gridFilter.Expression, onSelect: (query) => runQuery(query), setGridFilterExpression: (query) => setGridFilterExpression(query) }));
     const columnsDropdown = (React.createElement(DropdownButton, { disabled: disabled, accessLevel: gridFilterAccessLevel, variant: "text", items: availableColumns, marginRight: 1, tooltip: "Pick Columns" },
         React.createElement(Icon, { name: 'list' })));

package/src/View/GridFilter/useGridFilterExpressionEditor.js

@@ -59,7 +59,7 @@ export const useGridFilterExpressionEditor = () => {
     const runQuery = (newExpression = expression) => {
         if (StringExtensions.IsNullOrEmpty(newExpression) &&
             StringExtensions.IsNotNullOrEmpty(gridFilter === null || gridFilter === void 0 ? void 0 : gridFilter.Expression)) {
-            // user pressed enter key with an empty input => clear existing current query
+            // user pressed enter key with an empty input => clear existing expression
             adaptable.api.gridFilterApi.setGridFilterExpression('');
             return;
         }

package/src/View/Layout/LayoutViewPanel.js

@@ -25,8 +25,9 @@ class LayoutViewPanelComponent extends React.Component {
             return Object.assign(Object.assign({}, layout), { label: layout.Name, value: layout.Name, onClick: () => this.props.onSelectLayout(layout.Name) });
         });
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
+        let layoutSelectStyle = elementType === 'ToolPanel' ? { minWidth: '100%' } : {};
         return (React.createElement(Flex, { flexDirection: "row", className: `ab-${elementType}__Layout__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-            React.createElement(Flex, { flex: 1 },
+            React.createElement(Flex, { style: layoutSelectStyle, flex: 1 },
                 React.createElement(Select, { style: { width: '100%' }, options: availableLayoutOptions, className: `ab-${elementType}__Layout__select`, value: layoutEntity ? layoutEntity.Name : null, onChange: (layout) => this.props.onSelectLayout(layout) })),
             React.createElement(Flex, { flexDirection: "row", className: join(this.props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Layout__wrap`) },
                 isManualSaveLayout && (React.createElement(ButtonSave, { className: `ab-${elementType}__Layout__save`, onClick: () => this.onSaveLayout(), tooltip: "Save Changes to Current Layout", disabled: !this.props.CanSave, accessLevel: accessLevel })),

package/src/View/Layout/TransposedPopup.js

@@ -7,21 +7,21 @@ import { ColumnSelector } from '../Components/Selectors/ColumnSelector';
 import { AdaptableAgGrid } from '../../agGrid/AdaptableAgGrid';
 export const TransposedPopup = (props) => {
     const adaptable = useAdaptable();
+    const { transposedColumnId, hideTransposedColumn, visibleColumns, visibleRows, autosize } = props.popupProps;
     const rowNodes = React.useMemo(() => {
-        return adaptable.api.gridApi.getAllRowNodes();
+        return props.popupProps.visibleRows
+            ? adaptable.api.gridApi.getVisibleRowNodes()
+            : adaptable.api.gridApi.getAllRowNodes();
     }, [
-    // can be later triggered by ticking data
+    // can be later triggered by tickng data
     ]);
-    const { transposedColumnId, hideTransposedColumn = true } = props.popupProps;
     const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
-    // Thist must be qunique
-    const transposeByColumnId = primaryKey;
-    // Only used to show nice values a the top of the grid, istead on the value
-    // of the primarykey
-    const [synteticTransposedByColumnId, setSynteticTransposedByColumnId] = React.useState(transposedColumnId !== null && transposedColumnId !== void 0 ? transposedColumnId : primaryKey);
+    const [syntheticTransposedByColumnId, setSyntheticTransposedByColumnId] = React.useState(transposedColumnId);
     const columns = React.useMemo(() => {
         // customisable
-        return adaptable.api.columnApi.getColumns();
+        return visibleColumns
+            ? adaptable.api.columnApi.getVisibleColumns()
+            : adaptable.api.columnApi.getColumns();
     }, []);
     const adaptableContainerId = 'transposed-adaptable-container';
     const agGridContainerId = 'transposed-adaptable-ag-grid-container';
@@ -40,9 +40,10 @@ export const TransposedPopup = (props) => {
         for (const row of rowNodes) {
             // we force the col-ids to be strings, easer to work with
             //row[transposeByColumnId] + '';
-            const colId = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, transposeByColumnId) + '';
+            const colId = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, primaryKey) + '';
             //row[synteticTransposedByColumnId] + '';
-            const header = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, synteticTransposedByColumnId) + '';
+            const header = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, syntheticTransposedByColumnId) +
+                '';
             transposedColumns.push({
                 colId,
                 header,
@@ -52,7 +53,7 @@ export const TransposedPopup = (props) => {
             /**
              * We can hide the transposed column, if we want
              */
-            if (hideTransposedColumn && column.columnId === synteticTransposedByColumnId) {
+            if (hideTransposedColumn && column.columnId === syntheticTransposedByColumnId) {
                 continue;
             }
             const transposedRow = {
@@ -63,7 +64,7 @@ export const TransposedPopup = (props) => {
             };
             for (let row of rowNodes) {
                 // [transposed-by-column-value[n]]: [other column value[n]]
-                const key = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, transposeByColumnId);
+                const key = adaptable.api.gridApi.getNormalisedValueFromRowNode(row, primaryKey);
                 // row[column.field]
                 let value = adaptable.api.gridApi.getDisplayValueFromRowNode(row, column.columnId);
                 if (value instanceof Date) {
@@ -77,7 +78,7 @@ export const TransposedPopup = (props) => {
             transposedColumns,
             transposedRows,
         };
-    }, [rowNodes, primaryKey, synteticTransposedByColumnId]);
+    }, [rowNodes, primaryKey, syntheticTransposedByColumnId]);
     React.useEffect(() => {
         // Mounting in an effect, so the nodes are rendered/available
         const hostAdaptableOptions = adaptable.adaptableOptions;
@@ -95,7 +96,7 @@ export const TransposedPopup = (props) => {
             },
             layoutOptions: {
                 createDefaultLayout: false,
-                autoSizeColumnsInLayout: true,
+                autoSizeColumnsInLayout: autosize,
             },
             predefinedConfig: {
                 Layout: {
@@ -121,7 +122,7 @@ export const TransposedPopup = (props) => {
         };
         const firstColumn = {
             field: transposedFirstColumnHeader,
-            headerName: adaptable.api.columnApi.getFriendlyNameForColumnId(synteticTransposedByColumnId),
+            headerName: adaptable.api.columnApi.getFriendlyNameForColumnId(syntheticTransposedByColumnId),
         };
         const agGridOptions = {
             suppressLoadingOverlay: true,
@@ -173,7 +174,7 @@ export const TransposedPopup = (props) => {
                 transposedAdaptableApi.destroy();
             }
         };
-    }, [synteticTransposedByColumnId]);
+    }, [syntheticTransposedByColumnId]);
     /**
      * Need to get all data, manualy pivot the grid using the primary key.
      *
@@ -185,8 +186,8 @@ export const TransposedPopup = (props) => {
         React.createElement(Panel, null,
             React.createElement(FormLayout, null,
                 React.createElement(FormRow, { label: "Elevated Column" },
-                    React.createElement(ColumnSelector, { value: synteticTransposedByColumnId, onChange: (colId) => {
-                            setSynteticTransposedByColumnId(colId);
+                    React.createElement(ColumnSelector, { value: syntheticTransposedByColumnId, onChange: (colId) => {
+                            setSyntheticTransposedByColumnId(colId);
                         } })))),
         React.createElement(Flex, { height: "100%" },
             React.createElement(Box, { id: "transposed-adaptable-container" }),

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -14,6 +14,8 @@ import { AggregationsSection, AggregationsSectionSummary, isAggregationsSectionV
 import { SortSection, SortSectionSummary } from './sections/SortSection';
 import { FilterSection, FilterSectionSummary, isColumnFiltersValid, } from './sections/FilterSection';
 import { GridFilterSection, GridFilterSectionSummary, isGridFiltersValid, } from './sections/GridFilterSection';
+import { areSummaryRowsValid, RowSummarySection } from './sections/RowSummarySection';
+import { WEIGHTED_AVERAGE_AGGREATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
 export const LayoutWizard = (props) => {
     var _a, _b;
     const dispatch = useDispatch();
@@ -27,14 +29,16 @@ export const LayoutWizard = (props) => {
             preparedLayout = cloneObject(initialLayout);
             if (((_a = props === null || props === void 0 ? void 0 : props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Clone') {
                 preparedLayout.Name = '';
+                delete preparedLayout.Uuid;
             }
         }
         else {
             preparedLayout = ObjectFactory.CreateEmptyLayout({ Name: '' });
         }
         if (preparedLayout.SuppressAggFuncInHeader === undefined) {
-            preparedLayout.SuppressAggFuncInHeader =
-                !!adaptable.agGridAdapter.initialGridOptions.suppressAggFuncInHeader;
+            preparedLayout.SuppressAggFuncInHeader = !!adaptable.agGridAdapter
+                .getAgGridApi()
+                .getGridOption('suppressAggFuncInHeader');
         }
         return preparedLayout;
     });
@@ -101,6 +105,7 @@ export const LayoutWizard = (props) => {
             {
                 title: 'Row Groups',
                 isVisible: () => layoutSupportedFeatures.RowGroupedColumns,
+                isValid: areSummaryRowsValid,
                 details: 'Configure Row Grouping',
                 renderSummary: () => React.createElement(RowGroupingSectionSummary, null),
                 render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
@@ -113,7 +118,37 @@ export const LayoutWizard = (props) => {
                 renderSummary: () => React.createElement(AggregationsSectionSummary, null),
                 isValid: (data) => isAggregationsSectionValid(data),
                 render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
-                    React.createElement(AggregationsSection, { onChange: setLayout }))),
+                    React.createElement(AggregationsSection, { onChange: (layout) => {
+                            let newLayout = cloneObject(layout);
+                            // if we do not have an weighted avg col, we need to clear the row summary if one exists
+                            if (newLayout.RowSummaries) {
+                                newLayout.RowSummaries = newLayout.RowSummaries.map((rowSummary) => {
+                                    return Object.assign(Object.assign({}, rowSummary), { ColumnsMap: Object.entries(rowSummary.ColumnsMap).reduce((acc, [columnId, aggFunc]) => {
+                                            if (
+                                            // see if it is weighted avg
+                                            aggFunc === WEIGHTED_AVERAGE_AGGREATED_FUNCTION &&
+                                                // see if we have a weight in the agg columns
+                                                newLayout.AggregationColumns[columnId] &&
+                                                (typeof newLayout.AggregationColumns[columnId] !== 'object' ||
+                                                    newLayout.AggregationColumns[columnId].weightColumnId)) {
+                                                // need to remove the row summary
+                                                return acc;
+                                            }
+                                            acc[columnId] = aggFunc;
+                                            return acc;
+                                        }, {}) });
+                                });
+                            }
+                            setLayout(newLayout);
+                        } }))),
+            },
+            {
+                title: 'Row Summaries',
+                details: 'Configure Row Summaries',
+                renderSummary: () => React.createElement(RowGroupingSectionSummary, null),
+                isVisible: () => layoutSupportedFeatures.RowSummaries,
+                render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
+                    React.createElement(RowSummarySection, { onChange: setLayout }))),
             },
             {
                 title: 'Sort',

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

@@ -170,7 +170,7 @@ const ColumnRow = (props) => {
                     React.createElement(FormRow, { label: "ColumnId" },
                         React.createElement(Tag, null, props.column.columnId)),
                     React.createElement(FormRow, { label: "Header" },
-                        React.createElement(Input, { "data-name": "column-header", className: "ab-Layout-Wizard__ColumnRow__Input", placehoder: "Custom name (optional)", onChange: () => {
+                        React.createElement(Input, { "data-name": "column-header", className: "ab-Layout-Wizard__ColumnRow__Input", placeholder: "Custom name (optional)", onChange: () => {
                                 props.onColumnNameChange(props.column.columnId, event.target.value);
                             }, value: customHeader })),
                     React.createElement(FormRow, { label: "Width" },

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

@@ -52,7 +52,7 @@ export const FilterSection = (props) => {
         React.createElement(Tabs.Content, null,
             React.createElement(FormLayout, { mb: 2 },
                 React.createElement(FormRow, { label: "Add Column Filter" },
-                    React.createElement(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select column to create filter", onChange: (option) => {
+                    React.createElement(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select Column to create Filter", onChange: (option) => {
                             props.onChange(Object.assign(Object.assign({}, layout), { ColumnFilters: [
                                     ...layoutFilters,
                                     {

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

@@ -12,7 +12,23 @@ export const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = useAdaptable();
     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"))));
+    return (React.createElement(Box, null, ((_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.length) ? (layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary, index) => {
+        var _a;
+        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+            .map(([columnId, expression]) => {
+            if (columnId === 'Source' || columnId === 'Uuid') {
+                return '';
+            }
+            return `${expression}(${adaptable.api.columnApi.getFriendlyNameForColumnId(columnId)})`;
+        })
+            .filter(Boolean)
+            .join(', ');
+        return (React.createElement(Box, { mb: 2 },
+            React.createElement(Tag, { key: index },
+                rowSummary.Position,
+                " ",
+                columns)));
+    })) : (React.createElement(Tag, null, "No Row Summaries"))));
 };
 export const RowGroupingSection = (props) => {
     var _a, _b, _c;
@@ -27,7 +43,7 @@ export const RowGroupingSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));
     };
     return (React.createElement(Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs.Tab, null, "Grouped Rows"),
+        React.createElement(Tabs.Tab, null, "Group Rows"),
         ((_a = layout.ExpandedRowGroupValues) === null || _a === void 0 ? void 0 : _a.length) && React.createElement(Tabs.Tab, null, "Expanded Rows"),
         React.createElement(Tabs.Content, null,
             React.createElement(ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, options: sortedGroupableColumns, value: (_b = layout.RowGroupedColumns) !== null && _b !== void 0 ? _b : [], allowReorder: true, xSelectedLabel: () => {

package/src/View/Layout/Wizard/sections/RowSummarySection.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { Layout } from '../../../../../types';
+export declare const areSummaryRowsValid: (layout: Layout) => true | string;
+export declare const RowGroupingSectionSummary: React.FunctionComponent;
+interface RowSummarySectionProps {
+    onChange: (data: Layout) => void;
+}
+export declare const RowSummarySection: React.FunctionComponent<RowSummarySectionProps>;
+export {};

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

@@ -0,0 +1,174 @@
+import * as React from 'react';
+import { Box, Flex } from 'rebass';
+import FormLayout, { FormRow } from '../../../../components/FormLayout';
+import Panel from '../../../../components/Panel';
+import { Select } from '../../../../components/Select';
+import SimpleButton from '../../../../components/SimpleButton';
+import { Tabs } from '../../../../components/Tabs';
+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 { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
+import { useAdaptable } from '../../../AdaptableContext';
+import { ValueSelector } from '../../../Components/ValueSelector';
+import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
+import { columnFilter } from './Utilities';
+export const areSummaryRowsValid = (layout) => {
+    var _a;
+    if (!layout.RowSummaries)
+        return true;
+    let valid = true;
+    (_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.find((rowSummary) => {
+        var _a;
+        for (const [_, fn] of Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})) {
+            if (!fn) {
+                valid = 'All row summary columns must have an aggregation function.';
+                return true;
+            }
+        }
+    });
+    return valid;
+};
+const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
+    const inputType = mapColumnDataTypeToExpressionFunctionType(columnType);
+    // Object.entries(availableScalarExpressions ?? {})
+    return summarySupportedExpressions
+        .filter((expression) => availableScalarExpressions[expression])
+        .map((expression) => {
+        var _a, _b;
+        const expressionDef = availableScalarExpressions[expression];
+        let firstArg = 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];
+        }
+        else {
+            firstArg = expressionDef.inputs[0];
+        }
+        if (inputType === firstArg) {
+            return expression;
+        }
+        else {
+            return null;
+        }
+    })
+        .filter(Boolean);
+};
+export const RowGroupingSectionSummary = () => {
+    var _a;
+    const adaptable = useAdaptable();
+    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 { data: layout } = useOnePageAdaptableWizardContext();
+    const adaptable = useAdaptable();
+    const columns = React.useMemo(() => {
+        const colIds = adaptable.api.columnApi
+            .getColumns()
+            .filter((column) => {
+            var _a, _b;
+            if (!['Number', 'String', 'Date'].includes(column.dataType))
+                return false;
+            return (_b = (_a = layout.Columns) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, column.columnId);
+        })
+            .map((c) => c.columnId);
+        return sortWithOrderArray(colIds, Object.keys(rowSummary.ColumnsMap), {
+            sortUnorderedItems: false,
+        }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+    }, [rowSummary.ColumnsMap]);
+    return (React.createElement(Panel, { header: React.createElement(Flex, { style: { width: '100%' } },
+            React.createElement(Flex, { flex: 1, alignItems: "center" }, "Row Summary"),
+            React.createElement(SimpleButton, { icon: "delete", onClick: () => {
+                    onDelete();
+                } })), p: 2 },
+        React.createElement(FormLayout, null,
+            React.createElement(FormRow, { label: "Position" },
+                React.createElement(Select, { options: [
+                        {
+                            label: 'Top',
+                            value: 'Top',
+                        },
+                        {
+                            label: 'Bottom',
+                            value: 'Bottom',
+                        },
+                    ], value: rowSummary.Position, onChange: (position) => {
+                        onChange(Object.assign(Object.assign({}, rowSummary), { Position: position }));
+                    } }))),
+        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 } },
+                React.createElement(ValueSelector, { style: { maxHeight: '100%' }, showFilterInput: true, filter: columnFilter, toIdentifier: (column) => column.columnId, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, options: columns, xSelectedLabel: () => {
+                        return 'Active Aggregations:';
+                    }, toListLabel: (column) => {
+                        var _a, _b, _c;
+                        const label = (_a = column.friendlyName) !== null && _a !== void 0 ? _a : column.columnId;
+                        if (!(column.columnId in ((_b = rowSummary.ColumnsMap) !== null && _b !== void 0 ? _b : {}))) {
+                            return label;
+                        }
+                        const expressionOptions = getAvailableExpressionsForColumnType(column.dataType, availableScalarExpressions).map((expression) => ({
+                            label: expression,
+                            value: expression,
+                        }));
+                        // 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) {
+                            expressionOptions.push({
+                                label: 'WEIGHTERD_AVG',
+                                value: WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+                            });
+                        }
+                        const expression = rowSummary.ColumnsMap[column.columnId];
+                        return (React.createElement(Flex, null,
+                            React.createElement(Flex, { mr: 2, alignItems: 'center' }, label),
+                            React.createElement(Select, { value: expression, options: expressionOptions, onChange: (expression) => {
+                                    onChange(Object.assign(Object.assign({}, rowSummary), { ColumnsMap: Object.assign(Object.assign({}, rowSummary.ColumnsMap), { [column.columnId]: expression }) }));
+                                } })));
+                    }, value: Object.keys(rowSummary.ColumnsMap), onChange: (colIds) => {
+                        const newColumnsMap = {};
+                        colIds.forEach((colId) => {
+                            var _a;
+                            newColumnsMap[colId] = (_a = rowSummary.ColumnsMap[colId]) !== null && _a !== void 0 ? _a : null;
+                        });
+                        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
+            .getQueryLanguageService()
+            .getModuleExpressionFunctionsMap(LayoutModuleId).aggregatedScalarFunctions;
+    }, []);
+    return (React.createElement(Tabs, { style: { height: '100%' } },
+        React.createElement(Tabs.Tab, null, "Row Summaries"),
+        React.createElement(Tabs.Content, null,
+            React.createElement("div", null,
+                React.createElement(Flex, { mb: 1 },
+                    React.createElement(Flex, { flex: 1 }),
+                    React.createElement(SimpleButton, { onClick: () => {
+                            var _a;
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: [
+                                    ...((_a = layout.RowSummaries) !== null && _a !== void 0 ? _a : []),
+                                    {
+                                        Position: 'Top',
+                                        ColumnsMap: {},
+                                    },
+                                ] }));
+                        }, icon: "plus" }, "Add Row Summary")),
+                ((_a = layout.RowSummaries) !== null && _a !== void 0 ? _a : []).map((rowSummary, index) => {
+                    return (React.createElement(RowSummaryEditor, { key: index, onDelete: () => {
+                            const newSummaries = [...layout.RowSummaries];
+                            newSummaries.splice(index, 1);
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: newSummaries }));
+                        }, availableScalarExpressions: availableScalarExpressions, rowSummary: rowSummary, onChange: (rowSummary) => {
+                            const newSummaries = [...layout.RowSummaries];
+                            newSummaries[index] = rowSummary;
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: newSummaries }));
+                        } }));
+                })))));
+};

package/src/View/License/LicenseWatermark.js

@@ -1,61 +1 @@
-import * as React from 'react';
-import { Logo } from '../../components/Logo';
-import { Flex } from 'rebass';
-const style = {
-    border: '1px solid var(--ab-color-error)',
-    padding: '5px',
-    fontWeight: 600,
-    margin: '5px',
-    fontSize: '14px',
-    alignItems: 'center',
-    color: 'var(--ab-color-text-on-defaultbackground)',
-    background: 'var(--ab-color-defaultbackground)',
-};
-const isStyleValid = (element) => {
-    const notAllowedProperties = [
-        ['display', 'none'],
-        ['opacity', '0'],
-        ['position', 'absolute'],
-        ['position', 'fixed'],
-        ['position', 'relative'],
-        ['visibility', 'hidden'],
-    ];
-    for (const [prop, value] of notAllowedProperties) {
-        if (element.style[prop] === value) {
-            return false;
-        }
-    }
-    return true;
-};
-export const LicenseWatermark = (props) => {
-    const ref = React.useRef(null);
-    React.useEffect(() => {
-        const checkWatermark = () => {
-            var _a, _b;
-            if (!((_a = ref.current) === null || _a === void 0 ? void 0 : _a.isConnected)) {
-                alert('It is not allowed to remove the Adaptable watermark.');
-            }
-            if (!isStyleValid(ref.current)) {
-                alert('It is not allowed to modify the Adaptable watermark.');
-            }
-            if ((_b = ref === null || ref === void 0 ? void 0 : ref.current) === null || _b === void 0 ? void 0 : _b.style) {
-                ref.current.style.border = style.border;
-                ref.current.style.padding = style.padding;
-                ref.current.style.fontWeight = `${style.fontWeight}`;
-                ref.current.style.margin = style.margin;
-                ref.current.style.fontSize = style.fontSize;
-                ref.current.style.color = style.color;
-                ref.current.style.background = style.background;
-                ref.current.style.display = 'flex';
-                ref.current.style.position = 'static';
-                ref.current.style.opacity = '1';
-                ref.current.style.visibility = 'visible';
-            }
-        };
-        const timerId = setInterval(checkWatermark, 5000);
-        return () => clearTimeout(timerId);
-    }, []);
-    return (React.createElement(Flex, { style: style, ref: ref },
-        React.createElement(Logo, { style: { marginRight: 10 } }),
-        React.createElement("div", null, props.children)));
-};
+import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},n=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect((()=>{const e=setInterval((()=>{var e,t;(null===(e=l.current)||void 0===e?void 0:e.isConnected)||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),(null===(t=null==l?void 0:l.current)||void 0===t?void 0:t.style)&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")}),5e3);return()=>clearTimeout(e)}),[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};

package/src/View/Note/NotePopup.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const NotePopup: React.FunctionComponent;

package/src/View/{Notes/NotesPopup.js → Note/NotePopup.js}

@@ -1,10 +1,12 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTable } from '../../components/InfiniteTable';
-import { GetAllNotesSelector } from '../../Redux/ActionsReducers/NotesRedux';
+import { GetAllNotesSelector } from '../../Redux/ActionsReducers/NoteRedux';
+import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
+import { DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME } from '../../Utilities/Constants/GeneralConstants';
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -12,10 +14,13 @@ const tableDOMProps = {
         // minHeight: 600,
     },
 };
-export const NotesPopup = (props) => {
+export const NotePopup = (props) => {
+    var _a, _b, _c, _d;
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allNotes = useSelector((state) => GetAllNotesSelector(state.Notes));
+    const dateFormat = (_d = (_c = (_b = (_a = adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.dateFormat) !== null && _d !== void 0 ? _d : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
+    const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -32,21 +37,21 @@ export const NotesPopup = (props) => {
             text: {
                 field: 'Text',
                 header: 'Text',
-                defaultEditable: true,
+                defaultEditable: !isReadOnlyModule,
                 defaultFlex: 3,
             },
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return new Date(params.data.Timestamp).toDateString();
+                    return dateFnsFormat(params.data.Timestamp, dateFormat);
                 },
             },
             delete: {
                 defaultWidth: 50,
                 render: (params) => {
-                    return (React.createElement(AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
-                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
-                            adaptable.api.notesApi.deleteNote(note);
+                    return (React.createElement(AdaptableButtonComponent, { disabled: isReadOnlyModule, variant: "text", icon: "delete", onClick: () => {
+                            const note = adaptable.api.noteApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.noteApi.deleteNote(note);
                         } }));
                 },
             },
@@ -62,7 +67,7 @@ export const NotesPopup = (props) => {
                             const data = change.data;
                             const prevNote = allNotes.find((x) => x.Uuid === uuid);
                             if (prevNote.Text !== data.Text) {
-                                adaptable.api.notesApi.updateNoteText(data.Text, prevNote);
+                                adaptable.api.noteApi.updateNoteText(data.Text, prevNote);
                             }
                         }
                     }

package/src/View/PlusMinus/PlusMinusSummary.js

@@ -19,12 +19,12 @@ export class PlusMinusSummaryComponent extends React.Component {
     render() {
         let moduleSummaries = [];
         // title row
-        let titleRow = (React.createElement(ModuleHeader, { key: this.props.moduleInfo.FriendlyName, moduleInfo: this.props.moduleInfo, moduleSummary: Helper.returnItemCount(this.props.PlusMinusNudges.filter((item) => this.props.api.scopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)), this.props.moduleInfo.FriendlyName), onNew: () => this.onNew(), newButtonTooltip: 'Plus / Minus Rule', accessLevel: this.props.accessLevel }));
+        let titleRow = (React.createElement(ModuleHeader, { key: this.props.moduleInfo.FriendlyName, moduleInfo: this.props.moduleInfo, moduleSummary: Helper.returnItemCount(this.props.PlusMinusNudges.filter((item) => this.props.api.columnScopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)), this.props.moduleInfo.FriendlyName), onNew: () => this.onNew(), newButtonTooltip: 'Plus / Minus Rule', accessLevel: this.props.accessLevel }));
         moduleSummaries.push(titleRow);
         // existing items
         this.props.PlusMinusNudges.map((item, index) => {
             var _a;
-            if (this.props.api.scopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)) {
+            if (this.props.api.columnScopeApi.isColumnInScopeColumns(this.props.summarisedColumn, item.Scope)) {
                 let detailRow = (React.createElement(ModuleDetail, { key: 'PM' + index, item1: 'Nudge Value: ' + item.NudgeValue, item2: ((_a = item.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression) ? item.Rule.BooleanExpression : 'Always', configEnity: item, showShare: this.props.teamSharingActivated, moduleInfo: this.props.moduleInfo, onEdit: () => this.onEdit(item), onShare: (config) => this.props.onShare(item, config), onDelete: PlusMinusRedux.PlusMinusNudgeDelete(item), accessLevel: this.props.accessLevel }));
                 moduleSummaries.push(detailRow);
             }

package/src/View/SmartEdit/SmartEditPopup.js

@@ -63,7 +63,7 @@ class SmartEditPopupComponent extends React.Component {
                         (this.props.PreviewInfo &&
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All'), onClick: () => {
                         this.submit();
-                    }, marginRight: 2 }, "Apply to Grid"),
+                    }, marginRight: 2 }, "Apply Smart Edit"),
                 ' ',
                 this.props.PreviewInfo &&
                     this.props.PreviewInfo.previewValidationSummary.validationResult != 'None' && (React.createElement(AdaptablePopover, { headerText: 'Validation Error', bodyText: [globalValidationMessage], MessageType: 'Error' }))),