@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.0

package/src/View/Dashboard/DashboardToolbarFactory.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
-import { ALL_MODULES } from '../../PredefinedConfig/Common/Types';
+import { ALL_MODULES } from '../../AdaptableState/Common/Types';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableViewPanelFactory } from '../AdaptableViewFactory';
 import { CustomToolbarCmp } from './CustomToolbar';
@@ -9,8 +9,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 = 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

@@ -5,8 +5,7 @@ import { DashboardSetPinnedToolbars } from '../../Redux/ActionsReducers/Dashboar
 import { useAdaptable } from '../AdaptableContext';
 export const PinnedToolbarsSelector = (props) => {
     const { api } = useAdaptable();
-    const dashboardAccessLevel = api.entitlementApi
-        .getEntitlementAccessLevelForModule('Dashboard');
+    const dashboardAccessLevel = api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
     const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
     const dashboardState = useSelector((state) => state.Dashboard);
     const dispatch = 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

@@ -117,7 +117,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, adaptableContainerId, agGr
             defaultAccessLevel: 'Hidden',
         },
         actionColumnOptions: actionColumnOptions,
-        predefinedConfig: {
+        initialState: {
             Layout: {
                 Revision: Date.now(),
                 CurrentLayout: 'DataChangeHistoryLayout',
@@ -172,12 +172,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

@@ -35,7 +35,7 @@ export const ExportViewPanel = (props) => {
             React.createElement(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, { 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

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

@@ -4,7 +4,7 @@ import { Icon } from '../../components/icons';
 import Panel from '../../components/Panel';
 import SimpleButton from '../../components/SimpleButton';
 import { Tag } from '../../components/Tag';
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { ButtonOpen } from '../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

@@ -1,11 +1,15 @@
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { Box } from 'rebass';
 import { useAdaptable } from '../../AdaptableContext';
 import { AdaptableObjectList } from '../../Components/AdaptableObjectList';
+import { useRerender } from '../../../components/utils/useRerender';
+import { useEffect } from 'react';
 export const AdaptableObjectsSummary = () => {
-    const state = useSelector((state) => state);
     const adaptable = useAdaptable();
+    const rerender = useRerender();
+    useEffect(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
     const modules = adaptable.ModuleService.getModuleCollection();
     const baseClassName = 'ab-AdaptableObjectsSummary';
     return (React.createElement(Box, { className: baseClassName }, [...modules].map(([moduleName, module]) => {

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

@@ -83,7 +83,7 @@ export const GridInfoPopup = (props) => {
             React.createElement(Panel, { flex: 1 },
                 React.createElement(Tabs, null,
                     React.createElement(Tabs.Tab, null, "Grid Summary"),
-                    React.createElement(Tabs.Tab, null, "Grid Config"),
+                    React.createElement(Tabs.Tab, null, "Grid State"),
                     React.createElement(Tabs.Content, null,
                         React.createElement(AdaptableObjectCollection, { margin: 2, colItems: propValueColItems, items: gridSummaries })),
                     React.createElement(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

@@ -99,7 +99,7 @@ export const TransposedPopup = (props) => {
             entitlementOptions: {
                 defaultAccessLevel: 'Hidden',
             },
-            predefinedConfig: {
+            initialState: {
                 Layout: {
                     Revision: Date.now(),
                     CurrentLayout: 'TransposedView',
@@ -113,7 +113,7 @@ export 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

@@ -15,7 +15,7 @@ import { SortSection, SortSectionSummary } from './sections/SortSection';
 import { FilterSection, FilterSectionSummary, isColumnFiltersValid, } from './sections/FilterSection';
 import { GridFilterSection, GridFilterSectionSummary, isGridFiltersValid, } from './sections/GridFilterSection';
 import { areSummaryRowsValid, RowSummarySection, RowSummarySectionSummary, } from './sections/RowSummarySection';
-import { WEIGHTED_AVERAGE_AGGREGATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
+import { WEIGHTED_AVERAGE_AGGREGATED_FUNCTION } from '../../../AdaptableState/Common/RowSummary';
 import { isPivotLayout } from '../../../Utilities/isPivotLayout';
 import { PivotRowGroupingSection, PivotRowGroupingSectionSummary, } from './sections/PivotRowGroupingSection';
 import { PivotAggregationsSection, PivotAggregationsSectionSummary, } from './sections/PivotAggregationsSection';

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

@@ -7,7 +7,7 @@ import Input from '../../../../components/Input';
 import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { isValidOrderForColumnGroups, } from '../../../../PredefinedConfig/Common/AdaptableColumn';
+import { isValidOrderForColumnGroups, } from '../../../../AdaptableState/Common/AdaptableColumn';
 import { useAdaptable } from '../../../AdaptableContext';
 import { renderSelectionSection } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';

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

@@ -7,7 +7,7 @@ import { Select } from '../../../../components/Select';
 import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
+import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../../../AdaptableState/Common/RowSummary';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
 import { aggregatedExpressionFunctions } from '../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';

package/src/View/Note/NotePopup.js

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTable } from '../../components/InfiniteTable';
 import { GetAllNotesSelector } from '../../Redux/ActionsReducers/NoteRedux';
-import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import FormatHelper from '../../Utilities/Helpers/FormatHelper';
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -21,6 +21,9 @@ export const NotePopup = (props) => {
         : StringExtensions.Humanize(adaptable.adaptableOptions.primaryKey);
     const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -43,7 +46,7 @@ export const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return dateFnsFormat(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

@@ -14,7 +14,7 @@ import { useQuickSearchDebounced } from './useQuickSearchDebounced';
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = useQuickSearchDebounced(props);
     const [state, setState] = useState({
-        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -23,7 +23,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, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },

package/src/View/Schedule/Wizard/ScheduleScheduleWizard.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseSchedule } from '../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../AdaptableState/Common/Schedule';
 export declare const isScheduleValid: (schedule: BaseSchedule, isOneOff: boolean) => true | "Schedule is not specified" | "Schedule Time is not specified" | "Schedule Date is not specified" | "Schedule Days are not specified";
 interface ScheduleScheduleWizardProps {
     onChange: (schedule: BaseSchedule) => void;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReminder.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ReminderSchedule } from '../../../../PredefinedConfig/ScheduleState';
+import { ReminderSchedule } from '../../../../AdaptableState/ScheduleState';
 interface ReminderSettingsProps {
     reminderSchedule: ReminderSchedule;
     onChange: (reminder: ReminderSchedule) => void;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ExportDestinationType } from '../../../../AdaptableOptions/ExportOptions';
-import { Report, ReportFormatType, ReportSchedule } from '../../../../PredefinedConfig/ExportState';
+import { Report, ReportFormatType, ReportSchedule } from '../../../../AdaptableState/ExportState';
 interface ReportScheduleProps {
     report: ReportSchedule;
     onChange: (reminder: ReportSchedule) => void;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
 export declare const getScheduleSettingsValues: (data: BaseSchedule) => {
     label: string;
     value: string;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Tag } from '../../../../components/Tag';
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import { SummaryText, useOnePageAdaptableWizardContext, } from '../../../Wizard/OnePageAdaptableWizard';
 export const getScheduleSettingsValues = (data) => {
     if (data.ScheduleType === ScheduleType.Reminder) {

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsWizard.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
 interface ScheduleSettingsWizardProps {
     onChange: (schedule: BaseSchedule) => void;
 }

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import { ScheduleSettingsReminder } from './ScheduleSettingsReminder';
 import { ScheduleSettingsReport } from './ScheduleSettingsReport';
 import { ScheduleSettingsIPushPull } from './ScheduleSettingsIPushPull';

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/isSettingsValid.d.ts

@@ -1,2 +1,2 @@
-import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
 export declare const isSettingsValid: (schedule: BaseSchedule) => true | "Message type not selected" | "Reminder header not specified" | "Reminder message not specified" | "Report source not specified" | "Report format not selected" | "Report not selected" | "Report folder not selected" | "Report page not selected";

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/isSettingsValid.js

@@ -1,4 +1,4 @@
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
 export const isSettingsValid = (schedule) => {
     if (schedule.ScheduleType === ScheduleType.Reminder) {

package/src/View/Schedule/Wizard/ScheduleWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../../View/Wizard/Interface/IAdaptableWizard';
-import { BaseSchedule } from '../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../AdaptableState/Common/Schedule';
 export interface ScheduleWizardProps extends AdaptableOnePageWizardProps<BaseSchedule> {
 }
 export declare const ScheduleWizard: React.FunctionComponent<ScheduleWizardProps>;