@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.1

package/src/View/Components/ColumnFilter/components/FloatingFilterValues.js

@@ -100,6 +100,13 @@ export const FloatingFilterValues = (props) => {
                             border: 'none',
                         },
                     },
+                    ...(props.value?.length
+                        ? {
+                            valueContainer: {
+                                fontWeight: 'var(--ab-cmp-quickfilter-selected-options-text__font-weight)',
+                            },
+                        }
+                        : {}),
                 },
                 onMenuOpen,
                 onInputChange,

package/src/View/Components/ColumnFilter/useAdaptableFilterWrapper.d.ts

@@ -6,7 +6,7 @@ export declare const useAdaptableFilterWrapper: (columnId: string, handleOnChang
     qlPredicateDefs: import("@adaptabletools/adaptable/src/parser/src/predicate/types").QlPredicateDef[];
     columnFilter: ColumnFilter;
     handleClear: () => LayoutRedux.LayoutColumnFilterClearAction;
-    handlePredicateChange: (newPredicate: QlPredicate) => void;
+    handlePredicateChange: (newPredicate: QlPredicate | null) => void;
     handleOnChange: (adaptablePredicate: AdaptablePredicate[], logic?: QlLogicalOperator) => void;
     column: import("../../../types").AdaptableColumn<any>;
 };

package/src/View/Components/ColumnFilter/useAdaptableFilterWrapper.js

@@ -31,7 +31,7 @@ export const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
             ...columnFilter,
             ColumnId: columnId,
             Predicates: adaptablePredicate,
-            PredicatesLogic: logic,
+            PredicatesOperator: logic,
         };
         if (handleOnChangeOverride) {
             handleOnChangeOverride(newFilter);
@@ -42,11 +42,15 @@ export const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
                 : LayoutRedux.LayoutColumnFilterAdd(newFilter));
         }
     };
-    const handleClear = () => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter));
+    const handleClear = React.useCallback(() => dispatch(LayoutRedux.LayoutColumnFilterClear(columnId)), [columnId]);
     /**
      * Converts a QlPredicate to an AdaptablePredicate and dispatches the change.
      */
     const handlePredicateChange = React.useCallback((newPredicate) => {
+        if (!newPredicate) {
+            handleClear();
+            return;
+        }
         const newAdaptablePredicates = newPredicate.args.map(mapQlPredicateToAdaptablePredicate);
         handleOnChange(newAdaptablePredicates, newPredicate.operator);
     }, [columnId]);

package/src/View/Components/ColumnFilter/utils.js

@@ -63,11 +63,13 @@ export const qlPredicateToString = (qlPredicate, predicateDefs) => {
     if (!predicateDef.hasOwnProperty('toString')) {
         return predicateDef.label;
     }
-    const str = predicateDef.toString({ inputs: qlPredicate.args.filter((arg) => arg != undefined) });
+    const str = predicateDef.toString({
+        inputs: (qlPredicate.args || []).filter((arg) => arg != undefined),
+    });
     return str;
 };
 export const isPredicateEmpty = (predicate, predicateDef) => {
-    if (!predicateDef.inputs || predicateDef.inputs.length === 0) {
+    if (!predicateDef?.inputs || predicateDef.inputs.length === 0) {
         return false;
     }
     return (!predicate ||
@@ -76,7 +78,7 @@ export const isPredicateEmpty = (predicate, predicateDef) => {
         predicate.args.every((arg) => arg == undefined));
 };
 export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicateDefs, columnFilterOptions) => {
-    const combinator = columnFilter?.PredicatesLogic ?? 'AND';
+    const combinator = columnFilter?.PredicatesOperator ?? 'AND';
     const qlPredicate = {
         operator: combinator,
         args: (columnFilter?.Predicates ?? []).map?.(mapAdaptablePredicateToQlPredicate),

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { FlexProps } from 'rebass';
 import type { AdaptableColumnPredicate, AdaptableModule, AdaptablePredicateDef, ColumnScope } from '../../../types';
 import type { XOR } from '../../../Utilities/Extensions/TypeExtensions';
-import { AdaptableQuery } from '../../../PredefinedConfig/Common/AdaptableQuery';
+import { AdaptableQuery } from '../../../AdaptableState/Common/AdaptableQuery';
 export type RuleType = XOR<{
     Predicates: AdaptableColumnPredicate[];
 }, AdaptableQuery>;

package/src/View/Components/ExpressionWizard.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../Wizard/Interface/IAdaptableWizard';
 export interface ExpressionWizardProps extends AdaptableWizardStepProps<any> {
     onSetNewNamedQuery: (newNamedQuery: string) => void;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableColumn, AdaptableColumnDataType } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../../AdaptableState/Common/AdaptableColumn';
 import { SelectProps } from '../../../components/Select';
 export interface ColumnValuesSelectProps {
     column: AdaptableColumn;

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

@@ -1,19 +1,19 @@
 import * as React from 'react';
 import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions';
-import isDatesEqual from 'date-fns/isEqual';
+import { isEqual } from 'date-fns';
 import { parseDateValue } from '../../../Utilities/Helpers/DateHelper';
 import join from '../../../components/utils/join';
 import { Select } from '../../../components/Select';
 const baseClassName = 'ab-ListBoxFilterForm';
 export const ColumnValuesSelect = (props) => {
     const column = props.column;
-    const selectedColumnValues = props.value;
+    const selectedColumnValues = props.value || [];
     const value = [];
     const options = props.options.filter((distinctValue, index) => {
         let isActive = selectedColumnValues.indexOf(distinctValue.value) >= 0;
         // special case for date objects, need to check against string values
         if (!isActive && distinctValue.value && distinctValue.value instanceof Date) {
-            isActive = selectedColumnValues.some((dateStr) => isDatesEqual(parseDateValue(dateStr), parseDateValue(distinctValue.value)));
+            isActive = selectedColumnValues.some((dateStr) => isEqual(parseDateValue(dateStr), parseDateValue(distinctValue.value)));
         }
         const columnLabel = distinctValue.label;
         if (StringExtensions.IsNullOrEmpty(columnLabel)) {
@@ -24,7 +24,7 @@ export const ColumnValuesSelect = (props) => {
         }
         return true;
     });
-    const component = (React.createElement(Select, { isMulti: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
+    const component = (React.createElement(Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
             minWidth: `var(--ab-cmp-select-column-menu-${column.columnId}__min-width, var(--ab-cmp-select-column-menu__min-width, 260px))`,
         }, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
     return (React.createElement("div", { className: join(baseClassName, props.isLoading && `${baseClassName}--loading`), onKeyDownCapture: (e) => {

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ListGroupProps } from '../../../components/List/ListGroup';
-import { AdaptableMenuItem } from '../../../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem } from '../../../AdaptableState/Common/Menu';
 export interface ListBoxMenuProps extends ListGroupProps {
     MenuItems: AdaptableMenuItem[];
     onMenuItemClick: (menuItem: AdaptableMenuItem) => AdaptableMenuItem;

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

@@ -1,3 +1,3 @@
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 import { SystemFilterPredicateId } from '../../../types';
 export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: SystemFilterPredicateId | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;

package/src/View/Components/ListBox/DualListBoxEditor.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../../AdaptableState/Common/Enums';
 export interface DualListBoxEditorProps extends React.ClassAttributes<any> {
     SelectedValues: Array<any>;
     AvailableValues: Array<any>;

package/src/View/Components/ListBox/DualListBoxEditor.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useState, useRef, useEffect } from 'react';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../../AdaptableState/Common/Enums';
 import { ListBoxFilterSortComponent } from './ListBoxFilterSortComponent';
 import { ArrayExtensions } from '../../../Utilities/Extensions/ArrayExtensions';
 import ListGroupItem from '../../../components/List/ListGroupItem';

package/src/View/Components/ListBox/ListBoxFilterSortComponent.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../../AdaptableState/Common/Enums';
 export interface ListBoxFilterSortComponentProps extends React.ClassAttributes<ListBoxFilterSortComponent> {
     FilterValue: string;
     SortOrder: SortOrder;

package/src/View/Components/ListBox/ListBoxFilterSortComponent.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../../AdaptableState/Common/Enums';
 import SimpleButton from '../../../components/SimpleButton';
 import Input from '../../../components/Input';
 import FieldWrap from '../../../components/FieldWrap';

package/src/View/Components/ModuleSummary/ModuleDetail.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import * as Redux from 'redux';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
 export interface ModuleDetailProps extends React.ClassAttributes<ModuleDetail> {
     key: string;
     item1: any;

package/src/View/Components/ModuleSummary/ModuleHeader.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
 export interface ModuleHeaderProps extends React.ClassAttributes<ModuleHeader> {
     key: string;
     moduleInfo: ModuleInfo;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ValueSelectorProps } from '../ValueSelector';
-import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../../AdaptableState/Common/Types';
 export interface ModuleValueSelectorProps extends Omit<ValueSelectorProps<AdaptableModule, AdaptableModule>, 'allowReorder' | 'toIdentifier' | 'toLabel'> {
     isDisabled?: (module: AdaptableModule) => boolean;
 }

package/src/View/Components/NewScopeComponent.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ScopeDataType, ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
+import { ScopeDataType, ColumnScope } from '../../AdaptableState/Common/ColumnScope';
 import { AdaptableColumn } from '../../types';
 export declare const isScopeValid: ({ Scope }: {
     Scope: ColumnScope;

package/src/View/Components/Panels/PanelDashboard/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { PanelProps } from '../../../../components/Panel';
-import { AccessLevel } from '../../../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../../../AdaptableState/Common/Entitlement';
 export interface PanelDashboardProps extends PanelProps {
     headerText: string;
     onClose: () => void;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
 import { BoxProps } from 'rebass';
-import { AdaptableSystemIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableSystemIconName } from '../../../AdaptableState/Common/AdaptableIcon';
 export interface PanelWithButtonProps extends PanelProps {
     buttonContent?: React.ReactNode;
     buttonClick?: () => void;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
 import { BoxProps } from 'rebass';
-import { AdaptableSystemIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableSystemIconName } from '../../../AdaptableState/Common/AdaptableIcon';
 export interface PanelWithImageProps extends PanelProps {
     glyphicon?: AdaptableSystemIconName;
     icon?: AdaptableSystemIconName;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as PopupRedux from '../../../../Redux/ActionsReducers/PopupRedux';
 import { ModuleParams } from '../../SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../../../AdaptableState/Common/Types';
 import { AdaptableApi } from '../../../../Api/AdaptableApi';
 export interface AdaptablePopupProps {
     componentName?: string;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableAlert } from '../../../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableAlert } from '../../../AdaptableState/Common/AdaptableAlert';
 export interface AdaptablePopupAlertProps {
     onClose: () => void;
     adaptableAlert: AdaptableAlert;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableMessageType } from '../../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableMessageType } from '../../../AdaptableState/Common/AdaptableMessageType';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 /**
  * Used when giving the user 2 choices with the option of adding text also

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

@@ -1,4 +1,4 @@
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
 import * as React from 'react';
 export interface AdaptablePopupTeamSharingProps {
     showPopup: boolean;

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

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { AdaptableAlert } from '../../../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableAlert } from '../../../AdaptableState/Common/AdaptableAlert';
 export interface ShowToastProps {
     api: AdaptableApi;
     adaptableAlert: AdaptableAlert;

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

@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Flex } from 'rebass';
 import { AdaptableFormComponent } from '../../../../components/AdaptableFormComponent';
 import Dialog from '../../../../components/Dialog';
-import { getDefaultAdaptableFormData } from '../../../../PredefinedConfig/Common/AdaptableForm';
+import { getDefaultAdaptableFormData } from '../../../../AdaptableState/Common/AdaptableForm';
 import { PopupHideForm } from '../../../../Redux/ActionsReducers/PopupRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 export const FormDialog = ({ id, formProps, form, prepareContext, }) => {

package/src/View/Components/PreviewResultsPanel.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 export interface PreviewResultsPanelProps extends React.ClassAttributes<PreviewResultsPanel> {

package/src/View/Components/RangesComponent.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { CellColorRange, ColumnComparison, NumericStyledColumn } from '../../PredefinedConfig/StyledColumnState';
-import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
+import { CellColorRange, ColumnComparison, NumericStyledColumn } from '../../AdaptableState/StyledColumnState';
+import { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
 export interface RangesComponentProps extends React.ClassAttributes<RangesComponent> {
     ranges: CellColorRange[];
     columnComparison?: ColumnComparison;

package/src/View/Components/Selectors/BulkUpdateValueSelector.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 import { DropdownButtonProps } from '../../../components/DropdownButton';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { GridCell } from '../../../types';

package/src/View/Components/Selectors/ColumnSelectorOld.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { SelectionMode } from '../../../PredefinedConfig/Common/Enums';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { SelectionMode } from '../../../AdaptableState/Common/Enums';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 export interface ColumnSelectorProps extends React.HTMLProps<ColumnSelector> {
     ColumnList: AdaptableColumn[];
     SelectedColumnIds: string[];

package/src/View/Components/Selectors/ColumnSelectorOld.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../../AdaptableState/Common/Enums';
 import { ArrayExtensions } from '../../../Utilities/Extensions/ArrayExtensions';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import DropdownButton from '../../../components/DropdownButton';

package/src/View/Components/SharedProps/BaseProps.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
 export interface BaseProps<View> extends React.ClassAttributes<View> {
     accessLevel: AccessLevel;
     modalContainer: HTMLElement;

package/src/View/Components/SharedProps/ConfigEntityRowProps.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import * as Redux from 'redux';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { IColItem } from '../../UIInterfaces';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
 export interface BaseRowProps<View> extends React.ClassAttributes<View> {
     colItems: IColItem[];
     api: AdaptableApi;

package/src/View/Components/SharedProps/EditableConfigEntityState.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 export declare enum WizardStatus {
     New = "New",
     Edit = "Edit",

package/src/View/Components/SharedProps/ModuleSummaryProps.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 import { ModuleViewPopupProps } from './ModuleViewPopupProps';
 import * as TeamSharingRedux from '../../../Redux/ActionsReducers/TeamSharingRedux';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
 export interface ModuleSummaryProps<View> extends ModuleViewPopupProps<View> {
     summarisedColumn: AdaptableColumn;
     onShare: (entity: AdaptableObject, config: AdaptableSharedEntityConfig) => TeamSharingRedux.TeamSharingShareAction;

package/src/View/Components/SharedProps/ModuleViewPopupProps.d.ts

@@ -1,6 +1,6 @@
 import * as PopupRedux from '../../../Redux/ActionsReducers/PopupRedux';
 import { BaseProps } from './BaseProps';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
 import { AdaptableObject } from '../../../types';
 export interface ModuleViewPopupProps<View> extends BaseProps<View> {

package/src/View/Components/SharedProps/ToolPanelModuleViewPopupProps.d.ts

@@ -2,8 +2,8 @@ import { ModuleViewPopupProps } from './ModuleViewPopupProps';
 import * as Redux from 'redux';
 import * as PopupRedux from '../../../Redux/ActionsReducers/PopupRedux';
 import * as ToolPanelRedux from '../../../Redux/ActionsReducers/ToolPanelRedux';
-import { AdaptableToolPanel } from '../../../PredefinedConfig/Common/Types';
-import { ToolPanelVisibilityMode } from '../../../PredefinedConfig/ToolPanelState';
+import { AdaptableToolPanel } from '../../../AdaptableState/Common/Types';
+import { ToolPanelVisibilityMode } from '../../../AdaptableState/ToolPanelState';
 export interface ToolPanelModuleViewPopupProps<View> extends ModuleViewPopupProps<View> {
     onClick: (action: Redux.Action) => Redux.Action;
     onClose: (toolPanel: AdaptableToolPanel) => ToolPanelRedux.ToolPanelHideToolPanelAction;

package/src/View/Components/SharedProps/ToolbarModuleViewPopupProps.d.ts

@@ -2,7 +2,7 @@ import { ModuleViewPopupProps } from './ModuleViewPopupProps';
 import * as Redux from 'redux';
 import * as PopupRedux from '../../../Redux/ActionsReducers/PopupRedux';
 import * as DashboardRedux from '../../../Redux/ActionsReducers/DashboardRedux';
-import { AdaptableDashboardToolbar } from '../../../PredefinedConfig/Common/Types';
+import { AdaptableDashboardToolbar } from '../../../AdaptableState/Common/Types';
 import { CustomToolbar } from '../../../AdaptableOptions/DashboardOptions';
 export interface CustomToolbarModuleViewPopupProps<View> extends ModuleViewPopupProps<View> {
     customToolbar: CustomToolbar;

package/src/View/Components/SharedProps/ViewPanelProps.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
 export interface ViewPanelProps {
     viewType: 'Toolbar' | 'ToolPanel';

package/src/View/Components/SharedProps/WizardScopeState.d.ts

@@ -1,4 +1,4 @@
-import { ColumnScope } from '../../../PredefinedConfig/Common/ColumnScope';
+import { ColumnScope } from '../../../AdaptableState/Common/ColumnScope';
 export interface WizardScopeState {
     scope: ColumnScope;
 }

package/src/View/Components/StyleComponent.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSProperties } from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 export interface StyleComponentProps extends React.ClassAttributes<StyleComponent> {
     className?: string;
     style?: CSSProperties;

package/src/View/Components/StyleComponent.js

@@ -10,7 +10,7 @@ import { Select } from '../../components/Select';
 import { StylePreview } from '../../components/StylePreview';
 import { Toggle } from '../../components/Toggle/Toggle';
 import { ToggleGroup } from '../../components/Toggle/ToggleGroup';
-import { FontSize, FontStyle, FontWeight } from '../../PredefinedConfig/Common/Enums';
+import { FontSize, FontStyle, FontWeight } from '../../AdaptableState/Common/Enums';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';

package/src/View/Components/StyleVisualItem.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 export interface StyleVisualItemProps extends React.ClassAttributes<StyleVisualItem> {
     Style: AdaptableStyle;
     Text?: string;

package/src/View/Components/StyleVisualItem.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 /// <reference path="../../typings/.d.ts" />
 import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';
-import { FontWeight, FontStyle } from '../../PredefinedConfig/Common/Enums';
+import { FontWeight, FontStyle } from '../../AdaptableState/Common/Enums';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 export class StyleVisualItem extends React.Component {
     render() {

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ValueSelectorProps } from '../ValueSelector';
-import { AdaptableObjectTag } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObjectTag } from '../../../AdaptableState/Common/AdaptableObject';
 export interface TagsSelectorProps extends Omit<ValueSelectorProps<AdaptableObjectTag, string | number>, 'options' | 'value' | 'onChange' | 'allowReorder' | 'toIdentifier' | 'toLabel' | 'selectionBoxPosition' | 'noSelectionLabel' | 'xSelectedLabel'> {
     availableTags?: AdaptableObjectTag[];
     selectedTags?: AdaptableObjectTag[];

package/src/View/Components/ToolPanel/AdaptableToolPanel.d.ts

@@ -2,11 +2,11 @@ import * as React from 'react';
 import * as ToolPanelRedux from '../../../Redux/ActionsReducers/ToolPanelRedux';
 import { IToolPanelParams } from 'ag-grid-enterprise';
 import { AdaptableApi } from '../../../types';
-import { AdaptableMenuItem } from '../../../PredefinedConfig/Common/Menu';
-import { AdaptableModuleButtons, AdaptableToolPanel } from '../../../PredefinedConfig/Common/Types';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableMenuItem } from '../../../AdaptableState/Common/Menu';
+import { AdaptableModuleButtons, AdaptableToolPanel } from '../../../AdaptableState/Common/Types';
+import { AdaptableColumn } from '../../../AdaptableState/Common/AdaptableColumn';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
-import { AdaptableToolPanelDefinition } from '../../../PredefinedConfig/ToolPanelState';
+import { AdaptableToolPanelDefinition } from '../../../AdaptableState/ToolPanelState';
 import type { Action } from 'redux';
 interface AdaptableToolPanelProps {
     api: AdaptableApi;

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

@@ -7,7 +7,7 @@ import ArrayExtensions from '../../../Utilities/Extensions/ArrayExtensions';
 import { Icon } from '../../../components/icons';
 import { CheckBox } from '../../../components/CheckBox';
 import DropdownButton from '../../../components/DropdownButton';
-import { ALL_TOOL_PANELS, } from '../../../PredefinedConfig/Common/Types';
+import { ALL_TOOL_PANELS, } from '../../../AdaptableState/Common/Types';
 import SimpleButton from '../../../components/SimpleButton';
 import { ButtonConfigure } from '../Buttons/ButtonConfigure';
 import { renderWithAdaptableContext } from '../../renderWithAdaptableContext';

package/src/View/Components/ToolPanel/ToolPanelPopup.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import * as ToolPanelRedux from '../../../Redux/ActionsReducers/ToolPanelRedux';
 import { ModuleViewPopupProps } from '../SharedProps/ModuleViewPopupProps';
-import { InternalState } from '../../../PredefinedConfig/InternalState';
-import { AdaptableToolPanelDefinition, ToolPanelState } from '../../../PredefinedConfig/ToolPanelState';
-import { AdaptableModuleButtons, AdaptableToolPanels } from '../../../PredefinedConfig/Common/Types';
+import { InternalState } from '../../../AdaptableState/InternalState';
+import { AdaptableToolPanelDefinition, ToolPanelState } from '../../../AdaptableState/ToolPanelState';
+import { AdaptableModuleButtons, AdaptableToolPanels } from '../../../AdaptableState/Common/Types';
 interface ToolPanelPopupComponentProps extends ModuleViewPopupProps<ToolPanelPopupComponent> {
     ToolPanelState: ToolPanelState;
     InternalState: InternalState;

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

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import * as ToolPanelRedux from '../../../Redux/ActionsReducers/ToolPanelRedux';
 import { PopupPanel } from '../Popups/AdaptablePopup/PopupPanel';
 import Radio from '../../../components/Radio';
-import { ALL_TOOL_PANELS, } from '../../../PredefinedConfig/Common/Types';
+import { ALL_TOOL_PANELS, } from '../../../AdaptableState/Common/Types';
 import ArrayExtensions from '../../../Utilities/Extensions/ArrayExtensions';
 import { ModuleValueSelector } from '../ModuleValueSelector';
 import { Tabs } from '../../../components/Tabs';

package/src/View/Components/ToolPanel/ToolPanelWrapper.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { AdaptableToolPanel } from '../../../PredefinedConfig/Common/Types';
+import { AdaptableToolPanel } from '../../../AdaptableState/Common/Types';
 import { CustomToolPanel } from '../../../AdaptableOptions/ToolPanelOptions';
-import { ToolPanelVisibilityMode } from '../../../PredefinedConfig/ToolPanelState';
+import { ToolPanelVisibilityMode } from '../../../AdaptableState/ToolPanelState';
 export type ToolPanelWrapperProps = {
     adaptableToolPanel: AdaptableToolPanel;
     customToolPanel?: undefined;

package/src/View/CustomSort/CustomSortSummary.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ModuleSummaryProps } from '../Components/SharedProps/ModuleSummaryProps';
 import { EditableConfigEntityState } from '../Components/SharedProps/EditableConfigEntityState';
 import * as CustomSortRedux from '../../Redux/ActionsReducers/CustomSortRedux';
-import { CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { CustomSort } from '../../AdaptableState/CustomSortState';
 export interface CustomSortSummaryProps extends ModuleSummaryProps<CustomSortSummaryComponent> {
     CustomSorts: CustomSort[];
     onAddCustomSort: (customSort: CustomSort) => CustomSortRedux.CustomSortAddAction;

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CustomSort } from '../../../PredefinedConfig/CustomSortState';
+import { CustomSort } from '../../../AdaptableState/CustomSortState';
 export type CustomSortColumnWizardSectionProps = {
     onChange: (data: CustomSort) => void;
     isNew: boolean;

package/src/View/CustomSort/Wizard/CustomSortSummaryWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { CustomSort } from '../../../PredefinedConfig/CustomSortState';
+import { CustomSort } from '../../../AdaptableState/CustomSortState';
 export interface CustomSortSummaryWizardProps extends AdaptableWizardStepProps<CustomSort> {
 }
 export declare class CustomSortSummaryWizard extends React.Component<CustomSortSummaryWizardProps, {}> implements AdaptableWizardStep {