@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.1

package/src/Api/Implementation/ChartingApiImpl.d.ts

@@ -3,7 +3,7 @@ import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
 import { ChartContainer, ChartDefinition } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     constructor(_adaptable: IAdaptable);
     isChartingEnabled(): boolean;

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../AdaptableState/Common/AdaptableColumn';
 import { Layout } from '../../types';
 import { ColumnApi } from '../ColumnApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';

package/src/Api/Implementation/ColumnFilterApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
-import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptablePredicateDef, ColumnFilterDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { ColumnFilter, ColumnFilterPredicate } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnFilterInternalApi } from '../Internal/ColumnFilterInternalApi';
@@ -28,6 +28,7 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
     columnFilterToString(columnFilter: ColumnFilter): string;
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
     private getColumnFilterById;
+    isColumnFilterActiveForColumn(columnId: string): boolean;
     /**
      * Checks if a filter is applied. It is applied when:
      * - has no inputs

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -82,7 +82,7 @@ export class ColumnFilterApiImpl extends ApiBase {
             .filter(Boolean);
     }
     clearColumnFilter(columnFilter) {
-        this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter));
+        this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId));
     }
     clearColumnFiltersForColumns(columns) {
         columns.forEach((c) => {
@@ -95,7 +95,7 @@ export class ColumnFilterApiImpl extends ApiBase {
     clearColumnFilterForColumn(columnId) {
         let columnFilterForColumn = this.getColumnFilterForColumn(columnId);
         if (columnFilterForColumn) {
-            this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilterForColumn));
+            this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilterForColumn.ColumnId));
             this._adaptable.clearColumnFilteringForColumns([columnId]);
         }
     }
@@ -115,7 +115,7 @@ export class ColumnFilterApiImpl extends ApiBase {
         return ('[' +
             friendlyName +
             '] ' +
-            this.getPredicateApi().predicatesToString(columnFilter.Predicates, columnFilter.PredicatesLogic));
+            this.getPredicateApi().predicatesToString(columnFilter.Predicates, columnFilter.PredicatesOperator));
     }
     columnFiltersToString(columnFilters) {
         return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
@@ -123,6 +123,10 @@ export class ColumnFilterApiImpl extends ApiBase {
     getColumnFilterById(id) {
         return this.getColumnFilters()?.find((columnFilter) => columnFilter.Uuid === id);
     }
+    isColumnFilterActiveForColumn(columnId) {
+        const columnFilter = this.getColumnFilterForColumn(columnId);
+        return columnFilter ? this.isColumnFilterActive(columnFilter) : false;
+    }
     /**
      * Checks if a filter is applied. It is applied when:
      * - has no inputs
@@ -134,6 +138,9 @@ export class ColumnFilterApiImpl extends ApiBase {
         if (!filter || !filter.Predicates?.length) {
             return false;
         }
+        if (filter.IsSuspended) {
+            return false;
+        }
         return filter.Predicates.some((predicate) => {
             const predicateDef = this.getPredicateApi().getPredicateDefById(predicate.PredicateId);
             if (ArrayExtensions.IsNull(predicateDef.inputs) &&
@@ -141,7 +148,7 @@ export class ColumnFilterApiImpl extends ApiBase {
                 !this.getPredicateApi().internalApi.hasPredicateValues(predicate)) {
                 return true;
             }
-            const inputs = predicate.Inputs;
+            const inputs = predicate.Inputs || [];
             if (ArrayExtensions.IsEmpty(inputs)) {
                 return false;
             }

package/src/Api/Implementation/ColumnScopeApiImpl.d.ts

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnScope, ScopeDataType } from '../../PredefinedConfig/Common/ColumnScope';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { ColumnScope, ScopeDataType } from '../../AdaptableState/Common/ColumnScope';
 import { ColumnScopeApi } from '../ColumnScopeApi';
-import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
+import { CellColorRange } from '../../AdaptableState/StyledColumnState';
 export declare class ColumnScopeApiImpl extends ApiBase implements ColumnScopeApi {
     isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
     getColumnsInScope(scope: ColumnScope): AdaptableColumn[];

package/src/Api/Implementation/CustomSortApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { CustomSortApi } from '../CustomSortApi';
-import { CustomSort, CustomSortState } from '../../PredefinedConfig/CustomSortState';
+import { CustomSort, CustomSortState } from '../../AdaptableState/CustomSortState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CustomSortInternalApi } from '../Internal/CustomSortInternalApi';
 export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi {

package/src/Api/Implementation/DashboardApiImpl.d.ts

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
 import { DashboardApi } from '../DashboardApi';
-import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardState';
-import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { DashboardState, DashboardTab } from '../../AdaptableState/DashboardState';
+import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { CustomToolbar, DashboardButtonContext } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { DashboardInternalApi } from '../Internal/DashboardInternalApi';

package/src/Api/Implementation/DataChangeHistoryApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { ApiBase } from './ApiBase';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { GridCell } from '../../types';
 export declare class DataChangeHistoryApiImpl extends ApiBase implements DataChangeHistoryApi {
     getDataChangeHistoryMode(): 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';

package/src/Api/Implementation/ExportApiImpl.d.ts

@@ -1,8 +1,8 @@
 import { ExportApi } from '../ExportApi';
-import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../PredefinedConfig/ExportState';
+import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../AdaptableState/ExportState';
 import { ApiBase } from './ApiBase';
-import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, ExternalReport, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableForm } from '../../AdaptableState/Common/AdaptableForm';
+import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
 import { AdaptableColumn } from '../../types';
@@ -34,10 +34,9 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     updateReport(report: Report): Report;
     updateReports(reports: Report[]): Report[];
     getCustomReports(): Report[];
-    getExternalReports(): ExternalReport[];
-    isExternalReport(report: Report): boolean;
     isColumnExportable(adaptableColumn: AdaptableColumn): boolean;
     getSupportedExportDestinations(reportFormat: ReportFormatType): ExportDestinationType[];
-    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): void;
+    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): Promise<void>;
     getReportData(reportName: ReportNameType, format: ReportFormatType): Promise<ExportResultData>;
+    private processExport;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -1,8 +1,6 @@
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
-import ObjectFactory from '../../Utilities/ObjectFactory';
-import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
 import { EMPTY_STRING } from '../../Utilities/Constants/GeneralConstants';
 export class ExportApiImpl extends ApiBase {
@@ -29,10 +27,6 @@ export class ExportApiImpl extends ApiBase {
         if (customReport) {
             return customReport;
         }
-        const externalReport = this.getExternalReports()?.find((r) => r.name == reportName);
-        if (externalReport) {
-            return ObjectFactory.CreateExternalReport(externalReport.name);
-        }
     }
     getReportById(id) {
         return this.getAllReports()?.find((report) => report.Uuid === id);
@@ -74,12 +68,6 @@ export class ExportApiImpl extends ApiBase {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const externalReports = this.getExternalReports();
-        if (ArrayExtensions.IsNotNullOrEmpty(externalReports)) {
-            reports.push(...externalReports.map((c) => {
-                return ObjectFactory.CreateExternalReport(c.name);
-            }));
-        }
         return reports;
     }
     selectReport(reportName) {
@@ -126,12 +114,6 @@ export class ExportApiImpl extends ApiBase {
     getCustomReports() {
         return this.getExportState().Reports ?? [];
     }
-    getExternalReports() {
-        return this.getExportOptions().externalReports ?? [];
-    }
-    isExternalReport(report) {
-        return this.getExternalReports()?.find((cr) => cr.name == report.Name) != null;
-    }
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;
         if (typeof isExportableFn === 'function') {
@@ -157,51 +139,73 @@ export class ExportApiImpl extends ApiBase {
             return true;
         });
     }
-    exportReport(reportName, format, destination = 'Download') {
+    async exportReport(reportName, format, destination = 'Download') {
         let report = this.getReportByName(reportName);
-        if (this.checkItemExists(report, reportName, 'Report')) {
-            if (this.isExternalReport(report)) {
-                // Handle external report
-                this.internalApi
-                    .getExternalReportData(reportName, format, destination)
-                    .then((reportData) => {
-                    if (reportData) {
-                        this.internalApi.sendReportToDestination(reportData, report, format, destination);
-                    }
-                })
-                    .catch((error) => {
-                    this.logWarn(`Failed to get external report data for '${reportName}': ${error}`);
-                });
-                return;
-            }
-            this._adaptable.agGridExportAdapter
-                .exportData({
+        if (!this.checkItemExists(report, reportName, 'Report')) {
+            return;
+        }
+        this.logInfo(`Start Export of ${reportName} in format ${format} to ${destination}`);
+        const processExportResult = await this.processExport(report, format, destination);
+        // if FALSE, cancel export
+        if (!processExportResult) {
+            this.logInfo(`Cancel Export of ${reportName}`);
+            return;
+        }
+        // if TRUE, continue with standard export
+        if (processExportResult === true) {
+            const exportedReport = await this._adaptable.agGridExportAdapter.exportData({
                 report,
                 format,
                 destination,
                 showProgressIndicator: true,
-            })
-                .then((reportResult) => {
-                if (destination === 'Download' &&
-                    (format === 'Excel' || format === 'VisualExcel' || format === 'Csv')) {
-                    return;
-                }
-                this.internalApi.sendReportToDestination(reportResult, report, format, destination);
             });
+            if (destination === 'Download' &&
+                (format === 'Excel' || format === 'VisualExcel' || format === 'Csv')) {
+                return;
+            }
+            this.internalApi.sendReportToDestination(exportedReport, report, format, destination);
         }
+        else {
+            // in this case the user has returned a custom ExportResultData object
+            const userProcessedExportResult = processExportResult;
+            if (!userProcessedExportResult) {
+                this.logWarn(`Processing of Export ${reportName} to ${destination} returned null or undefined`);
+                return;
+            }
+            this.internalApi.sendReportToDestination(userProcessedExportResult, report, format, destination);
+        }
+        this.logInfo(`Finished Export of ${reportName} in format ${format} to ${destination}`);
     }
     async getReportData(reportName, format) {
         let report = this.getReportByName(reportName);
-        if (this.checkItemExists(report, reportName, 'Report')) {
-            this.logInfo(`Start getting Report Data for ${reportName} in format ${format}`);
-            const reportData = await this._adaptable.agGridExportAdapter.exportData({
+        if (!this.checkItemExists(report, reportName, 'Report')) {
+            return;
+        }
+        this.logInfo(`Start getting Report Data for ${reportName} in format ${format}`);
+        const processExportResult = await this.processExport(report, format, 'Clipboard');
+        let reportData;
+        // handle Export processing
+        if (typeof processExportResult?.type === 'string') {
+            reportData = processExportResult;
+        }
+        else {
+            reportData = await this._adaptable.agGridExportAdapter.exportData({
                 report,
                 format,
                 destination: 'Clipboard',
                 showProgressIndicator: false,
             });
-            this.logInfo(`Finished getting Report Data for ${reportName} in format ${format}`);
-            return reportData;
         }
+        this.logInfo(`Finished getting Report Data for ${reportName} in format ${format}`);
+        return reportData;
+    }
+    async processExport(report, format, destination) {
+        const processExportFn = this.getExportOptions().processExport;
+        if (!processExportFn) {
+            return true;
+        }
+        this.logInfo(`Process Export of ${report.Name} in format ${format} to ${destination}`);
+        const processExportContext = this.internalApi.buildProcessExportContext(report, format, destination);
+        return processExportFn(processExportContext);
     }
 }

package/src/Api/Implementation/ExpressionApiImpl.d.ts

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { ExpressionApi } from '../ExpressionApi';
-import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableQuery } from '../../AdaptableState/Common/AdaptableQuery';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -60,7 +60,7 @@ export class ExpressionApiImpl extends ApiBase {
             return Array.from(new Set(columnIds));
         }
         catch (error) {
-            // defensive programing, this should happen only if someone botched the predefined configs
+            // defensive programing, this should happen only if someone botched Initial Adaptable State
             this.logWarn(`QueryApi.getColumnsFromExpressionInvalid received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];

package/src/Api/Implementation/Fdc3ApiImpl.js

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { Fdc3InternalApi } from '../Internal/Fdc3InternalApi';
-import { ContextConfiguration } from '../../PredefinedConfig/Common/Fdc3Context';
+import { ContextConfiguration } from '../../AdaptableState/Common/Fdc3Context';
 export class Fdc3ApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);

package/src/Api/Implementation/FlashingCellApiImpl.d.ts

@@ -1,9 +1,9 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
-import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
+import { AdaptableFlashingCell } from '../../AdaptableState/Common/AdaptableFlashingCell';
 import { FlashingCellApi } from '../FlashingCellApi';
-import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
+import { FlashingCellDefinition, FlashingCellState } from '../../AdaptableState/FlashingCellState';
+import { AdaptablePredicateDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
 import { FlashingCellInternalApi } from '../Internal/FlashingCellInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableObjectLookupCriteria } from '../../types';

package/src/Api/Implementation/FormatColumnApiImpl.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { ApiBase } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumn, FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { FormatColumn, FormatColumnState } from '../../AdaptableState/FormatColumnState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { AdaptableFormat } from '../../types';
 import { AdaptableObjectLookupCriteria } from '../../../types';
 import { FormatColumnInternalApi } from '../Internal/FormatColumnInternalApi';

package/src/Api/Implementation/FreeTextColumnApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { FreeTextColumnApi } from '../FreeTextColumnApi';
-import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../AdaptableState/FreeTextColumnState';
 import { IRowNode } from 'ag-grid-enterprise';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { FreeTextColumnInternalApi } from '../Internal/FreeTextColumnInternalApi';

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -1,21 +1,21 @@
 import { ApiBase } from './ApiBase';
 import { ColDefWithId, GridApi } from '../GridApi';
-import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
-import { CellUpdateRequest, GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
-import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
-import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
+import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
+import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
+import { ColumnSort } from '../../AdaptableState/Common/ColumnSort';
+import { DataUpdateConfig } from '../../AdaptableState/Common/DataUpdateConfig';
+import { CellHighlightInfo } from '../../AdaptableState/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../AdaptableState/Common/RowHighlightInfo';
 import { ColDef, ColGroupDef, Column, ColumnState, IRowNode, RowModelType } from 'ag-grid-enterprise';
-import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
+import { GridCellRange } from '../../AdaptableState/Selection/GridCellRange';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { RowsHighlightInfo } from '../../AdaptableState/Common/RowsHighlightInfo';
 import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { GridInternalApi } from '../Internal/GridInternalApi';
-import { TransposeConfig } from '../../PredefinedConfig/Common/TransposeConfig';
+import { TransposeConfig } from '../../AdaptableState/Common/TransposeConfig';
 import { CellSummmaryInfo } from '../../types';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { InternalState } from '../../AdaptableState/InternalState';
 export declare class GridApiImpl extends ApiBase implements GridApi {
     internalApi: GridInternalApi;
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/GridApiImpl.js

@@ -4,7 +4,7 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { GridInternalApi } from '../Internal/GridInternalApi';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
-import { ROW_SUMMARY_ROW_ID } from '../../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID } from '../../AdaptableState/Common/RowSummary';
 import { errorOnce } from '../../agGrid/AdaptableLogger';
 export class GridApiImpl extends ApiBase {
     constructor(_adaptable) {

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -1,12 +1,12 @@
 import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
-import { Layout, LayoutState, PivotLayout, TableLayout } from '../../PredefinedConfig/LayoutState';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
+import { Layout, LayoutState, PivotLayout, TableLayout } from '../../AdaptableState/LayoutState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { ColumnSort } from '../../AdaptableState/Common/ColumnSort';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
-import { ExtendedLayoutInfo } from '../../PredefinedConfig/Common/ExtendedLayoutInfo';
+import { ExtendedLayoutInfo } from '../../AdaptableState/Common/ExtendedLayoutInfo';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     internalApi: LayoutInternalApi;
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/LayoutApiImpl.js

@@ -5,7 +5,7 @@ import { ApiBase } from './ApiBase';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import Helper from '../../Utilities/Helpers/Helper';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 import { isPivotLayout, normalizeLayout } from './LayoutHelpers';

package/src/Api/Implementation/LayoutHelpers.js

@@ -2,7 +2,7 @@ import isEqual from 'lodash/isEqual';
 import { isPivotLayoutModel } from '../../layout-manager/src/isPivotLayoutModel';
 import { normalizeTableLayoutModel, normalizePivotLayoutModel, } from '../../layout-manager/src/normalizeLayoutModel';
 import { simplifyTableLayoutModel, simplifyPivotLayoutModel, } from '../../layout-manager/src/simplifyLayoutModel';
-import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../PredefinedConfig/Common/AggregationColumns';
+import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../AdaptableState/Common/AggregationColumns';
 import { removeAdaptableObjectPrimitivesInline } from '../../Utilities/Helpers/AdaptableHelper';
 export const layoutStateToLayoutModel = (layout) => {
     if (isPivotLayout(layout)) {

package/src/Api/Implementation/NoteApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { NoteApi } from '../NoteApi';
-import { AdaptableNote, AdaptableNotes, NoteState } from '../../PredefinedConfig/NoteState';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../../AdaptableState/NoteState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { NoteInternalApi } from '../Internal/NoteInternalApi';
 import { CellAddress } from '../../types';

package/src/Api/Implementation/PlusMinusApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
-import { PlusMinusNudge, PlusMinusState } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge, PlusMinusState } from '../../AdaptableState/PlusMinusState';
 import { PlusMinusApi } from '../PlusMinusApi';
-import { CellUpdateRequest, GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
 export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     getPlusMinusState(): PlusMinusState;
     getAllPlusMinus(config?: LayoutAssociatedObjectLoadConfig): PlusMinusNudge[];

package/src/Api/Implementation/PredicateApiImpl.js

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
-import { SystemPredicateDefs } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { SystemPredicateDefs } from '../../AdaptableState/Common/AdaptablePredicate';
 export class PredicateApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -117,7 +117,7 @@ export class PredicateApiImpl extends ApiBase {
         if (predicates === undefined || predicates === null || predicates?.length === 0) {
             return this.handlePredicate(undefined, params, defaultReturn);
         }
-        if (params.predicatesLogic && params.predicatesLogic === 'OR') {
+        if (params.predicatesOperator && params.predicatesOperator === 'OR') {
             return predicates?.some((p) => this.handlePredicate(p, params, defaultReturn));
         }
         return predicates?.every((p) => this.handlePredicate(p, params, defaultReturn));

package/src/Api/Implementation/QuickSearchApiImpl.d.ts

@@ -1,7 +1,7 @@
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { ApiBase } from './ApiBase';
 import { QuickSearchApi } from '../QuickSearchApi';
-import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
+import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
 export declare class QuickSearchApiImpl extends ApiBase implements QuickSearchApi {
     getQuickSearchState(): QuickSearchState;
     runQuickSearch(quickSearchText: string): void;

package/src/Api/Implementation/ScheduleApiImpl.d.ts

@@ -1,10 +1,10 @@
 import { ApiBase } from './ApiBase';
 import { ScheduleApi } from '../ScheduleApi';
-import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
-import { ReportSchedule } from '../../PredefinedConfig/ExportState';
-import { IPushPullSchedule } from '../../PredefinedConfig/IPushPullState';
-import { OpenFinSchedule } from '../../PredefinedConfig/OpenFinState';
-import { ReminderSchedule, ScheduleState } from '../../PredefinedConfig/ScheduleState';
+import { BaseSchedule } from '../../AdaptableState/Common/Schedule';
+import { ReportSchedule } from '../../AdaptableState/ExportState';
+import { IPushPullSchedule } from '../../AdaptableState/IPushPullState';
+import { OpenFinSchedule } from '../../AdaptableState/OpenFinState';
+import { ReminderSchedule, ScheduleState } from '../../AdaptableState/ScheduleState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -2,7 +2,9 @@ import { ApiBase } from './ApiBase';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 export class SettingsPanelApiImpl extends ApiBase {
     openSettingsPanel(moduleName) {
-        const moduleInfo = this.getAdaptableInternalApi().getModuleService().getModuleInfoByModule(moduleName);
+        const moduleInfo = this.getAdaptableInternalApi()
+            .getModuleService()
+            .getModuleInfoByModule(moduleName);
         if (!moduleInfo) {
             this.logError(`${moduleName} module does not exist`);
             return;

package/src/Api/Implementation/ShortcutApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { ShortcutApi } from '../ShortcutApi';
-import { Shortcut, ShortcutState } from '../../PredefinedConfig/ShortcutState';
+import { Shortcut, ShortcutState } from '../../AdaptableState/ShortcutState';
 export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getShortcutState(): ShortcutState;
     getShortcuts(config?: {

package/src/Api/Implementation/SmartEditApiImpl.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { SmartEditApi } from '../SmartEditApi';
 import { SmartEditCustomOperation, SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {