@adaptabletools/adaptable 23.1.0 → 24.0.0-canary.0

package/src/View/ObjectItemViews/Layout/getLayoutFilterViewItems.js

@@ -0,0 +1,58 @@
+import { isQlPredicateError } from "../../../../vendor/aql/index.js";
+import { asColumnFilterGroup, deriveColumnFilterGroup, getColumnFilterOperatorDefs, isKnownPreferredFilter, qlGroupToLabel, } from '../../../aql/columnFilterQl';
+import { buildQueryBuilderMapper } from '../../../components/aql/QueryBuilder/mapper';
+import * as ModuleConstants from '../../../Utilities/Constants/ModuleConstants';
+const columnFilterToPreviewGroup = (columnFilter, api) => {
+    const column = api.columnApi.getColumnWithColumnId(columnFilter.ColumnId);
+    if (!column) {
+        return { group: null };
+    }
+    if (columnFilter.Expression) {
+        const mapper = buildQueryBuilderMapper(api, ModuleConstants.ColumnFilterModuleId);
+        const parsed = mapper.parse(columnFilter.Expression);
+        if (parsed && !isQlPredicateError(parsed)) {
+            return { group: asColumnFilterGroup(parsed) };
+        }
+        return { group: null, rawExpressionFallback: columnFilter.Expression };
+    }
+    if (isKnownPreferredFilter(columnFilter.PreferredFilter)) {
+        const mapper = buildQueryBuilderMapper(api, ModuleConstants.ColumnFilterModuleId);
+        return {
+            group: deriveColumnFilterGroup(api, column, columnFilter, mapper, 'FilterForm'),
+        };
+    }
+    return { group: null };
+};
+export const getColumnFilterExpressionPreview = (columnFilter, api) => {
+    const column = api.columnApi.getColumnWithColumnId(columnFilter.ColumnId);
+    const { group, rawExpressionFallback } = columnFilterToPreviewGroup(columnFilter, api);
+    if (rawExpressionFallback) {
+        return rawExpressionFallback;
+    }
+    if (!group || group.children.length === 0) {
+        return null;
+    }
+    const defs = column ? getColumnFilterOperatorDefs(api, column) : [];
+    return qlGroupToLabel(group, defs) || null;
+};
+export const getFilterPreview = (columnFilter, api) => {
+    const columnId = columnFilter.ColumnId;
+    const column = api.columnApi.getColumnWithColumnId(columnId);
+    const friendlyName = column?.friendlyName ?? columnId;
+    const { group, rawExpressionFallback } = columnFilterToPreviewGroup(columnFilter, api);
+    if (rawExpressionFallback) {
+        return `${friendlyName} ${rawExpressionFallback}`;
+    }
+    if (!group || group.children.length === 0) {
+        return friendlyName;
+    }
+    const defs = column ? getColumnFilterOperatorDefs(api, column) : [];
+    const label = qlGroupToLabel(group, defs);
+    return label ? `${friendlyName} ${label}` : friendlyName;
+};
+export const getLayoutFilterViewItems = (layout, api) => {
+    return {
+        name: 'Column Filters',
+        values: (layout.ColumnFilters ?? []).map((columnFilter) => getFilterPreview(columnFilter, api)),
+    };
+};

package/src/View/ObjectItemViews/Layout/getLayoutSortViewItems.d.ts

@@ -0,0 +1,6 @@
+import { AdaptableApi, Layout } from '../../../types';
+export declare const getLayoutSortViewItems: (layout: Layout, api: AdaptableApi) => {
+    name: string;
+    values: string[];
+    tagVariant: "accent";
+};

package/src/View/ObjectItemViews/Layout/getLayoutSortViewItems.js

@@ -0,0 +1,10 @@
+export const getLayoutSortViewItems = (layout, api) => {
+    const columnIdToFriendlyName = (columnId) => {
+        return api.columnApi.getFriendlyNameForColumnId(columnId);
+    };
+    return {
+        name: 'Sort',
+        values: (layout.ColumnSorts ?? []).map((customSort) => `[${columnIdToFriendlyName(customSort.ColumnId)}: ${customSort.SortOrder}]`),
+        tagVariant: 'accent',
+    };
+};

package/src/View/ObjectItemViews/getExpressionViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from '../../Strategy/Interface/IModule';
+import { AdaptableApi } from '../../types';
+export declare const getExpressionViewItems: (expression: string | undefined, api: AdaptableApi) => AdaptableObjectItemView;

package/src/View/ObjectItemViews/getExpressionViewItems.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ExpressionPreview } from '../../components/aql/ExpressionEditor/ExpressionPreview';
+import { ExpressionTag } from '../../components/Tag';
+export const getExpressionViewItems = (expression, api) => {
+    return {
+        name: 'Expression',
+        view: (_jsx(ExpressionTag, { children: _jsx(ExpressionPreview, { expression: expression }) })),
+    };
+};

package/src/View/ObjectItemViews/getLayoutExtensionInfoViewItems.d.ts

@@ -0,0 +1,8 @@
+import { AdaptableObjectItemView } from '../../Strategy/Interface/IModule';
+import { AdaptableApi, LayoutExtensionModule, LayoutExtensionObject } from '../../types';
+export declare const ALL_LAYOUTS_LABEL = "All Layouts";
+/**
+ * Settings Panel row showing which Layouts an object is extended into; when the Layout Extensions UI
+ * is enabled it also offers buttons to change which Layouts it is extended into relative to the Current Layout
+ */
+export declare const getLayoutExtensionInfoViewItems: (object: LayoutExtensionObject, module: LayoutExtensionModule, api: AdaptableApi) => AdaptableObjectItemView | undefined;

package/src/View/ObjectItemViews/getLayoutExtensionInfoViewItems.js

@@ -0,0 +1,31 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import SimpleButton from '../../components/SimpleButton';
+import { Flex } from '../../components/Flex';
+export const ALL_LAYOUTS_LABEL = 'All Layouts';
+export const getLayoutExtensionInfoViewItems = (object, module, api) => {
+    if (!object?.Name) {
+        return;
+    }
+    const layoutNames = api.layoutApi.getLayoutsForObject(object, module);
+    const isGlobal = layoutNames.length === 0;
+    const isUIEnabled = api.layoutApi.internalApi.isLayoutExtensionsUIEnabled();
+    if (isGlobal && (!isUIEnabled || api.layoutApi.getLayouts().length < 2)) {
+        return;
+    }
+    const item = {
+        name: 'Layouts',
+        values: isGlobal ? [ALL_LAYOUTS_LABEL] : layoutNames,
+    };
+    if (!isUIEnabled) {
+        return item;
+    }
+    const currentLayoutName = api.layoutApi.getCurrentLayoutName();
+    const isInCurrentLayout = layoutNames.includes(currentLayoutName);
+    const buttonClassName = 'twa:text-2 twa:py-2 twa:px-2';
+    const buttonIconSize = 12;
+    item.viewAfter = () => {
+        const setLayouts = (names) => api.layoutApi.setLayoutsForObject(object, module, names);
+        return (_jsxs(Flex, { className: "twa:mt-1 twa:gap-1 twa:flex-wrap", children: [isGlobal && (_jsx(SimpleButton, { icon: "minus", iconSize: buttonIconSize, className: buttonClassName, onClick: () => setLayouts([currentLayoutName]), children: "Restrict to Current Layout" })), !isGlobal && !isInCurrentLayout && (_jsx(SimpleButton, { icon: "plus", iconSize: buttonIconSize, className: buttonClassName, onClick: () => setLayouts([...layoutNames, currentLayoutName]), children: "Add to Current Layout" })), isInCurrentLayout && layoutNames.length > 1 && (_jsx(SimpleButton, { icon: "minus", iconSize: buttonIconSize, className: buttonClassName, onClick: () => setLayouts(layoutNames.filter((name) => name !== currentLayoutName)), children: "Remove from Current Layout" })), !isGlobal && (_jsx(SimpleButton, { icon: "plus", iconSize: buttonIconSize, className: buttonClassName, onClick: () => setLayouts([]), children: "Make Available in All Layouts" }))] }));
+    };
+    return item;
+};

package/src/View/ObjectItemViews/getLayoutExtensionsViewItems.d.ts

@@ -0,0 +1,9 @@
+import { AdaptableObjectItemView } from '../../Strategy/Interface/IModule';
+import { AdaptableApi } from '../../types';
+import { Layout } from '../../AdaptableState/LayoutState';
+/**
+ * Settings Panel row listing the objects extended into a Layout, one tag per object
+ * in the form `Module: Name` (e.g. `Format Column: my-format-column`); omitted when the
+ * Layout has no Extensions
+ */
+export declare const getLayoutExtensionsViewItems: (layout: Layout, api: AdaptableApi) => AdaptableObjectItemView | undefined;

package/src/View/ObjectItemViews/getLayoutExtensionsViewItems.js

@@ -0,0 +1,26 @@
+import { ADAPTABLE_MODULE_MAP } from '../../Utilities/Constants/ModuleConstants';
+import { LAYOUT_EXTENSION_MODULES } from '../../Utilities/Helpers/Layouts/LayoutExtensionHelper';
+export const getLayoutExtensionsViewItems = (layout, api) => {
+    if (!layout?.Name) {
+        return;
+    }
+    const extensionInfo = api.layoutApi.getLayoutExtensions(layout.Name);
+    const values = [];
+    for (const module of LAYOUT_EXTENSION_MODULES) {
+        const objectNames = extensionInfo?.[module];
+        if (!objectNames?.length) {
+            continue;
+        }
+        const moduleLabel = ADAPTABLE_MODULE_MAP[module] ?? module;
+        for (const objectName of objectNames) {
+            values.push(`${moduleLabel}: ${objectName}`);
+        }
+    }
+    if (!values.length) {
+        return;
+    }
+    return {
+        name: 'Extensions',
+        values,
+    };
+};

package/src/View/ObjectItemViews/getObjectTagsViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from '../../Strategy/Interface/IModule';
+import { AdaptableObject, AdaptableApi } from '../../types';
+export declare const getObjectTagsViewItems: (object: AdaptableObject, api: AdaptableApi) => AdaptableObjectItemView;

package/src/View/ObjectItemViews/getObjectTagsViewItems.js

@@ -0,0 +1,9 @@
+export const getObjectTagsViewItems = (object, api) => {
+    if (!api.internalApi.shouldDisplayTagSections() || !object?.Tags?.length) {
+        return;
+    }
+    return {
+        name: 'Tags',
+        values: object?.Tags?.map((tag) => api.internalApi.getLabelForTag(tag)),
+    };
+};

package/src/View/ObjectItemViews/getRuleViewItems.d.ts

@@ -0,0 +1,6 @@
+import { AdaptableApi } from '../../types';
+export declare const getRuleViewItems: (rule: string | undefined | null, api: AdaptableApi) => {
+    name: string;
+    values: string[];
+    tagVariant: "expression";
+};

package/src/View/ObjectItemViews/getRuleViewItems.js

@@ -0,0 +1,7 @@
+export const getRuleViewItems = (rule, api) => {
+    return {
+        name: 'Condition',
+        values: [api.internalApi.getAdaptableQueryExpressionText(rule) || 'No condition'],
+        tagVariant: 'expression',
+    };
+};

package/src/View/ObjectItemViews/getScopeViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from '../../Strategy/Interface/IModule';
+import { ColumnScope, AdaptableApi } from '../../types';
+export declare const getScopeViewItems: (scope: ColumnScope, api: AdaptableApi) => AdaptableObjectItemView;

package/src/View/ObjectItemViews/getScopeViewItems.js

@@ -0,0 +1,23 @@
+import { getScopeDataTypeSummaryLabel, getScopeViewItemsTagVariant, } from '../../components/Tag/columnScopeTagHelpers';
+export const getScopeViewItems = (scope, api) => {
+    let values = [];
+    if ('ColumnIds' in scope && Array.isArray(scope.ColumnIds)) {
+        values = scope.ColumnIds.map((columnId) => api.columnApi.getFriendlyNameForColumnId(columnId)).filter(Boolean);
+    }
+    if ('DataTypes' in scope) {
+        values = scope.DataTypes.map((dataType) => getScopeDataTypeSummaryLabel(dataType));
+    }
+    if ('All' in scope) {
+        values = ['All Columns'];
+    }
+    if ('ColumnTypes' in scope) {
+        values = scope.ColumnTypes;
+    }
+    return {
+        label: 'Columns',
+        name: 'Target',
+        values,
+        tagVariant: getScopeViewItemsTagVariant(scope),
+        tagClassName: 'DataTypes' in scope ? 'twa:italic' : undefined,
+    };
+};

package/src/View/PlusMinus/Wizard/PlusMinusRuleWizardSection.d.ts

@@ -7,7 +7,6 @@ export declare const PlusMinusRuleStepSummary: React.FunctionComponent;
 export declare const isRuleValid: (data: PlusMinusNudge, api: AdaptableApi, context: OnePageAdaptableWizardContextType<PlusMinusNudge>) => string | true;
 interface PlusMinusRuleWizardSectionProps {
     onChange: (data: PlusMinusNudge) => void;
-    defaultPredicateId: string;
 }
 export declare function PlusMinusRuleWizardSection(props: PlusMinusRuleWizardSectionProps): React.JSX.Element;
 export {};

package/src/View/PlusMinus/Wizard/PlusMinusRuleWizardSection.js

@@ -1,30 +1,29 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { SummaryText, useOnePageAdaptableWizardContext, } from '../../Wizard/OnePageAdaptableWizard';
 import { EntityRulesEditor, EntityRulesSummary } from '../../Components/EntityRulesEditor';
-import { CodeBlock } from '../../../components/CodeBlock';
 import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utilities';
 import { Box, Flex } from '../../../components/Flex';
 import { Card } from '../../../components/Card';
-import { TypeRadio } from '../../Wizard/TypeRadio';
-import { Tag } from '../../../components/Tag';
+import { ExpressionTag, Tag } from '../../../components/Tag';
+import EmptyContent from '../../../components/EmptyContent';
+import SimpleButton from '../../../components/SimpleButton';
+import { ExpressionUseCaseCard, } from '../../../components/aql/ExpressionEditor';
 export function PlusMinusRuleSummary() {
     const { data } = useOnePageAdaptableWizardContext();
-    return (_jsx(EntityRulesSummary, { data: data, renderPredicate: (contents) => {
-            return (_jsxs(_Fragment, { children: ["Apply Plus Minus on ", _jsx(CodeBlock, { children: contents })] }));
-        }, renderQueryExpression: (contents) => {
-            return (_jsxs(_Fragment, { children: ["Apply Plus Minus when", ' ', _jsx("b", { children: _jsx(CodeBlock, { children: contents }) })] }));
+    return (_jsx(EntityRulesSummary, { data: data, renderQueryExpression: (contents) => {
+            return (_jsxs(_Fragment, { children: ["Apply Plus Minus when ", _jsx(ExpressionTag, { children: contents })] }));
         } }));
 }
 export const PlusMinusRuleStepSummary = () => {
     const { data } = useOnePageAdaptableWizardContext();
     const hasCondition = Boolean(data.Rule);
-    return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Nudge Type ", _jsx(Tag, { children: hasCondition ? 'Conditional' : 'Always Apply' })] }), hasCondition ? _jsx(PlusMinusRuleSummary, {}) : null] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Nudge Type ", _jsx(Tag, { children: hasCondition ? 'Conditionally Apply' : 'Always Apply' })] }), hasCondition ? _jsx(PlusMinusRuleSummary, {}) : null] }));
 };
 export const isRuleValid = (data, api, context) => {
-    if (!data.Rule) {
+    if (data.Rule == undefined) {
         return true;
     }
-    if (!data.Rule.BooleanExpression) {
+    if (!data.Rule.trim()) {
         return 'A valid rule is required.';
     }
     const ruleValidation = isAdaptableRuleValid(data, api, context);
@@ -35,27 +34,31 @@ export const isRuleValid = (data, api, context) => {
 };
 export function PlusMinusRuleWizardSection(props) {
     const { data, moduleInfo } = useOnePageAdaptableWizardContext();
-    const hasCondition = Boolean(data.Rule);
-    const handleNudgeTypeChange = (conditional) => {
-        if (conditional) {
-            props.onChange({
-                ...data,
-                Rule: data.Rule ?? { BooleanExpression: '' },
-            });
-            return;
-        }
+    const hasCondition = data.Rule != null;
+    const addCondition = () => {
+        props.onChange({
+            ...data,
+            Rule: data.Rule ?? '',
+        });
+    };
+    const deleteCondition = () => {
         const preparedData = { ...data };
         delete preparedData.Rule;
         props.onChange(preparedData);
     };
     const plusMinusNudge = {
         ...data,
-        Rule: data?.Rule ?? { BooleanExpression: '' },
+        Rule: data?.Rule ?? '',
     };
-    return (_jsxs(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-3 twa:p-3", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Nudge Type" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose whether the nudge is always applied or only when a condition is met" })] }), _jsx(Card.Body, { children: _jsxs(Flex, { flexDirection: "column", children: [_jsx(TypeRadio, { "data-name": "nudge-type-always", text: "Always Apply", description: "The nudge value is always applied when using Plus/Minus", checked: !hasCondition, onClick: () => handleNudgeTypeChange(false) }), _jsx(TypeRadio, { "data-name": "nudge-type-condition", text: "Conditional", description: "Apply the nudge only when the row matches a rule", checked: hasCondition, onClick: () => handleNudgeTypeChange(true) })] }) })] }), hasCondition ? (_jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Condition" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Build a rule that determines when the nudge should be applied" })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0", children: _jsx(EntityRulesEditor, { module: moduleInfo.ModuleName, flexProps: { style: { minHeight: 0 } }, defaultPredicateId: props.defaultPredicateId, predicateDefs: [], showAggregation: false, showObservable: false, showPredicate: false, data: plusMinusNudge, onChange: (plusMinus) => props.onChange(plusMinus), descriptions: {
-                                selectPredicate: null,
-                                useBooleanQuery: (_jsxs(_Fragment, { children: ["Use an BooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression"] })),
-                                useObservableQuery: null,
-                                useAggregationQuery: null,
-                            } }) })] })) : null] }));
+    if (!hasCondition) {
+        return (_jsx(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-3 twa:p-3", children: _jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsx(Card.Title, { children: _jsxs(Flex, { flexDirection: "column", className: "twa:min-w-0 twa:flex-1 twa:gap-1", children: [_jsx(Box, { className: "twa:font-medium", children: "Rule" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[640px]", children: "The nudge value is always applied when using Plus/Minus" })] }) }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0", children: _jsxs(EmptyContent, { className: "twa:gap-4", children: [_jsx("p", { children: "No Expression \u2014 the Plus / Minus nudge is always applied" }), _jsx(SimpleButton, { "data-name": "plus-minus-add-condition", tone: "accent", variant: "raised", icon: "plus", onClick: addCondition, children: "Add Condition" })] }) })] }) }));
+    }
+    return (_jsx(ExpressionUseCaseCard, { title: "Rule", description: _jsx(_Fragment, { children: "Apply the Plus/Minus nudge only when the row matches this Expression. It must resolve to a boolean (true / false) value." }), examplesKind: "boolean", children: _jsx(EntityRulesEditor, { module: moduleInfo.ModuleName, flexProps: { style: { minHeight: 0, height: '100%' } }, showAggregation: false, showQueryBuilder: true, data: plusMinusNudge, onChange: (plusMinus) => props.onChange(plusMinus), secondaryAction: {
+                label: 'Delete Condition',
+                onClick: deleteCondition,
+                icon: 'delete',
+                tone: 'neutral',
+                variant: 'raised',
+                'data-name': 'plus-minus-delete-condition',
+            }, suppressTypeInfoCard: true, examplesKind: "boolean" }) }));
 }

package/src/View/PlusMinus/Wizard/PlusMinusWizard.js

@@ -9,6 +9,7 @@ import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
 import * as PlusMinusRedux from '../../../Redux/ActionsReducers/PlusMinusRedux';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
+import { isLayoutExtensionInfoWizardSectionVisible, LayoutExtensionInfoWizardSection, renderLayoutExtensionInfoSummary, useLayoutExtensionInfoState, } from '../../Wizard/LayoutExtensionInfoWizardSection';
 import { Box } from '../../../components/Flex';
 export const PlusMinusWizard = (props) => {
     const [plusMinus, doSetPlusMinus] = React.useState(() => {
@@ -27,6 +28,7 @@ export const PlusMinusWizard = (props) => {
     const setPlusMinus = React.useCallback((data) => {
         doSetPlusMinus(data);
     }, []);
+    const layoutExtensionInfo = useLayoutExtensionInfoState('PlusMinus', props.data);
     const dispatch = useDispatch();
     const handleFinish = () => {
         if (props.data) {
@@ -35,6 +37,7 @@ export const PlusMinusWizard = (props) => {
         else {
             dispatch(PlusMinusRedux.PlusMinusNudgeAdd(plusMinus));
         }
+        layoutExtensionInfo.applyLayoutExtensionInfo(plusMinus);
         props.onFinishWizard(plusMinus);
     };
     return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: plusMinus, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
@@ -50,7 +53,7 @@ export const PlusMinusWizard = (props) => {
                 details: 'Choose when the nudge should be applied',
                 isValid: isRuleValid,
                 renderSummary: () => _jsx(PlusMinusRuleStepSummary, {}),
-                render: () => (_jsx(PlusMinusRuleWizardSection, { defaultPredicateId: "NonBlanks", onChange: setPlusMinus })),
+                render: () => _jsx(PlusMinusRuleWizardSection, { onChange: setPlusMinus }),
             },
             {
                 title: 'Target',
@@ -70,6 +73,13 @@ export const PlusMinusWizard = (props) => {
                 render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(ObjectTagsWizardSection, { onChange: setPlusMinus }) })),
                 renderSummary: renderObjectTagsSummary,
             },
+            {
+                details: 'Select the Layouts where this Plus/Minus Rule is available',
+                title: 'Layouts',
+                isVisible: (_, api) => isLayoutExtensionInfoWizardSectionVisible(api),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(LayoutExtensionInfoWizardSection, { layoutNames: layoutExtensionInfo.layoutNames, onChange: layoutExtensionInfo.setLayoutNames }) })),
+                renderSummary: () => renderLayoutExtensionInfoSummary(layoutExtensionInfo.layoutNames),
+            },
             '-',
             {
                 details: 'Review the Plus/Minus Nudge',

package/src/View/QuickSearch/QuickSearchInput.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
 import { AdaptableFormControlTextClear } from '../Components/Forms/AdaptableFormControlTextClear';
-import { useQuickSearchDebounced } from './useQuickSearchDebounced';
+import { useQuickSearchDebounced } from './Utilities/useQuickSearchDebounced';
 import { useAdaptable } from '../AdaptableContext';
 import SimpleButton from '../../components/SimpleButton';
 import { Flex } from '../../components/Flex';

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -8,7 +8,7 @@ import { Box, Flex } from '../../components/Flex';
 import { CheckBox } from '../../components/CheckBox';
 import { Tabs } from '../../components/Tabs';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
-import { useQuickSearchDebounced } from './useQuickSearchDebounced';
+import { useQuickSearchDebounced } from './Utilities/useQuickSearchDebounced';
 import { QuickSearchInput } from './QuickSearchInput';
 import { Card } from '../../components/Card';
 import { isQuickSearchStyleUnset, resolveQuickSearchCurrentTextMatchStyle, resolveQuickSearchTextMatchStyle, } from '../../Utilities/Helpers/QuickSearchHelper';

package/src/View/QuickSearch/Utilities/useQuickSearchDebounced.d.ts

@@ -0,0 +1,7 @@
+import { QuickSearchRunAction } from '../../../Redux/ActionsReducers/QuickSearchRedux';
+type UseQuickSearchProps = {
+    onRunQuickSearch: (quickSearchText: string) => QuickSearchRunAction;
+    QuickSearchText: string;
+};
+export declare const useQuickSearchDebounced: (props: UseQuickSearchProps) => [string, (s: string) => void];
+export {};

package/src/View/QuickSearch/Utilities/useQuickSearchDebounced.js

@@ -0,0 +1,15 @@
+import { useEffect, useState, useMemo } from 'react';
+import { debounce } from '../../../Utilities/Helpers/TimingHelper';
+import { QUICK_SEARCH_DEBOUNCE_TIME } from '../../../Utilities/Constants/GeneralConstants';
+export const useQuickSearchDebounced = (props) => {
+    const [searchText, setSearchText] = useState(props.QuickSearchText ?? '');
+    const debouncedRunQuickSearch = useMemo(() => debounce(props.onRunQuickSearch, QUICK_SEARCH_DEBOUNCE_TIME), [props.onRunQuickSearch]);
+    useEffect(() => {
+        setSearchText(props.QuickSearchText);
+    }, [props.QuickSearchText]);
+    const executeSearch = (searchText) => {
+        setSearchText(searchText);
+        debouncedRunQuickSearch(searchText);
+    };
+    return [searchText, executeSearch];
+};

package/src/View/Schedule/Wizard/ScheduleScheduleSummary.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Tag } from '../../../components/Tag';
-import { UIHelper } from '../../UIHelper';
+import { UIHelper } from '../../../Utilities/Helpers/UIHelper';
 import { SummaryText, useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 export const ScheduleScheduleSummary = () => {
     const { data } = useOnePageAdaptableWizardContext();

package/src/View/Schedule/Wizard/ScheduleScheduleWizard.js

@@ -7,7 +7,7 @@ import AdaptableInput from '../../Components/AdaptableInput';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Box } from '../../../components/Flex';
 import { Card } from '../../../components/Card';
-import { SingleSelect } from '../../../components/NewSelect';
+import { SingleSelect } from '../../../components/Select';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { buildCronExpression, buildRunAtIso, inferPresetFromCron, isScheduleValid as validateSchedule, parseOneOffDateFromRunAt, parseTimeFromSchedule, } from '../../../Utilities/Helpers/Scheduling/ScheduleHelper';
 export const isScheduleValid = (holder) => {
@@ -87,18 +87,7 @@ export const ScheduleBuilderWizard = (props) => {
             ...overrides,
         });
         props.onChange({ ...data, Schedule: next });
-    }, [
-        isOneOff,
-        oneOffDate,
-        hour,
-        minute,
-        preset,
-        selectedDays,
-        dayOfMonth,
-        customCron,
-        data,
-        props,
-    ]);
+    }, [isOneOff, oneOffDate, hour, minute, preset, selectedDays, dayOfMonth, customCron, data, props]);
     const handleFrequencyChange = (oneOff) => {
         if (oneOff) {
             commit({
@@ -125,18 +114,14 @@ export const ScheduleBuilderWizard = (props) => {
     };
     const handlePresetChange = (value) => {
         setPreset(value);
-        const days = value === 'selectedDays' && selectedDays.length === 0
-            ? DEFAULT_SELECTED_DAYS
-            : selectedDays;
+        const days = value === 'selectedDays' && selectedDays.length === 0 ? DEFAULT_SELECTED_DAYS : selectedDays;
         if (value === 'selectedDays' && selectedDays.length === 0) {
             setSelectedDays(days);
         }
         commit({ preset: value, selectedDays: days });
     };
     const handleDayChange = (checked, day) => {
-        const next = checked
-            ? [...selectedDays, day]
-            : selectedDays.filter((d) => d !== day);
+        const next = checked ? [...selectedDays, day] : selectedDays.filter((d) => d !== day);
         if (next.length === 0) {
             return;
         }

package/src/View/Shortcut/Utilities/shortcutOperations.d.ts

@@ -0,0 +1,5 @@
+import { MathOperation } from '../../../AdaptableState/Common/Enums';
+export declare const shortcutOperationList: Array<MathOperation>;
+export declare const SHORTCUT_PREVIEW_EXAMPLE_VALUE = 100;
+export declare function getShortcutOperationSymbol(operation: MathOperation): string;
+export declare function calculateShortcutResult(cellValue: number, shortcutValue: number, operation: MathOperation): number | null;

package/src/View/Shortcut/Utilities/shortcutOperations.js

@@ -0,0 +1,35 @@
+import { MathOperation } from '../../../AdaptableState/Common/Enums';
+import NumberExtensions from '../../../Utilities/Extensions/NumberExtensions';
+export const shortcutOperationList = [
+    MathOperation.Add,
+    MathOperation.Subtract,
+    MathOperation.Multiply,
+    MathOperation.Divide,
+];
+export const SHORTCUT_PREVIEW_EXAMPLE_VALUE = 100;
+const shortcutOperationSymbols = {
+    [MathOperation.Add]: '+',
+    [MathOperation.Subtract]: '−',
+    [MathOperation.Multiply]: '×',
+    [MathOperation.Divide]: '÷',
+};
+export function getShortcutOperationSymbol(operation) {
+    return shortcutOperationSymbols[operation];
+}
+export function calculateShortcutResult(cellValue, shortcutValue, operation) {
+    if (operation === MathOperation.Divide && shortcutValue === 0) {
+        return null;
+    }
+    switch (operation) {
+        case MathOperation.Add:
+            return NumberExtensions.avoidJavascriptPrecisionIssues(cellValue + shortcutValue);
+        case MathOperation.Subtract:
+            return NumberExtensions.avoidJavascriptPrecisionIssues(cellValue - shortcutValue);
+        case MathOperation.Multiply:
+            return NumberExtensions.avoidJavascriptPrecisionIssues(cellValue * shortcutValue);
+        case MathOperation.Divide:
+            return NumberExtensions.avoidJavascriptPrecisionIssues(cellValue / shortcutValue);
+        default:
+            return null;
+    }
+}

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import Input from '../../../components/Input';
-import { calculateShortcutResult, getShortcutOperationSymbol, shortcutOperationList, SHORTCUT_PREVIEW_EXAMPLE_VALUE, } from '../shortcutOperations';
+import { calculateShortcutResult, getShortcutOperationSymbol, shortcutOperationList, SHORTCUT_PREVIEW_EXAMPLE_VALUE, } from '../Utilities/shortcutOperations';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { SummaryText } from '../../../View/Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
 import { Box, Flex } from '../../../components/Flex';
-import { SingleSelect } from '../../../components/NewSelect';
+import { SingleSelect } from '../../../components/Select';
 import { Card } from '../../../components/Card';
 export const isSettingsValid = (data, api) => {
     if (!data.Name?.trim()) {

package/src/View/Shortcut/Wizard/ShortcutWizard.js

@@ -8,9 +8,10 @@ import { ShortcutSettingsSummary, ShortcutSettingsWizard, isSettingsValid, } fro
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
 import * as ShortcutRedux from '../../../Redux/ActionsReducers/ShortcutRedux';
-import { shortcutKeys } from '../shortcutKeys';
+import { shortcutKeys } from '../Utilities/shortcutKeys';
 import { useAdaptable } from '../../AdaptableContext';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
+import { isLayoutExtensionInfoWizardSectionVisible, LayoutExtensionInfoWizardSection, renderLayoutExtensionInfoSummary, useLayoutExtensionInfoState, } from '../../Wizard/LayoutExtensionInfoWizardSection';
 import { Box } from '../../../components/Flex';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 export const ShortcutWizard = (props) => {
@@ -36,6 +37,7 @@ export const ShortcutWizard = (props) => {
         availableKeys.sort();
         return availableKeys;
     }, []);
+    const layoutExtensionInfo = useLayoutExtensionInfoState('Shortcut', props.data);
     const dispatch = useDispatch();
     const handleFinish = () => {
         if (props.data) {
@@ -44,6 +46,7 @@ export const ShortcutWizard = (props) => {
         else {
             dispatch(ShortcutRedux.ShortcutAdd(shortcut));
         }
+        layoutExtensionInfo.applyLayoutExtensionInfo(shortcut);
         props.onFinishWizard(shortcut);
     };
     return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: shortcut, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
@@ -72,6 +75,13 @@ export const ShortcutWizard = (props) => {
                 render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(ObjectTagsWizardSection, { onChange: setShortcut }) })),
                 renderSummary: renderObjectTagsSummary,
             },
+            {
+                details: 'Select the Layouts where this Shortcut is available',
+                title: 'Layouts',
+                isVisible: (_, api) => isLayoutExtensionInfoWizardSectionVisible(api),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(LayoutExtensionInfoWizardSection, { layoutNames: layoutExtensionInfo.layoutNames, onChange: layoutExtensionInfo.setLayoutNames }) })),
+                renderSummary: () => renderLayoutExtensionInfoSummary(layoutExtensionInfo.layoutNames),
+            },
             '-',
             {
                 details: 'Review the Shortcut',

package/src/View/SmartEdit/SmartEditPopup.d.ts

@@ -4,18 +4,23 @@ import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
 interface SmartEditPopupProps extends ModuleViewPopupProps<SmartEditPopupComponent> {
     SmartEditValue: number;
     SmartEditOperation: SmartEditOperation;
     PreviewInfo: PreviewInfo;
+    Alert: AdaptableAlert | null;
     onSmartEditValueChange: (value: number) => InternalRedux.SmartEditChangeValueAction;
     onSmartEditOperationChange: (SmartEditOperation: SmartEditOperation) => InternalRedux.SmartEditChangeOperationAction;
     onSmartEditCheckSelectedCells: () => InternalRedux.SmartEditCheckCellSelectionAction;
     onApplySmartEdit: () => SmartEditRedux.SmartEditApplyAction;
 }
 declare class SmartEditPopupComponent extends React.Component<SmartEditPopupProps, {}> {
+    private cleanupEvent?;
     constructor(props: SmartEditPopupProps);
     componentDidMount(): void;
+    componentWillUnmount(): void;
+    private renderPanel;
     render(): React.JSX.Element;
     private submit;
     private onSmartEditValueChange;