@adaptabletools/adaptable 20.0.0-canary.22 → 20.0.0-canary.24

package/src/View/Charting/ChartingWizard/ChartingWizard.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { isAgChartDefinition, } from '../../../PredefinedConfig/ChartingState';
+import { isAgChartDefinition, } from '../../../AdaptableState/ChartingState';
 import { AgChargingWizard } from './AgChargingWizard';
 import { ExternalChartingWizard } from './ExternalChartingWizard';
 export const ChartingWizard = (props) => {

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/ExternalChartingWizard.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ExternalChartDefinition } from '../../../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../../../AdaptableState/ChartingState';
 import { AdaptableOnePageWizardProps } from '../../../Wizard/Interface/IAdaptableWizard';
 export interface ExternalChartingWizardProps extends AdaptableOnePageWizardProps<ExternalChartDefinition> {
 }

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/SettingsSection.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ExternalChartDefinition } from '../../../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../../../AdaptableState/ChartingState';
 import { AdaptableApi } from '../../../../types';
 export declare const isSettingsValid: (chartDefinition: ExternalChartDefinition, api: AdaptableApi) => true | string;
 export interface SettingsSectionProps {

package/src/View/Charting/DeleteChartButton.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AccessLevel, ChartDefinition } from '../../types';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 export interface ButtonDeleteProps {
     chart: ChartDefinition | ExternalChartDefinition;
     accessLevel: AccessLevel;

package/src/View/Charting/DeleteChartButton.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { ButtonDelete } from '../Components/Buttons/ButtonDelete';
 import * as ChartingRedux from '../../Redux/ActionsReducers/ChartingRedux';
-import { isAgChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { isAgChartDefinition } from '../../AdaptableState/ChartingState';
 export const DeleteChartButton = (props) => {
     return (React.createElement(ButtonDelete, { iconSize: props.iconSize, disabled: !props.chart, ConfirmAction: isAgChartDefinition(props.chart)
             ? ChartingRedux.ChartingDeleteChart(props.chart)

package/src/View/Charting/EditChartButton.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AccessLevel, ChartDefinition } from '../../types';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 export interface EditChartButtonProps {
     chart: ChartDefinition | ExternalChartDefinition;
     accessLevel: AccessLevel;

package/src/View/Charting/ShowChartButton.js

@@ -3,7 +3,7 @@ import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
 import DropdownButton from '../../components/DropdownButton';
 import { AG_GRID_CHART_WINDOW } from '../../Utilities/Constants/GeneralConstants';
-import { isAgChartDefinition, isExternalChartDefinition, } from '../../PredefinedConfig/ChartingState';
+import { isAgChartDefinition, isExternalChartDefinition, } from '../../AdaptableState/ChartingState';
 import { useAgChartState } from './useAgChartState';
 import { useExternalChartState } from './useExternalChartState';
 const BaseShowChartButton = (props) => {

package/src/View/Charting/useChartingElements.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 import { AccessLevel, ChartDefinition } from '../../types';
 export declare const useChartingElements: ({ elementType, accessLevel, size, }: {
     elementType: string;

package/src/View/Charting/useChartingElements.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Select } from '../../components/Select';
 import SimpleButton from '../../components/SimpleButton';
-import { isAgChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { isAgChartDefinition } from '../../AdaptableState/ChartingState';
 import * as ChartingRedux from '../../Redux/ActionsReducers/ChartingRedux';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { useAdaptable } from '../AdaptableContext';

package/src/View/Charting/useExternalChartState.d.ts

@@ -1,4 +1,4 @@
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 import { ChartContainer } from '../../types';
 export declare const useExternalChartState: (chartDefinition?: ExternalChartDefinition) => {
     showChart: (container?: ChartContainer) => void;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Action } from 'redux';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { AdaptableObjectItemView, AdaptableObjectView, IModule } from '../../../Strategy/Interface/IModule';
 import { AccessLevel, AdaptableSharedEntityConfig } from '../../../types';
 export declare const AdaptableObjectListItemView: React.FunctionComponent<{

package/src/View/Components/Buttons/ButtonBase/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ButtonProps as BtnProps } from 'rebass';
-import { AccessLevel } from '../../../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../../../AdaptableState/Common/Entitlement';
 export interface ButtonBaseProps extends BtnProps {
     overrideDisableButton?: boolean;
     transformGlyph?: boolean;

package/src/View/Components/Buttons/ButtonShare.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
 interface ButtonShareProps extends SimpleButtonProps {
     onShare: (config: AdaptableSharedEntityConfig) => void;
     Header: string;

package/src/View/Components/Buttons/EntityListActionButtons.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import * as Redux from 'redux';
-import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
-import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
-import { SuspendableObject } from '../../../PredefinedConfig/Common/SuspendableObject';
+import { AccessLevel } from '../../../AdaptableState/Common/Entitlement';
+import { AdaptableSharedEntityConfig } from '../../../AdaptableState/TeamSharingState';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
+import { SuspendableObject } from '../../../AdaptableState/Common/SuspendableObject';
 export interface EntityListActionButtonsProps extends React.ClassAttributes<EntityListActionButtons> {
     editClick?: () => void;
     cloneClick?: () => void;

package/src/View/Components/Buttons/SuspendToggleButton/SuspendToggleButton.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { AdaptableObject } from '../../../../PredefinedConfig/Common/AdaptableObject';
-import { AccessLevel } from '../../../../PredefinedConfig/Common/Entitlement';
-import { SuspendableObject } from '../../../../PredefinedConfig/Common/SuspendableObject';
+import { AdaptableObject } from '../../../../AdaptableState/Common/AdaptableObject';
+import { AccessLevel } from '../../../../AdaptableState/Common/Entitlement';
+import { SuspendableObject } from '../../../../AdaptableState/Common/SuspendableObject';
 interface EntityListSuspendButtonProps {
     onSuspend: (adaptableObject: AdaptableObject) => void;
     onUnSuspend: (adaptableObject: AdaptableObject) => void;

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

@@ -4,6 +4,7 @@ export interface AdaptableColumnFilterProps {
     columnId: string;
     padding?: BoxProps['p'];
     wrapperProps?: BoxProps;
+    onChange?: () => void;
 }
 /**
  * This wrapper knows about predicates.

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

@@ -7,5 +7,8 @@ import { useAdaptableFilterWrapper } from './useAdaptableFilterWrapper';
  */
 export const AdaptableColumnFilter = (props) => {
     const { qlPredicate, qlPredicateDefs, columnFilter, handlePredicateChange } = useAdaptableFilterWrapper(props.columnId);
-    return (React.createElement(ColumnFilterComponent, { wrapperProps: props.wrapperProps, columnId: props.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: handlePredicateChange }));
+    return (React.createElement(ColumnFilterComponent, { wrapperProps: props.wrapperProps, columnId: props.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: React.useCallback((predicate) => {
+            handlePredicateChange(predicate);
+            props.onChange?.();
+        }, [handlePredicateChange, props.onChange]) }));
 };

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

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { ColumnFilterProps } from '../../../Utilities/Interface/ColumnFilterProps';
 export interface AdaptableColumnFilterProps extends ColumnFilterProps {
+    onClear?: () => void;
+    onChange?: () => void;
 }
 /**
  * This wrapper knows about predicates.

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

@@ -9,6 +9,14 @@ import { useAdaptableFilterWrapper } from './useAdaptableFilterWrapper';
 export const AdaptableFloatingFilter = (props) => {
     const adaptable = useAdaptable();
     const { qlPredicate, qlPredicateDefs, columnFilter, column, handlePredicateChange, handleOnChange, handleClear, } = useAdaptableFilterWrapper(props.Column.columnId);
+    const onClear = React.useCallback(() => {
+        handleClear();
+        props.onClear?.();
+    }, [handleClear, props.onClear]);
+    const onPredicateChange = React.useCallback((newPredicate) => {
+        handlePredicateChange(newPredicate);
+        props.onChange?.();
+    }, [handlePredicateChange, props.onChange]);
     if (!column) {
         return null;
     }
@@ -24,8 +32,7 @@ export const AdaptableFloatingFilter = (props) => {
                         Inputs: [],
                     },
                 ]);
+                props.onChange?.();
             }
-        }, onClear: handleClear, columnId: props.Column.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: (newPredicate) => {
-            handlePredicateChange(newPredicate);
-        } }));
+        }, onClear: onClear, columnId: props.Column.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: onPredicateChange }));
 };

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

@@ -31,7 +31,7 @@ export const FloatingFilter = (props) => {
         label = '';
     }
     const showQuickFilterDropdown = adaptable.api.filterApi.columnFilterApi.internalApi.showQuickFilterDropdown(props.columnId);
-    const handleClear = () => props.onClear();
+    const handleClear = () => props.onClear?.();
     const showEvent = 'click';
     const hideEvent = 'blur';
     let filterDropdown = null;

package/src/View/Components/ColumnFilter/components/ColumnFilterInput.d.ts

@@ -16,7 +16,7 @@ type ColumnFilterEditorChangeProps = {
     value: string;
     onChange: (value: string) => void;
 };
-export declare const ColumnFilterInput: ({ type, value, onChange: onChangeProp, onClear, disabled, onKeyDown, filterType, usePrimitiveInputs, columnId, }: {
+export declare const ColumnFilterInput: ({ type, value, onChange: onChangeProp, onClear: onClearProp, disabled, onKeyDown, filterType, usePrimitiveInputs, columnId, }: {
     disabled: boolean;
     onClear: () => void;
     onKeyDown?: (event: React.KeyboardEventHandler<HTMLInputElement>) => void;

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

@@ -9,7 +9,7 @@ import { useCallback } from 'react';
 function debounceOrImmediate(fn, time) {
     return time && time > 0 ? debounce(fn, time) : fn;
 }
-export const ColumnFilterInput = ({ type, value, onChange: onChangeProp, onClear, disabled, onKeyDown, filterType, usePrimitiveInputs = true, columnId, }) => {
+export const ColumnFilterInput = ({ type, value, onChange: onChangeProp, onClear: onClearProp, disabled, onKeyDown, filterType, usePrimitiveInputs = true, columnId, }) => {
     const [liveValue, setLiveValue] = React.useState(value);
     const [hasFocus, setHasFocus] = React.useState(false);
     const onFocus = useCallback(() => {
@@ -39,6 +39,12 @@ export const ColumnFilterInput = ({ type, value, onChange: onChangeProp, onClear
             onChangeProp(value);
         }, debounceTime);
     }, [onChangeProp, debounceTime]);
+    // the onClear needs to have the same debounce time as the onChange
+    const onClear = React.useMemo(() => {
+        return debounceOrImmediate(() => {
+            onClearProp();
+        }, debounceTime);
+    }, [onClearProp, debounceTime]);
     if (type === 'boolean') {
         return (React.createElement(CheckBox, { disabled: disabled, onFocus: onFocus, onBlur: onBlur, checked: value === 'checked'
                 ? true

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

@@ -63,7 +63,9 @@ 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) => {

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

@@ -7,7 +7,7 @@ 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;

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;