@adaptabletools/adaptable 12.0.4 → 12.0.7

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/GridOptionsForm.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+const CheckBox_1 = require("../../../components/CheckBox");
+const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
+const DefaultAdaptableOptions_1 = require("../../../Utilities/Defaults/DefaultAdaptableOptions");
+const GridOptionsForm = (props) => {
+    var _a;
+    let abOptions = props.adaptableOptions;
+    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(HelpBlock_1.default, null, "Grid Options"),
+        React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
+            React.createElement(FormLayout_1.FormRow, { label: "Show ToolPanel" },
+                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.sideBar == true, onChange: (addSideBar) => {
+                        abOptions = Object.assign({}, abOptions);
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.sideBar = addSideBar;
+                        props.onChangeadaptableOptions(abOptions);
+                    } })),
+            React.createElement(FormLayout_1.FormRow, { label: "Enable Range Selection" },
+                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.enableRangeSelection, onChange: (enableRangeSelection) => {
+                        abOptions = Object.assign({}, abOptions);
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.enableRangeSelection = enableRangeSelection;
+                        props.onChangeadaptableOptions(abOptions);
+                    } })),
+            React.createElement(FormLayout_1.FormRow, { label: "Show Quick Filter" },
+                React.createElement(CheckBox_1.CheckBox, { checked: (_a = gridOptions.defaultColDef) === null || _a === void 0 ? void 0 : _a.floatingFilter, onChange: (floatingFilter) => {
+                        abOptions = Object.assign({}, abOptions);
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.defaultColDef = {
+                            floatingFilter,
+                        };
+                        props.onChangeadaptableOptions(abOptions);
+                    } })),
+            React.createElement(FormLayout_1.FormRow, { label: "Suppress Column Virtualisation" },
+                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressColumnVirtualisation, onChange: (suppressColumnVirtualisation) => {
+                        abOptions = Object.assign({}, abOptions);
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
+                        props.onChangeadaptableOptions(abOptions);
+                    } })),
+            React.createElement(FormLayout_1.FormRow, { label: "Show Column Menu Button" },
+                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressMenuHide, onChange: (suppressMenuHide) => {
+                        abOptions = Object.assign({}, abOptions);
+                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
+                        abOptions.gridOptions.suppressMenuHide = suppressMenuHide;
+                        props.onChangeadaptableOptions(abOptions);
+                    } })))));
+};
+exports.default = GridOptionsForm;

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -324,7 +324,6 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
-    console.log('formatters', scopedCustomFormatters);
     return (React.createElement(rebass_1.Box, { "data-name": 'format-column-display-format', padding: 2 },
         React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "Format"),

package/src/agGrid/Adaptable.js

@@ -1394,13 +1394,6 @@ class Adaptable {
             shouldUpdateHeaders = this.setupColumnHeader(colSetupInfo) || shouldUpdateHeaders;
         });
         isChanged = isChanged || shouldUpdateHeaders;
-        if (this.api.layoutApi.areExpandedRowGroupsSavedInLayouts() &&
-            ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ExpandedRowGroupValues)) {
-            this.expandRowGroupsForValues(layout.ExpandedRowGroupValues);
-        }
-        if (this.adaptableOptions.layoutOptions.displayRowGroups === 'expanded') {
-            this.expandAllRowGroups();
-        }
         if (isChanged) {
             // it's important we set pivot mode
             // before we set column state
@@ -1421,6 +1414,15 @@ class Adaptable {
             // so we figured out the following line fixes the issue
             // this.gridOptions.api.setColumnDefs(this.gridOptions.api.getColumnDefs()); //TODO find a solution for weighted averages - column floating filters are not showing
             GridApi_setColumnDefs.call(this.gridOptions.api, this.gridOptions.api.getColumnDefs());
+            // these updates need to be at the end, the methods are based on the grid state/col defs
+            // the layout needs to be applied for them to work
+            if (this.api.layoutApi.areExpandedRowGroupsSavedInLayouts() &&
+                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ExpandedRowGroupValues)) {
+                this.expandRowGroupsForValues(layout.ExpandedRowGroupValues);
+            }
+            if (this.adaptableOptions.layoutOptions.displayRowGroups === 'expanded') {
+                this.expandAllRowGroups();
+            }
             // this.updateColumnsIntoStore();// no longer needed
         }
         const colsToAutoSizeArray = Object.keys(colsToAutoSize);

package/src/agGrid/agGridHelper.js

@@ -162,9 +162,9 @@ class agGridHelper {
         const customFriendlyName = typeof columnFriendlyName === 'function'
             ? columnFriendlyName({ colId: colId, agColumn: agGridColumn })
             : null;
-        const FriendlyName = (customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : isActionRowButtonColumn)
+        const FriendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
             ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
-            : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header');
+            : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header'));
         if (!this.initialAgGridColDefs[colId]) {
             this.initialAgGridColDefs[colId] = Object.assign({}, agGridColumn.getUserProvidedColDef());
         }

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -40,6 +40,9 @@ function BaseEditorInput(props) {
     };
     const testRowNode = react_1.useMemo(() => {
         const firstRowNode = props.api.gridApi.getFirstRowNode();
+        if (!firstRowNode || !firstRowNode.data) {
+            return {};
+        }
         // clone the class instance to still keep the prototype methods
         return Object.assign(Object.create(Object.getPrototypeOf(firstRowNode)), firstRowNode);
     }, []);
@@ -51,7 +54,7 @@ function BaseEditorInput(props) {
             result = expr.evaluate({
                 // we need a fully-fledged rowNode as Adaptable accesses internal methods of it
                 node: testRowNode,
-                api: props.api,
+                adaptableApi: props.api,
                 functions: expressionFunctions,
             });
         }

package/src/components/ExpressionEditor/index.js

@@ -112,9 +112,9 @@ function ExpressionEditor(props) {
                     cursor: 'grab',
                     marginRight: 'var(--ab-space-1)',
                 }, data: `[${column.columnId}]`, "data-name": "column", icon: "drag" },
-                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, Number(e.target.value))), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, e.target.value)), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", value: getColDateValue(column), onChange: (e) => {
+                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", "data-value": column.columnId, value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, Number(e.target.value))), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", "data-value": column.columnId, value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, e.target.value)), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", "data-value": column.columnId, value: getColDateValue(column), onChange: (e) => {
                 setData(updateColValue(data, column, new Date(e.target.value)));
-            }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", checked: getColValue(column), onChange: (checked) => setData(updateColValue(data, column, checked)), disabled: column.readOnly })) : null))))));
+            }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", "data-value": column.columnId, checked: getColValue(column), onChange: (checked) => setData(updateColValue(data, column, checked)), disabled: column.readOnly })) : null))))));
     const namedQueries = (React.createElement("div", null, props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: {
             padding: 3,
             marginTop: 'var(--ab-space-2)',

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

@@ -2544,22 +2544,22 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             description: string;
             uiLabel: string;
-            reference: string;
-            isOptional?: undefined;
+            isOptional: boolean;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional: boolean;
-            reference?: undefined;
+            reference: string;
+            isOptional?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            reference?: undefined;
             isOptional?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;