@adaptabletools/adaptable-cjs 20.2.0-canary.0 → 20.2.0

package/package.json

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

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -26,21 +26,21 @@ export interface ExportOptions<TData = any> {
      */
     customDestinations?: CustomDestination[];
     /**
-     * System Reports to use; leave blank for all, empty array for none
+     * System Reports to use; leave unset for all, empty array for none
      *
      * @defaultValue  'All Data', 'Current Layout', 'Selected Data',
      * @gridInfoItem
      */
     systemReportNames?: SystemReportName[] | ((context: SystemReportNamesContext) => SystemReportName[]);
     /**
-     * System Report Formats to use; leave blank for all, empty array for none
+     * System Report Formats to use; leave unset for all, empty array for none
      *
      * @defaultValue 'Excel', 'VisualExcel', 'CSV', 'JSON'
      * @gridInfoItem
      */
     systemReportFormats?: SystemReportFormat[] | ((context: SystemReportFormatsContext) => SystemReportFormat[]);
     /**
-     * Export destinations to use; leave blank for all, empty array for none
+     * Export destinations to use; leave unset for all, empty array for none
      *
      * @defaultValue 'Download', 'Clipboard'
      * @gridInfoItem

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -186,6 +186,10 @@ export interface InFilterValueInfo {
      * How many times the item appears in the column
      */
     count?: number;
+    /**
+     * How many times the item appears in the column in filtered rows
+     */
+    visibleCount?: number;
     /**
      * Whether the item is currently visible in the Grid (i.e. in filtered rows)
      */

package/src/AdaptableOptions/QuickSearchOptions.d.ts

@@ -9,6 +9,9 @@ export interface QuickSearchOptions<TData = any> {
      * @param quickSearchContext Contains quick search text and current Grid Cell
      */
     isCellSearchable?: (quickSearchContext: QuickSearchContext) => boolean;
+    /**
+     * Allows a different value to be used for a cell when searching (instead of its raw value)
+     */
     getCellSearchText?: (quickSearchContext: QuickSearchContext) => string | null;
     /**
      * Value to use as placeholder in QuickSearch controls (e.g. in Dashboard)

package/src/AdaptableState/LayoutState.d.ts

@@ -46,6 +46,9 @@ export interface LayoutBase extends AdaptableObject {
      * Defines which Row Groups are expanded / collapsed
      */
     RowGroupValues?: RowGroupValues;
+    /**
+     * Defines which Column Groups are expanded / collapsed
+     */
     ColumnGroupValues?: ColumnGroupValues;
     /**
      * Set of custom header names for some (or all) Columns
@@ -172,25 +175,43 @@ export interface PivotLayout extends LayoutBase {
  */
 export type PivotTotalPosition = 'before' | 'after' | boolean;
 /**
- * Manages how (and which) Row Group values are stored
+ * Manages Row Group expand / collapse behaviour, including exceptions
  */
 export type RowGroupValues = {
     RowGroupDefaultBehavior: 'always-expanded' | 'always-collapsed';
 } | RowGroupValuesWithExceptionKeys;
+/**
+ * Defines which Row Groups are expanded or collapsed
+ */
+export type RowGroupValuesWithExceptionKeys = {
+    /**
+     * Default behaviour for Row Groups: 'expanded' or 'collapsed';
+     */
+    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
+    /**
+     * Keys of Row Groups which are exceptions to default RowGroupDefaultBehavior - these are actual values in Row Grouped Column
+     */
+    ExceptionGroupKeys?: any[][];
+};
+/**
+ * Manages Column Group expand / collapse behaviour, including exceptions
+ */
 export type ColumnGroupValues = {
     ColumnGroupDefaultBehavior: 'always-expanded' | 'always-collapsed';
 } | ColumnGroupValuesWithExceptionKeys;
+/**
+ * Defines which Column Groups are expanded or collapsed
+ */
 export type ColumnGroupValuesWithExceptionKeys = {
+    /**
+     * Default behaviour for Column Groups: 'expanded' or 'collapsed';
+     */
     ColumnGroupDefaultBehavior: 'expanded' | 'collapsed';
+    /**
+     * Keys of Column Groups which are exceptions to default ColumnGroupDefaultBehavior; key maps to groupId property in ColGroupDef
+     */
     ExceptionGroupKeys?: any[];
 };
-/**
- * Defines which Row Group Values are expanded or collapsed
- */
-export type RowGroupValuesWithExceptionKeys = {
-    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
-    ExceptionGroupKeys?: any[][];
-};
 /**
  * Defines a map of Columns with a String value
  */

package/src/AdaptableState/Selection/GridCell.d.ts

@@ -56,6 +56,7 @@ export interface GridCell<TData = any> {
 }
 export interface GridCellWithCount extends GridCell {
     count: number;
+    visibleCount: number;
 }
 /**
  * Lightweight object used for identifying a Cell to be updated

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

@@ -6,17 +6,22 @@ const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 class SettingsPanelApiImpl extends ApiBase_1.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());
+    }
 }
 exports.SettingsPanelApiImpl = SettingsPanelApiImpl;

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

@@ -10,16 +10,16 @@ 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

@@ -20,7 +20,7 @@ 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/NewScopeComponent.js

@@ -29,19 +29,19 @@ const isScopeValid = ({ Scope }) => {
 };
 exports.isScopeValid = isScopeValid;
 const DATA_TYPES_MAP = {
-    Date: {
+    date: {
         label: 'Date',
         value: 'date',
     },
-    Number: {
+    number: {
         label: 'Number',
         value: 'number',
     },
-    String: {
+    text: {
         label: 'Text',
         value: 'text',
     },
-    Boolean: {
+    boolean: {
         label: 'Boolean',
         value: 'boolean',
     },

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/View/Layout/Wizard/sections/ColumnsSection.js

@@ -200,14 +200,16 @@ const ColumnsSection = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.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.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

@@ -1406,11 +1406,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_1.default.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
@@ -2252,6 +2266,9 @@ You need to define at least one Layout!`);
                             get visible() {
                                 return gridCell.visible;
                             },
+                            get visibleCount() {
+                                return gridCell.visibleCount;
+                            },
                         };
                     });
                     return result;
@@ -2266,6 +2283,9 @@ You need to define at least one Layout!`);
                             get visible() {
                                 return gridCell.visible;
                             },
+                            get visibleCount() {
+                                return gridCell.visibleCount;
+                            },
                         };
                     });
                     return result;
@@ -2434,6 +2454,11 @@ You need to define at least one Layout!`);
                     return (rowNodesWithSameCellValue.findIndex((pk) => self.isRowNodeAvailableAfterFiltering(pk) === true) !== -1);
                 },
             });
+            Object.defineProperty(cellWithCount, 'visibleCount', {
+                get: () => {
+                    return rowNodesWithSameCellValue.filter((pk) => self.isRowNodeAvailableAfterFiltering(pk) === true).length;
+                },
+            });
             result.push(cellWithCount);
         });
         return result;
@@ -2698,6 +2723,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
@@ -2707,6 +2736,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() {
@@ -2923,6 +2953,9 @@ You need to define at least one Layout!`);
             agGridApi.removeEventListener('columnGroupOpened', this.listenerColumnGroupOpened);
             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.listenerColumnGroupOpened = null;
@@ -3000,7 +3033,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

@@ -6,7 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const uuid_1 = require("../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

@@ -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: 1748873625358 || Date.now(),
-    VERSION: "20.2.0-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1749810340250 || Date.now(),
+    VERSION: "20.2.0" || '--current-version--',
 };