@adaptabletools/adaptable 20.1.10 → 20.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "20.1.10",
+  "version": "20.1.11",
   "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/SettingsPanelApiImpl.d.ts

@@ -4,4 +4,5 @@ import { AdaptableModule } from '../../../types';
 export declare class SettingsPanelApiImpl extends ApiBase implements SettingsPanelApi {
     openSettingsPanel(moduleName?: AdaptableModule): void;
     openCustomSettingsPanel(name: string): void;
+    closeSettingsPanel(): void;
 }

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -2,16 +2,21 @@ import { ApiBase } from './ApiBase';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 export class SettingsPanelApiImpl extends ApiBase {
     openSettingsPanel(moduleName) {
+        if (!moduleName) {
+            this.dispatchAction(PopupRedux.PopupShowScreen());
+        }
         const moduleInfo = this.getAdaptableInternalApi()
             .getModuleService()
             .getModuleInfoByModule(moduleName);
         if (!moduleInfo) {
-            this.logError(`${moduleName} module does not exist`);
-            return;
+            this.logWarn(`${moduleName} module does not exist`);
         }
-        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo.Popup));
+        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo?.Popup));
     }
     openCustomSettingsPanel(name) {
         this.dispatchAction(PopupRedux.PopupShowScreen(null, name));
     }
+    closeSettingsPanel() {
+        this.dispatchAction(PopupRedux.PopupHideScreen());
+    }
 }

package/src/Api/SettingsPanelApi.d.ts

@@ -13,4 +13,8 @@ export interface SettingsPanelApi {
      * @param name name of Custom Settings Panel to display
      */
     openCustomSettingsPanel(name: string): void;
+    /**
+     * Closes Settings Panel
+     */
+    closeSettingsPanel(): void;
 }

package/src/Utilities/Services/ChartingService.js

@@ -6,16 +6,16 @@ export class ChartingService {
     }
     onChartModelChange(models, eventType, params) {
         const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
-        const currentChartModel = models.find((model) => model.chartId === params.chartId);
-        const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model.chartId === params.chartId);
+        const currentChartModel = models.find((model) => model?.chartId === params.chartId);
+        const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model?.chartId === params.chartId);
         switch (eventType) {
             case 'chartCreated':
                 const createParams = params;
-                if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model.chartId === createParams.chartId)) {
+                if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model?.chartId === createParams.chartId)) {
                     // chart already exists
                 }
                 else {
-                    const chartModel = models.find((model) => model.chartId === createParams.chartId);
+                    const chartModel = models.find((model) => model?.chartId === createParams.chartId);
                     this.saveNewChart(chartModel);
                 }
                 break;

package/src/View/Charting/useAgChartState.js

@@ -16,7 +16,7 @@ export const useAgChartState = (chartDefinition) => {
     }, [currentChartModels, chartDefinition]);
     const closeAlreadyOpenedChartsInContainer = (element) => {
         const chartModelAlreadyInChartContainer = currentChartModels.find((chartModel) => {
-            const chartRef = adaptable.api.chartingApi.getChartRef(chartModel.chartId);
+            const chartRef = adaptable.api.chartingApi.getChartRef(chartModel?.chartId);
             return chartRef && element.contains(chartRef.chartElement);
         });
         if (chartModelAlreadyInChartContainer) {

package/src/View/Components/SharedProps/ModuleViewPopupProps.d.ts

@@ -18,7 +18,7 @@ export interface ModuleParams {
     value?: any;
     primaryKeyValues?: any[];
     maxWidth?: number;
-    source: 'Toolbar' | 'ModuleMenu' | 'ColumnMenu' | 'ContextMenu' | 'ModuleButton' | 'Other';
+    source: 'Toolbar' | 'ModuleMenu' | 'ColumnMenu' | 'ContextMenu' | 'ModuleButton' | 'Other' | 'Api';
     config?: {
         [key: string]: any;
     };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -101,6 +101,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private agGridListenerMouseEnter;
     private agGridListenerMouseLeave;
     private listenerGlobalSetRowSelection;
+    private listenerGlobalChartingChanges;
     private listenerCellEditingStarted;
     private listenerFirstDataRendered;
     private listenerPivotChanged;

package/src/agGrid/AdaptableAgGrid.js

@@ -1366,11 +1366,25 @@ You need to define at least one Layout!`);
         ];
         const chartingModule = this.ModuleService.getModuleById('Charting');
         if (chartingModule.isModuleAvailable()) {
-            this.agGridAdapter.getAgGridApi().addGlobalListener((type, params) => {
-                if (ArrayExtensions.ContainsItem(eventsThatTriggerChartingChanges, type)) {
+            // We need to break the loop of charting changes for 'chartOptionsChanged', which is triggered by the subsequent agGridApi.updateChart(...)
+            // see #ag_grid_update_chart_loop
+            let lastChartOptionsChangePayload = '';
+            this.listenerGlobalChartingChanges = (type, params) => {
+                if (eventsThatTriggerChartingChanges.includes(type)) {
+                    if (type === 'chartOptionsChanged') {
+                        // Exclude api and context
+                        const { api, context, ...sanitizedParams } = params || {};
+                        const eventPayload = JSON.stringify(sanitizedParams);
+                        if (eventPayload === lastChartOptionsChangePayload) {
+                            // this is a loop, so we ignore it
+                            return;
+                        }
+                        lastChartOptionsChangePayload = eventPayload;
+                    }
                     this.ChartingService.onChartModelChange(this.getChartModels(), type, params);
                 }
-            });
+            };
+            this.agGridAdapter.getAgGridApi().addGlobalListener(this.listenerGlobalChartingChanges);
         }
         /**
          * Row and Cell listeners created in 2020
@@ -2627,6 +2641,10 @@ You need to define at least one Layout!`);
         return chartRef;
     }
     updateChart(chart) {
+        if (!chart.Model) {
+            this.logger.consoleError(`Chart definition must have a Model property to be updated: ${chart.Name}`);
+            return;
+        }
         const upgradableProperties = {
             // Only Range charts are supported to be created at run time
             // the other two are pivot & cross-filter
@@ -2636,6 +2654,7 @@ You need to define at least one Layout!`);
             suppressChartRanges: Boolean(chart.Model.suppressChartRanges),
             aggFunc: chart.Model.aggFunc,
         };
+        // see also #ag_grid_update_chart_loop
         this.agGridAdapter.getAgGridApi().updateChart(upgradableProperties);
     }
     getChartModels() {
@@ -2848,6 +2867,9 @@ You need to define at least one Layout!`);
             agGridApi.removeEventListener('cellSelectionChanged', this.listenerCellSelectionChanged);
             agGridApi.removeEventListener('sortChanged', this.listenerSortChanged);
             agGridApi.removeGlobalListener(this.listenerGlobalSetRowSelection);
+            if (this.listenerGlobalChartingChanges) {
+                this.agGridAdapter.getAgGridApi().removeGlobalListener(this.listenerGlobalChartingChanges);
+            }
             this.listenerFirstDataRendered = null;
             this.listenerPivotChanged = null;
             this.listenerCellEditingStarted = null;
@@ -2924,7 +2946,9 @@ You need to define at least one Layout!`);
         }
         this.DANGER_USE_GETTER_adaptableContainerElement = null;
         this.DANGER_USE_GETTER_agGridContainerElement = null;
+        this.debouncedSetSelectedCells?.cancel?.();
         this.debouncedSetSelectedCells = null;
+        this.debouncedSetSelectedRows?.cancel?.();
         this.debouncedSetSelectedRows = null;
         this.adaptableStore?.destroy();
         this.adaptableStore = null;

package/src/components/WindowModal/useStacking.js

@@ -2,7 +2,8 @@ import * as React from 'react';
 import { createUuid } from '../utils/uuid';
 const setZIndexMap = {};
 const zIndexMap = [];
-const BASE_Z_INDEX = 1000;
+// starts with 3000, to be above the default zIndex of the Modal component
+const BASE_Z_INDEX = 3000;
 /**
  * Used to facilitate the stacking between multiple opened windows.
  * When calling 'bringToFront' brings caller to top.

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: 1749491077709 || Date.now(),
-    VERSION: "20.1.10" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1749648014004 || Date.now(),
+    VERSION: "20.1.11" || '--current-version--',
 };