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

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

@@ -14,7 +14,7 @@ export 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) {
@@ -33,7 +33,7 @@ export const StyledColumnWizardTypeSection = (props) => {
         };
         delete newStyledColumn.GradientStyle;
         delete newStyledColumn.PercentBarStyle;
-        delete newStyledColumn.SparkLineStyle;
+        delete newStyledColumn.SparklineStyle;
         delete newStyledColumn.BadgeStyle;
         switch (type) {
             case 'gradient':
@@ -43,7 +43,7 @@ export const StyledColumnWizardTypeSection = (props) => {
                 newStyledColumn.PercentBarStyle = {};
                 break;
             case 'sparkline':
-                newStyledColumn.SparkLineStyle = {
+                newStyledColumn.SparklineStyle = {
                     options: {
                         type: 'line',
                     },
@@ -64,6 +64,6 @@ export const StyledColumnWizardTypeSection = (props) => {
             React.createElement(Tabs.Content, null,
                 React.createElement(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, { 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, { 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, { text: "Sparkline", description: "Render the column as a Sparkline (Numeric Array Columns)", checked: Boolean(data.SparklineStyle), onClick: () => handleTypeChange('sparkline') })),
                 React.createElement(TypeRadio, { text: "Badge", description: "Display the column's values as Badges (All Columns)", checked: Boolean(data.BadgeStyle), onClick: () => handleTypeChange('badge') })))));
 };

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

@@ -131,11 +131,6 @@ const adaptableInstances = {};
 const publishTimestamp = Number(ADAPTABLE_PUBLISH_TIMESTAMP);
 export 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) => defaultRenderReactRoot(node, container);
@@ -295,11 +290,6 @@ export class AdaptableAgGrid {
         this.api = new 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();
@@ -330,6 +320,7 @@ export 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
         }
@@ -365,6 +356,7 @@ export 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!');
         }
@@ -472,6 +464,12 @@ export 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);
@@ -1042,7 +1040,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;
             }
@@ -1050,6 +1055,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;
@@ -1335,7 +1344,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();
@@ -2792,8 +2801,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()
@@ -2872,7 +2882,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);
@@ -2883,8 +2892,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();
@@ -3340,29 +3347,4 @@ 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,
-            };
-        });
-    }
 }

package/src/agGrid/AgGridAdapter.js

@@ -5,7 +5,7 @@ import { createUuid } from '../PredefinedConfig/Uuid';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ALL_AG_GRID_MODULES } from './agGridModules';
-import { agGridDataTypeDefinitions, ALL_ADAPTABLE_DATA_TYPES, } from './agGridDataTypeDefinitions';
+import { agGridDataTypeDefinitions, ALL_ADAPTABLE_DATA_TYPES } from './agGridDataTypeDefinitions';
 // AG GRID obfuscates its internals, this is (currently) the best way to get hold of its internal services
 const DANGER_AG_GRID_BEANS_MAP = {};
 const getColumnApiModule = () => ColumnApiModule;
@@ -31,6 +31,9 @@ export 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

@@ -12,6 +12,7 @@ import Helper from '../Utilities/Helpers/Helper';
 import { AdaptableNumberEditor, AdaptableReactNumberEditor } from './editors/AdaptableNumberEditor';
 import { AdaptableDateEditor, AdaptableReactDateEditor } from './editors/AdaptableDateEditor';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
+import { AdaptableHelper, } from '../Utilities/Helpers/AdaptableHelper';
 export function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableReactNumberEditor : AdaptableNumberEditor;
@@ -278,7 +279,7 @@ export class AgGridColumnAdapter {
                 if (styledColumn.BadgeStyle) {
                     return getBadgeRendererForColumn(styledColumn.BadgeStyle, abColumn, this.adaptableApi);
                 }
-                if (styledColumn.SparkLineStyle) {
+                if (styledColumn.SparklineStyle) {
                     return 'agSparklineCellRenderer';
                 }
             }
@@ -286,8 +287,9 @@ export class AgGridColumnAdapter {
         this.setColDefProperty(col, 'cellRendererParams', (userDefined) => {
             const styledColumn = this.adaptableApi.styledColumnApi.getStyledColumnForColumnId(abColumn.columnId);
             if (styledColumn && !styledColumn.IsSuspended) {
-                if (styledColumn.SparkLineStyle) {
-                    const sparklineOptions = merge({}, userDefined?.sparklineOptions, styledColumn.SparkLineStyle.options);
+                if (styledColumn.SparklineStyle) {
+                    const sanitizedSparklineOptions = AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
+                    const sparklineOptions = merge({}, userDefined?.sparklineOptions, sanitizedSparklineOptions);
                     return {
                         ...userDefined,
                         sparklineOptions,

package/src/components/ColorPicker/ColorPicker.js

@@ -31,11 +31,11 @@ export const 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(Flex, { alignItems: "center" },
             React.createElement(Box, { mr: 1 }, "Opacity"),
-            React.createElement(Input, { className: "ab-ColorPicker-range", style: { background: rangeBackround }, value: alpha, onChange: (event) => {
+            React.createElement(Input, { disabled: props.disabled, className: "ab-ColorPicker-range", style: { background: rangeBackround }, value: alpha, onChange: (event) => {
                     const color = tinycolor(value).setAlpha(event.target.value).toRgbString();
                     props.onChange(color);
                 }, min: 0, max: 1, step: 0.01, type: "range" })))));

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