@adaptabletools/adaptable 11.1.15 → 11.2.0

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -52,7 +52,7 @@ class QuickFilterFormComponent extends React.Component {
     }
     componentDidMount() {
         var _a, _b;
-        if (((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.Predicate.PredicateId) === 'Values') {
+        if (this.hasValuesPredicate((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.Predicate)) {
             this.loadPermittedValues();
         }
     }
@@ -65,7 +65,7 @@ class QuickFilterFormComponent extends React.Component {
             return;
         }
         this.setState({ filter });
-        if ((filter === null || filter === void 0 ? void 0 : filter.Predicate) && filter.Predicate.PredicateId === 'Values') {
+        if (this.hasValuesPredicate(filter === null || filter === void 0 ? void 0 : filter.Predicate)) {
             this.setState({ isDistinctColumnValuesLoading: true });
             this.loadPermittedValues();
         }
@@ -138,7 +138,7 @@ class QuickFilterFormComponent extends React.Component {
             showQuickFilterInput && this.renderPredicateInput(activePredicateDef, filter)));
     }
     renderLabel(filter, activePredicateDef) {
-        if ((filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId) === 'Values') {
+        if (this.hasValuesPredicate(filter === null || filter === void 0 ? void 0 : filter.Predicate)) {
             if (ArrayExtensions_1.default.IsNullOrEmpty(filter.Predicate.Inputs) &&
                 ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues)) {
                 return this.renderNoValuesDropdown(filter);
@@ -238,7 +238,7 @@ class QuickFilterFormComponent extends React.Component {
                         React.createElement(SimpleButton_1.default, { onClick: () => this.clearFilter() }, "Clear Filter"),
                         ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) ==
                             false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => this.updateFilter(this.state.filter) }, "Apply Filter"))),
-                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs, useAgGridStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
+                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs.filter((input) => input !== ''), useAgGridStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
             } },
             React.createElement(SimpleButton_1.default, { style: {
                     flex: 1,
@@ -248,12 +248,13 @@ class QuickFilterFormComponent extends React.Component {
                     borderRadius: 0,
                     borderLeftWidth: 0,
                     borderColor: 'var(--ab-color-primarydark)',
-                }, disabled: ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues) }, filter.Predicate.Inputs.join(', ') || 'Select Values')));
+                }, disabled: ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues) }, filter.Predicate.Inputs.join(', ') ||
+                (filter.Predicate.PredicateId === 'Values' ? 'Select Values' : 'Exclude Values'))));
     }
     onColumnValuesChange(columnValues) {
         var _a;
         const { filter } = this.state;
-        filter.Predicate = { PredicateId: 'Values', Inputs: columnValues };
+        filter.Predicate = { PredicateId: filter.Predicate.PredicateId, Inputs: columnValues };
         if ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) {
             this.updateFilter(filter);
         }
@@ -270,7 +271,7 @@ class QuickFilterFormComponent extends React.Component {
             Inputs: ((_a = predicateDef.inputs) !== null && _a !== void 0 ? _a : []).map((i) => { var _a; return (_a = i.defaultValue) !== null && _a !== void 0 ? _a : ''; }),
         };
         this.updateFilter(filter);
-        if (predicateId === 'Values') {
+        if (predicateId === 'Values' || predicateId === 'ExcludeValues') {
             this.loadPermittedValues();
             requestAnimationFrame(() => {
                 if (this.valuesDropdown) {
@@ -308,6 +309,9 @@ class QuickFilterFormComponent extends React.Component {
         const { filter } = this.state;
         this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
+    hasValuesPredicate(predicate) {
+        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+    }
 }
 function mapStateToProps(state, ownProps) {
     return {

package/src/View/Components/FilterForm/getDefaultColumnFilterPredicate.d.ts

@@ -1,3 +1,3 @@
 import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { SystemFilterPredicateId } from '../../../PredefinedConfig/FilterState';
-export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: "Before" | "After" | "Values" | "Blanks" | "NonBlanks" | "Equals" | "NotEquals" | "GreaterThan" | "LessThan" | "Positive" | "Negative" | "Zero" | "Between" | "NotBetween" | "Is" | "IsNot" | "Contains" | "NotContains" | "StartsWith" | "EndsWith" | "Regex" | "Today" | "Yesterday" | "Tomorrow" | "ThisWeek" | "ThisMonth" | "ThisQuarter" | "ThisYear" | "InPast" | "InFuture" | "InRange" | "On" | "NotOn" | "NextWorkDay" | "LastWorkDay" | "True" | "False" | "BooleanToggle" | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;
+export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: "Before" | "After" | "Blanks" | "NonBlanks" | "Equals" | "NotEquals" | "GreaterThan" | "LessThan" | "Positive" | "Negative" | "Zero" | "Between" | "NotBetween" | "Is" | "IsNot" | "Contains" | "NotContains" | "StartsWith" | "EndsWith" | "Regex" | "Today" | "Yesterday" | "Tomorrow" | "ThisWeek" | "ThisMonth" | "ThisQuarter" | "ThisYear" | "InPast" | "InFuture" | "On" | "NotOn" | "NextWorkDay" | "LastWorkDay" | "True" | "False" | "Values" | "ExcludeValues" | "InRange" | "BooleanToggle" | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;

package/src/View/Components/Forms/AdaptableFormControlTextClear.d.ts

@@ -7,4 +7,4 @@ export declare type AdaptableFormControlTextClearProps = {
     autoFocus?: boolean;
     inputStyle?: CSSProperties;
 } & InputProps;
-export declare const AdaptableFormControlTextClear: React.ForwardRefExoticComponent<Pick<AdaptableFormControlTextClearProps, "max" | "required" | "default" | "high" | "low" | "disabled" | "start" | "open" | "media" | "hidden" | "cite" | "data" | "dir" | "form" | "label" | "p" | "slot" | "span" | "style" | "summary" | "title" | "pattern" | "async" | "defer" | "manifest" | "m" | "color" | "content" | "size" | "flex" | "wrap" | "padding" | "multiple" | "alignSelf" | "backgroundColor" | "fontSize" | "height" | "marginBottom" | "marginLeft" | "marginRight" | "marginTop" | "opacity" | "order" | "paddingBottom" | "paddingLeft" | "paddingRight" | "paddingTop" | "translate" | "width" | "margin" | "children" | "key" | "list" | "step" | "contextMenu" | "type" | "min" | "rows" | "name" | "value" | "className" | "id" | "lang" | "method" | "target" | "role" | "tabIndex" | "crossOrigin" | "href" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "classID" | "useMap" | "wmode" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "draggable" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "as" | "hrefLang" | "integrity" | "rel" | "sizes" | "charSet" | "kind" | "src" | "srcLang" | "download" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "srcSet" | "accept" | "capture" | "checked" | "maxLength" | "minLength" | "readOnly" | "htmlFor" | "httpEquiv" | "optimum" | "reversed" | "selected" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "poster" | "challenge" | "keyType" | "keyParams" | "mt" | "mb" | "ml" | "mr" | "my" | "marginY" | "mx" | "marginX" | "pt" | "pr" | "pb" | "pl" | "px" | "paddingX" | "py" | "paddingY" | "css" | "bg" | "focusOnClear" | "placehoder" | "OnTextChange" | "inputStyle"> & React.RefAttributes<any>>;
+export declare const AdaptableFormControlTextClear: React.ForwardRefExoticComponent<Pick<AdaptableFormControlTextClearProps, "max" | "required" | "default" | "high" | "low" | "disabled" | "start" | "open" | "media" | "hidden" | "cite" | "data" | "dir" | "form" | "label" | "p" | "slot" | "span" | "style" | "summary" | "title" | "pattern" | "async" | "defer" | "manifest" | "m" | "color" | "content" | "size" | "flex" | "wrap" | "padding" | "multiple" | "alignSelf" | "backgroundColor" | "fontSize" | "height" | "marginBottom" | "marginLeft" | "marginRight" | "marginTop" | "opacity" | "order" | "paddingBottom" | "paddingLeft" | "paddingRight" | "paddingTop" | "translate" | "width" | "margin" | "children" | "key" | "list" | "step" | "type" | "min" | "contextMenu" | "value" | "onKeyDown" | "rows" | "name" | "className" | "id" | "lang" | "method" | "target" | "role" | "tabIndex" | "crossOrigin" | "href" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "classID" | "useMap" | "wmode" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "draggable" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "as" | "hrefLang" | "integrity" | "rel" | "sizes" | "charSet" | "kind" | "src" | "srcLang" | "download" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "srcSet" | "accept" | "capture" | "checked" | "maxLength" | "minLength" | "readOnly" | "htmlFor" | "httpEquiv" | "optimum" | "reversed" | "selected" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "poster" | "challenge" | "keyType" | "keyParams" | "mt" | "mb" | "ml" | "mr" | "my" | "marginY" | "mx" | "marginX" | "pt" | "pr" | "pb" | "pl" | "px" | "paddingX" | "py" | "paddingY" | "css" | "bg" | "focusOnClear" | "placehoder" | "OnTextChange" | "inputStyle"> & React.RefAttributes<any>>;

package/src/View/Components/Panels/PanelWithImage.d.ts

@@ -85,12 +85,13 @@ export declare const PanelWithImage: React.ForwardRefExoticComponent<{
     key?: string | number;
     list?: string;
     step?: string | number;
-    contextMenu?: string;
     type?: string;
     min?: string | number;
+    contextMenu?: string;
+    value?: string | number | readonly string[];
+    onKeyDown?: ((event: React.KeyboardEvent<HTMLElement>) => void) & ((event: React.KeyboardEvent<HTMLDivElement>) => void);
     rows?: number;
     name?: string;
-    value?: string | number | readonly string[];
     className?: string;
     id?: string;
     lang?: string;
@@ -183,7 +184,6 @@ export declare const PanelWithImage: React.ForwardRefExoticComponent<{
     onLoadCapture?: ((event: React.SyntheticEvent<HTMLElement, Event>) => void) & ((event: React.SyntheticEvent<HTMLDivElement, Event>) => void);
     onError?: ((event: React.SyntheticEvent<HTMLElement, Event>) => void) & ((event: React.SyntheticEvent<HTMLDivElement, Event>) => void);
     onErrorCapture?: ((event: React.SyntheticEvent<HTMLElement, Event>) => void) & ((event: React.SyntheticEvent<HTMLDivElement, Event>) => void);
-    onKeyDown?: ((event: React.KeyboardEvent<HTMLElement>) => void) & ((event: React.KeyboardEvent<HTMLDivElement>) => void);
     onKeyDownCapture?: ((event: React.KeyboardEvent<HTMLElement>) => void) & ((event: React.KeyboardEvent<HTMLDivElement>) => void);
     onKeyPress?: ((event: React.KeyboardEvent<HTMLElement>) => void) & ((event: React.KeyboardEvent<HTMLDivElement>) => void);
     onKeyPressCapture?: ((event: React.KeyboardEvent<HTMLElement>) => void) & ((event: React.KeyboardEvent<HTMLDivElement>) => void);

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupModuleView.js

@@ -10,6 +10,9 @@ const icons_1 = require("../../../../components/icons");
 const AdaptableObjectList_1 = require("../../AdaptableObjectList");
 const ButtonNew_1 = require("../../Buttons/ButtonNew");
 const PopupPanel_1 = require("./PopupPanel");
+const rebass_1 = require("rebass");
+const CheckBox_1 = require("../../../../components/CheckBox");
+const SystemRedux_1 = require("../../../../Redux/ActionsReducers/SystemRedux");
 exports.AdaptablePopupModuleView = (props) => {
     var _a, _b, _c, _d, _e;
     /**
@@ -83,7 +86,26 @@ exports.AdaptablePopupModuleView = (props) => {
             props.onClosePopup();
         }
     };
+    const adaptableModule = props.api.internalApi
+        .getModuleService()
+        .getModuleById(props.module.moduleInfo.ModuleName);
+    const dispatch = react_redux_1.useDispatch();
+    const showLayoutNotAssociatedObjects = react_redux_1.useSelector((state) => state.System.ShowLayoutNotAssociatedObjects);
+    const toggleButtonShowLayoutAssociatedObjects = () => {
+        if (!(adaptableModule === null || adaptableModule === void 0 ? void 0 : adaptableModule.canBeAssociatedWithLayouts())) {
+            return;
+        }
+        if (!props.api.internalApi.hasLayoutSpecificObjects()) {
+            return;
+        }
+        return (React.createElement(rebass_1.Flex, { justifyContent: "flex-start" },
+            React.createElement(CheckBox_1.CheckBox, { padding: 0, margin: 0, checked: showLayoutNotAssociatedObjects, onChange: (checked) => dispatch(SystemRedux_1.SystemLayoutShowNotAssociatedObjects(checked)) },
+                "Show ",
+                moduleInfo.FriendlyName,
+                "s not available in current Layout")));
+    };
     return (React.createElement(PopupPanel_1.PopupPanel, { glyphicon: moduleInfo.Glyph, infoLink: moduleInfo.HelpPage, headerText: moduleInfo.FriendlyName, button: newButton, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
+        !!(items === null || items === void 0 ? void 0 : items.length) && toggleButtonShowLayoutAssociatedObjects(),
         (items === null || items === void 0 ? void 0 : items.length) ? (React.createElement(AdaptableObjectList_1.AdaptableObjectList, { module: props.module, items: items })) : (React.createElement(EmptyContent_1.default, null, emptyContent !== null && emptyContent !== void 0 ? emptyContent : `Click 'New' to create a new ${moduleInfo.FriendlyName}`)),
         isWizardOpen && EditWizard && (React.createElement(EditWizard, { abObjectType: abObjectType, moduleInfo: moduleInfo, data: null, popupParams: props.popupParams, configEntities: null, onCloseWizard: handleWizardClose, onFinishWizard: handleWizardClose }))));
 };

package/src/View/Components/Popups/AdaptableToaster.js

@@ -7,9 +7,20 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const AdaptablePopupAlert_1 = require("./AdaptablePopupAlert");
 const react_toastify_1 = require("react-toastify");
 exports.showToast = (props) => {
+    // we're doing this hack and not simply using props.api in order not to have a memory
+    // leak where the api is still kept around in memory by the toaster
+    let api = props.api;
+    const off = api.eventApi.on('AdaptableDestroy', () => {
+        api = null;
+    });
     const toastProps = ObjectFactory_1.default.CreateToastOptions(props.api.internalApi.getAdaptableOptions().notificationsOptions, {
         onClose: () => {
-            props.api.internalApi.hidePopupAlert();
+            if (api) {
+                off();
+                if (!api.isDestroyed()) {
+                    api.internalApi.hidePopupAlert();
+                }
+            }
         },
     });
     const content = (React.createElement(AdaptablePopupAlert_1.AdaptablePopupAlert, Object.assign({ headless: true }, props, { onClose: () => {

package/src/View/Components/Popups/FormPopups/FormPopups.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { AdaptableForm, ButtonContext } from '../../../../../types';
+import { AdaptableForm, BaseContext } from '../../../../../types';
 export interface FormDialogProps {
     id: string;
     formProps: any;
-    prepareContext: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
-    form: AdaptableForm<ButtonContext>;
+    prepareContext: (context: BaseContext) => Promise<BaseContext> | BaseContext;
+    form: AdaptableForm<BaseContext>;
 }
 export declare const FormDialog: React.FunctionComponent<FormDialogProps>;
 export declare const FormPopups: React.FunctionComponent;

package/src/View/Components/TagValueSelector/index.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { ValueSelectorProps } from '../ValueSelector';
+import { AdaptableObjectTag } from '../../../PredefinedConfig/Common/AdaptableObject';
+export interface TagsSelectorProps extends Omit<ValueSelectorProps<AdaptableObjectTag, string | number>, 'options' | 'value' | 'onChange' | 'allowReorder' | 'toIdentifier' | 'toLabel' | 'selectionBoxPosition' | 'noSelectionLabel' | 'xSelectedLabel'> {
+    availableTags?: AdaptableObjectTag[];
+    selectedTags?: AdaptableObjectTag[];
+    onChange: (selectedTags: AdaptableObjectTag[]) => void;
+}
+export declare const TagValueSelector: (props: TagsSelectorProps) => JSX.Element;
+export interface TagValueOptionsTagsProps {
+    tags?: AdaptableObjectTag[];
+}
+export declare const TagValueOptionsTags: (props: TagValueOptionsTagsProps) => JSX.Element;

package/src/View/Components/TagValueSelector/index.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TagValueOptionsTags = exports.TagValueSelector = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const ValueSelector_1 = require("../ValueSelector");
+const AdaptableContext_1 = require("../../AdaptableContext");
+exports.TagValueSelector = (props) => {
+    const { api } = AdaptableContext_1.useAdaptable();
+    const getDefaultTags = () => {
+        var _a;
+        return (_a = api.internalApi.getAvailableTags()) !== null && _a !== void 0 ? _a : [];
+    };
+    const { availableTags = getDefaultTags(), selectedTags = [], onChange, singleSelect } = props;
+    return (React.createElement(ValueSelector_1.ValueSelector, { options: availableTags, value: selectedTags.map((tag) => tag.value), singleSelect: singleSelect, allowReorder: false, onChange: (selectedTagsIds, selectedTagsMap) => {
+            onChange(selectedTagsIds.map((id) => selectedTagsMap.get(id)));
+        }, selectionBoxPosition: 'top', toIdentifier: (tag) => tag.value, toLabel: (tag) => tag.label, noSelectionLabel: singleSelect ? 'Select a tag' : 'You have not selected any tags.', xSelectedLabel: singleSelect ? () => 'Selected tag:' : () => 'Selected tags:' }));
+};
+exports.TagValueOptionsTags = (props) => {
+    const { tags = [] } = props;
+    return (React.createElement(ValueSelector_1.ValueOptionsTags, { options: tags, value: tags.map((tag) => tag.value), toIdentifier: (tag) => tag.value, toLabel: (tag) => tag.label, allowWrap: true, readOnly: true }));
+};

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -194,11 +194,11 @@ const AdaptableToolPanelComponent = (props) => {
         }
     };
     const renderToolPanelConfigureButton = (initialTab) => {
-        const popupParams = initialTab
+        const moduleParams = initialTab
             ? { source: 'Other', config: { initialTab } }
             : undefined;
         return (React.createElement(ButtonConfigure_1.ButtonConfigure, { iconSize: 16, tone: "none", marginLeft: 2, className: "ab-ToolPanel__configure-button", tooltip: 'Configure ToolPanels', onClick: () => {
-                props.api.toolPanelApi.showToolPanelPopup(popupParams);
+                props.api.internalApi.showSettingsPanel('ToolPanel', moduleParams);
             } }));
     };
     const toolPanelButtons = renderToolPanelButtons();

package/src/View/ConditionalStyle/Wizard/ConditionalStyleWizard.js

@@ -18,6 +18,7 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ConditionalStyleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ConditionalStyleRedux"));
 const ConditionalStyleSettingsWizardSettings_1 = require("./ConditionalStyleSettingsWizardSettings");
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.ConditionalStyleWizard = (props) => {
     var _a;
     const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
@@ -91,6 +92,14 @@ exports.ConditionalStyleWizard = (props) => {
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
                     React.createElement(ConditionalStyleSettingsWizardSettings_1.ConditionalStyleSettingsWizardSettings, { onChange: setConditionalStyle }))),
             },
+            {
+                details: 'Select Conditional Style tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setConditionalStyle }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 details: 'Review the Conditional Style',

package/src/View/CustomSort/Wizard/CustomSortWizard.js

@@ -12,6 +12,7 @@ const CustomSortValuesWizardSection_1 = require("./CustomSortValuesWizardSection
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const CustomSortRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/CustomSortRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.CustomSortWizard = (props) => {
     var _a, _b;
     let data = props.data;
@@ -59,6 +60,14 @@ exports.CustomSortWizard = (props) => {
                 render: () => (React.createElement(rebass_1.Box, { padding: 2, style: { height: '100%' } },
                     React.createElement(CustomSortValuesWizardSection_1.CustomSortValuesWizardSection, { onChange: setCustomSort }))),
             },
+            {
+                details: 'Select Custom Sort tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setCustomSort }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 title: 'Summary',

package/src/View/DataSource/Wizard/DataSourceSettingsWizard.js

@@ -32,7 +32,7 @@ exports.DataSourceSettingsWizard = (props) => {
     };
     return (React.createElement(rebass_1.Box, { "data-name": "data-soruce-settings" },
         React.createElement(Tabs_1.Tabs, { autoFocus: false },
-            React.createElement(Tabs_1.Tabs.Tab, null, "Data Soruce Settings"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Data Source Settings"),
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Name" },

package/src/View/DataSource/Wizard/DataSourceWizard.js

@@ -10,6 +10,7 @@ const DataSourceSettingsSummary_1 = require("./DataSourceSettingsSummary");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const DataSourceRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/DataSourceRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.DataSourceWizard = (props) => {
     const [dataSource, setDataSource] = React.useState(() => {
         return props.data ? props.data : ObjectFactory_1.default.CreateEmptyDataSource();
@@ -32,6 +33,15 @@ exports.DataSourceWizard = (props) => {
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
                     React.createElement(DataSourceSettingsWizard_1.DataSourceSettingsWizard, { onChange: setDataSource }))),
             },
+            {
+                details: 'Select Data Source tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setDataSource }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
+            '-',
             {
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },

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

@@ -0,0 +1,4 @@
+import * as React from 'react';
+export interface ExportSelectorProps {
+}
+export declare const ExportSelector: React.FunctionComponent<ExportSelectorProps>;

package/src/View/Export/ExportSelector.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportSelector = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const AdaptableContext_1 = require("../AdaptableContext");
+const constants_1 = require("./constants");
+const dropdownStyle = {
+    padding: 2,
+    fontSize: 'small',
+};
+const isCustomDestination = (destination) => {
+    return !!destination.name;
+};
+exports.ExportSelector = () => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    // reports
+    const handleReportChange = (report) => {
+        adaptable.api.exportApi.selectReport(report);
+    };
+    const allReports = adaptable.api.exportApi.getAllReports();
+    const allReportNames = allReports.map((report) => report.Name);
+    const reportItems = allReportNames.map((report) => {
+        return {
+            label: report,
+            value: report,
+            onClick: () => handleReportChange(report),
+        };
+    });
+    const currentReport = adaptable.api.exportApi.getCurrentReport();
+    const currentReportId = StringExtensions_1.default.IsNullOrEmpty(currentReport === null || currentReport === void 0 ? void 0 : currentReport.Name)
+        ? currentReport
+        : currentReport.Name;
+    // destinations
+    const handleDestinationChange = (destination) => {
+        adaptable.api.exportApi.selectDestination(destination);
+    };
+    const destinationItems = [
+        ...adaptable.api.exportApi.getAvailableExportDestinations().map((destination) => ({
+            label: destination,
+            onClick: () => handleDestinationChange(destination),
+        })),
+        ...adaptable.api.exportApi.getAllCustomDestination().map((destination) => ({
+            label: destination.name,
+            onClick: () => handleDestinationChange(destination.name),
+        })),
+    ];
+    const currentDestination = adaptable.api.exportApi.getCurrentDestination();
+    let currentDestinationId = null;
+    if (typeof currentDestination === 'string') {
+        currentDestinationId = currentDestination;
+    }
+    else if (currentDestination && 'name' in currentDestination) {
+        currentDestinationId = currentDestination.name;
+    }
+    else {
+        currentDestinationId = constants_1.SELECT_DESTINATION_STRING;
+    }
+    // export
+    const handleExport = () => {
+        if (isCustomDestination(currentDestination)) {
+            adaptable.api.exportApi.sendReport(currentReport.Name, currentDestination.name);
+        }
+        else {
+            adaptable.api.exportApi.sendReport(currentReport.Name, currentDestination);
+        }
+    };
+    return (React.createElement(React.Fragment, null,
+        React.createElement(DropdownButton_1.default, { disabled: allReportNames.length == 0, style: dropdownStyle, items: reportItems, columns: ['label'], onClear: () => handleReportChange(null), showClearButton: !!currentReport, variant: "outlined", marginRight: 2 }, currentReportId !== null && currentReportId !== void 0 ? currentReportId : constants_1.SELECT_REPORT_STRING),
+        React.createElement(DropdownButton_1.default, { disabled: currentReportId === constants_1.SELECT_REPORT_STRING, style: dropdownStyle, items: destinationItems, columns: ['label'], onClear: () => handleDestinationChange(null), showClearButton: !!currentDestination, variant: "outlined", marginRight: 2 }, currentDestinationId),
+        React.createElement(SimpleButton_1.default, { disabled: currentDestinationId === constants_1.SELECT_DESTINATION_STRING, iconSize: 15, icon: "export", variant: "text", onClick: handleExport })));
+};

package/src/View/Export/ExportViewPanel.js

@@ -21,13 +21,12 @@ const ButtonSchedule_1 = require("../Components/Buttons/ButtonSchedule");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const react_redux_1 = require("react-redux");
-const SELECT_REPORT_STRING = 'Select Report';
-const SELECT_DESTINATION_STRING = 'Select Destination';
+const constants_1 = require("./constants");
 class ExportViewPanelComponent extends React.Component {
     render() {
         let currentReport = this.props.api.exportApi.getReportByName(this.props.CurrentReport);
         let currentReportId = StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.CurrentReport)
-            ? SELECT_REPORT_STRING
+            ? constants_1.SELECT_REPORT_STRING
             : this.props.CurrentReport;
         const allReportNames = this.getAllReportNames();
         let reportItems = allReportNames.map((report) => {
@@ -40,11 +39,11 @@ class ExportViewPanelComponent extends React.Component {
         if (currentReport && !allReportNames.includes(currentReport.Name)) {
             // current report is not available
             currentReport = undefined;
-            currentReportId = SELECT_REPORT_STRING;
+            currentReportId = constants_1.SELECT_REPORT_STRING;
         }
         let currentDestination = this.props.api.exportApi.getDestinationByName(this.props.CurrentDestination);
         let currentDestinationId = StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.CurrentDestination)
-            ? SELECT_DESTINATION_STRING
+            ? constants_1.SELECT_DESTINATION_STRING
             : this.props.CurrentDestination;
         const destinationItems = [
             ...this.props.api.exportApi.getAvailableExportDestinations().map((destination) => ({
@@ -66,7 +65,7 @@ class ExportViewPanelComponent extends React.Component {
                 .includes(this.props.CurrentDestination)) {
             // current destination is not available
             currentDestination = undefined;
-            currentDestinationId = SELECT_DESTINATION_STRING;
+            currentDestinationId = constants_1.SELECT_DESTINATION_STRING;
         }
         let accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(currentReport, this.props.accessLevel);
         let deleteMessage = "Are you sure you want to delete '";
@@ -81,7 +80,7 @@ class ExportViewPanelComponent extends React.Component {
             React.createElement(rebass_1.Flex, { flex: 1 },
                 React.createElement(DropdownButton_1.default, { disabled: allReportNames.length == 0, style: { width: '100%', fontSize: 'small' }, items: reportItems, columns: ['label'], className: `ab-${elementType}__Export__select`, onClear: () => this.onSelectedReportChanged(null), showClearButton: !!currentReport, variant: "outlined", marginRight: 2 }, currentReportId)),
             React.createElement(rebass_1.Flex, { flex: 1 },
-                React.createElement(DropdownButton_1.default, { disabled: currentReportId === SELECT_REPORT_STRING, style: { width: '100%', fontSize: 'small' }, items: destinationItems, columns: ['label'], className: `ab-${elementType}__Export__export`, onClear: () => this.onSelectedDestinationChanged(null), showClearButton: !!currentDestination, variant: "outlined", marginRight: 2 }, currentDestinationId)),
+                React.createElement(DropdownButton_1.default, { disabled: currentReportId === constants_1.SELECT_REPORT_STRING, style: { width: '100%', fontSize: 'small' }, items: destinationItems, columns: ['label'], className: `ab-${elementType}__Export__export`, onClear: () => this.onSelectedDestinationChanged(null), showClearButton: !!currentDestination, variant: "outlined", marginRight: 2 }, currentDestinationId)),
             React.createElement(rebass_1.Flex, { className: join_1.default(accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Export__controls`), style: { width: '100%' } },
                 React.createElement(ButtonExport_1.ButtonExport, { onClick: () => onApplyExport(), tooltip: "Export Report", className: `ab-${elementType}__Export__export`, disabled: currentReport == null || currentDestination == null }),
                 React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || currentReport.ReportColumnScope == 'CustomColumns', accessLevel: accessLevel }),

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

@@ -1,5 +1,2 @@
-import * as React from 'react';
-import { Report } from '../../../types';
-export declare const ReportExportDropdown: React.FunctionComponent<{
-    data: Report;
-}>;
+import { AdaptableModuleViewAction } from '../../Strategy/Interface/IModule';
+export declare const ReportExportDropdown: AdaptableModuleViewAction;

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

@@ -13,6 +13,7 @@ const ReportNameWizardSection_1 = require("./ReportNameWizardSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const ExportRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ExportRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.NewReportWizard = (props) => {
     var _a, _b;
     const isEdit = ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) ? props.popupParams.action === 'Edit'
@@ -59,6 +60,14 @@ exports.NewReportWizard = (props) => {
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
                     React.createElement(ReportNameWizardSection_1.ReportNameWizardSection, { onChange: setReport }))),
             },
+            {
+                details: 'Select Report tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setReport }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 title: 'Summary',

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

@@ -0,0 +1,2 @@
+export declare const SELECT_REPORT_STRING: string;
+export declare const SELECT_DESTINATION_STRING: string;

package/src/View/Export/constants.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SELECT_DESTINATION_STRING = exports.SELECT_REPORT_STRING = void 0;
+exports.SELECT_REPORT_STRING = 'Select Report';
+exports.SELECT_DESTINATION_STRING = 'Select Destination';

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

@@ -18,6 +18,7 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const isValidFlashingCellRules_1 = require("./isValidFlashingCellRules");
 const FlashingCellRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FlashingCellRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.FlashingCellWizard = (props) => {
     const { api } = AdaptableContext_1.useAdaptable();
     const [flashingCell, setFlashingCell] = react_1.useState(() => {
@@ -84,6 +85,14 @@ exports.FlashingCellWizard = (props) => {
                 renderSummary: FlashingCellStyleWizardSection_1.renderFlashingAlertStyleSummary,
                 title: 'Flash Styles',
             },
+            {
+                details: 'Select Flashing Cell tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setFlashingCell }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 details: 'Review the Flashing Cell Rule',

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

@@ -16,6 +16,7 @@ const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const FormatColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FormatColumnRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const adjustDisplayFormat = (formatColumn, api) => {
     formatColumn = Object.assign({}, formatColumn);
     const formatDataType = FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope(formatColumn.Scope, api);
@@ -137,6 +138,14 @@ function FormatColumnWizard(props) {
                         React.createElement(FormatColumnSettingsWizardSection_1.FormatColumnSettingsWizardSection, { onChange: setFormatColumn })));
                 },
             },
+            {
+                details: 'Select Format Column tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setFormatColumn }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 details: 'Review the Format Column',

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

@@ -11,6 +11,7 @@ const FreeTextColumnSettingsWizardSection_1 = require("./FreeTextColumnSettingsW
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FreeTextColumnRedux"));
 const react_redux_1 = require("react-redux");
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.FreeTextColumnWizard = (props) => {
     var _a;
     const allFreeTextColumns = react_redux_1.useSelector((state) => state.FreeTextColumn.FreeTextColumns);
@@ -45,6 +46,14 @@ exports.FreeTextColumnWizard = (props) => {
                         React.createElement(FreeTextColumnSettingsWizardSection_1.FreeTextColumnSettingsWizardSection, { isEdit: Boolean(props.data), onChange: setFreeTextColumn })));
                 },
             },
+            {
+                details: 'Select Free Text Column tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setFreeTextColumn }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 details: 'Review the Free Text Column',