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

package/index.css

@@ -934,6 +934,9 @@
   .twa\:w-\[7rem\] {
     width: 7rem;
   }
+  .twa\:w-\[8\.5rem\] {
+    width: 8.5rem;
+  }
   .twa\:w-\[10px\] {
     width: 10px;
   }
@@ -997,9 +1000,6 @@
   .twa\:w-\[480px\] {
     width: 480px;
   }
-  .twa\:w-\[calc\(6\.75rem\+2px\)\] {
-    width: calc(6.75rem + 2px);
-  }
   .twa\:w-auto {
     width: auto;
   }
@@ -7208,8 +7208,11 @@
     --ab-aql-token-keyword: #f0abfc;
   }
   .ab-AqlCodeMirror {
+    display: flex;
+    flex-direction: column;
     width: 100%;
     min-height: 0;
+    overflow: hidden;
     border-radius: var(--ab-border-radius);
     border: 1px solid var(--ab-aql-editor__border);
     background: var(--ab-aql-editor__background);
@@ -7222,6 +7225,14 @@
       box-shadow: inset 0 1px 3px color-mix(in srgb, var(--ab-color-primary-foreground) 12%, transparent);
     }
   }
+  .ab-AqlCodeMirror:focus-within {
+    box-shadow: 0 0 0 3px var(--ab-color-ring, var(--ab-color-accent));
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    .ab-AqlCodeMirror:focus-within {
+      box-shadow: 0 0 0 3px color-mix(in srgb, var(--ab-color-ring, var(--ab-color-accent)) 50%, transparent);
+    }
+  }
   .ab-AqlCodeMirror--full {
     min-height: 150px;
     font-size: var(--ab-font-size-4, 1rem);
@@ -7236,20 +7247,13 @@
     pointer-events: none;
   }
   .ab-AqlCodeMirror .cm-editor {
+    flex: 1;
+    min-height: 0;
     height: 100%;
     background: transparent;
   }
   .ab-AqlCodeMirror .cm-editor.cm-focused {
     outline: none;
-    box-shadow: 0 0 0 3px var(--ab-color-ring, var(--ab-color-accent));
-  }
-  @supports (color: color-mix(in lab, red, red)) {
-    .ab-AqlCodeMirror .cm-editor.cm-focused {
-      box-shadow: 0 0 0 3px color-mix(in srgb, var(--ab-color-ring, var(--ab-color-accent)) 50%, transparent);
-    }
-  }
-  .ab-AqlCodeMirror .cm-editor.cm-focused {
-    border-radius: inherit;
   }
   .ab-AqlCodeMirror .cm-scroller {
     padding: calc(var(--ab-base-space, 4px) * 2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "24.0.0-canary.0",
+  "version": "24.0.0-canary.1",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -45,7 +45,7 @@
     "@base-ui/react": "1.7.0",
     "@codemirror/autocomplete": "^6.20.3",
     "@codemirror/commands": "^6.11.0",
-    "@codemirror/language": "^6.12.4",
+    "@codemirror/language": "6.12.4",
     "@codemirror/lint": "^6.9.7",
     "@codemirror/state": "^6.7.1",
     "@codemirror/view": "^6.43.9",

package/src/Api/ExpressionApi.d.ts

@@ -1,6 +1,5 @@
 import { AdaptableModule } from '../AdaptableState/Common/Types';
 import type { ExpressionKind } from '../AdaptableState/Common/AdaptableQuery';
-import type { LegacyAdaptableQuery } from '../migration/legacyAdaptableQuery';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import type { IRowNode } from 'ag-grid-enterprise';
 import { AggregatedExpressionEvaluationValue, EvaluateAggregatedExpressionRequest, EvaluateStandardExpressionRequest, ExpressionEvaluationResult, FilterDataSetRequest, FilterRowNodesRequest } from '../aql/ExpressionEvaluation';
@@ -53,21 +52,10 @@ export interface ExpressionApi {
      */
     getExpressionKind(expression: string, module?: AdaptableModule): ExpressionKind;
     /**
-     * Returns the Expression string of a `Rule` / `Expression` property (pre-v25: `Query`).
-     *
-     * Since v25 these properties are plain strings and this method simply returns its argument;
-     * it still unwraps the pre-v25 object shape (`{ Expression }` / `{ AggregatedExpression }` /
-     * …) for callers that hold un-migrated objects.
-     *
-     * @deprecated `Rule` / `Expression` are strings; use them directly
-     * @param query - the Expression string (or pre-v25 wrapper object)
-     */
-    getAdaptableQueryExpression(query: string | Partial<LegacyAdaptableQuery> | undefined | null): string | undefined;
-    /**
-     * Returns the Expression string with column friendly names (instead of Column IDs)
-     * @param query - the Expression string (or pre-v25 wrapper object)
+     * Returns the Expression with Column Headers in place of Column IDs
+     * @param expression - the Expression string
      */
-    getAdaptableQueryExpressionWithColumnFriendlyNames(query: string | Partial<LegacyAdaptableQuery> | undefined | null): string | undefined;
+    getExpressionWithColumnFriendlyNames(expression: string | undefined | null): string | undefined;
     /**
      * Evaluates a Standard Expression against a row.
      * Requires a row target (`rowNode`, `primaryKeyValue`, or `data`) on the request.

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

@@ -4,7 +4,6 @@ import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { ExpressionApi } from '../ExpressionApi';
 import { AggregatedExpressionEvaluationValue, EvaluateAggregatedExpressionRequest, EvaluateStandardExpressionRequest, ExpressionEvaluationResult, FilterDataSetRequest, FilterRowNodesRequest } from '../../aql/ExpressionEvaluation';
 import type { ExpressionKind } from '../../AdaptableState/Common/AdaptableQuery';
-import { type LegacyAdaptableQuery } from '../../migration/legacyAdaptableQuery';
 import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
@@ -31,8 +30,7 @@ export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi
     getColumnsFromExpression(expression: string, visitedCalculatedColumnIds?: Set<string>): string[];
     isColumnQueryable(abColumn: AdaptableColumn): boolean;
     getExpressionKind(expression: string, module?: AdaptableModule): ExpressionKind;
-    getAdaptableQueryExpression(query: string | Partial<LegacyAdaptableQuery> | undefined | null): string | undefined;
-    getAdaptableQueryExpressionWithColumnFriendlyNames(query: string | Partial<LegacyAdaptableQuery> | undefined | null): string | undefined;
+    getExpressionWithColumnFriendlyNames(expression: string | undefined | null): string | undefined;
     migratePreV24Expression(expression: string, options?: {
         expressionKind?: 'boolean' | 'scalar' | 'aggregatedScalar' | 'aggregatedBoolean';
     }): {

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -1,7 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { emitAstForConsumer, migrateExpression } from "../../../vendor/aql/index.js";
 import { toMigrateOptions } from '../../aql/legacyExpressionKinds';
-import { getLegacyQueryText } from '../../migration/legacyAdaptableQuery';
 import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 import { ExpressionModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { invokeOptionCallback, resolveValueOrFunction, } from '../../Utilities/Helpers/ValueOrFunctionHelper';
@@ -269,13 +268,13 @@ export class ExpressionApiImpl extends ApiBase {
             .internalApi.getQueryLanguageService()
             .getExpressionKind(expression, module);
     }
-    getAdaptableQueryExpression(query) {
-        return getLegacyQueryText(query);
-    }
-    getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
+    getExpressionWithColumnFriendlyNames(expression) {
+        if (expression == null) {
+            return undefined;
+        }
         return this.getAdaptableApi()
             .internalApi.getQueryLanguageService()
-            .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
+            .getExpressionWithColumnFriendlyNames(expression);
     }
     migratePreV24Expression(expression, options) {
         return migrateExpression(expression, toMigrateOptions(options?.expressionKind));

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

@@ -7,7 +7,7 @@ import { AdaptableMenuItem } from '../../AdaptableState/Common/Menu';
 import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableState, BaseContext, InitialState } from '../../types';
-import type { LegacyAdaptableQuery } from '../../migration/legacyAdaptableQuery';
+import { type LegacyAdaptableQuery } from '../../migration/legacyAdaptableQuery';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { ICalculatedColumnExpressionService } from '../../Utilities/Services/Interface/ICalculatedColumnExpressionService';
@@ -112,7 +112,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     /**
      * Display text for an expression: column friendly names when
      * `expressionOptions.displayColumnFriendlyNamesForExpressions` is set, the raw
-     * text otherwise. Accepts the pre-v25 wrapper object for un-migrated callers.
+     * text otherwise. Still unwraps a leftover wrapper for internal callers.
      */
     getAdaptableQueryExpressionText(query: string | Partial<LegacyAdaptableQuery> | undefined | null): string;
     /**

package/src/Api/Internal/AdaptableInternalApi.js

@@ -3,6 +3,7 @@ import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { ApiBase } from '../Implementation/ApiBase';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { ADAPTABLE_ID } from '../../Utilities/Constants/GeneralConstants';
+import { getLegacyQueryText, } from '../../migration/legacyAdaptableQuery';
 import { waitForCondition } from '../../Utilities/waitForCondition';
 import { isAdaptableCustomIcon, isAdaptableSystemIcon } from '../../components/Icon';
 import { parseDateValue } from '../../Utilities/Helpers/DateHelper';
@@ -293,13 +294,14 @@ export class AdaptableInternalApi extends ApiBase {
         return adaptableObjectTag;
     }
     getAdaptableQueryExpressionText(query) {
-        if (!query) {
+        const text = getLegacyQueryText(query);
+        if (!text) {
             return '';
         }
         const displayColumnFriendlyNames = this.getExpressionOptions()?.displayColumnFriendlyNamesForExpressions;
-        return ((displayColumnFriendlyNames
-            ? this.getExpressionApi().getAdaptableQueryExpressionWithColumnFriendlyNames(query)
-            : this.getExpressionApi().getAdaptableQueryExpression(query)) ?? '');
+        return displayColumnFriendlyNames
+            ? (this.getExpressionApi().getExpressionWithColumnFriendlyNames(text) ?? '')
+            : text;
     }
     getValueUsingField(rowData, fieldName) {
         if (!rowData || !fieldName?.length) {

package/src/Strategy/AlertModule.js

@@ -102,7 +102,7 @@ export class AlertModule extends AdaptableModuleBase {
         if (isScheduledAlertDefinition(alertDefinition)) {
             return [];
         }
-        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = alertDefinition.Rule;
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
@@ -117,7 +117,7 @@ export class AlertModule extends AdaptableModuleBase {
         if (isScheduledAlertDefinition(alertDefinition)) {
             return [];
         }
-        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = alertDefinition.Rule;
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/FormatColumnModule.js

@@ -22,7 +22,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
         return this.getLayoutExtensionModuleObjects('FormatColumn', () => this.api.formatColumnApi.getFormatColumns(), config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
-        const queryExpression = formatColumn.Rule && this.api.expressionApi.getAdaptableQueryExpression(formatColumn.Rule);
+        const queryExpression = formatColumn.Rule;
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
@@ -34,7 +34,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(formatColumn) {
-        const queryExpression = formatColumn.Rule && this.api.expressionApi.getAdaptableQueryExpression(formatColumn.Rule);
+        const queryExpression = formatColumn.Rule;
         if (!queryExpression) {
             return [];
         }

package/src/Utilities/Services/QueryLanguageService.js

@@ -784,8 +784,6 @@ export class QueryLanguageService {
             const columnFriendlyName = this.adaptableApi.columnApi.getFriendlyNameForColumnId(columnId);
             result = result.split(columnId).join(columnFriendlyName);
         }
-        result = result.replace(/\$SCOPE\s*\(\s*\)/g, '$Column_Scope');
-        result = result.replace(/\$SCOPE\b/g, '$Column_Scope');
         return result;
     }
     getNodesFromExpression(input, nodeType) {

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -121,5 +121,5 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
     const showObservableHint = props.calculatedColumnType === 'Standard' &&
         props.onCalculatedColumnTypeChange != null &&
         expressionContainsObservableCall(data.Expression);
-    return (_jsxs(ExpressionUseCaseCard, { title: getTypeTitle(props.calculatedColumnType), description: getTypeDescription(props.calculatedColumnType), examplesKind: getExamplesKind(props.calculatedColumnType), children: [_jsx(ExpressionEditor, { type: editorType, scalarVariant: isObservable ? 'observable' : undefined, module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Expression ?? '', onChange: (expression) => setCalculatedColumnExpression(expression), initialData: initialData, columns: columns, fields: isPerRow ? api.expressionApi.internalApi.getAvailableFields() : undefined, namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api, suppressTypeInfoCard: true, examplesKind: getExamplesKind(props.calculatedColumnType) }), showObservableHint ? (_jsxs(HelpBlock, { "data-name": "calculated-column-observable-hint", className: "twa:mt-2 twa:flex twa:items-center twa:gap-2 twa:text-3", children: [_jsx("span", { children: "This Expression uses observable (live) functions." }), _jsx(SimpleButton, { variant: "outlined", "data-name": "calculated-column-switch-to-observable", onClick: () => props.onCalculatedColumnTypeChange?.('Observable'), children: "Switch to Observable" })] })) : null] }));
+    return (_jsxs(ExpressionUseCaseCard, { title: getTypeTitle(props.calculatedColumnType), description: getTypeDescription(props.calculatedColumnType), examplesKind: getExamplesKind(props.calculatedColumnType), children: [_jsx(ExpressionEditor, { type: editorType, scalarVariant: isObservable ? 'observable' : undefined, suppressObservable: !isObservable, module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Expression ?? '', onChange: (expression) => setCalculatedColumnExpression(expression), initialData: initialData, columns: columns, fields: isPerRow ? api.expressionApi.internalApi.getAvailableFields() : undefined, namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api, suppressTypeInfoCard: true, examplesKind: getExamplesKind(props.calculatedColumnType) }), showObservableHint ? (_jsxs(HelpBlock, { "data-name": "calculated-column-observable-hint", className: "twa:mt-2 twa:flex twa:items-center twa:gap-2 twa:text-3", children: [_jsx("span", { children: "This Expression uses observable (live) functions." }), _jsx(SimpleButton, { variant: "outlined", "data-name": "calculated-column-switch-to-observable", onClick: () => props.onCalculatedColumnTypeChange?.('Observable'), children: "Switch to Observable" })] })) : null] }));
 };

package/src/View/Filter/ColumnFilter/ColumnFilterNew.js

@@ -1,11 +1,10 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { clsx } from 'cn';
 import SimpleButton from '../../../components/SimpleButton';
 import { useAdaptable } from '../../AdaptableContext';
 import { Box, Flex } from '../../../components/Flex';
 import { twMerge } from '../../../twMerge';
-import { captureTab } from '../../../lib/utils';
+import { captureTab, cn } from '../../../lib/utils';
 import * as ModuleConstants from '../../../Utilities/Constants/ModuleConstants';
 import { QueryBuilder } from '../../../components/aql/QueryBuilder';
 import { getQueryBuilderColumnOptions, getQueryBuilderFieldOptions, } from '../../../components/aql/QueryBuilder/qlGroupUtils';
@@ -65,7 +64,7 @@ export const ColumnFilterComponentNew = (props) => {
     };
     const showClear = props.location !== 'filterForm';
     const showActions = !props.hideActionButtons && (showClear || manuallyApplyColumnFilter);
-    return (_jsx(ColumnFilterOverlayHost, { location: props.location, children: _jsxs("div", { ref: rootRef, onKeyDown: handleFocusTrap, className: "twa:contents", children: [showActions && (_jsxs(Flex, { className: clsx('ab-ColumnFilter-actions twa:m-2', {
+    return (_jsx(ColumnFilterOverlayHost, { location: props.location, children: _jsxs("div", { ref: rootRef, onKeyDown: handleFocusTrap, className: "twa:contents", children: [showActions && (_jsxs(Flex, { className: cn('ab-ColumnFilter-actions twa:m-2', {
                         'twa:mb-2': isEmbeddedColumnFilterLocation(props.location),
                     }), justifyContent: "space-between", children: [showClear && (_jsx(Box, { className: "ab-ColumnFilter-action-clearall", children: _jsx(SimpleButton, { "aria-label": "Clear All Filters", onClick: clearAllFilters, children: "Clear All" }) })), manuallyApplyColumnFilter && (_jsxs(_Fragment, { children: [_jsx(Box, { className: "twa:flex-1", "data-name": "spacer" }), _jsx(Box, { className: "ab-ColumnFilter-action-reset twa:mr-2", children: _jsx(SimpleButton, { "aria-label": "Reset All", tone: "neutral", variant: "raised", onClick: resetFilter, children: "Reset" }) }), _jsx(Box, { className: "ab-ColumnFilter-action-apply", children: _jsx(SimpleButton, { "aria-label": "Apply Filter", tone: "accent", variant: "raised", onClick: applyFilter, children: "Apply" }) })] }))] })), _jsx(Box, { style: props.wrapperProps?.style, className: twMerge('ab-ColumnFilter twa:flex-1 twa:min-h-0 twa:overflow-auto twa:overflow-x-hidden twa:p-0.5 twa:gap-1 twa:flex twa:flex-col', props.location === 'filtersToolPanel' && 'ab-ColumnFilter--tool-panel', props.disabled ? 'twa:opacity-60 twa:pointer-events-none' : '', props.wrapperProps?.className), children: _jsx(QueryBuilder, { module: ModuleConstants.ColumnFilterModuleId, query: "", initialPredicate: seededGroup, onChange: noop, onPredicateChange: handlePredicateChange, getColumns: getColumns, getFields: getFields, subject: { mode: 'locked', columnId: props.columnId }, hideExpressionPreview: true, hideInlineAdd: true, hideAddGroup: true, hideLockedSubject: true, hideDragHandles: true, layout: getColumnFilterQueryBuilderLayout(props.location) }, `${props.columnId}:${resetNonce}`) })] }) }));
 };

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/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: 1791377450889 || Date.now(),
+    VERSION: "24.0.0-canary.1" || '--current-version--',
 };