@adaptabletools/adaptable 21.0.0-canary.1 → 21.0.0-canary.3

package/src/View/Components/Selectors/PermittedValuesSelector.js

@@ -22,9 +22,7 @@ export const PermittedValuesSelector = function (props) {
         (async () => {
             let searchValueUsedInFilterValue = false;
             const currentSearchValue = searchFilterRef.current;
-            const distinctColumnValues = await runIfNotResolvedIn(
-            // we are here ALWAYS getting Filter values but sometimes we want to get other things!!!
-            props.loadValues
+            const p = props.loadValues
                 ? props.loadValues({
                     get currentSearchValue() {
                         searchValueUsedInFilterValue = true;
@@ -37,12 +35,15 @@ export const PermittedValuesSelector = function (props) {
                         searchValueUsedInFilterValue = true;
                         return currentSearchValue;
                     },
-                }), () => {
+                });
+            const distinctColumnValues = await runIfNotResolvedIn(
+            // we are here ALWAYS getting Filter values but sometimes we want to get other things!!!
+            p, () => {
                 setIsLoading(true);
             });
             setSearchValueWasUsedWhenFiltering(searchValueUsedInFilterValue);
             setIsLoading(false);
-            setOptions(distinctColumnValues);
+            setOptions(Array.isArray(distinctColumnValues) ? distinctColumnValues : distinctColumnValues.values);
         })();
     }, [props.columnId, props.loadValues, refetchKey]);
     const isCreatable = (props.allowNewValues && !dataType) || ['text', 'number'].includes(dataType);

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -21,7 +21,7 @@ import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
 import { AnnotationsService } from '../Utilities/Services/AnnotationsService';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
 import { AgGridMenuAdapter } from './AgGridMenuAdapter';
-import { AdaptableColumn, AdaptableTheme, ChartDefinition, ColumnSort, DataUpdateConfig, GridCell, InFilterValue, Layout, SelectedCellInfo, SelectedRowInfo } from '../types';
+import { AdaptableColumn, AdaptableTheme, ChartDefinition, ColumnSort, InFilterValueResult, DataUpdateConfig, GridCell, Layout, SelectedCellInfo, SelectedRowInfo } from '../types';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
@@ -257,7 +257,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getDistinctFilterValuesForColumn(options: {
         column: AdaptableColumn;
         currentSearchValue: string;
-    }): Promise<InFilterValue[]>;
+        previousResult: InFilterValueResult | undefined;
+    }): Promise<InFilterValueResult>;
     getDistinctEditValuesForColumn(options: {
         column: AdaptableColumn;
         currentSearchValue: string;

package/src/agGrid/AdaptableAgGrid.js

@@ -428,7 +428,6 @@ export class AdaptableAgGrid {
         this.lifecycleState = 'available';
         this.api.themeApi.applyCurrentTheme();
         this.validatePrimaryKey();
-        // TODO AFL MIG: we could just patch the defautl Layout on init? instead
         this.checkShouldClearExistingFiltersOrSearches();
         // FIXME AFL FILTER: talk with Radu: should ColumnFilters still be ignored?!
         // see layoutModel.Ignore_ColumnFilters
@@ -1853,7 +1852,7 @@ You need to define at least one Layout!`);
         if (dataType === 'boolean') {
             return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;
         }
-        if (dataType === 'date' || dataType === 'dateString') {
+        if (dataType === 'date') {
             return rawValue instanceof Date ? rawValue : parseDateValue(rawValue);
         }
         return rawValue;
@@ -2254,10 +2253,19 @@ You need to define at least one Layout!`);
         return this.getDistinctGridCellsForColumn(column);
     }
     async getDistinctFilterValuesForColumn(options) {
-        const { column } = options;
+        const { column, previousResult } = options;
         const self = this;
         // First get the Grid Cells in the Column
-        const currentGridCells = this.getDistinctGridCellsForColumn(column);
+        let currentGridCells;
+        const getCurrentGridCells = () => {
+            // we do this in a function so it's lazy
+            // but we also store in the outside closure, so we can reuse the value if
+            // already called
+            if (currentGridCells) {
+                return currentGridCells;
+            }
+            return (currentGridCells = this.getDistinctGridCellsForColumn(column));
+        };
         // If there are custom distinct value, return them; otherwise return the Grids Cells just retrieved
         const customInFilterValues = this.adaptableOptions.filterOptions.customInFilterValues;
         if (customInFilterValues) {
@@ -2265,12 +2273,13 @@ You need to define at least one Layout!`);
             const customInFilterValuesContext = {
                 ...this.api.internalApi.buildBaseContext(),
                 column,
+                previousFilterResult: previousResult,
                 get currentSearchValue() {
                     return options.currentSearchValue;
                 },
                 get sortedValues() {
                     const result = gridApiInternal
-                        .sortDistinctValues(currentGridCells, column)
+                        .sortDistinctValues(getCurrentGridCells(), column)
                         .map((gridCell) => {
                         return {
                             label: gridCell.displayValue,
@@ -2289,7 +2298,7 @@ You need to define at least one Layout!`);
                     return result;
                 },
                 get defaultValues() {
-                    const result = currentGridCells.map((gridCell) => {
+                    const result = getCurrentGridCells().map((gridCell) => {
                         return {
                             label: gridCell.displayValue,
                             value: gridCell.rawValue,
@@ -2327,23 +2336,24 @@ You need to define at least one Layout!`);
                     return result;
                 },
             };
-            let customDistinctValues;
+            let customInFilterValuesResult;
             try {
-                customDistinctValues = await customInFilterValues(customInFilterValuesContext);
+                customInFilterValuesResult = await customInFilterValues(customInFilterValuesContext);
             }
             catch (error) {
                 this.logger.consoleError(`Failed to fetch custom filter values`, column, error);
             }
-            return customDistinctValues ?? [];
+            return customInFilterValuesResult;
         }
         // No distinct values so lets return unique grid cells
-        return currentGridCells.map((gridCell) => {
+        const values = getCurrentGridCells().map((gridCell) => {
             const inFilterValue = {
                 value: gridCell.rawValue,
                 label: gridCell.displayValue,
             };
             return inFilterValue;
         });
+        return { values };
     }
     async getDistinctEditValuesForColumn(options) {
         const { column, gridCell } = options;

package/src/agGrid/AdaptableFilterHandler.d.ts

@@ -1,18 +1,26 @@
 import { DoesFilterPassParams, FilterHandler, FilterHandlerParams } from 'ag-grid-enterprise';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { ColumnSetupInfo } from '../AdaptableState/Common/ColumnSetupInfo';
-import { InFilterValue } from '../AdaptableOptions/FilterOptions';
+import { InFilterValueResult } from '../AdaptableOptions/FilterOptions';
 export declare class AdaptableFilterHandler implements FilterHandler {
     private adaptableApi;
     readonly colId: string;
-    private filterDisplayValues;
+    private filterDisplayValuesResult;
+    private previousFilterDisplayValuesResult;
     constructor(adaptableApi: AdaptableApi, columnSetup: ColumnSetupInfo);
     doesFilterPass(params: DoesFilterPassParams): boolean;
-    getFilterDisplayValues(currentSearchValue: string): Promise<InFilterValue[]>;
+    getCachedFilterDisplayValues(): InFilterValueResult | undefined;
+    getLastCachedFilterDisplayValues(): InFilterValueResult | undefined;
+    getFromCacheOrFetchFilterDisplayValues(options: {
+        currentSearchValue: string;
+    }): Promise<InFilterValueResult>;
+    fetchFilterDisplayValues(options: {
+        currentSearchValue: string;
+    }): Promise<InFilterValueResult>;
     onNewRowsLoaded(): void;
     onAnyFilterChanged(): void;
     resetFilterDisplayValues(): void;
-    refreshFilterDisplayValues(): Promise<InFilterValue<any>[]>;
+    refreshFilterDisplayValues(): Promise<InFilterValueResult>;
     refresh(params: FilterHandlerParams<any, any, any, any>): void;
     destroy(): void;
 }

package/src/agGrid/AdaptableFilterHandler.js

@@ -27,35 +27,62 @@ export class AdaptableFilterHandler {
             return false;
         }
     }
-    getFilterDisplayValues(currentSearchValue) {
-        if (!this.filterDisplayValues) {
-            this.filterDisplayValues =
-                this.adaptableApi.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn({
-                    columnId: this.colId,
-                    currentSearchValue,
-                });
+    getCachedFilterDisplayValues() {
+        return this.filterDisplayValuesResult;
+    }
+    getLastCachedFilterDisplayValues() {
+        return this.filterDisplayValuesResult ?? this.previousFilterDisplayValuesResult;
+    }
+    getFromCacheOrFetchFilterDisplayValues(options) {
+        if (this.filterDisplayValuesResult) {
+            return Promise.resolve(this.filterDisplayValuesResult);
         }
-        return this.filterDisplayValues;
+        return this.fetchFilterDisplayValues(options);
+    }
+    fetchFilterDisplayValues(options) {
+        return this.adaptableApi.gridApi.internalApi
+            .getDistinctFilterDisplayValuesForColumn({
+            columnId: this.colId,
+            get currentSearchValue() {
+                return options.currentSearchValue;
+            },
+            previousResult: this.filterDisplayValuesResult,
+        })
+            .then((result) => {
+            this.filterDisplayValuesResult = result;
+            return result;
+        });
     }
     onNewRowsLoaded() {
         this.resetFilterDisplayValues();
     }
     onAnyFilterChanged() {
+        const filterOptions = this.adaptableApi.optionsApi.getFilterOptions();
+        if (!filterOptions.customInFilterValues) {
+            // no-one is using value.count or value.visible
+            // or context.sortedValues
+            // so no need to reset the filter display values
+            return;
+        }
         this.resetFilterDisplayValues();
     }
     resetFilterDisplayValues() {
+        if (this.filterDisplayValuesResult) {
+            this.previousFilterDisplayValuesResult = this.filterDisplayValuesResult;
+        }
         // Reset the filter display values manually
-        this.filterDisplayValues = null;
+        this.filterDisplayValuesResult = undefined;
     }
     async refreshFilterDisplayValues() {
         this.resetFilterDisplayValues();
-        return this.getFilterDisplayValues('');
+        return this.getFromCacheOrFetchFilterDisplayValues({ currentSearchValue: '' });
     }
     refresh(params) {
         // No specific refresh logic needed for this handler
         // The filter display values will be reset on new rows loaded or any filter changed
     }
     destroy() {
-        this.filterDisplayValues = null;
+        this.filterDisplayValuesResult = undefined;
+        this.previousFilterDisplayValuesResult = undefined;
     }
 }

package/src/agGrid/AgGridColumnAdapter.js

@@ -20,7 +20,7 @@ export function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableReactNumberEditor : AdaptableNumberEditor;
     }
-    if (columnDataType === 'date' || columnDataType === 'dateString') {
+    if (columnDataType === 'date') {
         return variant === 'react' ? AdaptableReactDateEditor : AdaptableDateEditor;
     }
 }
@@ -506,7 +506,10 @@ export class AgGridColumnAdapter {
                 : Array.isArray(original_columnType)
                     ? original_columnType
                     : [original_columnType];
-            const columnTypes = new Set(originalTypes);
+            // Adaptable uses type 'date' for all date columns, while AG Grid uses 'date' and 'dateString'
+            // #data_type_dateString
+            let normalisedTypes = originalTypes.map((t) => (t === 'dateString' ? 'date' : t));
+            const columnTypes = new Set(normalisedTypes);
             if (this.adaptableApi.columnApi.isCalculatedColumn(colId)) {
                 columnTypes.add(CALCULATED_COLUMN_TYPE);
             }

package/src/agGrid/AgGridExportAdapter.js

@@ -431,7 +431,7 @@ export class AgGridExportAdapter {
             return;
         }
         const columnDataType = this.adaptableApi.columnApi.getColumnDataTypeForColumnId(columnId);
-        if ((columnDataType === 'date' || columnDataType === 'dateString') &&
+        if (columnDataType === 'date' &&
             typeof rawValue === 'string' &&
             // rawValue is composed only of digits
             /^\d+$/.test(rawValue)) {
@@ -689,7 +689,6 @@ export class AgGridExportAdapter {
             case 'boolean':
                 return 'Boolean';
             case 'date':
-            case 'dateString':
                 return 'DateTime';
             case 'text':
             default:
@@ -819,7 +818,7 @@ export class AgGridExportAdapter {
         if (exportContext.isVisualExcelReport) {
             return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 'formattedValue');
         }
-        const isDateColumn = columnDataType === 'date' || columnDataType === 'dateString';
+        const isDateColumn = columnDataType === 'date';
         // 2. if this is a date column and there is a custom export date format provided, that will next take precedence
         if (isDateColumn) {
             const customExportDateFormat = this.getCustomExportDateFormat(column, exportContext);
@@ -877,7 +876,6 @@ export class AgGridExportAdapter {
                 case 'number':
                     return dataFormatDataType.number;
                 case 'date':
-                case 'dateString':
                     return dataFormatDataType.date;
                 default:
                     // default to rawValue for all other column types

package/src/agGrid/AgGridModulesAdapter.js

@@ -1,3 +1,4 @@
+import { AdaptableLogger } from '.';
 import { AllEnterpriseModule } from 'ag-grid-enterprise';
 export const AG_GRID_VERSION = AllEnterpriseModule.version;
 export class AgGridModulesAdapter {
@@ -42,7 +43,10 @@ export class AgGridModulesAdapter {
                 mandatoryModules.push('ServerSideRowModelApiModule');
                 break;
             case 'infinite':
-                mandatoryModules.push('InfiniteRowModelModule');
+                AdaptableLogger.consoleErrorBase("AdapTable does not support AG Grid's Infinite Row Model");
+                break;
+            case 'viewport':
+                mandatoryModules.push('ViewportRowModelModule');
                 break;
             default:
                 mandatoryModules.push('ClientSideRowModelModule');

package/src/agGrid/agGridDataTypeDefinitions.js

@@ -7,7 +7,6 @@ export const ALL_ADAPTABLE_DATA_TYPES = [
     'number',
     'boolean',
     'date',
-    'dateString',
     'object',
     TEXT_ARRAY_DATA_TYPE,
     NUMBER_ARRAY_DATA_TYPE,
@@ -31,13 +30,7 @@ export const agGridDataTypeDefinitions = {
         valueFormatter: null,
         suppressDefaultProperties: true,
     },
-    dateString: {
-        baseDataType: 'dateString',
-        extendsDataType: 'dateString',
-        valueParser: null,
-        valueFormatter: null,
-        suppressDefaultProperties: true,
-    },
+    // dateString is force-cast to date in AdapTable, see #data_type_dateString
     // text: is kept as is
     // boolean: is kept as is
     // object: is kept as is

package/src/components/Select/Select.d.ts

@@ -16,6 +16,7 @@ export type SelectProps<SelectValue extends unknown, IsMulti extends boolean = f
     searchable?: false | 'inline' | 'menulist';
     resizable?: boolean;
     isClearable?: boolean;
+    skipDefaultFiltering?: boolean;
     closeMenuOnSelect?: boolean;
     hideSelectedOptions?: boolean;
     showHeaderSelectionCheckbox?: boolean;

package/src/components/Select/Select.js

@@ -140,6 +140,7 @@ export const Select = function (props) {
     const renderMultipleValues = props.renderMultipleValues;
     const isMulti = props.isMulti ?? Array.isArray(props.value);
     const showHeaderSelectionCheckbox = isMulti && (props.showHeaderSelectionCheckbox ?? false);
+    const skipDefaultFiltering = props.skipDefaultFiltering ?? false;
     let selectedOption = null;
     if (isMulti) {
         selectedOption =
@@ -194,7 +195,7 @@ export const Select = function (props) {
                     },
                 } }));
         };
-    }, []);
+    }, [isSelectMenuOpen]);
     const resizable = props.resizable ?? false;
     const ValueContainer = React.useMemo(() => {
         return (props) => {
@@ -289,7 +290,7 @@ export const Select = function (props) {
     const MenuList = React.useMemo(() => {
         return (props) => {
             const { setValue, getValue, focusedOption, options, selectProps } = props;
-            const { filterOption, inputValue, options: selectOptions, isLoading } = selectProps;
+            const { filterOption, inputValue, isLoading } = selectProps;
             // Focus the input when MenuList mounts
             React.useEffect(() => {
                 if (menulistInputRef.current) {
@@ -297,7 +298,7 @@ export const Select = function (props) {
                 }
             }, []);
             const filterFunction = React.useCallback(({ data }) => filterOption({ data, label: `${data.label}`, value: data.value }, inputValue), [filterOption, inputValue]);
-            const hasFilter = inputValue !== '';
+            const hasFilter = inputValue !== '' && !skipDefaultFiltering;
             const filteredOptionsValues = new Set();
             const filteredOptions = !hasFilter
                 ? options
@@ -454,7 +455,7 @@ export const Select = function (props) {
                         }, placeholder: "Search..." }))),
                 React.createElement(InfiniteTable, { header: isMulti && showHeaderSelectionCheckbox ? true : false, rowClassName: rowClassName, showZebraRows: false, rowHeight: '--ab-grid-row-height', onCellClick: isLoading ? null : onCellClick, keyboardNavigation: isLoading ? false : 'row', activeRowIndex: focusedOptionIndex, keyboardSelection: true, columns: isMulti ? INFINITE_COLUMNS_WITH_CHECKBOX : INFINITE_COLUMNS_WITH_RADIO, domProps: INFINITE_DOM_PROPS })));
         };
-    }, [isMulti, showHeaderSelectionCheckbox]);
+    }, [isMulti, skipDefaultFiltering, showHeaderSelectionCheckbox]);
     const DropdownIndicator = React.useMemo(() => {
         return (dropdownIndicatorProps) => {
             return (React.createElement(components.DropdownIndicator, { ...dropdownIndicatorProps, innerProps: {

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: 1756456060910 || Date.now(),
-    VERSION: "21.0.0-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1757076026384 || Date.now(),
+    VERSION: "21.0.0-canary.3" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -2408,6 +2408,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    CustomEditColumnValueInfo: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CustomEditColumnValuesContext: {
         name: string;
         kind: string;
@@ -3024,6 +3029,11 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
     };
     DefaultPivotLayoutProperties: {
         name: string;
@@ -3067,6 +3077,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    EditColumnValueInfo: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     EditOptions: {
         name: string;
         kind: string;