@adaptabletools/adaptable 18.0.0-canary.20 → 18.0.0-canary.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.20",
+  "version": "18.0.0-canary.21",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -10,7 +10,7 @@ import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo
 import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
-import { AdaptableMenuItem, AdaptableOptions, AdaptablePlugin, ChartDefinition, SelectedRowInfo } from '../types';
+import { AdaptableMenuItem, AdaptableOptions, AdaptablePlugin, AdaptableState, ChartDefinition, SelectedRowInfo } from '../types';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { CellPopupService } from '../Utilities/Services/CellPopupService';
@@ -265,4 +265,5 @@ export interface IAdaptable {
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     exportVisualDataToExcel(): void;
+    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
 }

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -65,12 +65,6 @@ export interface AdaptableOptions<TData = any> {
      * Commercial license key. If the license is not provided or is expired, various visual information notes will be displayed and some functionality may be limited.
      */
     licenseKey?: string;
-    /**
-     * Automatically migrate the state from the previous version of Adaptable to the current version.
-     *
-     * @defaultValue true
-     */
-    autoMigrateState?: boolean;
     /**
      * User State set at design-time and shipped with AdapTable for first use; can be `PredefinedConfig` object or url to file containing config
      *

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -12,7 +12,7 @@ export interface CommentOptions<TData = any> {
      */
     loadCommentThreads?(commentLoadContext: CommentLoadContext): Promise<CommentThread[]>;
     /**
-     * Called when Comments change and need to be saved
+     * Saves changed Comments
      * @param commentThreads
      */
     persistCommentThreads?(commentThreads: CommentThread[]): void;

package/src/AdaptableOptions/StateOptions.d.ts

@@ -33,6 +33,12 @@ export interface StateOptions {
      * @defaultValue 400
      */
     debounceStateDelay?: number;
+    /**
+     * Automatically migrate the state from the previous version of Adaptable to the current version.
+     *
+     * @defaultValue true
+     */
+    autoMigrateState?: boolean;
 }
 /**
  * State Function Config object passed into all State Options functions (except 'applyState')

package/src/Api/CommentApi.d.ts

@@ -8,9 +8,9 @@ export interface CommentApi {
      * Add a Comment to a Comment Thread
      *
      * @param comment comment
-     * @param address where the comment should be added
+     * @param cellAddress cell where comment is added
      */
-    addComment(commentText: string, address: CellAddress): void;
+    addComment(commentText: string, cellAddress: CellAddress): void;
     /**
      * Edit a Comment
      *

package/src/Api/Implementation/ConfigApiImpl.js

@@ -133,6 +133,9 @@ export class ConfigApiImpl extends ApiBase {
                         adaptable: this.adaptable,
                         adaptableStateKey,
                         predefinedConfig,
+                        postLoadHook: (state) => {
+                            return this.adaptable.normalizeAdaptableState(state, this.adaptable.agGridAdapter.getLiveGridOptions());
+                        },
                     });
                     promise
                         .then(() => {

package/src/Api/Implementation/GridApiImpl.js

@@ -526,11 +526,12 @@ export class GridApiImpl extends ApiBase {
         return this.getRowCount();
     }
     showTransposedView(transposeConfig = {}) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
         const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;
         const visibleColumns = (_c = transposeConfig.visibleColumns) !== null && _c !== void 0 ? _c : false;
         const visibleRows = (_d = transposeConfig.visibleRows) !== null && _d !== void 0 ? _d : false;
+        const autosize = (_e = transposeConfig.autosize) !== null && _e !== void 0 ? _e : true;
         this.adaptable.api.internalApi.showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
@@ -541,6 +542,7 @@ export class GridApiImpl extends ApiBase {
                 hideTransposedColumn,
                 visibleColumns,
                 visibleRows,
+                autosize,
             },
         });
     }

package/src/Api/Internal/ActionRowInternalApi.d.ts

@@ -16,6 +16,7 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildActionRowFields;
     private showColumnInActionRowForm;
     private buidActionRowButtons;
+    private prepareCreateData;
     private prepareEditData;
     private isColumnEditable;
     private buildFormField;

package/src/Api/Internal/ActionRowInternalApi.js

@@ -100,7 +100,7 @@ export class ActionRowInternalApi extends ApiBase {
                 const eventInfo = type === 'rowCreated'
                     ? {
                         type: 'rowCreated',
-                        formData: context.formData,
+                        formData: this.prepareCreateData(formFields, context),
                         adaptableApi: context.adaptableApi,
                         userName: this.getOptions().userName,
                         adaptableId: this.getOptions().adaptableId,
@@ -120,6 +120,17 @@ export class ActionRowInternalApi extends ApiBase {
         };
         return [cancelButton, saveButton];
     }
+    // private getNullValueForColumn(column: AdaptableColumn) {}
+    prepareCreateData(formFields, context) {
+        // when creating we just omit values that are not set
+        const dataToSave = Object.assign({}, context.formData);
+        for (const formField of formFields) {
+            if (dataToSave[formField.name] === '') {
+                delete dataToSave[formField.name];
+            }
+        }
+        return dataToSave;
+    }
     prepareEditData(formFields, context) {
         const dataToSave = Object.assign({}, context.formData);
         for (const formField of formFields) {

package/src/PredefinedConfig/Common/TransposeConfig.d.ts

@@ -22,4 +22,9 @@ export interface TransposeConfig {
       * @defaultValue false
       */
     visibleRows?: boolean;
+    /**
+     * Autosize columns in transposed view
+     * @defaultValue true
+     */
+    autosize?: boolean;
 }

package/src/Strategy/LayoutModule.js

@@ -39,6 +39,9 @@ export class LayoutModule extends AdaptableModuleBase {
         this.rowSummariesSubscribtions();
     }
     rowSummariesSubscribtions() {
+        if (this.api.isDestroyed()) {
+            return;
+        }
         // ROW SUMMARY
         this.evaluateRowSummary();
         this.api.eventApi.on('AdaptableStateReloaded', () => {
@@ -468,6 +471,9 @@ export class LayoutModule extends AdaptableModuleBase {
      */
     evaluateRowSummary(reason) {
         var _a;
+        if (this.api.isDestroyed()) {
+            return;
+        }
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         const rowSummaries = (_a = this.api.layoutApi.getCurrentLayout().RowSummaries) !== null && _a !== void 0 ? _a : [];
         const rowSummariesResults = rowSummaries.map(({ ColumnsMap, Position }) => {

package/src/View/Components/FilterForm/QuickFilterValues.js

@@ -6,6 +6,7 @@ import { isSameDay } from 'date-fns';
 import OverlayTrigger from '../../../components/OverlayTrigger';
 import { Flex } from 'rebass';
 import { ListBoxFilterForm } from './ListBoxFilterForm';
+import { Resizable } from 're-resizable';
 export const QuickFilterValues = (props) => {
     const { api } = props;
     const currentOverlayVisible = useRef(false);
@@ -135,33 +136,48 @@ export const QuickFilterValues = (props) => {
             }
         }, render: ({ targetWidth }) => {
             var _a;
-            return (React.createElement(Flex, { onMouseEnter: () => {
-                    if (showEvent === 'click') {
-                        // For showEvent=mousenter this is not needed.
-                        // When mouseenter is triggered on the overlay, onShowFn is called, the overlay is no longer hidden.
-                        // But in this case because the trigger is click, another show is not triggered.
-                        // The hide event is added direcly on the element so it does not use the React event system.
-                        // But this event does, maybe beause it uses event delegation it is triggered to soon.
-                        requestAnimationFrame(() => {
-                            var _a;
-                            (_a = valuesDropdownRef.current) === null || _a === void 0 ? void 0 : _a.show();
-                        });
-                    }
-                }, "data-name": "quick-filter-form", flexDirection: "column", style: {
+            return (React.createElement(Resizable, { style: {
                     fontSize: 'var(--ab-font-size-2)',
                     border: '1px solid var(--ab-color-primarydark)',
                     background: 'var(--ab-color-defaultbackground)',
                     zIndex: 1000,
-                    width: getPopoverWidth(targetWidth),
-                } },
-                React.createElement(Flex, { m: 2 },
-                    React.createElement(SimpleButton, { onClick: () => clearColumnFilter() }, "Clear Filter"),
-                    ((_a = api.optionsApi.getColumnFilterOptions()) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) == false && (React.createElement(SimpleButton, { ml: 2, onClick: () => {
-                            if (transientColumnFilter) {
-                                props.updateColumnFilter(transientColumnFilter);
-                            }
-                        } }, "Apply Filter"))),
-                React.createElement(ListBoxFilterForm, { disabled: props.isFilterDisabled, suppressClientSideFilter: quickFilterValues.suppressClientSideFilter, isLoading: isDistinctColumnValuesLoading, onFilterChange: handleFilterChange, currentColumn: props.currentColumn, columns: [], columnDistinctValues: quickFilterValues.values, dataType: props.currentColumn.dataType, uiSelectedColumnValues: props.columnFilter.Predicate.Inputs.filter((input) => input !== ''), useAgGridStyle: true, onColumnValueSelectedChange: (list) => onColumnValueSelectedChange(list) })));
+                }, enable: {
+                    top: false,
+                    right: true,
+                    bottom: false,
+                    left: false,
+                    topRight: false,
+                    bottomRight: false,
+                    bottomLeft: false,
+                    topLeft: false,
+                }, minWidth: getPopoverWidth(targetWidth) },
+                React.createElement(Flex, { onMouseEnter: () => {
+                        if (showEvent === 'click') {
+                            // For showEvent=mousenter this is not needed.
+                            // When mouseenter is triggered on the overlay, onShowFn is called, the overlay is no longer hidden.
+                            // But in this case because the trigger is click, another show is not triggered.
+                            // The hide event is added direcly on the element so it does not use the React event system.
+                            // But this event does, maybe beause it uses event delegation it is triggered to soon.
+                            requestAnimationFrame(() => {
+                                var _a;
+                                (_a = valuesDropdownRef.current) === null || _a === void 0 ? void 0 : _a.show();
+                            });
+                        }
+                    }, "data-name": "quick-filter-form", flexDirection: "column", style: {
+                    // fontSize: 'var(--ab-font-size-2)',
+                    // border: '1px solid var(--ab-color-primarydark)',
+                    // background: 'var(--ab-color-defaultbackground)',
+                    // zIndex: 1000,
+                    // width: getPopoverWidth(targetWidth),
+                    } },
+                    React.createElement(Flex, { m: 2 },
+                        React.createElement(SimpleButton, { onClick: () => clearColumnFilter() }, "Clear Filter"),
+                        ((_a = api.optionsApi.getColumnFilterOptions()) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) == false && (React.createElement(SimpleButton, { ml: 2, onClick: () => {
+                                if (transientColumnFilter) {
+                                    props.updateColumnFilter(transientColumnFilter);
+                                }
+                            } }, "Apply Filter"))),
+                    React.createElement(ListBoxFilterForm, { disabled: props.isFilterDisabled, suppressClientSideFilter: quickFilterValues.suppressClientSideFilter, isLoading: isDistinctColumnValuesLoading, onFilterChange: handleFilterChange, currentColumn: props.currentColumn, columns: [], columnDistinctValues: quickFilterValues.values, dataType: props.currentColumn.dataType, uiSelectedColumnValues: props.columnFilter.Predicate.Inputs.filter((input) => input !== ''), useAgGridStyle: true, onColumnValueSelectedChange: (list) => onColumnValueSelectedChange(list) }))));
         } },
         React.createElement(SimpleButton, { "data-name": 'Select Values', style: {
                 flex: 1,

package/src/View/Layout/TransposedPopup.js

@@ -7,7 +7,7 @@ import { ColumnSelector } from '../Components/Selectors/ColumnSelector';
 import { AdaptableAgGrid } from '../../agGrid/AdaptableAgGrid';
 export const TransposedPopup = (props) => {
     const adaptable = useAdaptable();
-    const { transposedColumnId, hideTransposedColumn, visibleColumns, visibleRows } = props.popupProps;
+    const { transposedColumnId, hideTransposedColumn, visibleColumns, visibleRows, autosize } = props.popupProps;
     const rowNodes = React.useMemo(() => {
         return props.popupProps.visibleRows
             ? adaptable.api.gridApi.getVisibleRowNodes()
@@ -96,7 +96,7 @@ export const TransposedPopup = (props) => {
             },
             layoutOptions: {
                 createDefaultLayout: false,
-                autoSizeColumnsInLayout: true,
+                autoSizeColumnsInLayout: autosize,
             },
             predefinedConfig: {
                 Layout: {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -7,6 +7,7 @@ import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
+import { AdaptableState } from '../PredefinedConfig/AdaptableState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
@@ -134,6 +135,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
      */
     static _initInternal(config: AdaptableInitInternalConfig): Promise<AdaptableApi>;
     private _initAdaptableAgGrid;
+    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
     refreshQuickFilter(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -305,15 +305,14 @@ export class AdaptableAgGrid {
              * e.g. adding default Layout, migrating deprecated state, etc.
              */
             postLoadHook: (state) => {
-                if (this.adaptableOptions.autoMigrateState) {
+                if (this.adaptableOptions.stateOptions.autoMigrateState) {
                     state = AdaptableUpgradeHelper.migrateAdaptableState(state, {
                         // version 16 actually includes all versions up until 16
                         fromVersion: 16,
                         logger: this.logger,
                     });
                 }
-                state = this.normaliseLayoutState(state, config);
-                state = this.normaliseToolPanelState(state);
+                state = this.normalizeAdaptableState(state, config.gridOptions);
                 return state;
             },
         });
@@ -388,10 +387,15 @@ export class AdaptableAgGrid {
         perfInitAdaptableAgGrid.end();
         return Promise.resolve(this.api);
     }
-    normaliseLayoutState(state, config) {
+    normalizeAdaptableState(state, gridOptions) {
+        state = this.normaliseLayoutState(state, gridOptions);
+        state = this.normaliseToolPanelState(state);
+        return state;
+    }
+    normaliseLayoutState(state, gridOptions) {
         var _a, _b, _c, _d, _e, _f;
         if (this.shouldCreateDefaultLayout(state, this.adaptableOptions)) {
-            const defaultLayout = this.createDefaultLayout(state, config.gridOptions.columnDefs);
+            const defaultLayout = this.createDefaultLayout(state, gridOptions.columnDefs);
             const layoutState = state.Layout || {};
             const availableLayouts = layoutState.Layouts || [];
             availableLayouts.push(defaultLayout);
@@ -427,7 +431,7 @@ export class AdaptableAgGrid {
          * logic where layout is applied, it is easier and
          * less error prone to just remove it.
          */
-        if (config.gridOptions.rowModelType === 'viewport') {
+        if (gridOptions.rowModelType === 'viewport') {
             (_f = state.Layout.Layouts) === null || _f === void 0 ? void 0 : _f.forEach((layout) => {
                 if (layout.RowGroupedColumns) {
                     delete layout.RowGroupedColumns;

package/src/agGrid/defaultAdaptableOptions.js

@@ -10,7 +10,6 @@ const DefaultAdaptableOptions = {
     adaptableStateKey: undefined,
     primaryKey: '',
     autogeneratePrimaryKey: false,
-    autoMigrateState: true,
     userName: GeneralConstants.USER_NAME,
     predefinedConfig: undefined,
     alertOptions: {
@@ -244,6 +243,7 @@ const DefaultAdaptableOptions = {
         loadState: undefined,
         persistState: undefined,
         clearState: undefined,
+        autoMigrateState: true,
     },
     teamSharingOptions: {
         enableTeamSharing: false,

package/src/env.js

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

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

@@ -703,15 +703,6 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode: string;
             defVal?: undefined;
             ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            defVal: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
-            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -766,6 +757,15 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo?: undefined;
             defVal?: undefined;
             ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal: string;
+            gridInfo?: undefined;
+            noCode?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -5040,14 +5040,14 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             defVal: string;
-            ref: string;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             defVal: string;
-            ref?: undefined;
+            ref: string;
         } | {
             name: string;
             kind: string;