@adaptabletools/adaptable 18.0.0-canary.24 → 18.0.0-canary.26

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

@@ -12,7 +12,23 @@ export const RowGroupingSectionSummary = () => {
     var _a;
     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, null, ((_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.length) ? (layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary, index) => {
+        var _a;
+        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+            .map(([columnId, expression]) => {
+            if (columnId === 'Source' || columnId === 'Uuid') {
+                return '';
+            }
+            return `${expression}(${adaptable.api.columnApi.getFriendlyNameForColumnId(columnId)})`;
+        })
+            .filter(Boolean)
+            .join(', ');
+        return (React.createElement(Box, { mb: 2 },
+            React.createElement(Tag, { key: index },
+                rowSummary.Position,
+                " ",
+                columns)));
+    })) : (React.createElement(Tag, null, "No Row Summaries"))));
 };
 export const RowGroupingSection = (props) => {
     var _a, _b, _c;

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

@@ -32,13 +32,13 @@ export const areSummaryRowsValid = (layout) => {
 };
 const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
     const inputType = mapColumnDataTypeToExpressionFunctionType(columnType);
-    return Object.entries(availableScalarExpressions !== null && availableScalarExpressions !== void 0 ? availableScalarExpressions : {})
-        .map(([expression, expressionDef]) => {
+    // Object.entries(availableScalarExpressions ?? {})
+    return summarySupportedExpressions
+        .filter((expression) => availableScalarExpressions[expression])
+        .map((expression) => {
         var _a, _b;
+        const expressionDef = availableScalarExpressions[expression];
         let firstArg = null;
-        if (!summarySupportedExpressions.includes(expression)) {
-            return null;
-        }
         if (Array.isArray((_a = expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs) === null || _a === void 0 ? void 0 : _a[0])) {
             // @ts-ignore
             firstArg = (_b = expressionDef.inputs.find((input) => input.includes(inputType))) === null || _b === void 0 ? void 0 : _b[0];

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -287,7 +287,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getAgGridLightThemeName;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
-    getAgGridAllGridColumns(): Column<any>[];
+    getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
     closeAllRowGroups(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -368,6 +368,16 @@ export class AdaptableAgGrid {
         this.temporaryAdaptableStateUpdates();
         this.redrawBody();
         this.refreshHeader();
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (currentLayout.EnablePivot) {
+            // this is very very strange!
+            // for some projects, if the initial layout is pivot, the columnDefs of the pivot resutl columns are NOT derived correctly from the main colDefs
+            // doing the following line fixes the issue because it foces the pivot columns to be created again
+            // this proj works without the hack: /tests/pages/format-column/initial-pivot-layout.page.tsx
+            // but this proj needs the hack: /tests/pages/format-column/initial-pivot-layout-docs.page.tsx
+            this.agGridAdapter.setGridOption('pivotMode', false);
+            this.agGridAdapter.setGridOption('pivotMode', true);
+        }
         // create the module menu (for use in the dashboard and the toolpanel)
         // TODO see #create-create-module-menu - make sure it's the same here and there
         this.ModuleService.createModuleMenus();
@@ -985,7 +995,9 @@ export class AdaptableAgGrid {
             // framework wrapper may pass the rowData as a prop
             const rowData = agGridApi.getGridOption('rowData');
             this.initWithLazyData = rowData == undefined || rowData.length === 0;
-            this.logger.info('initWithLazyData = TRUE');
+            if (this.initWithLazyData) {
+                this.logger.info('initWithLazyData = TRUE');
+            }
             if (!this.getAgGridContainerElement()) {
                 // initialize the agGridContainerElement from the AgGrid instance
                 // @ts-ignore
@@ -1371,17 +1383,17 @@ export class AdaptableAgGrid {
         // ADD filter event
         this.agGridAdapter.getAgGridApi().addGlobalListener((this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave = (type) => {
             if (columnEventsThatTriggersAutoLayoutSave.indexOf(type) > -1) {
-                this.logger.info('Column Event Triggering Auto Layout Save', type);
-                this.debouncedSaveGridLayout();
+                this.debouncedSaveGridLayout(type);
             }
         }));
         /**
          * Save Layout if Display Row Groups is "dynamic
          */
-        this.debouncedSaveGridLayout = debounce(() => {
+        this.debouncedSaveGridLayout = debounce((type) => {
             if (!this.isReady) {
                 return;
             }
+            this.logger.info('Event Triggering Auto Layout Save', type || '');
             this.updateLayoutFromGrid();
         }, HALF_SECOND);
         const rowGroupEventsThatTriggersAutoLayoutSave = [
@@ -1391,7 +1403,7 @@ export class AdaptableAgGrid {
         this.agGridAdapter.getAgGridApi().addGlobalListener((this.listenerGlobalRowGroupEventsThatTriggerAutoLayoutSave = (type) => {
             if (rowGroupEventsThatTriggersAutoLayoutSave.indexOf(type) > -1) {
                 if (this.adaptableOptions.layoutOptions.displayRowGroups == 'dynamic') {
-                    this.debouncedSaveGridLayout();
+                    this.debouncedSaveGridLayout(type);
                 }
             }
         }));
@@ -1415,7 +1427,7 @@ export class AdaptableAgGrid {
          */
         this.agGridAdapter.getAgGridApi().addEventListener(Events.EVENT_COLUMN_RESIZED, (this.listenerColumnResized = (params) => {
             if (params.finished == true && params.type == 'columnResized' && params.column) {
-                this.debouncedSaveGridLayout();
+                this.debouncedSaveGridLayout(params.type);
             }
         }));
         /**
@@ -2744,7 +2756,7 @@ export class AdaptableAgGrid {
     setRowGroupColumns(columnIds) {
         this.agGridAdapter.getAgGridApi().setRowGroupColumns(columnIds);
     }
-    getAgGridAllGridColumns() {
+    getAllGridColumns() {
         return this.agGridAdapter.getAgGridApi().getAllGridColumns();
     }
     clearRowGroupColumns() {

package/src/agGrid/AgGridAdapter.d.ts

@@ -1,9 +1,8 @@
-import { ColDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
+import { ColDef, ColGroupDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { ColGroupDef } from '@ag-grid-community/core/dist/esm/es6/entities/colDef';
 export declare class AgGridAdapter {
     private adaptableInstance;
     private DANGER_USE_GETTER_gridApi;

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: 1712325818168 || Date.now(),
-    VERSION: "18.0.0-canary.24" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712574265503 || Date.now(),
+    VERSION: "18.0.0-canary.26" || '--current-version--',
 };

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

@@ -1590,11 +1590,17 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
-        }[];
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        })[];
     };
     CellSummaryOptions: {
         name: string;