@adaptabletools/adaptable 20.1.7 → 20.1.9

package/package.json

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

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -17,6 +17,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         [key: string]: boolean;
     };
     getCurrentVisibleColumnIdsForTableLayout(): string[];
+    getCurrentVisibleColumnIdsForPivotLayout(): string[];
     getCurrentRowGroupsColumnIds(): string[];
     setLayout(layoutName: string): void;
     getCurrentLayout(): Layout;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -43,6 +43,15 @@ export class LayoutApiImpl extends ApiBase {
         }
         return layout.TableColumns.filter((colId) => !layout.ColumnVisibility || layout.ColumnVisibility?.[colId] !== false);
     }
+    getCurrentVisibleColumnIdsForPivotLayout() {
+        const layout = this.getCurrentLayout();
+        if (!isPivotLayout(layout)) {
+            return [];
+        }
+        return this.getAgGridApi()
+            .getAllDisplayedColumns()
+            .map((col) => col.getColId());
+    }
     getCurrentRowGroupsColumnIds() {
         const layout = this.getCurrentLayout();
         if (isPivotLayout(layout)) {

package/src/Api/LayoutApi.d.ts

@@ -29,15 +29,19 @@ export interface LayoutApi {
      */
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
     /**
-     * Retrieves map with visible columns in current Layout
+     * Retrieves map with visible columns in current Table Layout
      */
     getCurrentVisibleColumnIdsMapForTableLayout(): {
         [key: string]: boolean;
     };
     /**
-     * Retrieves array of visible ColumnIds in current Layout
+     * Retrieves array of visible ColumnIds in current Table Layout
      */
     getCurrentVisibleColumnIdsForTableLayout(): string[];
+    /**
+     * Retrieves array of visible ColumnIds in current Pivot Layout
+     */
+    getCurrentVisibleColumnIdsForPivotLayout(): string[];
     /**
      * Retrieves array of visible ColumnIds in current Layout
      */

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

@@ -195,14 +195,16 @@ export const ColumnsSection = (props) => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const [searchInputValue, setSearchInputValue] = React.useState('');
-    // we don't want to rely on all the columns from the Grid itself
-    // since the "Row Groups" section of the editor can determine a change
-    // which is not reflected into AG Grid until we hit finish
-    //
-    // so we only rely on non-generated columns, which are the same
-    const allColumns = adaptable.api.columnApi.getUIAvailableColumns().filter((col) => {
+    const allColumns = adaptable.api.columnApi
+        .getUIAvailableColumns()
+        .filter((col) => {
+        // since the "Row Groups" section of the editor can determine a change
+        // which is not reflected into AG Grid until we hit finish
+        // so we only rely on non-generated columns, which are the same
         return !col.isGeneratedRowGroupColumn;
-    });
+    })
+        // if the current Layout is a PivotLayout, then we also filter out current Pivot Result Columns
+        .filter((col) => !col.isGeneratedPivotResultColumn);
     // however, changes in RowGroupedColumns done in the previous step
     // are reflected into the layout, so we use the latest layout.RowGroupedColumns
     // to create new columns

package/src/agGrid/AdaptableAgGrid.js

@@ -1558,13 +1558,9 @@ You need to define at least one Layout!`);
             const autoGroupColumns = gridApi
                 .getAllGridColumns()
                 .filter((column) => this.api.columnApi.isAutoRowGroupColumn(column.getColId()));
-            if (pivotResultColumns.length) {
-                agGridCols = [...agGridCols, ...pivotResultColumns, ...autoGroupColumns];
-            }
+            agGridCols = [...autoGroupColumns, ...agGridCols, ...pivotResultColumns];
         }
-        const columnGroupChildren = gridApi
-            // TODO AFL MIG: check why this assertion is here
-            .getAllDisplayedColumnGroups();
+        const columnGroupChildren = gridApi.getAllDisplayedColumnGroups();
         const groupsCount = {};
         const colsToGroups = (columnGroupChildren ?? []).reduce((acc, columnGroup) => {
             if (!columnGroup.getProvidedColumnGroup?.()?.getColGroupDef()) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -343,8 +343,8 @@ export class AgGridColumnAdapter {
                 return userGetQuickFilterText;
             }
             return (params) => {
-                const visibleCoulmnsMap = this.adaptableApi.layoutApi.getCurrentVisibleColumnIdsMapForTableLayout();
-                const isVisible = visibleCoulmnsMap[abColumn.columnId];
+                const visibleColumnsMap = this.adaptableApi.layoutApi.getCurrentVisibleColumnIdsMapForTableLayout();
+                const isVisible = visibleColumnsMap[abColumn.columnId];
                 if (!isVisible) {
                     return '';
                 }

package/src/agGrid/AgGridExportAdapter.js

@@ -316,9 +316,13 @@ export class AgGridExportAdapter {
         // we compute the exported column keys early, as we need them for other parts of the export process
         const onlyExportableColumnIds = (columnId) => exportableColumnIdsSet.has(columnId);
         const getVisibleColumnIds = () => {
-            return this.adaptableApi.layoutApi
-                .getCurrentVisibleColumnIdsForTableLayout()
-                .filter(onlyExportableColumnIds);
+            return this.adaptableApi.layoutApi.isCurrentLayoutPivot()
+                ? this.adaptableApi.layoutApi
+                    .getCurrentVisibleColumnIdsForPivotLayout()
+                    .filter(onlyExportableColumnIds)
+                : this.adaptableApi.layoutApi
+                    .getCurrentVisibleColumnIdsForTableLayout()
+                    .filter(onlyExportableColumnIds);
         };
         let exportedColumnIds = [];
         switch (report.ReportColumnScope) {

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: 1748599416526 || Date.now(),
-    VERSION: "20.1.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1749212715232 || Date.now(),
+    VERSION: "20.1.9" || '--current-version--',
 };