@adaptabletools/adaptable-cjs 20.0.0-canary.2 → 20.0.0-canary.4

package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.js

@@ -18,7 +18,7 @@ const renderStyledColumnTypeSummary = (data) => {
     else if (data.PercentBarStyle) {
         type = 'Percent Bar';
     }
-    else if (data.SparkLineStyle) {
+    else if (data.SparklineStyle) {
         type = 'Spark Line';
     }
     else if (data.BadgeStyle) {
@@ -38,7 +38,7 @@ const StyledColumnWizardTypeSection = (props) => {
         };
         delete newStyledColumn.GradientStyle;
         delete newStyledColumn.PercentBarStyle;
-        delete newStyledColumn.SparkLineStyle;
+        delete newStyledColumn.SparklineStyle;
         delete newStyledColumn.BadgeStyle;
         switch (type) {
             case 'gradient':
@@ -48,7 +48,7 @@ const StyledColumnWizardTypeSection = (props) => {
                 newStyledColumn.PercentBarStyle = {};
                 break;
             case 'sparkline':
-                newStyledColumn.SparkLineStyle = {
+                newStyledColumn.SparklineStyle = {
                     options: {
                         type: 'line',
                     },
@@ -69,7 +69,7 @@ const StyledColumnWizardTypeSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Gradient", description: "Colour each cell in the column using a Gradient value (Numeric Columns)", checked: Boolean(data.GradientStyle), onClick: () => handleTypeChange('gradient') }),
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Percent Bar", description: "Display a coloured Bar where the width is based on the cell (Numeric Columns)", checked: Boolean(data.PercentBarStyle), onClick: () => handleTypeChange('percent') }),
-                adaptable.api.styledColumnApi.canDisplaySparklines() && (React.createElement(TypeRadio_1.TypeRadio, { text: "Sparkline", description: "Render the column as a Sparkline (Numeric Array Columns)", checked: Boolean(data.SparkLineStyle), onClick: () => handleTypeChange('sparkline') })),
+                adaptable.api.styledColumnApi.canDisplaySparklines() && (React.createElement(TypeRadio_1.TypeRadio, { text: "Sparkline", description: "Render the column as a Sparkline (Numeric Array Columns)", checked: Boolean(data.SparklineStyle), onClick: () => handleTypeChange('sparkline') })),
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Badge", description: "Display the column's values as Badges (All Columns)", checked: Boolean(data.BadgeStyle), onClick: () => handleTypeChange('badge') })))));
 };
 exports.StyledColumnWizardTypeSection = StyledColumnWizardTypeSection;

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -61,11 +61,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     hasAutogeneratedPrimaryKey: boolean;
     hasAdaptableToolPanel: boolean;
     private initWithLazyData;
-    /**
-     * once layouts are properly handled with the new aggrid methods & events
-     * we can remove this hack
-     */
-    private previousAgGridLayoutState;
     _rawAdaptableOptions: AdaptableOptions;
     adaptableOptions: AdaptableOptions;
     _isDetailGrid: boolean;
@@ -147,6 +142,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
      */
     static _initInternal(config: AdaptableInitInternalConfig): Promise<AdaptableApi>;
     private _initAdaptableAgGrid;
+    midwayDestroy(): void;
     normalizeAdaptableState(state: AdaptableState, agGridOptions: NormalizeAdaptableStateOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
@@ -337,6 +333,5 @@ export declare class AdaptableAgGrid implements IAdaptable {
     refreshLayout(): void;
     private isRowGroupDifferentInLayout;
     private onLayoutChange;
-    private getColumnSorts;
 }
 export {};

package/src/agGrid/AdaptableAgGrid.js

@@ -135,11 +135,6 @@ const adaptableInstances = {};
 const publishTimestamp = Number(EnvVars_1.ADAPTABLE_PUBLISH_TIMESTAMP);
 class AdaptableAgGrid {
     constructor(config) {
-        /**
-         * once layouts are properly handled with the new aggrid methods & events
-         * we can remove this hack
-         */
-        this.previousAgGridLayoutState = '';
         this.filteredOutPrimaryKeys = new Set();
         this.columnMinMaxValuesCache = {};
         this.renderReactRoot = (node, container) => (0, renderReactRoot_1.renderReactRoot)(node, container);
@@ -299,11 +294,6 @@ class AdaptableAgGrid {
         this.api = new AdaptableApiImpl_1.AdaptableApiImpl(this);
         this.forPlugins((plugin) => plugin.afterInitApi(this, this.api));
         this.lifecycleState = 'initAdaptableState';
-        // just in case Adaptable was destroyed while loading the store (which is an async operation)
-        if (this.isDestroyed) {
-            return Promise.reject('Adaptable was destroyed while loading the store.');
-            // FIXME AFL MIG: is this enough?! talk with the team
-        }
         this.initServices();
         this.forPlugins((plugin) => plugin.afterInitServices(this));
         this.adaptableModules = this.initModules();
@@ -334,6 +324,7 @@ class AdaptableAgGrid {
         perfLoadStore.end();
         // just in case Adaptable was destroyed while loading the store (which is an async operation)
         if (this.isDestroyed) {
+            this.midwayDestroy();
             return Promise.reject('Adaptable was destroyed while loading the store.');
             // FIXME AFL MIG: is this enough?! talk with the team
         }
@@ -369,6 +360,7 @@ class AdaptableAgGrid {
         this.agGridColumnAdapter.setupColumnFloatingFilterTemporarily(gridOptions);
         const agGridApi = await this.initializeAgGrid(gridOptions, config.modules, config.renderAgGridFrameworkComponent);
         if (agGridApi === false) {
+            this.midwayDestroy();
             this.logger.consoleError(`Adaptable failed to initialize AG Grid!`);
             return Promise.reject('Adaptable failed to initialize AG Grid!');
         }
@@ -476,6 +468,12 @@ class AdaptableAgGrid {
         perfInitAdaptableAgGrid.end();
         return Promise.resolve(this.api);
     }
+    midwayDestroy() {
+        this.destroy({
+            destroyAgGrid: false,
+            unmount: false,
+        });
+    }
     normalizeAdaptableState(state, agGridOptions) {
         state = this.normaliseLayoutState(state, agGridOptions);
         state = this.normaliseToolPanelState(state);
@@ -1046,7 +1044,14 @@ You need to define at least one Layout!`);
      */
     async initializeAgGrid(gridOptions, modules, renderAgGridFrameworkComponent) {
         if (renderAgGridFrameworkComponent) {
-            const result = await renderAgGridFrameworkComponent(gridOptions);
+            let result = false;
+            try {
+                result = await renderAgGridFrameworkComponent(gridOptions);
+            }
+            catch (err) {
+                console.log('Failed to get AG Grid API');
+                result = false;
+            }
             if (result === false) {
                 return false;
             }
@@ -1054,6 +1059,10 @@ You need to define at least one Layout!`);
             // framework wrapper may have altered the context value via props
             // in that case, we have to re-populate it with the Adaptable context values
             const agGridContext = agGridApi.getGridOption('context');
+            if (!agGridContext) {
+                console.log('Failed to get AG Grid context');
+                return false;
+            }
             if (!agGridContext.__adaptable) {
                 agGridContext.__adaptable = this;
                 agGridContext.adaptableApi = this.api;
@@ -1339,7 +1348,7 @@ You need to define at least one Layout!`);
         return currentLayout.AutoSizeColumns;
     }
     autoSizeLayoutIfNeeded() {
-        if (this.shouldAutoSizeLayout()) {
+        if (this.isAvailable && this.shouldAutoSizeLayout()) {
             requestAnimationFrame(() => {
                 if (this.isAvailable) {
                     this.autoSizeAllColumns();
@@ -2796,8 +2805,9 @@ You need to define at least one Layout!`);
             }
         }
         this.__prevLayoutForOnChange = undefined;
-        this.layoutManager.destroy();
-        this.filteredOutPrimaryKeys.clear();
+        this.layoutManager?.destroy();
+        this.layoutManager = null;
+        this.filteredOutPrimaryKeys?.clear();
         if (this.agGridAdapter?.getAgGridApi() && !this.agGridAdapter.getAgGridApi().isDestroyed()) {
             this.agGridAdapter
                 .getAgGridApi()
@@ -2876,7 +2886,6 @@ You need to define at least one Layout!`);
         if (config?.destroyAgGrid === true) {
             this.agGridAdapter.getAgGridApi()?.destroy();
         }
-        this.previousAgGridLayoutState = '';
         const gridContainerElement = this.getAgGridContainerElement();
         if (gridContainerElement) {
             gridContainerElement.removeEventListener('keydown', this.agGridListenerKeydown, true);
@@ -2887,8 +2896,6 @@ You need to define at least one Layout!`);
             this.agGridListenerMouseLeave = null;
         }
         this.api._internalDestroySelf();
-        this.layoutManager?.destroy();
-        this.layoutManager = null;
         this.agGridOptionsService?.destroy();
         this.agGridOptionsService = null;
         this.agGridAdapter?.destroy();
@@ -3344,30 +3351,5 @@ You need to define at least one Layout!`);
         this.__prevLayoutForOnChange = layout;
         this.api.layoutApi.createOrUpdateLayout(layout);
     }
-    getColumnSorts() {
-        const columnSorts = [];
-        const { columnApi } = this.api;
-        const columnState = this.agGridAdapter.getAgGridApi().getColumnState();
-        columnState.forEach((colState) => {
-            const { colId } = colState;
-            if (columnApi.isAutoRowGroupColumn(colId)) {
-                return;
-            }
-            if (colState.sort && colState.sortIndex != null) {
-                columnSorts.push({
-                    ColumnId: colId,
-                    SortOrder: colState.sort === 'asc' ? 'Asc' : 'Desc',
-                    SortIndex: colState.sortIndex,
-                });
-            }
-        });
-        columnSorts.sort((a, b) => a.SortIndex - b.SortIndex);
-        return columnSorts.map((c) => {
-            return {
-                ColumnId: c.ColumnId,
-                SortOrder: c.SortOrder,
-            };
-        });
-    }
 }
 exports.AdaptableAgGrid = AdaptableAgGrid;

package/src/agGrid/AgGridAdapter.js

@@ -35,6 +35,9 @@ class AgGridAdapter {
     }
     destroy() {
         delete DANGER_AG_GRID_BEANS_MAP[this._agGridId];
+        this.initialGridOptions = null;
+        this.DANGER_gridApi_from_args = null;
+        this.DANGER_USE_GETTER_gridApi = null;
         this.DANGER_updateGridOptionsMonkeyPatcher = null;
         this._adaptableInstance = null;
     }

package/src/agGrid/AgGridColumnAdapter.js

@@ -16,6 +16,7 @@ const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"))
 const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
+const AdaptableHelper_1 = require("../Utilities/Helpers/AdaptableHelper");
 function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableNumberEditor_1.AdaptableReactNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -283,7 +284,7 @@ class AgGridColumnAdapter {
                 if (styledColumn.BadgeStyle) {
                     return (0, BadgeRenderer_1.getBadgeRendererForColumn)(styledColumn.BadgeStyle, abColumn, this.adaptableApi);
                 }
-                if (styledColumn.SparkLineStyle) {
+                if (styledColumn.SparklineStyle) {
                     return 'agSparklineCellRenderer';
                 }
             }
@@ -291,8 +292,9 @@ class AgGridColumnAdapter {
         this.setColDefProperty(col, 'cellRendererParams', (userDefined) => {
             const styledColumn = this.adaptableApi.styledColumnApi.getStyledColumnForColumnId(abColumn.columnId);
             if (styledColumn && !styledColumn.IsSuspended) {
-                if (styledColumn.SparkLineStyle) {
-                    const sparklineOptions = (0, merge_1.default)({}, userDefined?.sparklineOptions, styledColumn.SparkLineStyle.options);
+                if (styledColumn.SparklineStyle) {
+                    const sanitizedSparklineOptions = AdaptableHelper_1.AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
+                    const sparklineOptions = (0, merge_1.default)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions);
                     return {
                         ...userDefined,
                         sparklineOptions,

package/src/components/ColorPicker/ColorPicker.js

@@ -35,11 +35,11 @@ exports.ColorPicker = React.forwardRef((props, ref) => {
             }, value: preparedValue, ref: ref, type: "color", style: {
                 width: 70,
                 padding: 0 /* we need this to be 0, since otherwise on Windows browsers, the chosen color cannot be seen */,
-            }, list: "ABcolorChoices" }),
+            }, list: "ABcolorChoices", title: props.title }),
         ABcolorChoices,
         includeAlpha && (React.createElement(rebass_1.Flex, { alignItems: "center" },
             React.createElement(rebass_1.Box, { mr: 1 }, "Opacity"),
-            React.createElement(Input_1.default, { className: "ab-ColorPicker-range", style: { background: rangeBackround }, value: alpha, onChange: (event) => {
+            React.createElement(Input_1.default, { disabled: props.disabled, className: "ab-ColorPicker-range", style: { background: rangeBackround }, value: alpha, onChange: (event) => {
                     const color = (0, tinycolor2_1.default)(value).setAlpha(event.target.value).toRgbString();
                     props.onChange(color);
                 }, min: 0, max: 1, step: 0.01, type: "range" })))));

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: 1740401889478 || Date.now(),
-    VERSION: "20.0.0-canary.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1740989636450 || Date.now(),
+    VERSION: "20.0.0-canary.4" || '--current-version--',
 };

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

@@ -2721,16 +2721,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    DataFormatTypeContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
     DataImportFileHandler: {
         name: string;
         kind: string;
@@ -2967,11 +2957,6 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    ExportableColumnContext: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     ExportFormContext: {
         name: string;
         kind: string;