@adaptabletools/adaptable 24.0.0-canary.4 → 24.0.0-canary.6

package/src/agGrid/AgGridColumnAdapter.js

@@ -67,7 +67,7 @@ const STABLE_CALLBACK_COL_DEF_PROPERTIES = new Set([
     'pivotComparator',
     'getFindText',
     'getQuickFilterText',
-    'tooltipValueGetter',
+    'tooltip',
     'cellEditorParams',
     'suppressNoteActions',
 ]);
@@ -333,7 +333,7 @@ export class AgGridColumnAdapter {
         this.setupColumnHeaderStyle(colSetupInfo);
         this.setupColumnHeaderClass(colSetupInfo);
         this.setupColumnValueGetter(colSetupInfo);
-        this.setupColumnTooltipValueGetter(colSetupInfo);
+        this.setupColumnTooltip(colSetupInfo);
         if (!isAutoRowGroupColumn) {
             this.setupColumnFilter(colSetupInfo);
             this.setupColumnFloatingFilter(colSetupInfo);
@@ -676,9 +676,9 @@ export class AgGridColumnAdapter {
             }
         });
     }
-    setupColumnTooltipValueGetter({ col, colId, abColumn }) {
+    setupColumnTooltip({ col, colId, abColumn }) {
         let hasTooptip = false;
-        this.setColDefProperty(col, 'tooltipValueGetter', () => {
+        this.setColDefProperty(col, 'tooltip', () => {
             const styledColumn = this.adaptableApi.styledColumnApi.getStyledColumnForColumnId(colId);
             if (!styledColumn || styledColumn.IsSuspended) {
                 return undefined;
@@ -928,6 +928,9 @@ export class AgGridColumnAdapter {
         return this.adaptableFloatingFilterComponent;
     }
     setupColumnFloatingFilter({ col, colDef }) {
+        if (!this.adaptableOptions.filterOptions.useAdaptableFiltering) {
+            return;
+        }
         const userProvidedFilterProp = this.getUserColDefProperty(col.getColId(), 'filter');
         const hasInvalidFilterProp = typeof userProvidedFilterProp !== 'boolean' &&
             typeof userProvidedFilterProp?.handler !== 'function' &&
@@ -938,7 +941,6 @@ export class AgGridColumnAdapter {
         }
         const isFloatingFilterDisabled = !colDef.filter ||
             !colDef.floatingFilter ||
-            !this.adaptableOptions.filterOptions.useAdaptableFiltering ||
             !this.adaptableApi.filterApi.columnFilterApi.isQuickFilterVisible();
         if (this.adaptableApi.columnApi.isAutoRowGroupColumnForMulti(col.getColId())) {
             this.setColDefProperty(col, 'floatingFilter', (original_floatingFilter) => {

package/src/components/aql/QueryBuilder/QueryBuilderInputs.js

@@ -7,6 +7,7 @@ import * as ModuleConstants from '../../../Utilities/Constants/ModuleConstants';
 import { cn } from '../../../lib/utils';
 import { useAdaptable } from '../../../View/AdaptableContext';
 import AdaptableInput from '../../../View/Components/AdaptableInput';
+import { AdaptableDateInlineInput } from '../../../View/Components/AdaptableInput/AdaptableDateInlineInput';
 import { FloatingFilterValues } from '../../../View/Filter/ColumnFilter/components/FloatingFilterValues';
 import { QueryBuilderColumnSelector } from './QueryBuilderColumnSelector';
 import { FieldSelector } from '../../../View/Components/Selectors/FieldSelector';
@@ -96,7 +97,7 @@ export const PrimitiveColumnOrFieldSelector = (props) => {
         input = (_jsx(Box, { "data-id": "query-input-row-display", "data-name": "qb2-whole-row", "data-slot": "select-trigger", className: subjectPillClassName, children: "Whole Row" }));
     }
     else {
-        input = (_jsx(Box, { "data-id": "query-input-scope-display", "data-slot": "select-trigger", className: subjectPillClassName, children: scopeMeta?.description ?? '$SCOPE' }));
+        input = (_jsx(Box, { "data-id": "query-input-scope-display", "data-slot": "select-trigger", className: subjectPillClassName, children: "Scoped Columns" }));
     }
     const typeOptions = [
         {
@@ -155,8 +156,12 @@ export const PrimitiveColumnOrFieldSelector = (props) => {
 };
 export const PrimitiveValueInput = (props) => {
     const adaptable = useAdaptable();
-    const { layout } = useQueryBuilder();
+    const { layout, module } = useQueryBuilder();
     const isStackedLayout = layout === 'stacked';
+    const showDatePicker = adaptable.api.optionsApi.getFilterOptions().showDatePicker;
+    const useInlineDateInput = !showDatePicker &&
+        (module === ModuleConstants.ColumnFilterModuleId ||
+            module === ModuleConstants.GridFilterModuleId);
     const allowedModes = props.allowedModes ?? DEFAULT_QUERY_BUILDER_INPUT_MODES;
     const hasFields = React.useMemo(() => {
         return adaptable.api.expressionApi.internalApi.getAvailableFields()?.length > 0;
@@ -218,6 +223,11 @@ export const PrimitiveValueInput = (props) => {
                     } }));
             case 'date': {
                 const dateStr = typeof currentLiteralValue === 'string' ? currentLiteralValue : '';
+                if (useInlineDateInput) {
+                    return (_jsx(AdaptableDateInlineInput, { ...common, value: dateStr, onChange: (value) => {
+                            props.onChange(value ? literalOf('date', value) : undefined);
+                        } }));
+                }
                 return (_jsx(AdaptableInput, { ...common, type: "date", value: dateStr, onChange: (event) => {
                         const raw = event.target.value;
                         props.onChange(literalOf('date', raw));

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: 1791555579146 || Date.now(),
-    VERSION: "24.0.0-canary.4" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1792067993639 || Date.now(),
+    VERSION: "24.0.0-canary.6" || '--current-version--',
 };

package/src/layout-manager/src/normalizeLayoutModel.d.ts

@@ -7,4 +7,4 @@ export declare function normalizeTableLayoutModel(layout: TableLayoutModel, opti
 export declare function normalizePivotLayoutModel(layout: PivotLayoutModel): PivotLayoutModel;
 export declare function normalizeLayoutModel(layout: TableLayoutModel | PivotLayoutModel, options?: {
     isTree: boolean;
-}): PivotLayoutModel | TableLayoutModel;
+}): TableLayoutModel | PivotLayoutModel;

package/src/layout-manager/src/simplifyLayoutModel.d.ts

@@ -1,4 +1,4 @@
 import { PivotLayoutModel, TableLayoutModel } from './LayoutManagerModel';
 export declare function simplifyTableLayoutModel(layout: TableLayoutModel): TableLayoutModel;
 export declare function simplifyPivotLayoutModel(layout: PivotLayoutModel): PivotLayoutModel;
-export declare function simplifyLayoutModel(layout: TableLayoutModel | PivotLayoutModel): PivotLayoutModel | TableLayoutModel;
+export declare function simplifyLayoutModel(layout: TableLayoutModel | PivotLayoutModel): TableLayoutModel | PivotLayoutModel;

package/src/migration/AdaptableUpgradeHelper.d.ts

@@ -1,5 +1,5 @@
 import { VersionUpgrade } from './VersionUpgrade';
-import { AdaptableState } from '../AdaptableState/AdaptableState';
+import { AdaptablePersistentState } from '../AdaptableState/AdaptableState';
 import { LayoutTagOptions } from '../AdaptableOptions/LayoutOptions';
 /**
  * Config object used by State Auto-migration Wizard
@@ -38,7 +38,12 @@ export declare class AdaptableUpgradeHelper {
     protected versionUpgrades: Map<number, VersionUpgrade>;
     protected logger: MigrationLogger;
     private constructor();
-    static migrateAdaptableState(state: AdaptableState, config: UpgradeConfig): AdaptableState;
+    /**
+     * Migrates the given Adaptable State from `config.fromVersion` to `config.toVersion`.
+     *
+     * Accepts both a full `AdaptableState` and a (partial) `AdaptablePersistentState` - e.g. as received in `StateOptions.applyState()` - and returns the same shape.
+     */
+    static migrateAdaptableState<T extends Partial<AdaptablePersistentState>>(state: T, config: UpgradeConfig): T;
     /**
      * Published major version. When `VERSION` is not a parseable semver (local
      * builds and tests) this is 24, matching the previous helper fallback.

package/src/migration/VersionUpgrade17.js

@@ -91,7 +91,7 @@ export class VersionUpgrade17 extends VersionUpgrade {
         if (dashboardState?.VisibleButtons) {
             this.logger.warn(`Migrating deprecated DashboardState.VisibleButtons: [${dashboardState.VisibleButtons}].`);
             state.Dashboard.ModuleButtons = [
-                ...state.Dashboard.ModuleButtons,
+                ...(state.Dashboard.ModuleButtons ?? []),
                 ...dashboardState.VisibleButtons,
             ];
             delete state.Dashboard.VisibleButtons;
@@ -175,22 +175,24 @@ export class VersionUpgrade17 extends VersionUpgrade {
             return state;
         }
         const expression = oldQueryState.CurrentQuery;
-        const currentLayout = state.Layout.Layouts?.find((l) => l.Name === state.Layout.CurrentLayout);
+        const currentLayout = state.Layout?.Layouts?.find((l) => l.Name === state.Layout?.CurrentLayout);
         const currentGridFilter = currentLayout?.GridFilter;
         const currentGridFilterExpression = currentGridFilter && !currentGridFilter.IsSuspended ? currentGridFilter.Expression || '' : '';
-        if (expression && StringExtensions.IsNullOrEmpty(currentGridFilterExpression)) {
+        if (expression &&
+            currentLayout &&
+            StringExtensions.IsNullOrEmpty(currentGridFilterExpression)) {
             currentLayout.GridFilter = {
                 ...currentGridFilter,
                 Expression: expression,
             };
         }
-        state.Dashboard.Tabs?.forEach((tab) => {
+        state.Dashboard?.Tabs?.forEach((tab) => {
             if (tab.Toolbars.includes('Query')) {
                 tab.Toolbars = tab.Toolbars.map((t) => (t == 'Query' ? 'GridFilter' : t));
             }
         });
         let updatePinnedToolbars = false;
-        if (state.Dashboard.PinnedToolbars) {
+        if (state.Dashboard?.PinnedToolbars) {
             state.Dashboard.PinnedToolbars = state.Dashboard.PinnedToolbars.map((pinnedToolbar) => {
                 if (pinnedToolbar == 'Query') {
                     return 'GridFilter';
@@ -204,11 +206,12 @@ export class VersionUpgrade17 extends VersionUpgrade {
         const oldQueryState = state.Query;
         const oldNamedQueries = oldQueryState?.NamedQueries;
         if (ArrayExtensions.IsNotNullOrEmpty(oldNamedQueries)) {
-            const currentNamedQueries = state.NamedQuery.NamedQueries;
+            state.NamedQuery ??= {};
+            const currentNamedQueries = (state.NamedQuery.NamedQueries ??= []);
             oldNamedQueries.forEach((oldNamedQuery) => {
                 const currentQuery = currentNamedQueries.find((q) => q.Name === oldNamedQuery.Name);
                 if (!currentQuery) {
-                    state.NamedQuery?.NamedQueries?.push(oldNamedQuery);
+                    currentNamedQueries.push(oldNamedQuery);
                 }
             });
         }
@@ -236,6 +239,7 @@ export class VersionUpgrade17 extends VersionUpgrade {
             };
         })
             .filter(Boolean);
+        state.StyledColumn ??= {};
         state.StyledColumn.StyledColumns ??= [];
         styledColumns.forEach((styledColumn) => {
             state.StyledColumn.StyledColumns.push(styledColumn);
@@ -263,8 +267,9 @@ export class VersionUpgrade17 extends VersionUpgrade {
             }
         });
         const alertState = state.Alert;
-        if (ArrayExtensions.IsEmpty(state.FlashingCell?.FlashingCellDefinitions) &&
+        if (ArrayExtensions.IsNullOrEmpty(state.FlashingCell?.FlashingCellDefinitions) &&
             ArrayExtensions.IsNotNullOrEmpty(alertState?.FlashingAlertDefinitions)) {
+            state.FlashingCell ??= {};
             state.FlashingCell.FlashingCellDefinitions = alertState.FlashingAlertDefinitions;
             delete state.Alert.FlashingAlertDefinitions;
         }