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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "20.2.0-canary.0",
+  "version": "20.2.0-canary.1",
   "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/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/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/View/Components/NewScopeComponent.js

@@ -24,19 +24,19 @@ export const isScopeValid = ({ Scope }) => {
     return result.length ? result.join(', ') : true;
 };
 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/Layout/Wizard/sections/ColumnsSection.js

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

@@ -2248,6 +2248,9 @@ You need to define at least one Layout!`);
                             get visible() {
                                 return gridCell.visible;
                             },
+                            get visibleCount() {
+                                return gridCell.visibleCount;
+                            },
                         };
                     });
                     return result;
@@ -2262,6 +2265,9 @@ You need to define at least one Layout!`);
                             get visible() {
                                 return gridCell.visible;
                             },
+                            get visibleCount() {
+                                return gridCell.visibleCount;
+                            },
                         };
                     });
                     return result;
@@ -2430,6 +2436,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;

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