@adaptabletools/adaptable-cjs 20.0.0-canary.5 → 20.0.0-canary.7

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -46,6 +46,47 @@ const ConfigurationWizard = (props) => {
                 delete newColumn.caption;
                 return newColumn;
             });
+            const columnDefs = adaptableConfig.gridOptions.columnDefs;
+            // handle the layout creation
+            let Layouts = newAdaptableOptions.predefinedConfig?.Layout?.Layouts || [];
+            const NewLayout = {
+                TableColumns: columnDefs.map((col) => col.colId ?? col.field),
+                Name: 'Default Layout',
+            };
+            let currentLayoutName = NewLayout.Name;
+            let found = false;
+            if (!Layouts.length) {
+                // no layouts, make this the only one
+                Layouts = [NewLayout];
+            }
+            else {
+                Layouts = Layouts.map((layout) => {
+                    if (found) {
+                        return layout;
+                    }
+                    if (layout.TableColumns?.length === 0) {
+                        // when finding the first empty layout
+                        // set its column to be those of the new layout
+                        found = true;
+                        // and grab the name so we can put it in the Layout.CurrentLayout state
+                        currentLayoutName = layout.Name;
+                        layout = { ...layout };
+                        layout.TableColumns = NewLayout.TableColumns;
+                    }
+                    return layout;
+                });
+                if (!found) {
+                    Layouts.push(NewLayout);
+                }
+            }
+            newAdaptableOptions.predefinedConfig = {
+                ...newAdaptableOptions.predefinedConfig,
+                Layout: {
+                    ...newAdaptableOptions.predefinedConfig.Layout,
+                    Layouts: Layouts,
+                    CurrentLayout: currentLayoutName,
+                },
+            };
             newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
         }
         const newAdaptableConfig = {

package/src/agGrid/AdaptableAgGrid.js

@@ -2965,6 +2965,10 @@ You need to define at least one Layout!`);
             };
             this.agGridColumnAdapter.setupColumnHeader(colSetupInfo);
         });
+        // need to refresh the header,
+        // as the Layout.ColumnHeaders state property is not implemented in the LayoutManager
+        // and is specific to Adaptable, therefore we need to refresh it manually
+        this.refreshHeader();
         const layoutModel = (0, LayoutHelpers_1.layoutStateToLayoutModel)(layout);
         this.layoutManager?.setLayout(layoutModel, {
             skipApplyRowGroupsExpandedState: !shouldUpdateExpandState,

package/src/agGrid/AgGridAdapter.js

@@ -100,7 +100,7 @@ class AgGridAdapter {
             // `context`
             const passedContext = options.context;
             if (passedContext) {
-                passedContext['__adaptable'] = self;
+                passedContext['__adaptable'] = self._adaptableInstance;
                 passedContext['adaptableApi'] = self.adaptableApi;
             }
             // we mutated the options array, so it's OK to use the 'arguments' object

package/src/agGrid/AgGridColumnAdapter.js

@@ -392,9 +392,6 @@ class AgGridColumnAdapter {
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
             }
-            // required here for the initial layout rendering
-            // Removed by JW, 3 october 2023; i don't think we need it and it overrides stuff unnecessarily
-            abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = col?.getColDef()?.headerName;

package/src/agGrid/AgGridExportAdapter.d.ts

@@ -23,6 +23,7 @@ export declare class AgGridExportAdapter {
     private get agGridApi();
     private get adaptableApi();
     private get exportOptions();
+    private get logger();
     static getExcelClassNameForCell(colId: string, primaryKeyValue: any, userDefinedCellClass?: string | string[]): string;
     destroy(): void;
     exportData(config: ExportConfig): Promise<null | ExportResultData>;

package/src/agGrid/AgGridExportAdapter.js

@@ -33,6 +33,9 @@ class AgGridExportAdapter {
     get exportOptions() {
         return this._adaptableInstance.api.optionsApi.getExportOptions();
     }
+    get logger() {
+        return this._adaptableInstance.logger;
+    }
     static getExcelClassNameForCell(colId, primaryKeyValue, userDefinedCellClass) {
         let excelClassName = `--excel-cell-${colId}-${primaryKeyValue}`;
         if (excelClassName.indexOf(' ') > 0) {
@@ -102,8 +105,7 @@ class AgGridExportAdapter {
             };
         }
         catch (error) {
-            // FIXME AFL improve logging
-            console.error(error);
+            this.logger.consoleError(`Error exporting ${report.Name} in ${format} format to ${config.destination}`, error);
         }
         finally {
             /**

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1741156652553 || Date.now(),
-    VERSION: "20.0.0-canary.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1741274250893 || Date.now(),
+    VERSION: "20.0.0-canary.7" || '--current-version--',
 };