@adaptabletools/adaptable 17.0.1 → 17.0.3

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1705922479309;
+declare const _default: 1706194555500;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1705922479309;
+exports.default = 1706194555500;

package/src/AdaptableOptions/ColumnFilterOptions.d.ts

@@ -208,7 +208,7 @@ export interface ValuesFilterOptions<TData = any> {
      * @gridInfoItem
      * @noCodeItem
      */
-    showValuesCount?: (column: AdaptableColumn<TData>) => boolean;
+    showValuesCount?: (columFilterContext: ColumnFilterContext<TData>) => boolean;
     /**
      * Includes a [BLANKS] entry in Values filter
      * @defaultValue  false

package/src/Api/GridApi.d.ts

@@ -301,12 +301,6 @@ export interface GridApi {
      * @param displayValue Display Value to use
      */
     getGridCellsForDisplayValue(columnId: string, displayValue: any): GridCell[] | undefined;
-    /**
-     * Gets the count of the cells in a Column that have the given Display Value
-     * @param columnId ColumnId to lookup
-     * @param displayValue Display Value to use
-     */
-    getCellDisplayValueCount(columnId: string, displayValue: any): number;
     /**
      * Retrieves Formatted Value for a given Raw Value in given Column
      * @param columnId ColumnId to lookup

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -99,7 +99,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridCellsForRawValue(columnId: string, rawValue: any): GridCell[] | undefined;
     getCellRawValueCount(columnId: string, rawValue: any): number;
     getGridCellsForDisplayValue(columnId: string, displayValue: any): GridCell[] | undefined;
-    getCellDisplayValueCount(columnId: string, displayValue: any): number;
     jumpToRow(primaryKeyValue: any): void;
     jumpToColumn(columnId: string): void;
     jumpToCell(primaryKeyValue: any, columnId: string): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -385,10 +385,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         });
         return returnGridCells;
     }
-    getCellDisplayValueCount(columnId, displayValue) {
-        const gridCells = this.getGridCellsForDisplayValue(columnId, displayValue);
-        return gridCells === null || gridCells === void 0 ? void 0 : gridCells.length;
-    }
     jumpToRow(primaryKeyValue) {
         const node = this.adaptable.getRowNodeForPrimaryKey(primaryKeyValue);
         this.adaptable.jumpToRow(node);

package/src/Api/Internal/GridInternalApi.d.ts

@@ -26,7 +26,9 @@ export declare class GridInternalApi extends ApiBase {
      */
     getDistinctDisplayValuesForColumn(columnId: string): any[];
     /**
-     * Gets all distinct Filter values for the Column with the given ColumnId (used for Floating Filter and Column Header filter)
+     * Gets all distinct Filter values for the Column with the given ColumnId
+     * used for Floating Filter and Column Header filter
+     * either returns a list of values or al ist a list of values with count
      * @param columnId Column to check
      * @param columnFilter Current applied filter
      */

package/src/Api/Internal/GridInternalApi.js

@@ -74,11 +74,14 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         });
     }
     /**
-     * Gets all distinct Filter values for the Column with the given ColumnId (used for Floating Filter and Column Header filter)
+     * Gets all distinct Filter values for the Column with the given ColumnId
+     * used for Floating Filter and Column Header filter
+     * either returns a list of values or al ist a list of values with count
      * @param columnId Column to check
      * @param columnFilter Current applied filter
      */
     async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
+        var _a;
         const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
         if (abColumn == undefined) {
             return {
@@ -90,19 +93,39 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             visibleRowsOnly: showFilteredRowsOnly,
         };
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterListValuesForColumn(abColumn, filter, distinctValuesParams);
-        let showValuesCount = false;
+        const sortedDistinctValues = this.sortDistinctValues(gridCells, abColumn);
+        let shouldShowValuesCount = false;
         const showValuesCountFunction = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
         if (showValuesCountFunction) {
-            showValuesCount = showValuesCountFunction(abColumn);
+            const columnFilterContext = {
+                column: abColumn,
+                adaptableApi: this.adaptable.api,
+                userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
+            };
+            shouldShowValuesCount = showValuesCountFunction(columnFilterContext);
+        }
+        if (shouldShowValuesCount) {
+            const allColumnDisplayValues = (_a = this.adaptable
+                .getGridCellsForColumn(columnId)) === null || _a === void 0 ? void 0 : _a.map((gc) => {
+                return gc.displayValue;
+            });
+            return {
+                values: sortedDistinctValues.map((cv) => {
+                    const label = cv.displayValue +
+                        NumberExtensions_1.default.WrapInParentheses(ArrayExtensions_1.default.getOccurrence(allColumnDisplayValues, cv.displayValue));
+                    return {
+                        label: label,
+                        value: cv.normalisedValue,
+                    };
+                }),
+                suppressClientSideFilter,
+            };
         }
         return {
-            values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                const label = showValuesCount
-                    ? cv.displayValue +
-                        NumberExtensions_1.default.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
-                    : cv.displayValue;
+            values: sortedDistinctValues.map((cv) => {
                 return {
-                    label: label,
+                    label: cv.displayValue,
                     value: cv.normalisedValue,
                 };
             }),

package/src/Utilities/Extensions/ArrayExtensions.d.ts

@@ -17,6 +17,7 @@ export declare function IsNotNullOrEmpty(arrayToCheck: any[] | undefined | null)
 export declare function IsNullOrEmptyOrContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function IsNotNullOrEmptyNorContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function HasSingleEmptyValue(arrayToCheck: any[]): boolean;
+export declare function getOccurrence(arrayToCheck: any[], valueToCheck: any): number;
 export declare function hasOneItem(arrayToCheck: any[]): boolean;
 export declare function hasItemsOfCount(arrayToCheck: any[], numberOfItems: number): boolean;
 export declare function moveArray(array: any[], from: number, to: number): void;
@@ -50,6 +51,7 @@ export declare const ArrayExtensions: {
     IsNullOrEmptyOrContainsSingleEmptyValue: typeof IsNullOrEmptyOrContainsSingleEmptyValue;
     IsNotNullOrEmptyNorContainsSingleEmptyValue: typeof IsNotNullOrEmptyNorContainsSingleEmptyValue;
     HasSingleEmptyValue: typeof HasSingleEmptyValue;
+    getOccurrence: typeof getOccurrence;
     hasOneItem: typeof hasOneItem;
     hasItemsOfCount: typeof hasItemsOfCount;
     moveArray: typeof moveArray;

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
+exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.getOccurrence = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 function GetLength(arrayToCheck) {
     return IsNotNull(arrayToCheck) ? arrayToCheck.length : 0;
@@ -95,6 +95,12 @@ function HasSingleEmptyValue(arrayToCheck) {
     return false;
 }
 exports.HasSingleEmptyValue = HasSingleEmptyValue;
+function getOccurrence(arrayToCheck, valueToCheck) {
+    var count = 0;
+    arrayToCheck.forEach((v) => v === valueToCheck && count++);
+    return count;
+}
+exports.getOccurrence = getOccurrence;
 function hasOneItem(arrayToCheck) {
     return hasItemsOfCount(arrayToCheck, 1);
 }
@@ -302,6 +308,7 @@ exports.ArrayExtensions = {
     IsNullOrEmptyOrContainsSingleEmptyValue,
     IsNotNullOrEmptyNorContainsSingleEmptyValue,
     HasSingleEmptyValue,
+    getOccurrence,
     hasOneItem,
     hasItemsOfCount,
     moveArray,

package/src/agGrid/agGridMenuHelper.js

@@ -346,12 +346,30 @@ class agGridMenuHelper {
         let isSingleSelectedColumn = false;
         let isSelectedCell = false;
         let isSelectedRow = false;
-        let clickedCell = undefined;
-        if (adaptableColumn) {
-            clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.columnId);
+        // row group columns dont provide an AdapTable Column so return bare minimum
+        if (!adaptableColumn) {
+            return {
+                isSelectedCell: false,
+                isSelectedRow: false,
+                gridCell: undefined,
+                adaptableColumn: undefined,
+                agGridColumn: params.column,
+                rowNode: params.node,
+                isGroupedNode: params.node ? params.node.group : false,
+                isSingleSelectedColumn: false,
+                isSingleSelectedCell: false,
+                primaryKeyValue: undefined,
+                adaptableApi: this.adaptable.api,
+                userName: this.adaptable.adaptableOptions.userName,
+                adaptableId: this.adaptable.adaptableOptions.adaptableId,
+                selectedCellInfo: undefined,
+                selectedRowInfo: undefined,
+                isRowGroupColumn: this.adaptable.api.columnApi.isAutoRowGroupColumn(params.column.getColId()),
+            };
         }
-        let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
-        if (clickedCell && selectedCellInfo) {
+        const clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.columnId);
+        const selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
+        if (selectedCellInfo) {
             let matchedCell = selectedCellInfo.gridCells.find((gc) => gc != null &&
                 gc.column == clickedCell.column &&
                 gc.primaryKeyValue == clickedCell.primaryKeyValue);
@@ -360,9 +378,9 @@ class agGridMenuHelper {
                 isSingleSelectedColumn = ArrayExtensions_1.ArrayExtensions.CorrectLength(selectedCellInfo.columns, 1);
             }
         }
-        let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
+        const selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
         if (selectedRowInfo) {
-            let matchedPKValue = selectedRowInfo.gridRows.find((gr) => gr != null && gr.primaryKeyValue == clickedCell.primaryKeyValue);
+            const matchedPKValue = selectedRowInfo.gridRows.find((gr) => gr != null && gr.primaryKeyValue == clickedCell.primaryKeyValue);
             isSelectedRow = matchedPKValue != null;
         }
         return {

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "17.0.1";
+declare const _default: "17.0.3";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '17.0.1'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '17.0.3'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version