@adaptabletools/adaptable 20.2.5 → 20.2.6

package/package.json

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

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -92,10 +92,6 @@ export interface AdaptableOptions<TData = any, TContext = Record<string, any>> {
      * Options for managing Action Columns
      */
     actionColumnOptions?: ActionColumnOptions<TData>;
-    /**
-     * Options for managing Row Forms
-     */
-    rowFormOptions?: RowFormOptions<TData>;
     /**
      * Options for managing Alerts in AdapTable
      *
@@ -237,6 +233,10 @@ export interface AdaptableOptions<TData = any, TContext = Record<string, any>> {
      * @noCodeContainer
      */
     quickSearchOptions?: QuickSearchOptions<TData>;
+    /**
+     * Options for managing Row Forms
+     */
+    rowFormOptions?: RowFormOptions<TData>;
     /**
      * Setting panel options
      *

package/src/AdaptableOptions/DataSetOptions.d.ts

@@ -5,7 +5,7 @@ import { FormContext } from '../AdaptableState/Common/FormContext';
  */
 export interface DataSetOptions<TData = any> {
     /**
-     * Collection of Data Sets to provide Data to AdapTable
+     * Collection of Data Sets to provide data to AdapTable
      */
     dataSets?: DataSet[];
 }

package/src/AdaptableState/Common/AdaptableColumn.d.ts

@@ -95,6 +95,10 @@ export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
      * Is Column editable; returns FALSE if Column has conditional/dynamic editability, assuming some rows are editable
      */
     readOnly: boolean;
+    /**
+     * Is Column resizable
+     */
+    resizable: boolean;
     /**
      * Is Column currently visible
      */

package/src/AdaptableState/ExportState.d.ts

@@ -32,11 +32,11 @@ export interface Report extends AdaptableObject {
      */
     Name: ReportNameType;
     /**
-     * Columns to display: 'AllColumns', 'VisibleColumns', 'SelectedColumns', 'ScopeColumns'
+     * Columns to display: `AllColumns`, `VisibleColumns`, `SelectedColumns`, `ScopeColumns`
      */
     ReportColumnScope: ReportColumnScope;
     /**
-     * Rows to export: 'AllRows', 'VisibleRows',  'SelectedRows', 'ExpressionRows'
+     * Rows to export: `AllRows`, `VisibleRows`,  `SelectedRows`, `ExpressionRows`
      */
     ReportRowScope: ReportRowScope;
     /**

package/src/AdaptableState/FormatColumnState.d.ts

@@ -22,11 +22,11 @@ export interface FormatColumnState extends BaseState {
  */
 export interface FormatColumn extends SuspendableObject {
     /**
-     * Where Format will be applied - whole Row, some Columns or all Columns of given DataType
+     * Where Format will be applied: whole Row, some Columns, or Columns of DataType
      */
     Scope: ColumnScope;
     /**
-     * Rule used to decide whether to apply the Format; if undefined Format is always applied
+     * Rule to decide whether to apply Format; if undefined Format is always applied
      */
     Rule?: FormatColumnRule;
     /**
@@ -46,7 +46,7 @@ export interface FormatColumn extends SuspendableObject {
      */
     RowScope?: RowScope;
     /**
-     * When to format Columns in Column Groups (can be 'Expanded', 'Collapsed' or 'Both')
+     * When to format Columns in Column Groups ('Expanded', 'Collapsed' or 'Both')
      *
      */
     ColumnGroupScope?: ColumnGroupScope;

package/src/Api/AdaptableApi.d.ts

@@ -72,14 +72,14 @@ export interface AdaptableApi {
      * Provides access to the Bulk Update Module
      */
     bulkUpdateApi: BulkUpdateApi;
-    /**
-     * Functions for managing Holidays
-     */
-    calendarApi: CalendarApi;
     /**
      * Provides access to the Calculated Column Module
      */
     calculatedColumnApi: CalculatedColumnApi;
+    /**
+     * Functions for managing Holidays
+     */
+    calendarApi: CalendarApi;
     /**
      * Provides access to the Cell Summary Module
      */
@@ -93,9 +93,21 @@ export interface AdaptableApi {
      */
     columnApi: ColumnApi;
     /**
-     * Methods giving access to Adaptable State
+     * Provides access to Column Menu
      */
-    stateApi: StateApi;
+    columnMenuApi: ColumnMenuApi;
+    /**
+     * Provides access to Context Menu
+     */
+    contextMenuApi: ContextMenuApi;
+    /**
+     * Provides access to the Comment Module
+     */
+    commentApi: CommentApi;
+    /**
+     * Manages the `Scope` object - used widely to determine where objects are applied
+     */
+    columnScopeApi: ColumnScopeApi;
     /**
      * Provides access to the Custom Sort Module
      */
@@ -108,6 +120,10 @@ export interface AdaptableApi {
      * Provides run-time access to the Data Changes Module
      **/
     dataChangeHistoryApi: DataChangeHistoryApi;
+    /**
+     * Provides access to the Data Import Module
+     */
+    dataImportApi: DataImportApi;
     /**
      * Provides access to Data Sets
      */
@@ -124,6 +140,14 @@ export interface AdaptableApi {
      * Provides access to the Export Module and Reports
      */
     exportApi: ExportApi;
+    /**
+     * Manages AdapTableQL Expressions
+     */
+    expressionApi: ExpressionApi;
+    /**
+     * Manages the FDC3 capabilities of AdapTable
+     */
+    fdc3Api: Fdc3Api;
     /**
      * Provides access to Filtering in AdapTable
      */
@@ -148,6 +172,14 @@ export interface AdaptableApi {
      * Provides access to the Layout Module
      */
     layoutApi: LayoutApi;
+    /**
+     * Provides access to the Named Query Module
+     */
+    namedQueryApi: NamedQueryApi;
+    /**
+     * Provides access to the Note Module
+     */
+    noteApi: NoteApi;
     /**
      * Provides access to Adaptable Options
      */
@@ -164,14 +196,6 @@ export interface AdaptableApi {
      * Manages the Predicate - a  boolean-return function used in Filters and Alerts
      */
     predicateApi: PredicateApi;
-    /**
-     * Provides access to the Named Query Module
-     */
-    namedQueryApi: NamedQueryApi;
-    /**
-     * Manages AdapTableQL Expressions
-     */
-    expressionApi: ExpressionApi;
     /**
      * Provides access to the Quick Search Module
      */
@@ -188,10 +212,6 @@ export interface AdaptableApi {
      * Provides access to the Settings Panel
      */
     settingsPanelApi: SettingsPanelApi;
-    /**
-     * Manages the `Scope` object - used widely to determine where objects are applied
-     */
-    columnScopeApi: ColumnScopeApi;
     /**
      * Provides access to the Shortcut Module
      */
@@ -200,6 +220,10 @@ export interface AdaptableApi {
      * Provides access to the Smart Edit Module
      */
     smartEditApi: SmartEditApi;
+    /**
+     * Methods giving access to Adaptable State
+     */
+    stateApi: StateApi;
     /**
      * Provides run-time access to the AdapTable Status Bar
      */
@@ -228,30 +252,6 @@ export interface AdaptableApi {
      * Manages User Interface Options where colours, styles and custom column values are configured
      */
     userInterfaceApi: UserInterfaceApi;
-    /**
-     * Provides access to the Note Module
-     */
-    noteApi: NoteApi;
-    /**
-     * Provides access to Column Menu
-     */
-    columnMenuApi: ColumnMenuApi;
-    /**
-     * Provides access to Context Menu
-     */
-    contextMenuApi: ContextMenuApi;
-    /**
-     * Provides access to the Comment Module
-     */
-    commentApi: CommentApi;
-    /**
-     * Provides access to the Data Import Module
-     */
-    dataImportApi: DataImportApi;
-    /**
-     * Manages the FDC3 capabilities of AdapTable
-     */
-    fdc3Api: Fdc3Api;
     /**
      * Cleanup method - call only for vanilla JavaScript components, as framework components handle cleanup on destroy/unmount. By default, it unmounts the Adaptable component and destroys the AG Grid instance.
      * @param config - optional configuration object

package/src/Api/EventApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, RowChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowFormSubmittedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo } from '../types';
+import { AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowChangedInfo, RowFormSubmittedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */

package/src/Api/Implementation/ColumnApiImpl.js

@@ -12,6 +12,7 @@ const ROW_GROUP_COLUMN_DEFAULTS = {
     friendlyName: 'Group',
     isPrimaryKey: false,
     readOnly: false,
+    resizable: true,
     visible: true,
     alwaysHidden: false,
     fieldOnly: false,

package/src/Api/OptionsApi.d.ts

@@ -1,10 +1,4 @@
-import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
-import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
-import { ActionColumnOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnMenuOptions, ColumnOptions, ContainerOptions, ContextMenuOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, NoteOptions, NotificationsOptions, PredicateOptions, QuickSearchOptions, RowFormOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
-import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
-import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
-import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
-import { CommentOptions } from '../AdaptableOptions/CommentOptions';
+import { ActionColumnOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnMenuOptions, ColumnOptions, CommentOptions, ContainerOptions, ContextMenuOptions, CustomSortOptions, DashboardOptions, DataChangeHistoryOptions, DataImportOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, ExpressionOptions, Fdc3Options, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, NoteOptions, NotificationsOptions, PredicateOptions, QuickSearchOptions, RowFormOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 /**
  * Range of functions to access Adaptable Options
  */

package/src/Strategy/TeamSharingModule.js

@@ -25,9 +25,9 @@ export class TeamSharingModule extends AdaptableModuleBase {
         ];
     }
     onAdaptableReady() {
-        // make sure there is no zombie import process remaining (in case a previous import crashed)
-        this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {
+            // make sure there is no zombie import process remaining (in case a previous import crashed)
+            this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
             this.api.teamSharingApi.refreshTeamSharing();
         }
         this.api.eventApi.on('AdaptableStateChanged', (adaptableStateChangedInfo) => this.handleStateChanged(adaptableStateChangedInfo));

package/src/View/Dashboard/Dashboard.js

@@ -87,7 +87,7 @@ const DashboardComponent = (props) => {
     };
     const renderQuickSearch = () => {
         return (React.createElement(Box, { ml: 2 },
-            React.createElement(QuickSearchInput, { width: '7rem' })));
+            React.createElement(QuickSearchInput, { width: '7rem', className: "ab-DashboardToolbar__QuickSearch__text" })));
     };
     let instanceName = props.api.internalApi.getToolbarTitle();
     let dashboardOptions = props.api.optionsApi.getDashboardOptions();

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

@@ -184,7 +184,7 @@ const ColumnRow = (props) => {
                                 props.onColumnNameChange(props.column.columnId, event.target.value);
                             }, value: customHeader })),
                     React.createElement(FormRow, { label: "Width" },
-                        React.createElement(Input, { "data-name": "column-width", className: "ab-Layout-Wizard__ColumnRow__Input", type: "number", placeholder: "Column width", onChange: (event) => {
+                        React.createElement(Input, { "data-name": "column-width", className: "ab-Layout-Wizard__ColumnRow__Input", type: "number", placeholder: "Column width", disabled: !props.column.resizable, onChange: (event) => {
                                 let value = parseFloat(event.target.value);
                                 value = typeof value === 'number' && !isNaN(value) ? value : void 0;
                                 props.onColumnWidthChange(props.column.columnId, value);

package/src/View/QuickSearch/QuickSearchInput.d.ts

@@ -3,5 +3,6 @@ export interface QuickSearchInputProps {
     className?: string;
     autoFocus?: boolean;
     width?: string | number;
+    onClick?: (event: React.MouseEvent<HTMLInputElement>) => void;
 }
 export declare const QuickSearchInput: React.FunctionComponent<QuickSearchInputProps>;

package/src/View/QuickSearch/QuickSearchInput.js

@@ -17,7 +17,7 @@ export const QuickSearchInput = (props) => {
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (React.createElement(AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: join('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: isServerSideRowModel ? null : (React.createElement(Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
+    return (React.createElement(AdaptableFormControlTextClear, { onClick: props.onClick, "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: join('ab-QuickSearch__control', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: isServerSideRowModel ? null : (React.createElement(Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
             React.createElement(SimpleButton, { "aria-label": 'Previous Match', icon: "arrow-up", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoPreviousMatch() }),
             React.createElement(SimpleButton, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() }))) }));
 };

package/src/View/QuickSearch/QuickSearchStatusBarContent.js

@@ -1,12 +1,5 @@
 import * as React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useAdaptable } from '../AdaptableContext';
-import { AdaptableFormControlTextClear } from '../Components/Forms/AdaptableFormControlTextClear';
-import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
+import { QuickSearchInput } from './QuickSearchInput';
 export const QuickSearchStatusBarContent = () => {
-    const text = useSelector((state) => state.QuickSearch.QuickSearchText);
-    const dispatch = useDispatch();
-    const adaptable = useAdaptable();
-    const handleTextChange = React.useCallback((text) => dispatch(QuickSearchRedux.QuickSearchRun(text)), []);
-    return (React.createElement(AdaptableFormControlTextClear, { onClick: (event) => event.stopPropagation(), type: "text", inputStyle: { padding: '2px 3px', width: 90 }, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, value: text, OnTextChange: handleTextChange }));
+    return React.createElement(QuickSearchInput, { onClick: (event) => event.stopPropagation() });
 };

package/src/agGrid/AdaptableAgGrid.js

@@ -434,6 +434,7 @@ export class AdaptableAgGrid {
         this.refreshHeader();
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         checkForDuplicateColumns(currentLayout);
+        this._prevLayout = currentLayout;
         this.__prevLayoutForRefresh = currentLayout;
         if (isPivotLayout(currentLayout)) {
             // this is very very strange!

package/src/agGrid/AgGridAdapter.js

@@ -471,6 +471,7 @@ export class AgGridAdapter {
             isTreeColumn,
             columnId: ColumnId,
             field: colDef.field,
+            resizable: colDef.resizable !== false,
             friendlyName: friendlyName,
             isPrimaryKey: ColumnId === pkColumn,
             dataType: dataType,

package/src/agGrid/AgGridColumnAdapter.js

@@ -109,9 +109,10 @@ export class AgGridColumnAdapter {
                 this.agGridApi.getAllGridColumns();
         if (pivotMode) {
             const pivotResultColumns = this.agGridApi.getPivotResultColumns() || [];
-            if (pivotResultColumns.length) {
-                cols = [...cols, ...pivotResultColumns];
-            }
+            const autoGroupColumns = this.agGridApi
+                .getAllGridColumns()
+                .filter((column) => this.adaptableApi.columnApi.isAutoRowGroupColumn(column.getColId()));
+            cols = [...autoGroupColumns, ...cols, ...pivotResultColumns];
         }
         // this needs to be here, before the other setup below
         // so the setup methods below reference the correct columns in adaptable store

package/src/agGrid/AgGridExportAdapter.js

@@ -419,7 +419,7 @@ export class AgGridExportAdapter {
                 let rawValue = rowNode.key;
                 return { columnId, rawValue };
             }
-            if (this.adaptableApi.columnApi.isPivotResultColumn(agColumn.getColId())) {
+            if (!!rowNode.aggData) {
                 const columnId = agColumn.getColId();
                 const rawValue = rowNode.aggData?.[columnId];
                 return { columnId, rawValue };

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_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: 1751286758695 || Date.now(),
-    VERSION: "20.2.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1751633635859 || Date.now(),
+    VERSION: "20.2.6" || '--current-version--',
 };

package/src/layout-manager/src/index.js

@@ -1016,7 +1016,9 @@ export class LayoutManager extends LMEmitter {
             acc[colId] = index;
             return acc;
         }, {});
-        columnState.applyOrder = true;
+        // having this set to true will change pivot column order when there is sorting
+        // and we don't want that to happen #keep-sorted-columns-in-same-order-as-unsorted
+        // columnState.applyOrder = true;
         const columnIds = getColumnOrderIdsForAllColDefs([
             ...layout.PivotColumns,
             ...(layout.PivotAggregationColumns || []).map((col) => col.ColumnId),