@adaptabletools/adaptable 22.0.2 → 22.0.4

package/src/Api/Internal/RowFormInternalApi.js

@@ -1,14 +1,14 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class RowFormInternalApi extends ApiBase {
     // Row Form Methods
-    buildRowEditForm(rowNode) {
+    async buildRowEditForm(rowNode) {
         return this.buildRowForm('rowEdited', rowNode);
     }
-    buildRowCreateForm(clonedRowNode) {
+    async buildRowCreateForm(clonedRowNode) {
         return this.buildRowForm('rowCreated', clonedRowNode);
     }
-    buildRowForm(type, rowNode) {
-        const formFields = this.buildRowFormFields(type, rowNode);
+    async buildRowForm(type, rowNode) {
+        const formFields = await this.buildRowFormFields(type, rowNode);
         const formButtons = this.buidRowFormButtons(type, rowNode, formFields);
         const formTitle = this.getFormTitle(type, rowNode);
         const formDescription = this.getFormDescription(type, rowNode);
@@ -104,7 +104,7 @@ export class RowFormInternalApi extends ApiBase {
         dataToSave[this.getOptions().primaryKey] = pkValue;
         return dataToSave;
     }
-    buildRowFormFields(rowFormType, rowNode) {
+    async buildRowFormFields(rowFormType, rowNode) {
         const relevantColumns = this.getColumnApi()
             .getUIAvailableColumns()
             .filter((column) => {
@@ -112,7 +112,7 @@ export class RowFormInternalApi extends ApiBase {
             return !!rowNode || this.isCellEditable(column, rowNode);
         })
             .filter((column) => this.showColumnInRowForm(column, rowFormType));
-        return relevantColumns.map((column) => this.buildRowFormField(rowFormType, column, rowNode));
+        return Promise.all(relevantColumns.map((column) => this.buildRowFormField(rowFormType, column, rowNode)));
     }
     showColumnInRowForm(adaptableColumn, rowFormType) {
         if (adaptableColumn.isActionColumn) {
@@ -135,9 +135,9 @@ export class RowFormInternalApi extends ApiBase {
         const gridCell = this.getGridApi().getGridCellFromRowNode(rowNode, column.columnId);
         return this.getGridApi().isCellEditable(gridCell);
     }
-    buildRowFormField(type, column, rowNode) {
+    async buildRowFormField(type, column, rowNode) {
         const isCellEditable = this.isCellEditable(column, rowNode);
-        const fieldValueOptions = this.getFieldValueOptions(column, rowNode);
+        const fieldValueOptions = await this.getFieldValueOptions(column, rowNode);
         const fieldType = isCellEditable
             ? !!fieldValueOptions?.length
                 ? 'select'
@@ -183,21 +183,25 @@ export class RowFormInternalApi extends ApiBase {
                 return 'text';
         }
     }
-    getFieldValueOptions(column, rowNode) {
+    async getFieldValueOptions(column, rowNode) {
         const shouldShowSelectCellEditor = this.getUserInterfaceApi().internalApi.shouldShowSelectCellEditor(column);
         if (!shouldShowSelectCellEditor) {
             return;
         }
-        const returnValues = this.getGridApi().internalApi.getDistinctDisplayValuesForColumnOld(column.columnId);
-        // FIXME add support for asynchronous custom select cell editor values
-        // it involves refactoring the AdaptableForm & adaptableFormComponent
-        // await this.getSelectCellEditorValuesForColumn(
-        //   column,
-        //   gridCell
-        // );
-        return returnValues?.map((value) => ({
-            value,
-            label: value,
+        const gridCell = rowNode
+            ? this.getGridApi().getGridCellFromRowNode(rowNode, column.columnId)
+            : undefined;
+        const valueOptions = await this.getGridApi().internalApi.getDistinctEditDisplayValuesForColumn({
+            columnId: column.columnId,
+            gridCell,
+            currentSearchValue: '',
+        });
+        if (!valueOptions?.length) {
+            return;
+        }
+        return valueOptions.map((opt) => ({
+            value: opt.value,
+            label: opt.label ?? String(opt.value),
         }));
     }
 }

package/src/Api/RowFormApi.d.ts

@@ -6,16 +6,16 @@ export interface RowFormApi {
      * Open edit dialog for row with the given primary key value
      * @param primaryKey - the primary key of the edited row
      */
-    displayEditRowForm(primaryKey: any): void;
+    displayEditRowForm(primaryKey: any): Promise<void>;
     /**
      * Open create dialog for a new row
      */
-    displayCreateRowForm(): void;
+    displayCreateRowForm(): Promise<void>;
     /**
      * Open create dialog for cloning an existing row
      * @param primaryKey - Primary Key of the duplicated row
      */
-    displayCloneRowForm(primaryKey?: any): void;
+    displayCloneRowForm(primaryKey?: any): Promise<void>;
     /**
      * Deletes row from grid (with event fired) - note: no visible Row Form is displayed
      * @param primaryKey - Primary Key of the deleted row

package/src/Api/StateApi.d.ts

@@ -15,7 +15,7 @@ import { AdaptablePersistentState, AdaptableState } from '../AdaptableState/Adap
 import { FreeTextColumnState } from '../AdaptableState/FreeTextColumnState';
 import { ToolPanelState } from '../AdaptableState/ToolPanelState';
 import { AdaptableModule, AdaptableStateKey } from '../AdaptableState/Common/Types';
-import { AdaptableFilterState, AdaptableSortState, ChartingState, FlashingCellState, InitialState, NamedQueryState, NoteState, PredefinedConfig, ScheduleState, StatusBarState, StyledColumnState } from '../types';
+import { AdaptableFilterState, AdaptableSortState, ChartingState, FlashingCellState, InitialState, NamedQueryState, NoteState, ScheduleState, StatusBarState, StyledColumnState } from '../types';
 /**
  * Range of functions to access Initial and Full Adaptable State
  */
@@ -33,18 +33,10 @@ export interface StateApi {
         flushCurrentState?: boolean;
         progressIndicatorLabel?: string;
     }): Promise<void>;
-    /**
-     * @deprecated use `getInitialState()` instead
-     */
-    getPredefinedConfig(): PredefinedConfig | any;
     /**
      * Returns the Initial Adaptable State
      */
     getInitialState(): InitialState | any;
-    /**
-     * @deprecated use `reloadInitialState()` instead
-     */
-    reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
     /**
      * Reloads existing (or supplied) Initial State; clears persistent state by calling `StateOptions.clearState`
      * @param newInitialState optional new InitialState to load

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -219,6 +219,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getCleanValue;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
     private __updateColumnModelAndRefreshGrid_already_called;
+    private __forceUpdateColumnModel;
     updateColumnModelAndRefreshGrid(): void;
     _updateColumnModelAndRefreshGridNow(): void;
     redrawBody(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -2229,10 +2229,12 @@ export class AdaptableAgGrid {
         return rawValue;
     }
     __updateColumnModelAndRefreshGrid_already_called = false;
+    __forceUpdateColumnModel = false;
     updateColumnModelAndRefreshGrid() {
-        if (this.__updateColumnModelAndRefreshGrid_already_called) {
+        if (this.__updateColumnModelAndRefreshGrid_already_called && !this.__forceUpdateColumnModel) {
             return;
         }
+        this.__forceUpdateColumnModel = false;
         try {
             this._updateColumnModelAndRefreshGridNow();
             this.__updateColumnModelAndRefreshGrid_already_called = true;
@@ -4281,6 +4283,10 @@ export class AdaptableAgGrid {
         // this setGridOption call will also trigger layout.onColumnDefsChanged()
         // which will in turn call updateColumnModelAndRefreshGrid
         this.agGridAdapter.setGridOption('columnDefs', columnDefs);
+        // the setGridOption call above already triggered updateColumnModelAndRefreshGrid,
+        // setting the dedup guard. We force the next call so that the column model
+        // is re-derived after the layout store has been updated.
+        this.__forceUpdateColumnModel = true;
         // this is needed here for when we call setAdaptableStateKey
         // and pass a new config
         this.updateLayoutInManagerAfterStoreHasChanged();

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: 1773153884150 || Date.now(),
-    VERSION: "22.0.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1773747271741 || Date.now(),
+    VERSION: "22.0.4" || '--current-version--',
 };

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

@@ -26,6 +26,10 @@ export function destructurePivotColumnId(colDef, currentModel, logWarning) {
         const pivotColumnIds = pivotColsTxt.split('-');
         const pivotKeys = pivotKeysTxt.split('-');
         const pivotColumnId = pivotColumnIds[pivotKeys.length - 1];
+        if (aggregationColumnId !== '' && !currentModel.aggColIds.includes(aggregationColumnId)) {
+            logWarning(`Unknown aggregation column: ${aggregationColumnId}`);
+            return '!unknown!';
+        }
         return {
             pivotColumnIds,
             pivotKeys,
@@ -52,16 +56,18 @@ export function destructurePivotColumnId(colDef, currentModel, logWarning) {
         return {
             pivotColumnIds,
             pivotKeys,
-            pivotColumnId: pivotColumnIds[pivotKeys.length],
+            pivotColumnId: pivotColumnIds[pivotKeys.length - 1],
         };
     }
-    // For regular pivot columns, work backwards to find aggregation column
-    const parts = withoutPrefix.split('_');
-    const lastPart = parts[parts.length - 1];
-    // Find the longest matching aggregation column id from the end
-    const aggregationColumnId = currentModel.aggColIds.find((aggId) => lastPart.endsWith(aggId));
+    // For regular pivot columns, work backwards to find aggregation column.
+    // Check if the full string ends with _${aggColId} rather than splitting by _,
+    // since agg column IDs may themselves contain underscores (e.g. github_stars).
+    // Sort by length descending so the longest match wins.
+    const aggregationColumnId = [...currentModel.aggColIds]
+        .sort((a, b) => b.length - a.length)
+        .find((aggId) => withoutPrefix.endsWith('_' + aggId));
     if (!aggregationColumnId) {
-        logWarning(`Could not identify aggregation column in: ${lastPart}`);
+        logWarning(`Could not identify aggregation column in: ${withoutPrefix}`);
         return '!unknown!';
     }
     // Remove aggregation part and get pivot columns

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

@@ -1279,10 +1279,22 @@ export class LayoutManager extends LMEmitter {
         this.computeColumnSorts(layout, columnState);
         this.computePinnedColumns(layout, columnState);
         this.computePivotAggregations(layout, columnState);
-        // Add pivot result columns to the state for ordering (will be applied with applyOrder: true later)
+        // Add pivot result columns to the state for ordering (will be applied with applyOrder: true later).
+        // Some pivot result columns may already be in the state (e.g. added by computeColumnSorts),
+        // so remove them first and re-add all pivot result columns in the persisted order,
+        // merging any existing state (like sort info) back in.
         if (Array.isArray(layout.PivotResultColumnsOrder)) {
+            const pivotResultColumnsOrderSet = new Set(layout.PivotResultColumnsOrder);
+            const existingPivotResultState = {};
+            columnState.state = columnState.state.filter((colState) => {
+                if (pivotResultColumnsOrderSet.has(colState.colId)) {
+                    existingPivotResultState[colState.colId] = colState;
+                    return false;
+                }
+                return true;
+            });
             layout.PivotResultColumnsOrder.forEach((colId) => {
-                columnState.state.push({ colId });
+                columnState.state.push(existingPivotResultState[colId] || { colId });
             });
         }
         return columnState;

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

@@ -4239,6 +4239,24 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal: string;
         }[];
     };
+    IPushPullConfig: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            defVal?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal: string;
+        })[];
+    };
     IPushPullDomain: {
         name: string;
         kind: string;
@@ -4259,12 +4277,21 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             defVal: string;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
+            ref: string;
             defVal?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal?: undefined;
+            ref?: undefined;
         })[];
     };
     IPushPullReport: {
@@ -4904,24 +4931,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    PredefinedConfig: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref: string;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            ref: string;
-            isOpt?: undefined;
-        })[];
-    };
     PredicateDefHandlerContext: {
         name: string;
         kind: string;