@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

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

@@ -18,13 +18,11 @@ import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptab
 import { columnFilter } from './Utilities';
 import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 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 : {})) {
+    layout.RowSummaries?.find((rowSummary) => {
+        for (const [_, fn] of Object.entries(rowSummary.ColumnsMap ?? {})) {
             if (!fn) {
                 valid = 'All row summary columns must have an aggregation function.';
                 return true;
@@ -49,16 +47,15 @@ const getAvailableExpressionsForColumnType = (columnType, availableScalarExpress
         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)) {
+        if (!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])) {
+        if (Array.isArray(expressionDef?.inputs?.[0])) {
             // @ts-ignore
-            firstArg = (_b = expressionDef.inputs.find((input) => input.includes(columnInputType))) === null || _b === void 0 ? void 0 : _b[0];
+            firstArg = expressionDef.inputs.find((input) => input.includes(columnInputType))?.[0];
         }
         else {
             firstArg = expressionDef.inputs[0];
@@ -74,24 +71,36 @@ const getAvailableExpressionsForColumnType = (columnType, availableScalarExpress
     availableExpressionsForColumnTypeCache.set(key, expressions);
     return expressions;
 };
-export const RowGroupingSectionSummary = () => {
-    var _a;
+export const RowSummarySectionSummary = () => {
     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, { display: 'flex', flexDirection: 'column' }, layout.RowSummaries?.length ? (layout.RowSummaries.map((rowSummary, index) => {
+        return (React.createElement(React.Fragment, null,
+            React.createElement(Box, { mr: 1, mb: 1, key: index },
+                rowSummary.Position,
+                ":",
+                ' ',
+                Object.keys(rowSummary.ColumnsMap).map((colId) => {
+                    if (colId === 'Source' || colId === 'Uuid')
+                        return null;
+                    return (React.createElement(Tag, { mr: 1, key: colId },
+                        rowSummary.ColumnsMap[colId],
+                        "(",
+                        adaptable.api.columnApi.getFriendlyNameForColumnId(colId),
+                        ")"));
+                }))));
+    })) : (React.createElement(Tag, null, "No Row Summaries"))));
 };
 const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpressions, onDelete, }) => {
-    var _a;
     const { data: layout } = useOnePageAdaptableWizardContext();
     const adaptable = useAdaptable();
     const columns = React.useMemo(() => {
         const colIds = adaptable.api.columnApi
-            .getColumns()
+            .getUIAvailableColumns()
             .filter((column) => {
-            var _a, _b;
-            if (!['Number', 'String', 'Date'].includes(column.dataType))
+            if (!['number', 'text', '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);
+            return layout.TableColumns?.includes?.(column.columnId);
         })
             .map((c) => c.columnId);
         return ArrayExtensions.sortArrayWithOrder(colIds, Object.keys(rowSummary.ColumnsMap), {
@@ -102,9 +111,15 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
             React.createElement(Flex, { flex: 1, alignItems: "center" }, "Row Summary"),
             React.createElement(Box, { mr: 2 },
                 React.createElement(SuspendToggleButton, { onSuspend: () => {
-                        onChange(Object.assign(Object.assign({}, rowSummary), { IsSuspended: true }));
+                        onChange({
+                            ...rowSummary,
+                            IsSuspended: true,
+                        });
                     }, onUnSuspend: () => {
-                        onChange(Object.assign(Object.assign({}, rowSummary), { IsSuspended: false }));
+                        onChange({
+                            ...rowSummary,
+                            IsSuspended: false,
+                        });
                     }, suspendableObject: rowSummary })),
             React.createElement(SimpleButton, { icon: "delete", onClick: () => {
                     onDelete();
@@ -121,29 +136,34 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                             value: 'Bottom',
                         },
                     ], value: rowSummary.Position, onChange: (position) => {
-                        onChange(Object.assign(Object.assign({}, rowSummary), { Position: position }));
+                        onChange({
+                            ...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 }));
+                React.createElement(CheckBox, { checked: rowSummary.IncludeOnlyFilteredRows ?? true, onChange: (IncludeOnlyFilteredRows) => {
+                        onChange({
+                            ...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 } },
-                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: () => {
+                React.createElement(ValueSelector, { style: { maxHeight: '100%' }, showFilterInput: true, filter: columnFilter, toIdentifier: (column) => column.columnId, toLabel: (option) => option.friendlyName ?? 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 : {}))) {
+                        const label = column.friendlyName ?? column.columnId;
+                        if (!(column.columnId in (rowSummary.ColumnsMap ?? {}))) {
                             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];
+                        // check out if this layout has a aggregation with weighted column
+                        const aggregation = layout.TableAggregationColumns?.find((agg) => agg.ColumnId === column.columnId)?.AggFunc;
                         if (aggregation &&
                             typeof aggregation === 'object' &&
                             aggregation.weightedColumnId) {
@@ -156,19 +176,26 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                         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 }) }));
+                                    onChange({
+                                        ...rowSummary,
+                                        ColumnsMap: {
+                                            ...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;
+                            newColumnsMap[colId] = rowSummary.ColumnsMap[colId] ?? null;
+                        });
+                        onChange({
+                            ...rowSummary,
+                            ColumnsMap: newColumnsMap,
                         });
-                        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(() => {
@@ -184,25 +211,33 @@ export const RowSummarySection = (props) => {
                 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 : []),
+                            props.onChange({
+                                ...layout,
+                                RowSummaries: [
+                                    ...(layout.RowSummaries ?? []),
                                     {
                                         Position: 'Top',
                                         ColumnsMap: {},
                                         IncludeOnlyFilteredRows: true,
                                     },
-                                ] }));
+                                ],
+                            });
                         }, icon: "plus" }, "Add Row Summary")),
-                ((_a = layout.RowSummaries) !== null && _a !== void 0 ? _a : []).map((rowSummary, index) => {
+                (layout.RowSummaries ?? []).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 }));
+                            props.onChange({
+                                ...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 }));
+                            props.onChange({
+                                ...layout,
+                                RowSummaries: newSummaries,
+                            });
                         } }));
                 })))));
 };

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

@@ -6,27 +6,29 @@ import Radio from '../../../../components/Radio';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
+import { isPivotLayout } from '../../../../Utilities/isPivotLayout';
 export const SettingsSectionSummary = () => {
     const { data: layout } = useOnePageAdaptableWizardContext();
+    const isPivot = isPivotLayout(layout);
     return (React.createElement(Box, null,
         React.createElement(Tag, { mr: 2 },
             "Layout Name: ",
             layout.Name),
         React.createElement(Tag, { mr: 2 },
             "Layout Grid Type: ",
-            layout.EnablePivot ? 'Pivot' : 'Table'),
+            isPivot ? 'Pivot' : 'Table'),
         React.createElement(Tag, { mr: 2 },
-            "Suppress Aggregation Function in Header: ",
+            "Suppress Aggregation Function in Column Header:",
+            ' ',
             layout.SuppressAggFuncInHeader ? 'Yes' : 'No')));
 };
 export const SettingsSection = (props) => {
-    var _a;
     const { data: layout } = useOnePageAdaptableWizardContext();
     const onNameChange = (event) => {
-        props.onChange(Object.assign(Object.assign({}, layout), { Name: event.target.value }));
-    };
-    const handlePivotChange = (checked) => {
-        props.onChange(Object.assign(Object.assign({}, layout), { EnablePivot: checked }));
+        props.onChange({
+            ...layout,
+            Name: event.target.value,
+        });
     };
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs, { mb: 3 },
@@ -35,11 +37,11 @@ export const SettingsSection = (props) => {
                 React.createElement(Flex, { flexDirection: "row" },
                     React.createElement(FormLayout, { width: "100%", style: { maxWidth: 300 } },
                         React.createElement(FormRow, { label: "Name" },
-                            React.createElement(Input, { width: "100%", "data-name": "layout-name", onChange: onNameChange, value: (_a = layout === null || layout === void 0 ? void 0 : layout.Name) !== null && _a !== void 0 ? _a : '' })))))),
+                            React.createElement(Input, { width: "100%", "data-name": "layout-name", onChange: onNameChange, value: layout?.Name ?? '' })))))),
         React.createElement(Tabs, { mb: 2 },
             React.createElement(Tabs.Tab, null, "Grid Type"),
             React.createElement(Tabs.Content, null,
                 React.createElement(Flex, { flexDirection: "column" },
-                    React.createElement(Radio, { "data-name": "layout-type-table", onClick: () => handlePivotChange(false), checked: !Boolean(layout.EnablePivot) }, "Table"),
-                    React.createElement(Radio, { "data-name": "layout-type-pivot", onClick: () => handlePivotChange(true), checked: Boolean(layout.EnablePivot) }, "Pivot"))))));
+                    React.createElement(Radio, { "data-name": "layout-type-table", disabled: true, checked: !isPivotLayout(layout) }, "Table"),
+                    React.createElement(Radio, { "data-name": "layout-type-pivot", disabled: true, checked: isPivotLayout(layout) }, "Pivot"))))));
 };

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

@@ -16,45 +16,49 @@ export const SortSectionSummary = () => {
     return (React.createElement(Box, null, sortViewItems.values.length ? (sortViewItems.values.map((value) => (React.createElement(Tag, { key: value, mb: 1, mr: 1 }, value)))) : (React.createElement(Tag, null, "No Sorts"))));
 };
 const ColumnRow = (props) => {
-    var _a, _b, _c;
-    const SortOrder = (_c = ((_b = (_a = props.layout) === null || _a === void 0 ? void 0 : _a.ColumnSorts) !== null && _b !== void 0 ? _b : []).find((sort) => sort.ColumnId === props.column.columnId)) === null || _c === void 0 ? void 0 : _c.SortOrder;
+    const SortOrder = (props.layout?.ColumnSorts ?? []).find((sort) => sort.ColumnId === props.column.columnId)?.SortOrder;
     const icon = SortOrder === 'Asc' ? 'sort-asc' : 'sort-desc';
     return (React.createElement(Box, null,
         props.column.friendlyName,
         SortOrder && (React.createElement(SimpleButton, { ml: 2, onClick: () => props.onSortChange(props.column.columnId, SortOrder === 'Asc' ? 'Desc' : 'Asc'), variant: "raised", icon: icon }))));
 };
 export const SortSection = (props) => {
-    var _a;
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const allSortableColumns = adaptable.api.columnApi.getSortableColumns();
     const sortedSortColumns = React.useMemo(() => {
-        var _a;
-        return ArrayExtensions.sortArrayWithOrder(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions.sortArrayWithOrder(allSortableColumns.map((col) => col.columnId), (layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allSortableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
-        props.onChange(Object.assign(Object.assign({}, layout), { ColumnSorts: (columnIds || []).map((columnId) => {
-                var _a, _b, _c;
-                const SortOrder = (_c = (_b = (_a = layout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.find((sort) => sort.ColumnId === columnId)) === null || _b === void 0 ? void 0 : _b.SortOrder) !== null && _c !== void 0 ? _c : 'Asc';
+        props.onChange({
+            ...layout,
+            ColumnSorts: (columnIds || []).map((columnId) => {
+                const SortOrder = layout.ColumnSorts?.find((sort) => sort.ColumnId === columnId)?.SortOrder ?? 'Asc';
                 return {
                     ColumnId: columnId,
                     SortOrder: SortOrder,
                 };
-            }) }));
+            }),
+        });
     }, [layout]);
     const handleSortChange = React.useCallback((columnId, SortOrder) => {
-        var _a;
-        props.onChange(Object.assign(Object.assign({}, layout), { ColumnSorts: (_a = layout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.map((sort) => {
+        props.onChange({
+            ...layout,
+            ColumnSorts: layout.ColumnSorts?.map((sort) => {
                 if (sort.ColumnId === columnId) {
-                    return Object.assign(Object.assign({}, sort), { SortOrder: SortOrder });
+                    return {
+                        ...sort,
+                        SortOrder: SortOrder,
+                    };
                 }
                 return sort;
-            }) }));
+            }),
+        });
     }, [layout]);
     return (React.createElement(Tabs, { style: { height: '100%' } },
         React.createElement(Tabs.Tab, null, "Column Sorts"),
         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; }, toListLabel: (column) => (React.createElement(ColumnRow, { onSortChange: handleSortChange, layout: layout, column: column })), options: sortedSortColumns, value: ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), allowReorder: () => true, xSelectedLabel: () => {
-                    return `Active aggregations:`;
+            React.createElement(ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (column) => (React.createElement(ColumnRow, { onSortChange: handleSortChange, layout: layout, column: column })), options: sortedSortColumns, value: (layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), allowReorder: () => true, xSelectedLabel: () => {
+                    return `Active sorts:`;
                 }, onChange: handleColumnsSelectionChange }))));
 };

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

@@ -1 +1 @@
-export const columnFilter = (column, searchText) => [column.friendlyName, column.columnId].some((candidate) => candidate === null || candidate === void 0 ? void 0 : candidate.toLowerCase().includes(searchText.toLowerCase()));
+export const columnFilter = (column, searchText) => [column.friendlyName, column.columnId].some((candidate) => candidate?.toLowerCase().includes(searchText.toLowerCase()));

package/src/View/License/LicenseWatermark.js

@@ -1 +1 @@
-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))};
+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((()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.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/NamedQuery/EditCurrentQueryButton.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const EditGridFilterButton: () => JSX.Element;
+import * as React from 'react';
+export declare const EditGridFilterButton: () => React.JSX.Element;

package/src/View/NamedQuery/EditCurrentQueryButton.js

@@ -5,7 +5,7 @@ export const EditGridFilterButton = () => {
     const adaptable = useAdaptable();
     const handleClick = React.useCallback((event) => {
         event.stopPropagation();
-        adaptable.api.gridFilterApi.openUIEditorForGridFilter();
+        adaptable.api.filterApi.gridFilterApi.openUIEditorForGridFilter();
     }, []);
     return React.createElement(SimpleButton, { variant: "text", iconSize: 15, onClick: handleClick, icon: "edit" });
 };

package/src/View/NamedQuery/Wizard/NamedQueryExpressionWizardSection.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { NamedQuery } from '../../../types';
 export interface NamedQueryExpressionWizardSectionProps {
     onChange: (data: NamedQuery) => void;
 }
 export declare const isValidNamedQueryExpression: (data: NamedQuery, api: AdaptableApi) => string | true;
-export declare const renderNamedQueryExpressionSummary: (data: NamedQuery) => JSX.Element;
-export declare const NamedQueryExpressionWizardSection: (props: NamedQueryExpressionWizardSectionProps) => JSX.Element;
+export declare const renderNamedQueryExpressionSummary: (data: NamedQuery) => React.JSX.Element;
+export declare const NamedQueryExpressionWizardSection: (props: NamedQueryExpressionWizardSectionProps) => React.JSX.Element;

package/src/View/NamedQuery/Wizard/NamedQueryExpressionWizardSection.js

@@ -25,6 +25,6 @@ export const NamedQueryExpressionWizardSection = (props) => {
     const { data, moduleInfo, api } = useOnePageAdaptableWizardContext();
     const initialData = useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(ExpressionEditor, { allowSaveNamedQuery: false, showQueryBuilder: true, type: 'boolean', module: moduleInfo.ModuleName, value: data.BooleanExpression, onChange: (BooleanExpression) => {
-            props.onChange(Object.assign(Object.assign({}, data), { BooleanExpression }));
+            props.onChange({ ...data, BooleanExpression });
         }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
 };

package/src/View/NamedQuery/Wizard/NamedQuerySettingsWizardSection.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { NamedQuery } from '../../../types';
 export interface NamedQuerySettingsWizardSectionProps {
     onChange: (data: NamedQuery) => void;
 }
 export declare const isValidNamedQuerySettings: (data: NamedQuery, api: AdaptableApi) => true | string;
-export declare const renderNamedQuerySettingsSummary: (data: NamedQuery) => JSX.Element;
-export declare const NamedQuerySettingsWizardSection: (props: NamedQuerySettingsWizardSectionProps) => JSX.Element;
+export declare const renderNamedQuerySettingsSummary: (data: NamedQuery) => React.JSX.Element;
+export declare const NamedQuerySettingsWizardSection: (props: NamedQuerySettingsWizardSectionProps) => React.JSX.Element;

package/src/View/NamedQuery/Wizard/NamedQuerySettingsWizardSection.js

@@ -26,7 +26,10 @@ export const NamedQuerySettingsWizardSection = (props) => {
     const errorMessage = valid === true ? null : valid;
     const handleColumnNameChange = (event) => {
         let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { Name: e.value }));
+        props.onChange({
+            ...data,
+            Name: e.value,
+        });
     };
     return (React.createElement(WizardPanel, { "data-name": 'named-query-settings' },
         React.createElement(FormLayout, null,

package/src/View/NamedQuery/Wizard/NamedQueryWizard.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { NamedQuery } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 export interface NamedQueryWizardProps extends AdaptableOnePageWizardProps<NamedQuery> {
 }
-export declare function NamedQueryWizard(props: NamedQueryWizardProps): JSX.Element;
+export declare function NamedQueryWizard(props: NamedQueryWizardProps): React.JSX.Element;

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

@@ -11,8 +11,7 @@ import * as NamedQueryRedux from '../../../Redux/ActionsReducers/NamedQueryRedux
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 export function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = useState(() => {
-        var _a, _b;
-        const value = (_b = (_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '';
+        const value = props.popupParams?.value ?? '';
         return props.data
             ? cloneObject(props.data)
             : ObjectFactory.CreateEmptyNamedQuery(value);

package/src/View/Note/NoteEditor.js

@@ -4,9 +4,8 @@ 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 showPopupCloseButton = api.optionsApi.getNoteOptions()?.showPopupCloseButton ?? true;
     const textAreaRef = React.useRef(null);
     const [liveValue, setLiveValue] = React.useState(note || '');
     const throttledOnChange = React.useMemo(() => {
@@ -17,9 +16,8 @@ export const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }
         };
     }, []);
     React.useEffect(() => {
-        var _a;
         if (editMode) {
-            (_a = textAreaRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+            textAreaRef.current?.focus();
         }
     }, [editMode]);
     if (note === undefined || note === null) {

package/src/View/PlusMinus/MovePlusMinus.js

@@ -13,7 +13,7 @@ export const MovePlusMinus = (props) => {
     const handleMoveDown = React.useCallback(() => {
         dispatch(PlusMinusRedux.PlusMinusMoveDown(props.data));
     }, []);
-    if ((plusMinusNudges === null || plusMinusNudges === void 0 ? void 0 : plusMinusNudges.length) <= 1) {
+    if (plusMinusNudges?.length <= 1) {
         return React.createElement(React.Fragment, null);
     }
     return (React.createElement(React.Fragment, null,

package/src/View/PlusMinus/PlusMinusSummary.d.ts

@@ -17,4 +17,6 @@ export declare class PlusMinusSummaryComponent extends React.Component<PlusMinus
     onFinishWizard(): void;
     canFinishWizard(): boolean;
 }
-export declare let PlusMinusSummary: import("react-redux").ConnectedComponent<typeof PlusMinusSummaryComponent, any>;
+export declare let PlusMinusSummary: import("react-redux").ConnectedComponent<typeof PlusMinusSummaryComponent, {
+    [x: string]: any;
+}>;

package/src/View/PlusMinus/PlusMinusSummary.js

@@ -23,9 +23,8 @@ export class PlusMinusSummaryComponent extends React.Component {
         moduleSummaries.push(titleRow);
         // existing items
         this.props.PlusMinusNudges.map((item, index) => {
-            var _a;
             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 }));
+                let detailRow = (React.createElement(ModuleDetail, { key: 'PM' + index, item1: 'Nudge Value: ' + item.NudgeValue, item2: item.Rule?.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/PlusMinus/Wizard/PlusMinusRuleWizardSection.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { PlusMinusNudge } from '../../../types';
-export declare function PlusMinusRuleSummary(): JSX.Element;
+export declare function PlusMinusRuleSummary(): React.JSX.Element;
 interface PlusMinusRuleWizardSectionProps {
     onChange: (data: PlusMinusNudge) => void;
     defaultPredicateId: string;
 }
-export declare function PlusMinusRuleWizardSection(props: PlusMinusRuleWizardSectionProps): JSX.Element;
+export declare function PlusMinusRuleWizardSection(props: PlusMinusRuleWizardSectionProps): React.JSX.Element;
 export {};

package/src/View/PlusMinus/Wizard/PlusMinusRuleWizardSection.js

@@ -17,9 +17,11 @@ export function PlusMinusRuleSummary() {
         } }));
 }
 export function PlusMinusRuleWizardSection(props) {
-    var _a;
     const { data, moduleInfo } = useOnePageAdaptableWizardContext();
-    const plusMinusNudge = Object.assign(Object.assign({}, data), { Rule: (_a = data === null || data === void 0 ? void 0 : data.Rule) !== null && _a !== void 0 ? _a : { BooleanExpression: '' } });
+    const plusMinusNudge = {
+        ...data,
+        Rule: data?.Rule ?? { BooleanExpression: '' },
+    };
     return (React.createElement(EntityRulesEditor, { module: moduleInfo.ModuleName, 
         // min-height 0 so the container does not min-size from it's children
         // https://stackoverflow.com/questions/33605552/how-to-prevent-a-flex-item-height-to-overflow-due-to-its-content

package/src/View/PlusMinus/Wizard/PlusMinusScopeWizardSection.js

@@ -4,15 +4,21 @@ import { NewScopeComponent } from '../../Components/NewScopeComponent';
 export const PlusMinusScopeWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const availableColumns = React.useMemo(() => api.columnApi.getNumericColumns(), []);
-    return (React.createElement(NewScopeComponent, { availableDataTypes: ['Number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
+    return (React.createElement(NewScopeComponent, { availableDataTypes: ['number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
             rowScope: 'Matching rows will have the plus/minus applied',
             columnScope: 'Matching Columns will have the plus/minus applied',
         }, updateScope: (Scope) => {
             let preparedScope = Scope;
             if (Scope && 'DataTypes' in Scope && Scope.DataTypes.length === 0) {
                 // default to checked
-                preparedScope = Object.assign(Object.assign({}, Scope), { DataTypes: ['Number'] });
+                preparedScope = {
+                    ...Scope,
+                    DataTypes: ['number'],
+                };
             }
-            props.onChange(Object.assign(Object.assign({}, data), { Scope: preparedScope }));
+            props.onChange({
+                ...data,
+                Scope: preparedScope,
+            });
         } }));
 };

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -10,18 +10,16 @@ import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utiliti
 import { SummaryText } from '../../../View/Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
 export const PlusMinusSettingsSummary = (props) => {
-    var _a;
     const { data } = useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(SummaryText, null,
             "Nudge Value ",
-            React.createElement(Tag, null, (_a = data.NudgeValue) !== null && _a !== void 0 ? _a : 'Not selected')),
+            React.createElement(Tag, null, data.NudgeValue ?? 'Not selected')),
         props.hasCondition && React.createElement(PlusMinusRuleSummary, null)));
 };
 export const isSettingsValid = (hasCondition) => (data, api, context) => {
-    var _a;
     if (hasCondition) {
-        if (!((_a = data === null || data === void 0 ? void 0 : data.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression)) {
+        if (!data?.Rule?.BooleanExpression) {
             return 'No valid Rule is specified';
         }
         const ruleValidation = isAdaptableRuleValid(data, api, context);
@@ -38,11 +36,13 @@ export const isSettingsValid = (hasCondition) => (data, api, context) => {
     return true;
 };
 export const PlusMinusSettingsWizardSection = (props) => {
-    var _a;
     const { data } = useOnePageAdaptableWizardContext();
     const handleNudgeValueChange = (event) => {
         const newValue = parseFloat(event.target.value);
-        props.onChange(Object.assign(Object.assign({}, data), { NudgeValue: isNaN(newValue) ? '' : newValue }));
+        props.onChange({
+            ...data,
+            NudgeValue: isNaN(newValue) ? '' : newValue,
+        });
     };
     return (React.createElement(Flex, { height: "100%", flexDirection: "column", "data-name": "plus-minus-column-settings" },
         React.createElement(Tabs, { autoFocus: false, padding: 2 },
@@ -50,7 +50,7 @@ export const PlusMinusSettingsWizardSection = (props) => {
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
                     React.createElement(FormRow, { label: "Nudge Value" },
-                        React.createElement(Input, { "data-name": "nudge-value", flex: 1, marginRight: 3, onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: (_a = data.NudgeValue) !== null && _a !== void 0 ? _a : '' })),
+                        React.createElement(Input, { "data-name": "nudge-value", flex: 1, marginRight: 3, onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: data.NudgeValue ?? '' })),
                     React.createElement(FormRow, { label: "Nudge Type" },
                         React.createElement(Flex, null,
                             React.createElement(Radio, { "data-name": "nudge-type-always", value: "Always", checked: !props.hasCondition, onChange: () => props.onConditionChange(false) }, "Always Apply Nudge"),