@adaptabletools/adaptable 24.0.0-canary.0 → 24.0.0-canary.10

package/src/agGrid/AdaptableLogger.d.ts

@@ -2,30 +2,103 @@ import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageT
 export declare const errorOnce: (message: string) => void;
 export declare const warnOnce: (message: string) => void;
 /**
- * AdapTable's Logger
+ * Logger for one AdapTable instance.
+ *
+ * `info`, `success`, `warn` and `error` write through the debug logger (namespaced `Adaptable:<adaptableId>`).
+ * `consoleInfo`, `consoleLog`, `consoleWarn` and `consoleError` write straight to the console, with the same prefix.
  */
 export declare class AdaptableLogger {
     private adaptableId;
+    /** Root debug logger, namespaced `Adaptable:<adaptableId>`. The public methods write through this. */
     private debugger;
+    /** Debug logger used by {@link AdaptableLogger.info}. */
     private infoLogger;
+    /** Debug logger used by {@link AdaptableLogger.success}. */
     private successLogger;
+    /** Debug logger used by {@link AdaptableLogger.warn}. */
     private warnLogger;
+    /** Debug logger used by {@link AdaptableLogger.error}. */
     private errorLogger;
+    /** Debug logger used by {@link AdaptableLogger.beginPerf}. */
     private perfLogger;
     static consoleErrorBase(message: string, ...optionalParams: any[]): void;
     static consoleWarnBase(message: string, ...optionalParams: any[]): void;
     static consoleLogBase(message: string, ...optionalParams: any[]): void;
+    /**
+     * @param adaptableId Id of the AdapTable instance, used as the log prefix
+     */
     constructor(adaptableId: string);
+    /**
+     * Starts a performance span. Call `end` on the returned object to log the elapsed milliseconds.
+     *
+     * @param sectionName Label included in the begin and end lines
+     * @returns An object whose `end` logs the duration
+     */
     beginPerf(sectionName: string): {
         end: (additionalComment?: string) => void;
     };
+    /**
+     * Writes an informational message to the `info` debug logger.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     info(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes a success message to the `success` debug logger.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     success(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes a warning to the `warn` debug logger.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     warn(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes an error to the `error` debug logger.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     error(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes to the console at the level of `messageType` (`Info`, `Success`, `Warning` or `Error`), prefixed with the AdapTable id.
+     *
+     * @param message Message text
+     * @param messageType Which console method to use
+     * @param optionalParams Extra values appended to the log
+     */
     consoleLogByMessageType(message: string, messageType: AdaptableMessageType, ...optionalParams: any[]): void;
+    /**
+     * Writes to `console.info`, prefixed with the AdapTable id.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     consoleInfo(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes to `console.log`, prefixed with the AdapTable id.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     consoleLog(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes to `console.warn`, prefixed with the AdapTable id.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     consoleWarn(message: string, ...optionalParams: any[]): void;
+    /**
+     * Writes to `console.error`, prefixed with the AdapTable id.
+     *
+     * @param message Message text
+     * @param optionalParams Extra values appended to the log
+     */
     consoleError(message: string, ...optionalParams: any[]): void;
 }

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -88,7 +88,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnHeaderStyle;
     private setupColumnCellEditor;
     private setupColumnCellRenderer;
-    private setupColumnTooltipValueGetter;
+    private setupColumnTooltip;
     /**
      * Resolves a Range Bar bound (number / column id / Col-Min / Col-Max /
      * Col-Avg / Col-Median) into a concrete numeric value for the supplied row.

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/agGrid/editors/AdaptableDateEditor/index.d.ts

@@ -5,6 +5,9 @@ import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
  * Params used by the AdapTable Date Editor
  */
 export interface AdaptableDateEditorParams extends ICellEditorParams {
+    /**
+     * AG Grid callback. The editor calls this with the selected date, or `null` when the date is cleared.
+     */
     onValueChange?: (value: any) => void;
 }
 export declare const AdaptableReactDateEditor: React.ForwardRefExoticComponent<AdaptableDateEditorParams & React.RefAttributes<unknown>>;

package/src/agGrid/editors/AdaptableNumberEditor/index.d.ts

@@ -15,6 +15,9 @@ export interface AdaptableNumberCellEditorParams extends ICellEditorParams {
      * @defaultValue '' (empty string)
      */
     emptyValue: string;
+    /**
+     * AG Grid callback. The editor calls this with the value as the user edits, so the grid can commit it.
+     */
     onValueChange: (value: any) => void;
 }
 export declare const AdaptableReactNumberEditor: React.ForwardRefExoticComponent<AdaptableNumberCellEditorParams & React.RefAttributes<unknown>>;

package/src/agGrid/index.d.ts

@@ -1,11 +1,6 @@
-import { Adaptable, AdaptableNoCodeWizard as ABWizard } from './Adaptable';
+import { Adaptable } from './Adaptable';
 import { AdaptableLogger as ABLogger } from './AdaptableLogger';
-export { default as AdaptableWizardView } from '../View/AdaptableWizardView';
 export default Adaptable;
-/**
- * AdapTable's No Code Wizard
- */
-export declare const AdaptableNoCodeWizard: typeof ABWizard;
 /**
  * AdapTable's Logger
  */

package/src/agGrid/index.js

@@ -1,6 +1,4 @@
-import { Adaptable, AdaptableNoCodeWizard as ABWizard, } from './Adaptable';
+import { Adaptable } from './Adaptable';
 import { AdaptableLogger as ABLogger } from './AdaptableLogger';
-export { default as AdaptableWizardView } from '../View/AdaptableWizardView';
 export default Adaptable;
-export const AdaptableNoCodeWizard = ABWizard;
 export const AdaptableLogger = ABLogger;

package/src/aql/ExpressionEvaluation.d.ts

@@ -9,12 +9,27 @@ import type { CellDataChangedInfo } from '../AdaptableState/Common/CellDataChang
  * throws — check `success` and read `value` / `errorMessage` accordingly.
  */
 export type ExpressionEvaluationResult<T> = {
+    /**
+     * The expression evaluated. Read `value`.
+     */
     success: true;
+    /**
+     * Result of the expression.
+     */
     value: T;
 } | {
+    /**
+     * The expression did not evaluate. Read `errorMessage`. The API does not throw for these failures.
+     */
     success: false;
+    /**
+     * Why evaluation failed: a syntax error, an unknown column, a missing row, or a function that is not available.
+     */
     errorMessage: string;
 };
+/**
+ * Options shared by the `expressionApi` evaluate and filter calls.
+ */
 export interface EvaluateExpressionOptions {
     /**
      * Emulate a specific feature module's filtered function pool (e.g. "would
@@ -32,7 +47,13 @@ export interface EvaluateExpressionOptions {
  * When a `columnId` is both a grid column and listed here, this override wins.
  */
 export interface ExternalDataColumn {
+    /**
+     * Key on the plain-object row this metadata describes. Matches a grid `colId` when the key is also a column.
+     */
     columnId: string;
+    /**
+     * How to treat the value. When this key is also a grid column, this type wins over the column's data type.
+     */
     dataType?: 'number' | 'text' | 'date' | 'boolean' | 'array';
 }
 /**
@@ -40,7 +61,13 @@ export interface ExternalDataColumn {
  * Does not mutate grid (or data-set) data; other rows are unaffected.
  */
 export interface CellValueOverride {
+    /**
+     * Column whose value is replaced for this evaluation only.
+     */
     columnId: string;
+    /**
+     * Value used in place of the cell's current value. The grid data is not changed.
+     */
     value: unknown;
 }
 /**

package/src/aql/types.d.ts

@@ -24,10 +24,22 @@ context: AdaptableExpressionContext) => any;
  * Defines how an AdaptableQL Function is described in Expression Editor
  */
 export type ExpressionFunctionDocBlock = {
+    /**
+     * A code sample, shown as code in the Expression Editor.
+     */
     type: 'code';
+    /**
+     * The sample, for example `[price] > 100`.
+     */
     content: string;
 } | {
+    /**
+     * A prose description, shown as a paragraph in the Expression Editor.
+     */
     type: 'paragraph';
+    /**
+     * The description text.
+     */
     content: string;
 };
 /**
@@ -289,7 +301,17 @@ export type AdaptableAggregationFunctionMap<T extends string = string> = Record<
  * (not Layout / Cell Summary — those are aggregation-only).
  */
 export type AdaptableCustomExpressionFunction = Omit<AqlExpressionFunction<AdaptableExpressionContext> & AdaptableExpressionFunctionEnhancement, 'isAvailable' | 'returnType'> & {
+    /**
+     * Type the function returns. `boolean` makes it a predicate that can appear in the Query Builder and Column Filter when it takes one or two operands.
+     *
+     * Use an {@link ExpressionReturnType} value. `string & {}` keeps autocomplete while still accepting a widened string.
+     */
     returnType: ExpressionReturnType | (string & {});
+    /**
+     * Modules that may call this function, or a function of the availability context that returns whether it may be called.
+     *
+     * Omit it to allow the function in every standard-expression module. Layout and Cell Summary are aggregated-expression modules and are not in this list.
+     */
     isAvailable?: AdaptableStandardExpressionModule[] | ((context: ExpressionFunctionAvailabilityContext) => boolean);
 };
 /**

package/src/components/ColorField/index.d.ts

@@ -0,0 +1,13 @@
+import { type ColorFieldProps as SharedColorFieldProps } from "../../../vendor/components/ColorField";
+export type ColorFieldProps = Omit<SharedColorFieldProps, 'onChange' | 'clearable' | 'data-name' | 'filterColours'> & {
+    'data-name'?: string;
+} & ({
+    clearable?: true;
+    onChange: (color: string | undefined) => void;
+} | {
+    /** The colour is required, so there is no clear button and `onChange` always gets one. */
+    clearable: false;
+    onChange: (color: string) => void;
+});
+/** The shared colour field with AdapTable's defaults. */
+export declare const ColorField: (props: ColorFieldProps) => import("react").JSX.Element;

package/src/components/ColorField/index.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ColorField as SharedColorField, } from "../../../vendor/components/ColorField";
+import { useAdaptable } from '../../View/AdaptableContext';
+import { useOnePageAdaptableWizardContext } from '../../View/Wizard/OnePageAdaptableWizard';
+function useEditedModule() {
+    const wizard = useOnePageAdaptableWizardContext();
+    const adaptable = useAdaptable();
+    const fromWizard = wizard.moduleInfo?.ModuleName;
+    if (fromWizard) {
+        return fromWizard;
+    }
+    const screenPopup = adaptable?.adaptableStore?.TheStore.getState().Popup.ScreenPopup;
+    return screenPopup?.ShowScreenPopup ? screenPopup.ComponentModule : undefined;
+}
+const DEFAULT_TABS = ['Custom', 'Palette'];
+const showAllColours = () => undefined;
+export const ColorField = (props) => {
+    const adaptable = useAdaptable();
+    const module = useEditedModule();
+    const paletteOptions = adaptable?.api.optionsApi.getUserInterfaceOptions().colourPickerOptions;
+    const filterColours = paletteOptions?.filterColours;
+    const { onChange, tabs, orderPaletteColours, removeDuplicates, showGroupLabels, 'data-name': dataName = 'color-field', ...rest } = props;
+    return (_jsx(SharedColorField, { ...rest, "data-name": dataName, tabs: tabs ?? paletteOptions?.tabs ?? DEFAULT_TABS, orderPaletteColours: orderPaletteColours ?? paletteOptions?.orderPaletteColours, removeDuplicates: removeDuplicates ?? paletteOptions?.removeDuplicates, showGroupLabels: showGroupLabels ?? paletteOptions?.showGroupLabels, filterColours: filterColours
+            ? (colours) => filterColours({ ...colours, module })
+            : showAllColours, onChange: onChange }));
+};

package/src/components/aql/CompactEditor/CompactEditor.js

@@ -137,5 +137,5 @@ export const CompactEditor = () => {
         }, children: _jsx(PanelWithImage, { className: "twa:overflow-hidden", bodyScroll: false, style: { height: '100%', maxHeight: '100%' }, bodyProps: {
                 className: 'twa:min-h-0 twa:overflow-hidden twa:p-2',
                 style: { height: '100%', maxHeight: '100%' },
-            }, header: `Edit Expression — ${title}`, glyphicon: "calculated-column", variant: "primary", children: _jsx(Box, { className: "twa:min-h-0 twa:overflow-hidden", style: { height: '100%' }, children: _jsx(ExpressionEditor, { type: editorType, scalarVariant: calculatedColumnType === 'Observable' ? 'observable' : undefined, module: CalculatedColumnModuleId, isFullExpression: true, compactLayout: true, value: expression, onChange: persistExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), namedQueries: api.namedQueryApi.getNamedQueries(), allowSaveNamedQuery: false, api: api, className: "twa:min-h-0 twa:overflow-hidden", style: { height: '100%' }, toolbarEnd: _jsxs(Flex, { className: "twa:gap-1 twa:shrink-0 twa:items-center", children: [_jsx(SimpleButton, { variant: "outlined", icon: "undo", "data-name": "compact-calcol-revert", disabled: !canRevert, onClick: revertExpression, children: "Revert" }), _jsx(SimpleButton, { variant: "outlined", icon: "edit", "data-name": "compact-calcol-open-full-editor", onClick: openFullEditor, children: "Open Full Editor" })] }) }) }) }) }));
+            }, header: `Edit Expression — ${title}`, glyphicon: "calculated-column", variant: "primary", children: _jsx(Box, { className: "twa:min-h-0 twa:overflow-hidden", style: { height: '100%' }, children: _jsx(ExpressionEditor, { type: editorType, scalarVariant: calculatedColumnType === 'Observable' ? 'observable' : undefined, suppressObservable: calculatedColumnType !== 'Observable', module: CalculatedColumnModuleId, isFullExpression: true, compactLayout: true, value: expression, onChange: persistExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), namedQueries: api.namedQueryApi.getNamedQueries(), allowSaveNamedQuery: false, api: api, className: "twa:min-h-0 twa:overflow-hidden", style: { height: '100%' }, toolbarEnd: _jsxs(Flex, { className: "twa:gap-1 twa:shrink-0 twa:items-center", children: [_jsx(SimpleButton, { variant: "outlined", icon: "undo", "data-name": "compact-calcol-revert", disabled: !canRevert, onClick: revertExpression, children: "Revert" }), _jsx(SimpleButton, { variant: "outlined", icon: "edit", "data-name": "compact-calcol-open-full-editor", onClick: openFullEditor, children: "Open Full Editor" })] }) }) }) }) }));
 };

package/src/components/aql/ExpressionEditor/BaseEditorInput.js

@@ -1081,7 +1081,7 @@ export function BaseEditorInput(props) {
         }, [])
             .filter((row) => row.length > 0);
     const showDocumentationLink = Boolean(props.documentationLink) && props.api.internalApi.isDocumentationLinksDisplayed();
-    return (_jsxs(Flex, { flexDirection: "column", className: isCompact ? 'twa:h-full twa:min-h-0 twa:overflow-hidden' : undefined, children: [_jsxs(Flex, { "data-name": "expression-toolbar", className: `${baseClassName} twa:pt-1 twa:pb-2 twa:mb-2 twa:mt-0 twa:w-full twa:shrink-0 ${isCompact ? 'twa:pb-1 twa:mb-1' : ''}`, flexDirection: "column", children: [_jsxs(Flex, { className: "twa:w-full twa:min-h-8 twa:items-center twa:justify-between twa:gap-2", children: [_jsx(Flex, { className: "twa:flex-wrap twa:items-center", children: (props.functionMenuVariant ?? 'legacy') === 'basic' ? (_jsx(BasicFunctionMenus, { expressionFunctions: menuExpressionFunctions, editorButtons: props.editorButtons, baseClassName: baseClassName, extraFunctionMenus: props.extraFunctionMenus, prioritizeObservableMenu: props.prioritizeObservableMenu, suppressObservableMenu: props.suppressObservableMenu, getInsertText: getMenuInsertText })) : isCompact ? (_jsx(CompactExpressionToolbar, { expressionFunctions: menuExpressionFunctions, columns: props.columnsDropdownItems ?? [], getInsertText: getMenuInsertText, toolbarFunctionNames: props.compactIncludeToolbarFunctions ? undefined : toolbarFunctionNames })) : (_jsx(_Fragment, { children: (() => {
+    return (_jsxs(Flex, { flexDirection: "column", className: isCompact ? 'twa:h-full twa:min-h-0 twa:overflow-hidden' : undefined, children: [_jsxs(Flex, { "data-name": "expression-toolbar", className: `${baseClassName} twa:pt-1 twa:pb-2 twa:mb-2 twa:mt-0 twa:w-full twa:shrink-0 ${isCompact ? 'twa:pb-1 twa:mb-1' : ''}`, flexDirection: "column", children: [_jsxs(Flex, { className: "twa:w-full twa:min-h-8 twa:items-center twa:justify-between twa:gap-2", children: [_jsx(Flex, { className: "twa:flex-wrap twa:items-center", children: (props.functionMenuVariant ?? 'legacy') === 'basic' ? (_jsx(BasicFunctionMenus, { expressionFunctions: menuExpressionFunctions, editorButtons: props.editorButtons, baseClassName: baseClassName, extraFunctionMenus: props.extraFunctionMenus, prioritizeObservableMenu: props.prioritizeObservableMenu, suppressObservableMenu: props.suppressObservableMenu, getInsertText: getMenuInsertText })) : isCompact ? (_jsx(CompactExpressionToolbar, { expressionFunctions: menuExpressionFunctions, columns: props.columnsDropdownItems ?? [], getInsertText: getMenuInsertText, suppressObservable: props.suppressObservableMenu, toolbarFunctionNames: props.compactIncludeToolbarFunctions ? undefined : toolbarFunctionNames })) : (_jsx(_Fragment, { children: (() => {
                                         const menuVariant = props.functionMenuVariant;
                                         const isAggregatedVariant = menuVariant === 'aggregated';
                                         const whereStrip = menuVariant != null &&

package/src/components/aql/ExpressionEditor/CompactExpressionToolbar.d.ts

@@ -24,5 +24,10 @@ export declare const CompactExpressionToolbar: React.FunctionComponent<{
     toolbarFunctionNames?: Set<string>;
     /** Pool-aware insert text (brace calls); defaults to the paren spelling. */
     getInsertText?: (functionName: string) => string;
+    /**
+     * When true (Standard Calculated Column), omit live sources and timeframe
+     * / history clauses from Functions. Observable compact keeps them.
+     */
+    suppressObservable?: boolean;
 }>;
 export {};

package/src/components/aql/ExpressionEditor/CompactExpressionToolbar.js

@@ -6,6 +6,7 @@ import { useExpressionEditor } from './EditorContext';
 import { getFunctionInsertText } from './functionInsertText';
 import { useLookupItems } from './useLookupItems';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
+const OBSERVABLE_ONLY_CATEGORIES = new Set(['observable', 'timeframe', 'history']);
 const SIDEBAR_REFERENCE_FUNCTION_NAMES = new Set(['COL', 'FIELD', '$SCOPE']);
 const LOOKUP_FUNCTION_NAMES = new Set(['QUERY', 'VAR']);
 const EXCLUDED_FROM_COMPACT_FUNCTIONS = new Set([
@@ -22,10 +23,13 @@ const CATEGORY_ORDER = {
     numeric: 5,
     date: 6,
     changes: 7,
-    general: 8,
-    custom: 9,
+    history: 8,
+    timeframe: 9,
+    observable: 10,
+    general: 11,
+    custom: 12,
 };
-export const CompactExpressionToolbar = ({ expressionFunctions, columns, toolbarFunctionNames, getInsertText }) => {
+export const CompactExpressionToolbar = ({ expressionFunctions, columns, toolbarFunctionNames, getInsertText, suppressObservable, }) => {
     const { expressionEditorRef } = useExpressionEditor();
     const { queryVariables, namedQueries, hasLookups } = useLookupItems(expressionFunctions);
     const insert = React.useCallback((text) => {
@@ -46,6 +50,9 @@ export const CompactExpressionToolbar = ({ expressionFunctions, columns, toolbar
             const category = typeof rawCategory === 'string' && rawCategory.trim() !== ''
                 ? rawCategory.trim()
                 : 'general';
+            if (suppressObservable && OBSERVABLE_ONLY_CATEGORIES.has(category)) {
+                continue;
+            }
             const existing = byCategory.get(category) ?? [];
             existing.push({ label: name, value: name, textLabel: name });
             byCategory.set(category, existing);
@@ -58,7 +65,7 @@ export const CompactExpressionToolbar = ({ expressionFunctions, columns, toolbar
             items: items.sort((a, b) => a.label.localeCompare(b.label)),
         }))
             .filter((group) => group.items.length > 0);
-    }, [expressionFunctions, toolbarFunctionNames]);
+    }, [expressionFunctions, toolbarFunctionNames, suppressObservable]);
     const columnItems = React.useMemo(() => {
         return columns.map((column) => {
             const label = column.friendlyName || column.columnId;
@@ -93,7 +100,7 @@ export const CompactExpressionToolbar = ({ expressionFunctions, columns, toolbar
         }
         return groups;
     }, [namedQueries, queryVariables]);
-    return (_jsxs(Flex, { className: "twa:flex-row twa:flex-wrap twa:items-center twa:gap-1", "data-name": "compact-expression-toolbar", children: [_jsx(CompactInsertCombobox, { dataName: "expression-functions-dropdown", placeholder: "Functions", widthClassName: "twa:w-[calc(6.75rem+2px)]", groups: functionGroups, onInsert: (functionName) => insert((getInsertText ?? getFunctionInsertText)(functionName)) }), columnItems.length > 0 ? (_jsx(CompactInsertCombobox, { dataName: "expression-columns-dropdown", placeholder: "Columns", items: columnItems, onInsert: (columnId) => insert(`[${columnId}]`) })) : null, hasLookups && lookupGroups.length > 0 ? (_jsx(CompactInsertCombobox, { dataName: "expression-lookups-dropdown", placeholder: "Lookups", groups: lookupGroups, onInsert: (value) => {
+    return (_jsxs(Flex, { className: "twa:flex-row twa:flex-wrap twa:items-center twa:gap-1", "data-name": "compact-expression-toolbar", children: [_jsx(CompactInsertCombobox, { dataName: "expression-functions-dropdown", placeholder: "Functions", widthClassName: "twa:w-[8.5rem]", groups: functionGroups, onInsert: (functionName) => insert((getInsertText ?? getFunctionInsertText)(functionName)) }), columnItems.length > 0 ? (_jsx(CompactInsertCombobox, { dataName: "expression-columns-dropdown", placeholder: "Columns", items: columnItems, onInsert: (columnId) => insert(`[${columnId}]`) })) : null, hasLookups && lookupGroups.length > 0 ? (_jsx(CompactInsertCombobox, { dataName: "expression-lookups-dropdown", placeholder: "Lookups", groups: lookupGroups, onInsert: (value) => {
                     if (value.startsWith('var:')) {
                         insert(`VAR('${value.slice(4)}')`);
                         return;

package/src/components/aql/ExpressionEditor/ExpressionPreview.js

@@ -11,7 +11,7 @@ export const ExpressionPreview = (props) => {
     const displayColumnFriendlyNames = adaptableApi.optionsApi.getExpressionOptions()?.displayColumnFriendlyNamesForExpressions;
     const text = props.expression ?? undefined;
     const expression = displayColumnFriendlyNames && text
-        ? adaptableApi.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(text)
+        ? adaptableApi.expressionApi.getExpressionWithColumnFriendlyNames(text)
         : text;
     const canonical = toCanonical(expression);
     if (!canonical) {

package/src/components/aql/ExpressionEditor/index.d.ts

@@ -32,8 +32,9 @@ interface ExpressionEditorProps {
     scalarVariant?: ScalarEditorVariant;
     /**
      * When true on a `scalar` editor, hide Observable chrome (Live chips, Observable
-     * Function menu, brace completions) even if the module offers the observable
-     * pool. Used by Change / Relative Change surfaces so they stay uncluttered.
+     * Function menu, brace completions, timeframe / history Functions) even if the
+     * module offers the observable pool. Used by Standard Calculated Columns and
+     * Change / Relative Change surfaces so they stay uncluttered.
      */
     suppressObservable?: boolean;
     module: AdaptableModule;

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

@@ -31,7 +31,7 @@ export const GroupEditor = ({ node, path, isRoot, dispatch, hideDelete, }) => {
     };
     return (_jsxs(Box, { className: cn('ab-QueryBuilder__group twa:my-1', !isRoot &&
             'twa:pl-3 twa:border-l twa:rounded-md twa:py-1 twa:pr-1 ' +
-                'twa:bg-(--ab-cmp-query-builder-group__background)'), children: [showHeader && (_jsxs(Flex, { alignItems: "center", className: "twa:gap-2 twa:my-1", children: [showCombinator && (_jsx(CombinatorSelector, { value: node.combinator, onChange: (combinator) => dispatch({ type: 'setCombinator', groupPath: path, combinator }) })), _jsx(Box, { className: "twa:flex-1" }), showGroupDelete && (_jsx(RowActions, { rail: qb.hideInlineAdd ? 'compact' : 'full', hideAdd: true, onDelete: () => dispatch({ type: 'delete', path }) }))] })), isEmpty ? (_jsx(PrimitiveEditor, { node: emptyQlPrimitive(), path: [...path, 0], dispatch: seedDispatch, hideAdd: true, hideDelete: true })) : (_jsxs(_Fragment, { children: [hideDragHandles ? (_jsx("div", { className: "ab-QueryBuilder__group-children", children: node.children.map((child, index) => (_jsx(Flex, { className: "ab-QueryBuilder__row", alignItems: "center", children: _jsx(Box, { className: "ab-QueryBuilder__row-body twa:flex-1 twa:min-w-0", children: _jsx(NodeEditor, { node: child, path: [...path, index], dispatch: dispatch }) }) }, `${listId}/${index}`))) })) : (_jsx(DragList, { dragListId: listId, orientation: "vertical", onDrop: handleDrop, onDragProxyMove: defaultDragProxyMove, children: (listDomProps) => (_jsx("div", { ...listDomProps, className: cn('ab-QueryBuilder__group-children', listDomProps.className), children: node.children.map((child, index) => {
+                'twa:bg-(--ab-cmp-query-builder-group__background)'), children: [showHeader && (_jsxs(Flex, { alignItems: "center", className: "twa:gap-2 twa:my-1 twa:w-full", children: [showCombinator && (_jsx(CombinatorSelector, { value: node.combinator, onChange: (combinator) => dispatch({ type: 'setCombinator', groupPath: path, combinator }) })), _jsx(Box, { className: "twa:flex-1" }), showGroupDelete && (_jsx(RowActions, { rail: qb.hideInlineAdd ? 'compact' : 'full', hideAdd: true, onDelete: () => dispatch({ type: 'delete', path }) })), isRoot && showCombinator && qb.rootHeaderEnd] })), isEmpty ? (_jsx(PrimitiveEditor, { node: emptyQlPrimitive(), path: [...path, 0], dispatch: seedDispatch, hideAdd: true, hideDelete: true })) : (_jsxs(_Fragment, { children: [hideDragHandles ? (_jsx("div", { className: "ab-QueryBuilder__group-children", children: node.children.map((child, index) => (_jsx(Flex, { className: "ab-QueryBuilder__row", alignItems: "center", children: _jsx(Box, { className: "ab-QueryBuilder__row-body twa:flex-1 twa:min-w-0", children: _jsx(NodeEditor, { node: child, path: [...path, index], dispatch: dispatch }) }) }, `${listId}/${index}`))) })) : (_jsx(DragList, { dragListId: listId, orientation: "vertical", onDrop: handleDrop, onDragProxyMove: defaultDragProxyMove, children: (listDomProps) => (_jsx("div", { ...listDomProps, className: cn('ab-QueryBuilder__group-children', listDomProps.className), children: node.children.map((child, index) => {
                                 const childId = `${listId}/${index}`;
                                 return (_jsx(DragList.DraggableItem, { id: childId, children: (itemDomProps) => {
                                         const { onPointerDown, ...rest } = itemDomProps;

package/src/components/aql/QueryBuilder/QueryBuilder.d.ts

@@ -88,5 +88,10 @@ export interface QueryBuilderProps {
      * @defaultValue 'auto'
      */
     layout?: QueryBuilderLayoutMode;
+    /**
+     * Extra control on the right of the root AND/OR row, once there are
+     * two or more conditions. Hidden while the editor has a single condition.
+     */
+    rootHeaderEnd?: React.ReactNode;
 }
 export declare const QueryBuilder: React.FunctionComponent<QueryBuilderProps>;

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

@@ -104,7 +104,7 @@ export const QueryBuilder = (props) => {
                             : 'query-builder2-invalid-expression', className: "twa:my-2 twa:w-full twa:max-w-full twa:text-2 twa:leading-snug twa:bg-background twa:text-foreground", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3", alignItems: "flex-start", children: [_jsxs(Flex, { flexDirection: "column", className: "twa:gap-2", children: [_jsx(Box, { children: primaryLine }), typeMismatchMessages.map((message) => (_jsx(Box, { children: message }, message))), _jsx(Box, { children: "Please edit the Expression in the Expression Editor." })] }), clearExpressionButton] }) }));
     }
     else if (!isQlPredicateError(root) && isQlGroup(root)) {
-        body = (_jsx(QueryBuilderProvider, { module: props.module, columnScope: props.columnScope, getColumns: props.getColumns, getFields: props.getFields, subject: props.subject, hideInlineAdd: props.hideInlineAdd ?? true, hideAddGroup: props.hideAddGroup, hideLockedSubject: props.hideLockedSubject, hideDragHandles: props.hideDragHandles, layout: props.layout ?? 'auto', children: props.hideDragHandles ? (_jsx(Box, { "data-name": "query-builder2-editor", className: "twa:my-2", children: _jsx(NodeEditor, { node: root, path: [], isRoot: true, dispatch: dispatch }) })) : (_jsx(DragDropProvider, { children: _jsx(Box, { "data-name": "query-builder2-editor", className: "twa:my-2", children: _jsx(NodeEditor, { node: root, path: [], isRoot: true, dispatch: dispatch }) }) })) }));
+        body = (_jsx(QueryBuilderProvider, { module: props.module, columnScope: props.columnScope, getColumns: props.getColumns, getFields: props.getFields, subject: props.subject, hideInlineAdd: props.hideInlineAdd ?? true, hideAddGroup: props.hideAddGroup, hideLockedSubject: props.hideLockedSubject, hideDragHandles: props.hideDragHandles, layout: props.layout ?? 'auto', rootHeaderEnd: props.rootHeaderEnd, children: props.hideDragHandles ? (_jsx(Box, { "data-name": "query-builder2-editor", className: "twa:my-2", children: _jsx(NodeEditor, { node: root, path: [], isRoot: true, dispatch: dispatch }) })) : (_jsx(DragDropProvider, { children: _jsx(Box, { "data-name": "query-builder2-editor", className: "twa:my-2", children: _jsx(NodeEditor, { node: root, path: [], isRoot: true, dispatch: dispatch }) }) })) }));
     }
     return (_jsxs(Box, { className: twMerge(QUERY_BUILDER_CLASSNAME, QUERY_BUILDER_LAYOUT_CLASS[props.layout ?? 'auto']), children: [body, !props.hideExpressionPreview && (_jsxs(Card, { shadow: false, className: "twa:mt-12", children: [_jsxs(Card.Title, { className: "twa:justify-between twa:gap-2", children: [_jsxs(Flex, { flexDirection: "column", className: "twa:min-w-0 twa:gap-0.5", children: [_jsx(Box, { className: "twa:font-medium", children: "Output Expression" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal", children: cannotDisplayInQueryBuilder
                                             ? 'Readonly view of the current Expression'

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/components/aql/QueryBuilder/context.d.ts

@@ -109,6 +109,12 @@ export interface QueryBuilderContextValue {
      * narrow (container query).
      */
     layout?: QueryBuilderLayoutMode;
+    /**
+     * Extra control rendered on the right of the root group's AND/OR row.
+     * Shown only once that row exists (≥2 conditions). Used by the column
+     * filter popups for Clear All.
+     */
+    rootHeaderEnd?: React.ReactNode;
 }
 export declare const useQueryBuilder: () => QueryBuilderContextValue;
 export interface QueryBuilderProviderProps {
@@ -123,6 +129,7 @@ export interface QueryBuilderProviderProps {
     hideLockedSubject?: boolean;
     hideDragHandles?: boolean;
     layout?: QueryBuilderLayoutMode;
+    rootHeaderEnd?: React.ReactNode;
     children: React.ReactNode;
 }
 /**

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

@@ -11,7 +11,7 @@ export const useQueryBuilder = () => {
     }
     return context;
 };
-export const QueryBuilderProvider = ({ module, columnScope, getColumns, getFields, subject, hideInlineAdd, hideAddGroup, hideLockedSubject, hideDragHandles, layout = 'auto', children, }) => {
+export const QueryBuilderProvider = ({ module, columnScope, getColumns, getFields, subject, hideInlineAdd, hideAddGroup, hideLockedSubject, hideDragHandles, layout = 'auto', rootHeaderEnd, children, }) => {
     const adaptable = useAdaptable();
     const api = adaptable.api;
     const lockedSubject = React.useMemo(() => {
@@ -72,6 +72,7 @@ export const QueryBuilderProvider = ({ module, columnScope, getColumns, getField
             hideLockedSubject,
             hideDragHandles,
             layout,
+            rootHeaderEnd,
         };
     }, [
         module,
@@ -88,6 +89,7 @@ export const QueryBuilderProvider = ({ module, columnScope, getColumns, getField
         hideLockedSubject,
         hideDragHandles,
         layout,
+        rootHeaderEnd,
     ]);
     return _jsx(QueryBuilderContext.Provider, { value: value, children: children });
 };

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: 1791295847529 || Date.now(),
-    VERSION: "24.0.0-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1793185013782 || Date.now(),
+    VERSION: "24.0.0-canary.10" || '--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;