@adaptabletools/adaptable-cjs 20.0.0-canary.9 → 20.0.1

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 {

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

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

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { CustomSort } from '../../../PredefinedConfig/CustomSortState';
+import { CustomSort } from '../../../AdaptableState/CustomSortState';
 export interface CustomSortWizardProps extends AdaptableOnePageWizardProps<CustomSort> {
     isNew: boolean;
 }

package/src/View/Dashboard/CustomDashboardButton.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { DashboardButtonContext } from '../../AdaptableOptions/DashboardOptions';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
 export interface CustomDashboardButtonProps {
     button: AdaptableButton<DashboardButtonContext>;
     api: AdaptableApi;

package/src/View/Dashboard/CustomToolbar.js

@@ -92,8 +92,8 @@ const CustomToolbarCmp = (props) => {
 exports.CustomToolbarCmp = CustomToolbarCmp;
 const CustomToolbarWrapper = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
-    return (React.createElement(PanelDashboard_1.PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Configure') !=
-            undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Close') != undefined, onConfigure: () => {
+    return (React.createElement(PanelDashboard_1.PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'configure') !=
+            undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'close') != undefined, onConfigure: () => {
             const customToolbarConfiguredInfo = {
                 ...api.internalApi.buildBaseContext(),
                 customToolbar: props.customToolbar,

package/src/View/Dashboard/Dashboard.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
-import { AdaptableCoordinate, DashboardState } from '../../PredefinedConfig/DashboardState';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
+import { AdaptableCoordinate, DashboardState } from '../../AdaptableState/DashboardState';
+import { InternalState } from '../../AdaptableState/InternalState';
 import * as DashboardRedux from '../../Redux/ActionsReducers/DashboardRedux';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';

package/src/View/Dashboard/DashboardPopup.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as DashboardRedux from '../../Redux/ActionsReducers/DashboardRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-import { InternalState } from '../../PredefinedConfig/InternalState';
-import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardState';
+import { InternalState } from '../../AdaptableState/InternalState';
+import { DashboardState, DashboardTab } from '../../AdaptableState/DashboardState';
 interface DashboardPopupComponentProps extends ModuleViewPopupProps<DashboardPopupComponent> {
     DashboardState: DashboardState;
     InternalState: InternalState;

package/src/View/Dashboard/DashboardToolbarFactory.js

@@ -4,7 +4,7 @@ exports.DashboardToolbarFactory = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
-const Types_1 = require("../../PredefinedConfig/Common/Types");
+const Types_1 = require("../../AdaptableState/Common/Types");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableViewFactory_1 = require("../AdaptableViewFactory");
 const CustomToolbar_1 = require("./CustomToolbar");
@@ -13,8 +13,7 @@ const SystemDashboardToolbarFactory = (props) => {
     const moduleInfo = adaptable.api.internalApi
         .getModuleService()
         .getModuleInfoByModule(props.toolbarName);
-    const accessLevel = adaptable.api.entitlementApi
-        .getEntitlementAccessLevelForModule(props.toolbarName);
+    const accessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.toolbarName);
     const moduleToolbarView = AdaptableViewFactory_1.AdaptableViewPanelFactory.get(props.toolbarName);
     if (!moduleToolbarView) {
         return React.createElement(React.Fragment, null, "adasdasdas");

package/src/View/Dashboard/ModuleToolbarWrapper.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 ModuleToolbarWrapperProps {
     moduleInfo: ModuleInfo;
     accessLevel: AccessLevel;

package/src/View/Dashboard/PinnedToolbarsSelector.js

@@ -9,8 +9,7 @@ const DashboardRedux_1 = require("../../Redux/ActionsReducers/DashboardRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const PinnedToolbarsSelector = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
-    const dashboardAccessLevel = api.entitlementApi
-        .getEntitlementAccessLevelForModule('Dashboard');
+    const dashboardAccessLevel = api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
     const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
     const dashboardState = (0, react_redux_1.useSelector)((state) => state.Dashboard);
     const dispatch = (0, react_redux_1.useDispatch)();

package/src/View/DataChangeHistory/DataChangeHistoryGrid.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 export interface DataChangeHistoryData {
     primaryKey: string;
     changeKey: string;

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -122,7 +122,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, adaptableContainerId, agGr
             defaultAccessLevel: 'Hidden',
         },
         actionColumnOptions: actionColumnOptions,
-        predefinedConfig: {
+        initialState: {
             Layout: {
                 Revision: Date.now(),
                 CurrentLayout: 'DataChangeHistoryLayout',
@@ -177,12 +177,10 @@ const buildAdaptableOptions = (mainAdaptableInstance, adaptableContainerId, agGr
         },
     };
     if (!undoChangeEnabled) {
-        const layoutColumns = options.predefinedConfig.Layout.Layouts[0]
-            .TableColumns;
+        const layoutColumns = options.initialState.Layout.Layouts[0].TableColumns;
         if (layoutColumns.includes('undoActionColumn')) {
             // remove action column from layout
-            options.predefinedConfig.Layout.Layouts[0].TableColumns =
-                layoutColumns.filter((columnId) => columnId !== 'undoActionColumn');
+            options.initialState.Layout.Layouts[0].TableColumns = layoutColumns.filter((columnId) => columnId !== 'undoActionColumn');
         }
     }
     return options;

package/src/View/DataChangeHistory/DataChangeHistoryPopup.d.ts

@@ -1,8 +1,8 @@
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import * as React from 'react';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { DataChangeHistoryDisableAction, DataChangeHistoryEnableAction, DataChangeHistoryResumeAction, DataChangeHistorySuspendAction } from '../../Redux/ActionsReducers/InternalRedux';
-import { DataChangeHistoryMode } from '../../PredefinedConfig/InternalState';
+import { DataChangeHistoryMode } from '../../AdaptableState/InternalState';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 interface DataChangeHistoryPopupProps extends ModuleViewPopupProps<DataChangeHistoryPopupComponent> {
     changeHistoryLog: Record<string, CellDataChangedInfo>;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ReportFormatType, ReportNameType } from '../../PredefinedConfig/ExportState';
+import { ReportFormatType, ReportNameType } from '../../AdaptableState/ExportState';
 interface ExportDestinationPickerProps {
     viewType: 'Toolbar' | 'ToolPanel' | 'StatusBar' | 'SettingsPanel';
     reportName: ReportNameType;

package/src/View/Export/ExportViewPanel.js

@@ -39,7 +39,7 @@ const ExportViewPanel = (props) => {
             React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
                     action: 'Edit',
                     source: 'Toolbar',
-                })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || exportApi.isExternalReport(currentReport), accessLevel: accessLevel }),
+                })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null, accessLevel: accessLevel }),
             React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
                     action: 'New',
                     source: 'Toolbar',

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ReportFormatType, ReportNameType } from '../../PredefinedConfig/ExportState';
+import { ReportFormatType, ReportNameType } from '../../AdaptableState/ExportState';
 export interface ReportFormatSelectorProps {
     viewType: 'Toolbar' | 'ToolPanel' | 'StatusBar' | 'SettingsPanel';
     size?: 'small' | 'normal';

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Report, ReportNameType } from '../../PredefinedConfig/ExportState';
+import { Report, ReportNameType } from '../../AdaptableState/ExportState';
 export interface ReportNameSelectorProps {
     viewType: 'Toolbar' | 'ToolPanel' | 'StatusBar' | 'SettingsPanel';
     size?: 'small' | 'normal';

package/src/View/Export/Wizard/NewReportWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 export interface NewReportWizardProps extends AdaptableOnePageWizardProps<Report> {
 }
 export declare const NewReportWizard: (props: NewReportWizardProps) => React.JSX.Element;

package/src/View/Export/Wizard/ReportColumnTypeWizard.d.ts

@@ -1,4 +1,4 @@
-import { Report, ReportColumnScope } from '../../../PredefinedConfig/ExportState';
+import { Report, ReportColumnScope } from '../../../AdaptableState/ExportState';
 import * as React from 'react';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../../Wizard/Interface/IAdaptableWizard';
 export interface ReportColumnTypeWizardProps extends AdaptableWizardStepProps<Report> {

package/src/View/Export/Wizard/ReportColumnsWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 export type ReportColumnsWizardSectionProps = {
     onChange: (data: Report) => void;
 };

package/src/View/Export/Wizard/ReportNameWizardSection.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 export type ReportNameWizardSectionProps = {
     onChange: (data: Report) => void;
 };

package/src/View/Export/Wizard/ReportRowTypeWizard.d.ts

@@ -1,4 +1,4 @@
-import { Report, ReportRowScope } from '../../../PredefinedConfig/ExportState';
+import { Report, ReportRowScope } from '../../../AdaptableState/ExportState';
 import * as React from 'react';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../../Wizard/Interface/IAdaptableWizard';
 export interface ReportRowTypeWizardProps extends AdaptableWizardStepProps<Report> {

package/src/View/Export/Wizard/ReportRowsWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 export type ReportRowsWizardSectionProps = {
     onChange: (data: Report) => void;
 };

package/src/View/Export/Wizard/ReportSettingsWizard.d.ts

@@ -1,4 +1,4 @@
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 import * as React from 'react';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../../Wizard/Interface/IAdaptableWizard';
 export interface ReportSettingsWizardProps extends AdaptableWizardStepProps<Report> {

package/src/View/Export/Wizard/ReportSummaryWizard.d.ts

@@ -1,4 +1,4 @@
-import { Report } from '../../../PredefinedConfig/ExportState';
+import { Report } from '../../../AdaptableState/ExportState';
 import * as React from 'react';
 import { AdaptableWizardStep, AdaptableWizardStepProps } from '../../Wizard/Interface/IAdaptableWizard';
 export interface ReportSummaryWizardProps extends AdaptableWizardStepProps<Report> {

package/src/View/Filter/FilterSummary.js

@@ -45,7 +45,7 @@ function mapStateToProps(state) {
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onClearFilter: (columnFilter) => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter)),
+        onClearFilter: (columnFilter) => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId)),
         onClearPopupParams: () => dispatch(PopupRedux.PopupClearParam()),
         onShare: (entity, config) => dispatch(TeamSharingRedux.TeamSharingShare(entity, ModuleConstants.ColumnFilterModuleId, config)),
     };

package/src/View/Filter/FilterViewPanel.d.ts

@@ -1,7 +1,7 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { Entitlement } from '../../PredefinedConfig/Common/Entitlement';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { Entitlement } from '../../AdaptableState/Common/Entitlement';
 import * as React from 'react';
 import { ColumnFilter } from '../../types';
 export interface FilterViewPanelComponentProps extends ViewPanelProps {

package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FlashingCellDefinition } from '../../../PredefinedConfig/FlashingCellState';
+import { FlashingCellDefinition } from '../../../AdaptableState/FlashingCellState';
 export interface FlashingAlertRulesWizardSectionProps {
     onChange: (data: FlashingCellDefinition) => void;
 }

package/src/View/FormatColumn/FormatColumnSummary.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 FormatColumnRedux from '../../Redux/ActionsReducers/FormatColumnRedux';
-import { FormatColumn } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumn } from '../../AdaptableState/FormatColumnState';
 export interface FormatColumnSummaryProps extends ModuleSummaryProps<FormatColumnSummaryComponent> {
     FormatColumns: FormatColumn[];
     onAddFormatColumn: (FormatColumn: FormatColumn) => FormatColumnRedux.FormatColumnAddAction;

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
-import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
-import { ColumnScope } from '../../../PredefinedConfig/Common/ColumnScope';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
+import { AdaptableFormat } from '../../../AdaptableState/Common/AdaptableFormat';
+import { ColumnScope } from '../../../AdaptableState/Common/ColumnScope';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export type FormatColumnFormatWizardSectionProps = {
     onChange: (data: FormatColumn) => void;

package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
 type FormatColumnScopeWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
 type FormatColumnOptionsWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export declare const isFormatColumnStyleValid: (data: FormatColumn, api: AdaptableApi) => true | "No format applied";
 type FormatColumnStyleWizardSectionProps = {

package/src/View/FormatColumn/Wizard/FormatColumnWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
 export interface FormatColumnWizardProps extends AdaptableOnePageWizardProps<FormatColumn> {
 }
 export declare function FormatColumnWizard(props: FormatColumnWizardProps): React.JSX.Element;

package/src/View/FreeTextColumn/FreeTextColumnSummary.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 FreeTextColumnRedux from '../../Redux/ActionsReducers/FreeTextColumnRedux';
-import { FreeTextColumn } from '../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn } from '../../AdaptableState/FreeTextColumnState';
 export interface FreeTextColumnSummaryProps extends ModuleSummaryProps<FreeTextColumnSummaryComponent> {
     FreeTextColumns: FreeTextColumn[];
     onAddFreeTextColumn: (FreeTextColumn: FreeTextColumn) => FreeTextColumnRedux.FreeTextColumnAddAction;

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FreeTextColumn } from '../../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn } from '../../../AdaptableState/FreeTextColumnState';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export declare const renderFreeTextColumnSummary: (data: FreeTextColumn) => React.JSX.Element;
 export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column Id cannot be empty" | "A Column already exists with that id" | "No data type specified for column";

package/src/View/FreeTextColumn/Wizard/FreeTextColumnWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { FreeTextColumn } from '../../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn } from '../../../AdaptableState/FreeTextColumnState';
 export interface FreeTextColumnWizardProps extends AdaptableOnePageWizardProps<FreeTextColumn> {
 }
 export declare const FreeTextColumnWizard: (props: FreeTextColumnWizardProps) => React.JSX.Element;

package/src/View/GridFilter/NamedQuerySelector.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
+import { CachedQuery } from '../../AdaptableState/NamedQueryState';
 import { NamedQuery } from '../../types';
 export declare const AvailableSearchLabel: (props: {
     label: string;

package/src/View/GridFilter/NamedQuerySelector.js

@@ -8,7 +8,7 @@ const icons_1 = require("../../components/icons");
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const Tag_1 = require("../../components/Tag");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const AdaptablePopover_1 = require("../AdaptablePopover");
 const ButtonOpen_1 = require("../Components/Buttons/ButtonOpen");

package/src/View/GridFilter/useGridFilterExpressionEditor.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
+import { CachedQuery } from '../../AdaptableState/NamedQueryState';
 export declare const useGridFilterExpressionEditor: () => {
     isReadOnly: boolean;
     namedQueryModuleAccessLevel: import("../../types").AccessLevel;

package/src/View/GridInfo/GridInfoPopup/AdaptableObjectsSummary.js

@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableObjectsSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const AdaptableObjectList_1 = require("../../Components/AdaptableObjectList");
+const useRerender_1 = require("../../../components/utils/useRerender");
+const react_1 = require("react");
 const AdaptableObjectsSummary = () => {
-    const state = (0, react_redux_1.useSelector)((state) => state);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const rerender = (0, useRerender_1.useRerender)();
+    (0, react_1.useEffect)(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
     const modules = adaptable.ModuleService.getModuleCollection();
     const baseClassName = 'ab-AdaptableObjectsSummary';
     return (React.createElement(rebass_1.Box, { className: baseClassName }, [...modules].map(([moduleName, module]) => {

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -87,7 +87,7 @@ const GridInfoPopup = (props) => {
             React.createElement(Panel_1.default, { flex: 1 },
                 React.createElement(Tabs_1.Tabs, null,
                     React.createElement(Tabs_1.Tabs.Tab, null, "Grid Summary"),
-                    React.createElement(Tabs_1.Tabs.Tab, null, "Grid Config"),
+                    React.createElement(Tabs_1.Tabs.Tab, null, "Grid State"),
                     React.createElement(Tabs_1.Tabs.Content, null,
                         React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { margin: 2, colItems: propValueColItems, items: gridSummaries })),
                     React.createElement(Tabs_1.Tabs.Content, null,

package/src/View/Layout/LayoutViewPanel.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Layout, LayoutArray } from '../../PredefinedConfig/LayoutState';
+import { Layout, LayoutArray } from '../../AdaptableState/LayoutState';
 import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 export declare const COMPONENT_LAYOUT_POPUP_NAME = "LayoutEditorStandalonePopup";

package/src/View/Layout/TransposedPopup.js

@@ -103,7 +103,7 @@ const TransposedPopup = (props) => {
             entitlementOptions: {
                 defaultAccessLevel: 'Hidden',
             },
-            predefinedConfig: {
+            initialState: {
                 Layout: {
                     Revision: Date.now(),
                     CurrentLayout: 'TransposedView',
@@ -117,7 +117,7 @@ const TransposedPopup = (props) => {
                             ColumnPinning: {
                                 [transposedFirstColumnHeader]: 'left',
                             },
-                            AutoSizeColumns: true
+                            AutoSizeColumns: true,
                         },
                     ],
                 },

package/src/View/Layout/Wizard/Components/ColumnLabels.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableColumnProperties } from '../../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnProperties } from '../../../../AdaptableState/Common/AdaptableColumn';
 export declare const ColumnLabels: (props: AdaptableColumnProperties & {
     children?: React.ReactNode;
     labels?: Record<string, React.ReactNode>;

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -19,7 +19,7 @@ const SortSection_1 = require("./sections/SortSection");
 const FilterSection_1 = require("./sections/FilterSection");
 const GridFilterSection_1 = require("./sections/GridFilterSection");
 const RowSummarySection_1 = require("./sections/RowSummarySection");
-const RowSummary_1 = require("../../../PredefinedConfig/Common/RowSummary");
+const RowSummary_1 = require("../../../AdaptableState/Common/RowSummary");
 const isPivotLayout_1 = require("../../../Utilities/isPivotLayout");
 const PivotRowGroupingSection_1 = require("./sections/PivotRowGroupingSection");
 const PivotAggregationsSection_1 = require("./sections/PivotAggregationsSection");

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -11,7 +11,7 @@ const Input_1 = tslib_1.__importDefault(require("../../../../components/Input"))
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
-const AdaptableColumn_1 = require("../../../../PredefinedConfig/Common/AdaptableColumn");
+const AdaptableColumn_1 = require("../../../../AdaptableState/Common/AdaptableColumn");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -11,7 +11,7 @@ const Select_1 = require("../../../../components/Select");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
-const RowSummary_1 = require("../../../../PredefinedConfig/Common/RowSummary");
+const RowSummary_1 = require("../../../../AdaptableState/Common/RowSummary");
 const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
 const ModuleConstants_1 = require("../../../../Utilities/Constants/ModuleConstants");
 const aggregatedScalarExpressionFunctions_1 = require("../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions");

package/src/View/Note/NotePopup.js

@@ -6,11 +6,11 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const NoteRedux_1 = require("../../Redux/ActionsReducers/NoteRedux");
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -25,6 +25,9 @@ const NotePopup = (props) => {
         : StringExtensions_1.default.Humanize(adaptable.adaptableOptions.primaryKey);
     const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -47,7 +50,7 @@ const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
+                    return formatDate(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
                 },
             },
             delete: {

package/src/View/PlusMinus/PlusMinusSummary.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 PlusMinusRedux from '../../Redux/ActionsReducers/PlusMinusRedux';
-import { PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge } from '../../AdaptableState/PlusMinusState';
 export interface PlusMinusSummaryProps extends ModuleSummaryProps<PlusMinusSummaryComponent> {
     PlusMinusNudges: PlusMinusNudge[];
     onAddPlusMinusNudge: (PlusMinus: PlusMinusNudge) => PlusMinusRedux.PlusMinusNudgeAddAction;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { PlusMinusNudge } from '../../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge } from '../../../AdaptableState/PlusMinusState';
 interface StyleScopeWizardSectionProps {
     onChange: (data: PlusMinusNudge) => void;
 }

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../../View/Wizard/Interface/IAdaptableWizard';
-import { PlusMinusNudge } from '../../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge } from '../../../AdaptableState/PlusMinusState';
 export interface PlusMinusWizardProps extends AdaptableOnePageWizardProps<PlusMinusNudge> {
 }
 export declare const PlusMinusWizard: React.FunctionComponent<PlusMinusWizardProps>;

package/src/View/QuickSearch/QuickSearchPopup.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 interface QuickSearchPopupProps extends ModuleViewPopupProps<any> {
     QuickSearchText: string;
     QuickSearchStyle: AdaptableStyle;

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -18,7 +18,7 @@ const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const [state, setState] = (0, react_1.useState)({
-        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -27,7 +27,7 @@ const QuickSearchPopupComponent = (props) => {
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState({ ...state, RunQueryAfterQuickSearch: checked });
-        props.api.optionsApi.getAdaptableOptions().quickSearchOptions.filterResultsAfterQuickSearch =
+        props.api.optionsApi.getAdaptableOptions().quickSearchOptions.filterGridAfterQuickSearch =
             checked;
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },