@adaptabletools/adaptable 14.0.3 → 14.0.4

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -109,6 +109,9 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         entitlementOptions: {
             defaultAccessLevel: 'Hidden',
         },
+        filterOptions: {
+            quickFilterTrigger: 'click',
+        },
         layoutOptions: {
             createDefaultLayout: false,
             autoSizeColumnsInLayout: true,

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -27,7 +27,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
         const disabled = changeHistoryMode === 'INACTIVE';
         const suspended = changeHistoryMode === 'SUSPENDED';
         const buttonPanel = (React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup--button-panel", padding: 2, style: { gap: 'var(--ab-space-1)' } },
-            disabled && (React.createElement(ButtonPlay_1.ButtonPlay, { className: "ab-DataChangeHistoryPopup--button-activate", "data-name": 'data-change-history--button-activate"', variant: 'raised', tone: 'accent', tooltip: '', onClick: () => onChangeHistoryEnable() }, "Activate data change tracking")),
+            disabled && (React.createElement(ButtonPlay_1.ButtonPlay, { className: "ab-DataChangeHistoryPopup--button-activate", "data-name": 'data-change-history--button-activate"', variant: 'raised', tone: 'accent', tooltip: '', onClick: () => onChangeHistoryEnable() }, "Activate")),
             suspended && (React.createElement(ButtonPlay_1.ButtonPlay, { className: "ab-DataChangeHistoryPopup--button-resume", "data-name": 'data-change-history--button-resume', variant: 'outlined', tooltip: 'Resume tracking data changes', onClick: () => onChangeHistoryResume() }, "Resume")),
             enabled && (React.createElement(ButtonPause_1.ButtonPause, { className: "ab-DataChangeHistoryPopup--button-suspend", "data-name": 'data-change-history--button-suspend', variant: 'outlined', tooltip: 'Suspend tracking data changes', onClick: () => onChangeHistorySuspend() }, "Suspend")),
             (enabled || suspended) && (React.createElement(ButtonStop_1.ButtonStop, { className: "ab-DataChangeHistoryPopup--button-deactivate", "data-name": 'data-change-history--button-deactivate', variant: 'outlined', tooltip: 'Deactivate data change tracking', onClick: () => onChangeHistoryDisable() }, "Deactivate"))));

package/src/View/DataChangeHistory/DataChangeHistoryViewPanel.js

@@ -46,7 +46,7 @@ const DataChangeHistoryViewPanelControl = (props) => {
             React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-active", fontSize: 2, style: { color: 'var(--ab-color-success)' } }, "Active"))),
         suspended && (React.createElement(Tooltip_1.default, { label: !!suspensionTime && `since ${(0, FormatHelper_1.DateFormatter)(suspensionTime, { Pattern: dateFormat })}` },
             React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-suspended", fontSize: 2, style: { color: 'var(--ab-color-warn)' } }, "Suspended"))),
-        disabled && (React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-disabled", fontSize: 2 }, "Activate data tracking"))));
+        disabled && (React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-disabled", fontSize: 2 }, "Activate Data Tracking"))));
     return (React.createElement(rebass_1.Flex, { flexDirection: 'row' },
         buttonPanel,
         statusPanel,

package/src/View/Export/ExportTablePopup.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { WindowPopupChildProps } from '../Components/Popups/WindowPopups/WindowPopups';
+export declare const ExportTablePopup: React.FunctionComponent<WindowPopupChildProps>;

package/src/View/Export/ExportTablePopup.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportTablePopup = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const InfiniteTable_1 = require("../../components/InfiniteTable");
+const AdaptableContext_1 = require("../AdaptableContext");
+const tableDOMProps = {
+    style: {
+        height: '100%',
+        minWidth: '10rem',
+        minHeight: 300,
+    },
+};
+const ExportTablePopup = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const adaptableApi = adaptable.api;
+    const primaryKey = adaptableApi.optionsApi.getPrimaryKey();
+    const { reportData, } = props.popupProps;
+    const data = reportData.rows;
+    const columns = React.useMemo(() => {
+        const getFriendlyName = (columnId) => adaptableApi.columnApi.getFriendlyNameForColumnId(columnId);
+        const columns = {
+            [primaryKey]: { field: primaryKey, header: getFriendlyName(primaryKey) },
+        };
+        for (let column of reportData.columns) {
+            columns[column.columnId] = {
+                field: column.columnId,
+                header: getFriendlyName(column.columnId),
+                dataType: column.dataType,
+            };
+            if (column.dataType === 'Date') {
+                columns[column.columnId].valueFormatter = (params) => {
+                    var _a;
+                    if (typeof params.value === 'string') {
+                        return params.value;
+                    }
+                    return ((_a = params.value) === null || _a === void 0 ? void 0 : _a.toString) ? params.value.toString() : '';
+                };
+            }
+            if (column.dataType === 'Boolean') {
+                columns[column.columnId].valueFormatter = (params) => {
+                    if (typeof params.value === 'boolean') {
+                        return params.value ? 'true' : 'false';
+                    }
+                    return '';
+                };
+            }
+        }
+        return columns;
+    }, [props.popupProps]);
+    return (React.createElement(InfiniteTable_1.DataSource, { data: data, primaryKey: primaryKey },
+        React.createElement(InfiniteTable_1.InfiniteTable, { columnTypes: {
+                default: {
+                    defaultFlex: 1,
+                },
+            }, domProps: tableDOMProps, columns: columns })));
+};
+exports.ExportTablePopup = ExportTablePopup;

package/src/View/Export/Wizard/NewReportWizard.js

@@ -62,7 +62,7 @@ const NewReportWizard = (props) => {
                     React.createElement(ReportNameWizardSection_1.ReportNameWizardSection, { onChange: setReport }))),
             },
             {
-                details: 'Select Report tags',
+                details: 'Select Report Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/Export/Wizard/ReportColumnsWizardSection.js

@@ -62,7 +62,7 @@ const ReportColumnsWizardSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, { value: "BespokeColumns" },
                 React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "Only selected Columns (which you will choose in the next step) will be exported - whether visible or not"))),
         data.ReportColumnScope === 'ScopeColumns' ? (React.createElement(rebass_1.Box, { padding: 2, flex: 1, style: { overflow: 'auto' } },
-            React.createElement(NewScopeComponent_1.NewScopeComponent, { hideWholeRow: true, descriptions: {
+            React.createElement(NewScopeComponent_1.NewScopeComponent, { hideWholeRow: true, isColumnAvailable: (column) => Boolean(column.exportable), descriptions: {
                     rowScope: 'Apply Scope for: Row, or one or more Columns, or one or more Data Types',
                     columnScope: 'Selected columns will be included in the report',
                 }, scope: data.Scope, updateScope: (Scope) => {

package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.js

@@ -31,7 +31,7 @@ exports.renderFlashingAlertRulesSummary = renderFlashingAlertRulesSummary;
 const FlashingAlertRulesWizardSection = (props) => {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const predicateDefs = api.flashingCellApi.getFlashingCellPredicateDefsForScope(data.Scope);
-    return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "Any", data: data, predicateDefs: predicateDefs, onChange: props.onChange, showAggregation: false, showObservable: false, showBoolean: true, showPredicate: true, descriptions: {
+    return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "Any", data: data, predicateDefs: predicateDefs, getPredicateDefsForColId: (colId) => api.flashingCellApi.getFlashingCellPredicateDefsForScope({ ColumnIds: [colId] }), onChange: props.onChange, showAggregation: false, showObservable: false, showBoolean: true, showPredicate: true, descriptions: {
             selectPredicate: 'Select an Flashing Cell Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",

package/src/View/FlashingCell/Wizard/FlashingCellWizard.js

@@ -61,7 +61,7 @@ const FlashingCellWizard = (props) => {
                 details: 'Specify which data changes should trigger Cell Flashing',
                 isValid: NewScopeComponent_1.isScopeValid,
                 render: () => React.createElement(FlashingCellScopeWizardSection_1.FlashingAlertScopeWizardSection, { onChange: setFlashingCell }),
-                renderSummary: BaseAlertScopeWizardSection_1.renderBaseAlertScopeSummary,
+                renderSummary: BaseAlertScopeWizardSection_1.renderScopeSummary,
                 title: 'Scope',
             },
             {
@@ -88,7 +88,7 @@ const FlashingCellWizard = (props) => {
                 title: 'Flash Styles',
             },
             {
-                details: 'Select Flashing Cell tags',
+                details: 'Select Flashing Cell Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.js

@@ -9,7 +9,7 @@ function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, 
         // TODO see what is this
-        predicateDefs: api.formatColumnApi.internalApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
+        predicateDefs: api.formatColumnApi.internalApi.getFormatColumnDefsForScope(data.Scope), getPredicateDefsForColId: (colId) => api.formatColumnApi.internalApi.getFormatColumnDefsForScope({ ColumnIds: [colId] }), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
             selectPredicate: 'Create a Format Column Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",

package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.js

@@ -10,7 +10,7 @@ const renderFormatColumnScopeSummary = (data) => {
     return (0, NewScopeComponent_1.renderScopeSummary)(data.Scope, {
         scopeWholeRow: 'Matching rows will be formatted',
         scopeColumns: 'Cells in selected columns will be formatted',
-        scopeDataTypes: 'Cells in columns of the selected data-types will be formatted',
+        scopeDataTypes: 'Cells in columns with these Data Types will be formatted',
     });
 };
 exports.renderFormatColumnScopeSummary = renderFormatColumnScopeSummary;

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -134,7 +134,7 @@ function FormatColumnWizard(props) {
                 },
             },
             {
-                details: 'Select Format Column tags',
+                details: 'Select Format Column Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/FreeTextColumn/Wizard/FreeTextColumnWizard.js

@@ -47,7 +47,7 @@ const FreeTextColumnWizard = (props) => {
                 },
             },
             {
-                details: 'Select Free Text Column tags',
+                details: 'Select Free Text Column Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/GridInfo/GridInfoPopup.js

@@ -23,7 +23,7 @@ const GridInfoPopup = (props) => {
     const showColumnInfo = entitlementService.isGridInfoSectionVisible('ColumnInfo');
     /**
      * Because it is not associated with a module yet, setting this flag to true.
-     * Needed for the logic weather to show radio buttons (buttons.length >= 2)
+     * Needed for the logic whether to show radio buttons (buttons.length >= 2)
      */
     const showAdaptableObjects = entitlementService.isGridInfoSectionVisible('AdaptableObjects');
     const [state, setState] = React.useState({

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

@@ -69,7 +69,7 @@ const PlusMinusWizard = (props) => {
                 render: () => (React.createElement(PlusMinusSettingsWizardSection_1.PlusMinusSettingsWizardSection, { hasCondition: hasCondition, onConditionChange: setHasCondition, onChange: setPlusMinus })),
             },
             {
-                details: 'Select Plus/Minus tags',
+                details: 'Select Plus/Minus Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/Query/Wizard/NamedQueryWizard.js

@@ -49,7 +49,7 @@ function NamedQueryWizard(props) {
                 },
             },
             {
-                details: 'Select Query tags',
+                details: 'Select Query Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

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

@@ -103,7 +103,7 @@ const ScheduleWizard = (props) => {
                     React.createElement(ScheduleScheduleWizard_1.ScheduleScheduleWizard, { isOneOff: isOneOff, onSetIsOneOff: setIsOneOff, onChange: setSchedule }))),
             },
             {
-                details: 'Select Schedule tags',
+                details: 'Select Schedule Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

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

@@ -73,7 +73,7 @@ const ShortcutWizard = (props) => {
                 },
             },
             {
-                details: 'Select Shortcut tags',
+                details: 'Select Shortcut Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/StatusBar/StatusBarPanel.d.ts

@@ -17,17 +17,16 @@ export interface StatusBarPanelProps extends Omit<FlexProps, 'content'> {
     icon?: string;
     content?: React.ReactNode | React.FunctionComponent<React.PropsWithChildren<unknown>>;
     /**
-     * weather to trigger onAction when the wrapper is clicked
+     * Whether to trigger onAction when Wrapper is clicked
      */
     triggerActionOnWrapperClick?: boolean;
     /**
-     * When specified this content will be rendered when the text
-     * is clicked.
+     * If specified this content will be rendered when text is clicked
      */
     popover?: React.ReactNode | React.FunctionComponent<React.PropsWithChildren<unknown>>;
     popoverMinWidth?: number;
     /**
-     * Allow to render custom content
+     * Can render custom content
      */
     view?: React.FunctionComponent<React.PropsWithChildren<unknown>>;
     onAction?: () => void;

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -17,8 +17,10 @@ const StyledColumnWizardSettingsSection_1 = require("./StyledColumnWizardSetting
 const StyledColumnSparklineSettingsSection_1 = require("./StyledColumnSparklineSettingsSection");
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const StyledColumnWizard = (props) => {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
     const data = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
+    const popupDefaultCurrentSectionName = (_e = (_d = (_c = props === null || props === void 0 ? void 0 : props.popupParams) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.defaultCurrentSectionName) !== null && _e !== void 0 ? _e : undefined;
+    const defaultCurrentSectionName = (_f = props.defaultCurrentSectionName) !== null && _f !== void 0 ? _f : popupDefaultCurrentSectionName;
     const [styledColumn, setStyledColumn] = (0, react_1.useState)(() => {
         if (data) {
             return (0, Helper_1.cloneObject)(data);
@@ -29,7 +31,8 @@ const StyledColumnWizard = (props) => {
     });
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleFinish = () => {
-        if (props.popupParams.action === 'New' || !data) {
+        var _a;
+        if (((_a = props === null || props === void 0 ? void 0 : props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'New' || !data) {
             dispatch(StyledColumnRedux.StyledColumnAdd(styledColumn));
         }
         else {
@@ -64,7 +67,7 @@ const StyledColumnWizard = (props) => {
                 React.createElement(StyledColumnSparklineSettingsSection_1.StyledColumnSparklineSettingsSection, { onChange: setStyledColumn }))),
         },
     ];
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: styledColumn, onFinish: handleFinish, onHide: props.onCloseWizard, sections: [
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: styledColumn, onFinish: handleFinish, onHide: props.onCloseWizard, sections: [
             {
                 details: 'Select a Styled Column type',
                 renderSummary: StyledColumnWizardTypeSection_1.renderStyledColumnTypeSummary,
@@ -86,7 +89,7 @@ const StyledColumnWizard = (props) => {
             },
             ...(styledColumn.SparkLineStyle ? sparklineSteps : checkboxGrandientPercentSteps),
             {
-                details: 'Select Format Column tags',
+                details: 'Select Format Column Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },

package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.js

@@ -4,11 +4,11 @@ exports.StyledColumnWizardTypeSection = exports.renderStyledColumnTypeSummary =
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const Tabs_1 = require("../../../components/Tabs");
 const Tag_1 = require("../../../components/Tag");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const TypeRadio_1 = require("../../Wizard/TypeRadio");
 const renderStyledColumnTypeSummary = (data) => {
     let type = null;
     if (data.GradientStyle) {
@@ -62,9 +62,9 @@ const StyledColumnWizardTypeSection = (props) => {
         React.createElement(Tabs_1.Tabs, { autoFocus: false, padding: 2 },
             React.createElement(Tabs_1.Tabs.Tab, null, "Type"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(Radio_1.default, { checked: Boolean(data.GradientStyle), onChange: () => handleTypeChange('gradient') }, "Gradient Column"),
-                React.createElement(Radio_1.default, { onChange: () => handleTypeChange('percent'), checked: Boolean(data.PercentBarStyle) }, "Percent Bar"),
-                React.createElement(Radio_1.default, { onChange: () => handleTypeChange('checkbox'), checked: Boolean(data.CheckBoxStyle) }, "Check Box"),
-                adaptable.api.styledColumnApi.canDisplaySparklines() && (React.createElement(Radio_1.default, { onChange: () => handleTypeChange('sparkline'), checked: Boolean(data.SparkLineStyle) }, "Sparkline"))))));
+                React.createElement(TypeRadio_1.TypeRadio, { text: "Gradient Column", description: "Colour each cell in a numeric column using a gradient value", checked: Boolean(data.GradientStyle), onClick: () => handleTypeChange('gradient') }),
+                React.createElement(TypeRadio_1.TypeRadio, { text: "Percent Bar", description: "Display a coloured bar where the width is based on the cell", checked: Boolean(data.PercentBarStyle), onClick: () => handleTypeChange('percent') }),
+                React.createElement(TypeRadio_1.TypeRadio, { text: "Check Box", description: "Display a checkbox (in a Boolean column)", checked: Boolean(data.CheckBoxStyle), onClick: () => handleTypeChange('checkbox') }),
+                adaptable.api.styledColumnApi.canDisplaySparklines() && (React.createElement(TypeRadio_1.TypeRadio, { text: "Sparkline", description: "Render the column as a Sparkline", checked: Boolean(data.SparkLineStyle), onClick: () => handleTypeChange('sparkline') }))))));
 };
 exports.StyledColumnWizardTypeSection = StyledColumnWizardTypeSection;

package/src/View/TeamSharing/TeamSharingApplyButton.js

@@ -10,6 +10,6 @@ const TeamSharingApplyButton = (props) => {
     const handleImport = React.useCallback(() => {
         adaptable.api.teamSharingApi.importSharedEntry(props.data);
     }, []);
-    return (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-apply-button", onClick: handleImport, variant: "text", tooltip: "Apply Adaptable Object", icon: "import-export" }));
+    return (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-apply-button", onClick: handleImport, variant: "text", tooltip: "Apply", icon: "import-export" }));
 };
 exports.TeamSharingApplyButton = TeamSharingApplyButton;

package/src/View/Theme/ThemeStatusPanelPopover.js

@@ -9,9 +9,17 @@ const ThemeStatusPanelPopover = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const themes = adaptable.api.themeApi.getThemes();
     const handleThemeChange = React.useCallback((option) => {
-        adaptable.api.themeApi.loadTheme(option.label);
+        adaptable.api.themeApi.loadTheme(option.value);
+    }, []);
+    const options = React.useMemo(() => {
+        return themes.map((theme) => {
+            var _a;
+            return ({
+                label: (_a = theme.Description) !== null && _a !== void 0 ? _a : theme.Name,
+                value: theme.Name,
+            });
+        });
     }, []);
-    const options = themes.map((theme) => ({ label: theme.Name, value: theme.Uuid }));
     return React.createElement(SelectList_1.SelectList, { options: options, onChange: handleThemeChange });
 };
 exports.ThemeStatusPanelPopover = ThemeStatusPanelPopover;

package/src/View/Wizard/TypeRadio.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export declare const TypeRadio: (props: {
+    checked: boolean;
+    text: string;
+    description: string;
+    onClick: () => void;
+}) => JSX.Element;

package/src/View/Wizard/TypeRadio.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeRadio = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
+const TypeRadio = (props) => (React.createElement(Radio_1.default, { onClick: () => props.onClick(), checked: props.checked },
+    React.createElement(rebass_1.Flex, { flexDirection: "column" },
+        React.createElement(rebass_1.Text, null, props.text),
+        React.createElement(rebass_1.Text, { fontSize: 2, marginTop: 1 }, props.description))));
+exports.TypeRadio = TypeRadio;

package/src/agGrid/Adaptable.d.ts

@@ -307,7 +307,9 @@ export declare class Adaptable implements IAdaptable {
      * There are a few things that we need to do AFTER we edit a cell and it makes sense to put them in one place
      */
     private performPostEditChecks;
-    private getExpressionStylesChanges;
+    private refreshCellsBasedOnCellDataChange;
+    private getFormatColumnExpressionStylesChanges;
+    private getFormatColumnPredicateStyleChanges;
     private getStyledColumnComparisonChanges;
     private checkChangedCellCurrentlySelected;
     refreshColumnForRelativeRangeStyledColumns(cellDataChangedInfos: CellDataChangedInfo[]): void;

package/src/agGrid/Adaptable.js

@@ -2415,7 +2415,7 @@ class Adaptable {
                 }
             });
         };
-        const resultColDefs = mapColDefs(allColDefs);
+        let resultColDefs = mapColDefs(allColDefs);
         // check if there are any special colDefs that were not processed
         // in that case, add them to the end of the colDefs
         specialColDefs.forEach((specialColDef) => {
@@ -2423,6 +2423,14 @@ class Adaptable {
                 resultColDefs.push(specialColDef);
             }
         });
+        // remove special column that are no longer defined
+        resultColDefs = resultColDefs.filter((colDef) => {
+            if (isSpecialColDef(colDef)) {
+                // must be in specialColDefs
+                return specialColDefs.some((specialColDef) => specialColDef.colId === colDef.colId);
+            }
+            return true;
+        });
         this.safeSetColDefs(resultColDefs);
         this.setLayout();
     }
@@ -2759,6 +2767,7 @@ class Adaptable {
          */
         this.gridOptions.api.addEventListener(core_1.Events.EVENT_FIRST_DATA_RENDERED, (this.listenerFirstDataRendered = () => {
             this.checkColumnsDataTypeSet();
+            this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
             this.setLayout();
         }));
         /**
@@ -3712,6 +3721,11 @@ class Adaptable {
             this.DataService.CreateDataChangedEvent(cellDataChangedInfo);
             this.resetMinMaxCachedValueForColumn(cellDataChangedInfo.column);
         });
+        this.refreshCellsBasedOnCellDataChange(cellDataChangedInfos);
+        firstInfo.trigger == 'tick' ? this.filterOnTickingDataChange() : this.filterOnEditDataChange();
+    }
+    refreshCellsBasedOnCellDataChange(cellDataChangedInfos) {
+        const [firstInfo] = cellDataChangedInfos;
         // if node is visible then check if need to refresh other columns / whole row if the updating column is:
         // 1. referenced in Format Column Styles that have Expressions (refreshing whole row if Scope is All)
         // 2. referenced in Format Column styles that use Column Comparisons (which might also be calculated columns)
@@ -3720,7 +3734,10 @@ class Adaptable {
                 wholeRow: false,
                 columnIds: new Set(),
             };
-            this.getExpressionStylesChanges(dataChangedScope, cellDataChangedInfos);
+            this.getFormatColumnExpressionStylesChanges(dataChangedScope, cellDataChangedInfos);
+            if (dataChangedScope.wholeRow === false) {
+                this.getFormatColumnPredicateStyleChanges(dataChangedScope, cellDataChangedInfos);
+            }
             if (dataChangedScope.wholeRow) {
                 this.redrawRow(firstInfo.rowNode);
             }
@@ -3732,9 +3749,8 @@ class Adaptable {
             }
         }
         this.refreshColumnForRelativeRangeStyledColumns(cellDataChangedInfos);
-        firstInfo.trigger == 'tick' ? this.filterOnTickingDataChange() : this.filterOnEditDataChange();
     }
-    getExpressionStylesChanges(dataChangedScope, cellDataChangedInfos) {
+    getFormatColumnExpressionStylesChanges(dataChangedScope, cellDataChangedInfos) {
         const formatColumnsWithExpression = [];
         formatColumnsWithExpression.push(...this.api.formatColumnApi.internalApi.getFormatColumnsWithExpression());
         if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(formatColumnsWithExpression)) {
@@ -3764,6 +3780,14 @@ class Adaptable {
             }
         });
     }
+    getFormatColumnPredicateStyleChanges(dataChangedScope, cellDataChangedInfos) {
+        cellDataChangedInfos.forEach((cellDataChangeInfo) => {
+            const dependentColumns = this.api.formatColumnApi.internalApi.getFormatColumnColumnsDependentOnColumnChange(cellDataChangeInfo.column);
+            for (let colId of dependentColumns) {
+                dataChangedScope.columnIds.add(colId);
+            }
+        });
+    }
     getStyledColumnComparisonChanges(dataChangedScope, cellDataChangedInfos) {
         this.api.styledColumnApi.getStyledColumns().forEach((sc) => {
             let columnComparison = this.api.styledColumnApi.internalApi.getColumnComparisonForStyledColumn(sc);

package/src/agGrid/agGridHelper.d.ts

@@ -39,6 +39,7 @@ export declare class agGridHelper {
     private getColumnAggregationFunctions;
     private isColumnMoveable;
     private isColumnQueryable;
+    private isColumnExportable;
     private isColumnHideable;
     private isColumnFilterable;
     private getColumnPinnedPosition;

package/src/agGrid/agGridHelper.js

@@ -207,6 +207,7 @@ class agGridHelper {
             moveable: this.isColumnMoveable(colDef),
             hideable: this.isColumnHideable(colDef),
             queryable: this.isColumnQueryable(colDef, ColumnId, friendlyName, dataType),
+            exportable: this.isColumnExportable(colDef, ColumnId, friendlyName, dataType),
             isGrouped: this.isColumnGrouped(colDef),
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
@@ -334,6 +335,20 @@ class agGridHelper {
         };
         return this.adaptable.api.queryLanguageApi.isColumnQueryable(abColumnBase);
     }
+    isColumnExportable(colDef, columnId, friendlyName, datatype) {
+        if (!colDef) {
+            return false;
+        }
+        if (colDef.colId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS) {
+            return false;
+        }
+        const abColumnBase = {
+            columnId,
+            friendlyName,
+            dataType: datatype,
+        };
+        return this.adaptable.api.exportApi.isColumnExportable(abColumnBase);
+    }
     isColumnHideable(colDef) {
         if (!colDef) {
             return false;

package/src/components/ExpressionEditor/EditorInputWithWhereClause.js

@@ -47,6 +47,10 @@ function EditorInputWithWhereClause(props) {
     const queryName = `${(0, StringExtensions_1.CapitaliseFirstLetter)(props.type)}Query`;
     return (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" },
         React.createElement(BaseEditorInput_1.BaseEditorInput, { type: 'main', value: reactiveValue || '', placeholder: `Create ${queryName}`, onChange: updateReactiveValue, onSelectedFunctionChange: setSelectedFunction, expressionFunctions: reactiveExpressionFns, editorButtons: props.type === 'observable' ? editorButtonsObservable_1.editorButtonsObservable : editorButtonsAggregatedBoolean_1.editorButtonsAggregatedBoolean, testData: props.testData, isFullExpression: true, hideResultPreview: true, api: props.api, style: { height: '75px' } }),
+        React.createElement(rebass_1.Text, { fontSize: 2, marginTop: 2, pl: 3 },
+            "Add a ",
+            React.createElement("i", null, "WHERE"),
+            " Clause to narrow the scope of the Query"),
         React.createElement(CheckBox_1.CheckBox, { disabled: (0, StringExtensions_1.IsNullOrEmptyOrWhiteSpace)(reactiveValue), checked: showWhereClause, style: { alignItems: 'center' }, onChange: (checked) => {
                 setShowWhereClause(checked);
                 if (!checked) {

package/src/components/ExpressionEditor/editorButtonsAggregatedBoolean.js

@@ -22,6 +22,11 @@ exports.editorButtonsAggregatedBoolean = [
         data: 'AVG()',
         text: 'Average',
     },
+    {
+        functionName: 'COUNT',
+        data: 'COUNT()',
+        text: 'Count',
+    },
     {
         functionName: 'GROUP_BY',
         data: 'GROUP_BY()',

package/src/components/ExpressionEditor/editorButtonsAggregatedScalar.js

@@ -32,6 +32,11 @@ exports.editorButtonsAggregatedScalar = [
         data: 'QUANT()',
         text: 'Quantile',
     },
+    {
+        functionName: 'COUNT',
+        data: 'COUNT()',
+        text: 'Count',
+    },
     {
         functionName: 'WEIGHT',
         data: 'WEIGHT()',

package/src/components/icons/index.js

@@ -138,6 +138,8 @@ const quote_1 = tslib_1.__importDefault(require("./quote"));
 const news_1 = tslib_1.__importDefault(require("./news"));
 const instrument_1 = tslib_1.__importDefault(require("./instrument"));
 const analysis_1 = tslib_1.__importDefault(require("./analysis"));
+const visibility_1 = tslib_1.__importDefault(require("./visibility"));
+const visibility_off_1 = tslib_1.__importDefault(require("./visibility-off"));
 const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 const allIcons = {
     // toolbars
@@ -280,6 +282,8 @@ const allIcons = {
     menu: menu_1.default,
     statusbar: statusbar_1.default,
     'add-row': add_row_1.default,
+    visibility: visibility_1.default,
+    'visibility-off': visibility_off_1.default,
 };
 Object.keys(allIcons).forEach((name) => {
     const ReactCmp = allIcons[name];

package/src/components/icons/visibility-off.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/visibility-off.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props),
+    React.createElement("path", { d: "m16.1 13.3-1.45-1.45q.225-1.175-.675-2.2-.9-1.025-2.325-.8L10.2 7.4q.425-.2.862-.3Q11.5 7 12 7q1.875 0 3.188 1.312Q16.5 9.625 16.5 11.5q0 .5-.1.938-.1.437-.3.862Zm3.2 3.15-1.45-1.4q.95-.725 1.688-1.588.737-.862 1.262-1.962-1.25-2.525-3.588-4.013Q14.875 6 12 6q-.725 0-1.425.1-.7.1-1.375.3L7.65 4.85q1.025-.425 2.1-.638Q10.825 4 12 4q3.775 0 6.725 2.087Q21.675 8.175 23 11.5q-.575 1.475-1.512 2.738Q20.55 15.5 19.3 16.45Zm.5 6.15-4.2-4.15q-.875.275-1.762.413Q12.95 19 12 19q-3.775 0-6.725-2.087Q2.325 14.825 1 11.5q.525-1.325 1.325-2.463Q3.125 7.9 4.15 7L1.4 4.2l1.4-1.4 18.4 18.4ZM5.55 8.4q-.725.65-1.325 1.425T3.2 11.5q1.25 2.525 3.587 4.012Q9.125 17 12 17q.5 0 .975-.062.475-.063.975-.138l-.9-.95q-.275.075-.525.112Q12.275 16 12 16q-1.875 0-3.188-1.312Q7.5 13.375 7.5 11.5q0-.275.037-.525.038-.25.113-.525Zm7.975 2.325ZM9.75 12.6Z" })));

package/src/components/icons/visibility.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/visibility.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props),
+    React.createElement("path", { d: "M12 16q1.875 0 3.188-1.312Q16.5 13.375 16.5 11.5q0-1.875-1.312-3.188Q13.875 7 12 7q-1.875 0-3.188 1.312Q7.5 9.625 7.5 11.5q0 1.875 1.312 3.188Q10.125 16 12 16Zm0-1.8q-1.125 0-1.912-.788Q9.3 12.625 9.3 11.5t.788-1.913Q10.875 8.8 12 8.8t1.913.787q.787.788.787 1.913t-.787 1.912q-.788.788-1.913.788Zm0 4.8q-3.65 0-6.65-2.038-3-2.037-4.35-5.462 1.35-3.425 4.35-5.463Q8.35 4 12 4q3.65 0 6.65 2.037 3 2.038 4.35 5.463-1.35 3.425-4.35 5.462Q15.65 19 12 19Zm0-7.5Zm0 5.5q2.825 0 5.188-1.488Q19.55 14.025 20.8 11.5q-1.25-2.525-3.612-4.013Q14.825 6 12 6 9.175 6 6.812 7.487 4.45 8.975 3.2 11.5q1.25 2.525 3.612 4.012Q9.175 17 12 17Z" }),
+    ' '));