@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.0

package/src/Api/Implementation/ActionRowApiImpl.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionRowApiImpl = void 0;
-const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
-const ApiBase_1 = require("./ApiBase");
-const ActionRowInternalApi_1 = require("../Internal/ActionRowInternalApi");
-class ActionRowApiImpl extends ApiBase_1.ApiBase {
+import { PopupShowForm } from '../../Redux/ActionsReducers/PopupRedux';
+import { ApiBase } from './ApiBase';
+import { ActionRowInternalApi } from '../Internal/ActionRowInternalApi';
+export class ActionRowApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new ActionRowInternalApi_1.ActionRowInternalApi(adaptable);
+        this.internalApi = new ActionRowInternalApi(adaptable);
     }
     getActionRowButtons() {
         var actionRowButtons = this.getActionRowOptions().actionRowButtons;
@@ -27,7 +24,7 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
             this.logWarn(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
         const editForm = this.internalApi.buildRowEditForm(rowNode);
-        this.dispatchAction((0, PopupRedux_1.PopupShowForm)({
+        this.dispatchAction(PopupShowForm({
             Id: 'edit_row_form',
             Form: editForm,
             // formProps are added to the formContext
@@ -38,7 +35,7 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
     }
     displayCreateActionRow() {
         const createForm = this.internalApi.buildRowCreateForm();
-        this.dispatchAction((0, PopupRedux_1.PopupShowForm)({
+        this.dispatchAction(PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,
         }));
@@ -49,7 +46,7 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
             this.logWarn(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);
         }
         const createForm = this.internalApi.buildRowCreateForm(rowNode);
-        this.dispatchAction((0, PopupRedux_1.PopupShowForm)({
+        this.dispatchAction(PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,
             // formProps are added to the formContext
@@ -59,4 +56,3 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
         }));
     }
 }
-exports.ActionRowApiImpl = ActionRowApiImpl;

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

@@ -22,13 +22,11 @@ import { PlusMinusApi } from '../PlusMinusApi';
 import { QuickSearchApi } from '../QuickSearchApi';
 import { ShortcutApi } from '../ShortcutApi';
 import { SmartEditApi } from '../SmartEditApi';
-import { FilterApi } from '../FilterApi';
 import { SystemStatusApi } from '../SystemStatusApi';
 import { UserInterfaceApi } from '../UserInterfaceApi';
 import { ThemeApi } from '../ThemeApi';
 import { GridApi } from '../GridApi';
 import { ScheduleApi } from '../ScheduleApi';
-import { QueryApi } from '../QueryApi';
 import { ExpressionApi } from '../ExpressionApi';
 import { TeamSharingApi } from '../TeamSharingApi';
 import { ColumnApi } from '../ColumnApi';
@@ -45,6 +43,9 @@ import { ActionRowApi } from '../ActionRowApi';
 import { NotesApi } from '../NotesAPi';
 import { Fdc3Api } from '../Fdc3Api';
 import { DataImportApiImpl } from './DataImportApiImpl';
+import { GridFilterApi } from '../GridFilterApi';
+import { NamedQueryApiImpl } from './NamedQueryApiImpl';
+import { ColumnFilterApi } from '../ColumnFilterApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     internalApi: AdaptableInternalApi;
@@ -76,12 +77,11 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     scheduleApi: ScheduleApi;
     shortcutApi: ShortcutApi;
     smartEditApi: SmartEditApi;
-    filterApi: FilterApi;
+    columnFilterApi: ColumnFilterApi;
     systemStatusApi: SystemStatusApi;
     pluginsApi: PluginsApi;
     themeApi: ThemeApi;
     userInterfaceApi: UserInterfaceApi;
-    queryApi: QueryApi;
     expressionApi: ExpressionApi;
     settingsPanelApi: SettingsPanelApi;
     styledColumnApi: StyledColumnApi;
@@ -94,6 +94,8 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     notesApi: NotesApi;
     fdc3Api: Fdc3Api;
     dataImportApi: DataImportApiImpl;
+    gridFilterApi: GridFilterApi;
+    namedQueryApi: NamedQueryApiImpl;
     private destroyed;
     constructor(adaptable: IAdaptable);
     /**

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -1,106 +1,105 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableApiImpl = void 0;
-const AlertApiImpl_1 = require("./AlertApiImpl");
-const StatusBarApiImpl_1 = require("./StatusBarApiImpl");
-const PredicateApiImpl_1 = require("./PredicateApiImpl");
-const PluginsApiImpl_1 = require("./PluginsApiImpl");
-const BulkUpdateApiImpl_1 = require("./BulkUpdateApiImpl");
-const CalculatedColumnApiImpl_1 = require("./CalculatedColumnApiImpl");
-const CellSummaryApiImpl_1 = require("./CellSummaryApiImpl");
-const ConfigApiImpl_1 = require("./ConfigApiImpl");
-const CustomSortApiImpl_1 = require("./CustomSortApiImpl");
-const DashboardApiImpl_1 = require("./DashboardApiImpl");
-const ToolPanelApiImpl_1 = require("./ToolPanelApiImpl");
-const DataSetApiImpl_1 = require("./DataSetApiImpl");
-const EventApiImpl_1 = require("./EventApiImpl");
-const ExportApiImpl_1 = require("./ExportApiImpl");
-const FormatColumnApiImpl_1 = require("./FormatColumnApiImpl");
-const FreeTextColumnApiImpl_1 = require("./FreeTextColumnApiImpl");
-const GridApiImpl_1 = require("./GridApiImpl");
-const LayoutApiImpl_1 = require("./LayoutApiImpl");
-const PlusMinusApiImpl_1 = require("./PlusMinusApiImpl");
-const QuickSearchApiImpl_1 = require("./QuickSearchApiImpl");
-const ShortcutApiImpl_1 = require("./ShortcutApiImpl");
-const SmartEditApiImpl_1 = require("./SmartEditApiImpl");
-const FilterApiImpl_1 = require("./FilterApiImpl");
-const SystemStatusApiImpl_1 = require("./SystemStatusApiImpl");
-const ThemeApiImpl_1 = require("./ThemeApiImpl");
-const UserInterfaceApiImpl_1 = require("./UserInterfaceApiImpl");
-const AdaptableInternalApi_1 = require("../Internal/AdaptableInternalApi");
-const ScheduleApiImpl_1 = require("./ScheduleApiImpl");
-const QueryApiImpl_1 = require("./QueryApiImpl");
-const TeamSharingApiImpl_1 = require("./TeamSharingApiImpl");
-const ColumnApiImpl_1 = require("./ColumnApiImpl");
-const ApplicationApiImpl_1 = require("./ApplicationApiImpl");
-const ScopeApiImpl_1 = require("./ScopeApiImpl");
-const DataChangeHistoryApiImpl_1 = require("./DataChangeHistoryApiImpl");
-const ExpressionApiImpl_1 = require("./ExpressionApiImpl");
-const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
-const ChartingApiImpl_1 = require("./ChartingApiImpl");
-const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
-const ActionColumnApiImpl_1 = require("./ActionColumnApiImpl");
-const ActionRowApiImpl_1 = require("./ActionRowApiImpl");
-const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
-const CalendarApiImpl_1 = require("./CalendarApiImpl");
-const EntitlementApiImpl_1 = require("./EntitlementApiImpl");
-const OptionsApiImpl_1 = require("./OptionsApiImpl");
-const NotesApiImpl_1 = require("./NotesApiImpl");
-const Fdc3ApiImpl_1 = require("./Fdc3ApiImpl");
-const DataImportApiImpl_1 = require("./DataImportApiImpl");
-class AdaptableApiImpl {
+import { AlertApiImpl } from './AlertApiImpl';
+import { StatusBarApiImpl } from './StatusBarApiImpl';
+import { PredicateApiImpl } from './PredicateApiImpl';
+import { PluginsApiImpl } from './PluginsApiImpl';
+import { BulkUpdateApiImpl } from './BulkUpdateApiImpl';
+import { CalculatedColumnApiImpl } from './CalculatedColumnApiImpl';
+import { CellSummaryApiImpl } from './CellSummaryApiImpl';
+import { ConfigApiImpl } from './ConfigApiImpl';
+import { CustomSortApiImpl } from './CustomSortApiImpl';
+import { DashboardApiImpl } from './DashboardApiImpl';
+import { ToolPanelApiImpl } from './ToolPanelApiImpl';
+import { DataSetApiImpl } from './DataSetApiImpl';
+import { EventApiImpl } from './EventApiImpl';
+import { ExportApiImpl } from './ExportApiImpl';
+import { FormatColumnApiImpl } from './FormatColumnApiImpl';
+import { FreeTextColumnApiImpl } from './FreeTextColumnApiImpl';
+import { GridApiImpl } from './GridApiImpl';
+import { LayoutApiImpl } from './LayoutApiImpl';
+import { PlusMinusApiImpl } from './PlusMinusApiImpl';
+import { QuickSearchApiImpl } from './QuickSearchApiImpl';
+import { ShortcutApiImpl } from './ShortcutApiImpl';
+import { SmartEditApiImpl } from './SmartEditApiImpl';
+import { SystemStatusApiImpl } from './SystemStatusApiImpl';
+import { ThemeApiImpl } from './ThemeApiImpl';
+import { UserInterfaceApiImpl } from './UserInterfaceApiImpl';
+import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
+import { ScheduleApiImpl } from './ScheduleApiImpl';
+import { TeamSharingApiImpl } from './TeamSharingApiImpl';
+import { ColumnApiImpl } from './ColumnApiImpl';
+import { ApplicationApiImpl } from './ApplicationApiImpl';
+import { ScopeApiImpl } from './ScopeApiImpl';
+import { DataChangeHistoryApiImpl } from './DataChangeHistoryApiImpl';
+import { ExpressionApiImpl } from './ExpressionApiImpl';
+import { FlashingCellApiImpl } from './FlashingCellApiImpl';
+import { ChartingApiImpl } from './ChartingApiImpl';
+import { SettingsPanelApiImpl } from './SettingsPanelApiImpl';
+import { ActionColumnApiImpl } from './ActionColumnApiImpl';
+import { ActionRowApiImpl } from './ActionRowApiImpl';
+import { StyledColumnApiImpl } from './StyledColumnApiImpl';
+import { CalendarApiImpl } from './CalendarApiImpl';
+import { EntitlementApiImpl } from './EntitlementApiImpl';
+import { OptionsApiImpl } from './OptionsApiImpl';
+import { NotesApiImpl } from './NotesApiImpl';
+import { Fdc3ApiImpl } from './Fdc3ApiImpl';
+import { DataImportApiImpl } from './DataImportApiImpl';
+import { GridFilterApiImpl } from './GridFilterApiImpl';
+import { NamedQueryApiImpl } from './NamedQueryApiImpl';
+import { ColumnFilterApiImpl } from './ColumnFilterApiImpl';
+export class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
         this.destroyed = false;
         this.adaptable = adaptable;
-        this.optionsApi = new OptionsApiImpl_1.OptionsApiImpl(adaptable);
-        this.actionColumnApi = new ActionColumnApiImpl_1.ActionColumnApiImpl(adaptable);
-        this.actionRowApi = new ActionRowApiImpl_1.ActionRowApiImpl(adaptable);
-        this.applicationApi = new ApplicationApiImpl_1.ApplicationApiImpl(adaptable);
-        this.alertApi = new AlertApiImpl_1.AlertApiImpl(adaptable);
-        this.flashingCellApi = new FlashingCellApiImpl_1.FlashingCellApiImpl(adaptable);
-        this.predicateApi = new PredicateApiImpl_1.PredicateApiImpl(adaptable);
-        this.pluginsApi = new PluginsApiImpl_1.PluginsApiImpl(adaptable);
-        this.bulkUpdateApi = new BulkUpdateApiImpl_1.BulkUpdateApiImpl(adaptable);
-        this.calendarApi = new CalendarApiImpl_1.CalendarApiImpl(adaptable);
-        this.calculatedColumnApi = new CalculatedColumnApiImpl_1.CalculatedColumnApiImpl(adaptable);
-        this.cellSummaryApi = new CellSummaryApiImpl_1.CellSummaryApiImpl(adaptable);
-        this.columnApi = new ColumnApiImpl_1.ColumnApiImpl(adaptable);
-        this.configApi = new ConfigApiImpl_1.ConfigApiImpl(adaptable);
-        this.customSortApi = new CustomSortApiImpl_1.CustomSortApiImpl(adaptable);
-        this.dashboardApi = new DashboardApiImpl_1.DashboardApiImpl(adaptable);
-        this.dataSetApi = new DataSetApiImpl_1.DataSetApiImpl(adaptable);
-        this.entitlementApi = new EntitlementApiImpl_1.EntitlementApiImpl(adaptable);
-        this.eventApi = new EventApiImpl_1.EventApiImpl(adaptable);
-        this.exportApi = new ExportApiImpl_1.ExportApiImpl(adaptable);
-        this.formatColumnApi = new FormatColumnApiImpl_1.FormatColumnApiImpl(adaptable);
-        this.freeTextColumnApi = new FreeTextColumnApiImpl_1.FreeTextColumnApiImpl(adaptable);
-        this.gridApi = new GridApiImpl_1.GridApiImpl(adaptable);
-        this.layoutApi = new LayoutApiImpl_1.LayoutApiImpl(adaptable);
-        this.plusMinusApi = new PlusMinusApiImpl_1.PlusMinusApiImpl(adaptable);
-        this.quickSearchApi = new QuickSearchApiImpl_1.QuickSearchApiImpl(adaptable);
-        this.scheduleApi = new ScheduleApiImpl_1.ScheduleApiImpl(adaptable);
-        this.shortcutApi = new ShortcutApiImpl_1.ShortcutApiImpl(adaptable);
-        this.smartEditApi = new SmartEditApiImpl_1.SmartEditApiImpl(adaptable);
-        this.filterApi = new FilterApiImpl_1.FilterApiImpl(adaptable);
-        this.systemStatusApi = new SystemStatusApiImpl_1.SystemStatusApiImpl(adaptable);
-        this.settingsPanelApi = new SettingsPanelApiImpl_1.SettingsPanelApiImpl(adaptable);
-        this.themeApi = new ThemeApiImpl_1.ThemeApiImpl(adaptable);
-        this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
-        this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);
-        this.expressionApi = new ExpressionApiImpl_1.ExpressionApiImpl(adaptable);
-        this.styledColumnApi = new StyledColumnApiImpl_1.StyledColumnApiImpl(adaptable);
-        this.toolPanelApi = new ToolPanelApiImpl_1.ToolPanelApiImpl(adaptable);
-        this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
-        this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);
-        this.dataChangeHistoryApi = new DataChangeHistoryApiImpl_1.DataChangeHistoryApiImpl(adaptable);
-        this.chartingApi = new ChartingApiImpl_1.ChartingApiImpl(adaptable);
-        this.statusBarApi = new StatusBarApiImpl_1.StatusBarApiImpl(adaptable);
-        this.notesApi = new NotesApiImpl_1.NotesApiImpl(adaptable);
-        this.fdc3Api = new Fdc3ApiImpl_1.Fdc3ApiImpl(adaptable);
-        this.dataImportApi = new DataImportApiImpl_1.DataImportApiImpl(adaptable);
+        this.optionsApi = new OptionsApiImpl(adaptable);
+        this.actionColumnApi = new ActionColumnApiImpl(adaptable);
+        this.actionRowApi = new ActionRowApiImpl(adaptable);
+        this.applicationApi = new ApplicationApiImpl(adaptable);
+        this.alertApi = new AlertApiImpl(adaptable);
+        this.flashingCellApi = new FlashingCellApiImpl(adaptable);
+        this.predicateApi = new PredicateApiImpl(adaptable);
+        this.pluginsApi = new PluginsApiImpl(adaptable);
+        this.bulkUpdateApi = new BulkUpdateApiImpl(adaptable);
+        this.calendarApi = new CalendarApiImpl(adaptable);
+        this.calculatedColumnApi = new CalculatedColumnApiImpl(adaptable);
+        this.cellSummaryApi = new CellSummaryApiImpl(adaptable);
+        this.columnApi = new ColumnApiImpl(adaptable);
+        this.configApi = new ConfigApiImpl(adaptable);
+        this.customSortApi = new CustomSortApiImpl(adaptable);
+        this.dashboardApi = new DashboardApiImpl(adaptable);
+        this.dataSetApi = new DataSetApiImpl(adaptable);
+        this.entitlementApi = new EntitlementApiImpl(adaptable);
+        this.eventApi = new EventApiImpl(adaptable);
+        this.exportApi = new ExportApiImpl(adaptable);
+        this.formatColumnApi = new FormatColumnApiImpl(adaptable);
+        this.freeTextColumnApi = new FreeTextColumnApiImpl(adaptable);
+        this.gridApi = new GridApiImpl(adaptable);
+        this.layoutApi = new LayoutApiImpl(adaptable);
+        this.plusMinusApi = new PlusMinusApiImpl(adaptable);
+        this.quickSearchApi = new QuickSearchApiImpl(adaptable);
+        this.scheduleApi = new ScheduleApiImpl(adaptable);
+        this.shortcutApi = new ShortcutApiImpl(adaptable);
+        this.smartEditApi = new SmartEditApiImpl(adaptable);
+        this.systemStatusApi = new SystemStatusApiImpl(adaptable);
+        this.settingsPanelApi = new SettingsPanelApiImpl(adaptable);
+        this.themeApi = new ThemeApiImpl(adaptable);
+        this.userInterfaceApi = new UserInterfaceApiImpl(adaptable);
+        this.namedQueryApi = new NamedQueryApiImpl(adaptable);
+        this.expressionApi = new ExpressionApiImpl(adaptable);
+        this.styledColumnApi = new StyledColumnApiImpl(adaptable);
+        this.toolPanelApi = new ToolPanelApiImpl(adaptable);
+        this.teamSharingApi = new TeamSharingApiImpl(adaptable);
+        this.scopeApi = new ScopeApiImpl(adaptable);
+        this.dataChangeHistoryApi = new DataChangeHistoryApiImpl(adaptable);
+        this.chartingApi = new ChartingApiImpl(adaptable);
+        this.statusBarApi = new StatusBarApiImpl(adaptable);
+        this.notesApi = new NotesApiImpl(adaptable);
+        this.fdc3Api = new Fdc3ApiImpl(adaptable);
+        this.dataImportApi = new DataImportApiImpl(adaptable);
+        this.gridFilterApi = new GridFilterApiImpl(adaptable);
+        this.columnFilterApi = new ColumnFilterApiImpl(adaptable);
         // adaptable internal api
-        this.internalApi = new AdaptableInternalApi_1.AdaptableInternalApi(adaptable);
+        this.internalApi = new AdaptableInternalApi(adaptable);
     }
     /**
      * This is only meant to be called by the Adaptable instance.
@@ -126,7 +125,8 @@ class AdaptableApiImpl {
         this.dataSetApi = null;
         this.eventApi = null;
         this.exportApi = null;
-        this.filterApi = null;
+        this.columnApi = null;
+        this.namedQueryApi = null;
         this.flashingCellApi = null;
         this.formatColumnApi = null;
         this.freeTextColumnApi = null;
@@ -136,7 +136,6 @@ class AdaptableApiImpl {
         this.pluginsApi = null;
         this.plusMinusApi = null;
         this.predicateApi = null;
-        this.queryApi = null;
         this.expressionApi = null;
         this.quickSearchApi = null;
         this.scheduleApi = null;
@@ -177,4 +176,3 @@ class AdaptableApiImpl {
         this.adaptable.logger.consoleWarn(message, optionalParams);
     }
 }
-exports.AdaptableApiImpl = AdaptableApiImpl;

package/src/Api/Implementation/AlertApiImpl.js

@@ -1,20 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlertApiImpl = void 0;
-const tslib_1 = require("tslib");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
-const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
-const ApiBase_1 = require("./ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const AlertInternalApi_1 = require("../Internal/AlertInternalApi");
-class AlertApiImpl extends ApiBase_1.ApiBase {
+import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
+import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
+import { ApiBase } from './ApiBase';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import { AlertInternalApi } from '../Internal/AlertInternalApi';
+export class AlertApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new AlertInternalApi_1.AlertInternalApi(adaptable);
+        this.internalApi = new AlertInternalApi(adaptable);
     }
     getAlertState() {
         return this.getAdaptableState().Alert;
@@ -86,13 +82,13 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             // 4.JumpToCell and 5.JumpToRow are exclusive, based on alertType!
             // 4: Jump to the Cell
             if (alertProperties.JumpToCell &&
-                (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(alertToShow) &&
+                isAdaptableCellChangedAlert(alertToShow) &&
                 alertToShow.cellDataChangedInfo) {
                 this.adaptable.jumpToCell(alertToShow.cellDataChangedInfo.column.columnId, alertToShow.cellDataChangedInfo.rowNode);
             }
             // 5: Jump to the Row
             else if (alertProperties.JumpToRow &&
-                (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(alertToShow) &&
+                isAdaptableRowChangedAlert(alertToShow) &&
                 ((_a = alertToShow.gridDataChangedInfo) === null || _a === void 0 ? void 0 : _a.rowTrigger) === 'Add') {
                 const [firstRowNode] = alertToShow.gridDataChangedInfo.rowNodes;
                 if (firstRowNode) {
@@ -101,7 +97,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             // 6: For CellChanged Alerts either Highlight the cell or row
             // for former - we just refresh the cells to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
-            if ((0, AdaptableAlert_1.isAdaptableCellChangedAlert)(alertToShow) &&
+            if (isAdaptableCellChangedAlert(alertToShow) &&
                 alertToShow.cellDataChangedInfo &&
                 (alertProperties.HighlightCell || alertProperties.HighlightRow)) {
                 let alertNode = alertToShow.cellDataChangedInfo.rowNode;
@@ -125,7 +121,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             // 7. For RowChange Alerts only Highlight the row - we just refresh the rows to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
             else if (alertProperties.HighlightRow &&
-                (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(alertToShow) &&
+                isAdaptableRowChangedAlert(alertToShow) &&
                 ((_b = alertToShow.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowTrigger) === 'Add') {
                 this.adaptable.api.gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
                 setTimeout(() => {
@@ -138,8 +134,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(PopupRedux.PopupShowAlert(alert));
     }
     async showAlert(alertHeader, alertMessage, messageType, alertProperties) {
-        const alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages(messageType, alertProperties);
-        let alertToShow = ObjectFactory_1.default.CreateGenericAlert(alertHeader, alertMessage, alertDefinition);
+        const alertDefinition = ObjectFactory.CreateInternalAlertDefinitionForMessages(messageType, alertProperties);
+        let alertToShow = ObjectFactory.CreateGenericAlert(alertHeader, alertMessage, alertDefinition);
         await this.showAdaptableAlert(alertToShow);
     }
     async showAlertInfo(alertHeader, alertMessage, alertProperties) {
@@ -207,7 +203,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         // columns referenced in rule expression
         const ruleExpression = this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (this.getAdaptableApi().scopeApi.scopeIsAll(alertDefinition.Scope) &&
-            StringExtensions_1.default.IsNotNullOrEmpty(ruleExpression)) {
+            StringExtensions.IsNotNullOrEmpty(ruleExpression)) {
             // return only first referenced column (otherwise we would generate multiple alerts for the same row)
             const queryColumns = this.getAdaptableApi()
                 .internalApi.getQueryLanguageService()
@@ -244,4 +240,3 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         return cellDataChangeInfos;
     }
 }
-exports.AlertApiImpl = AlertApiImpl;

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

@@ -7,20 +7,8 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QueryApi, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
-import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
-import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NotesOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
-import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
-import { ColumnOptions } from '../../AdaptableOptions/ColumnOptions';
-import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
-import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
-import { ExpressionApi } from '../ExpressionApi';
-import { CalendarOptions } from '../../AdaptableOptions/CalendarOptions';
-import { Fdc3Api } from '../Fdc3Api';
-import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
-import { NotesOptions } from '../../AdaptableOptions/NotesOptions';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
     /**
@@ -78,7 +66,7 @@ export declare abstract class ApiBase {
     protected getGroupingOptions(): GroupingOptions;
     protected getLayoutOptions(): LayoutOptions;
     protected getMenuOptions(): MenuOptions;
-    protected getFilterOptions(): FilterOptions;
+    protected getColumnFilterOptions(): ColumnFilterOptions;
     protected getExpressionOptions(): ExpressionOptions;
     protected getPredicateOptions(): PredicateOptions;
     protected getQuickSearchOptions(): QuickSearchOptions;
@@ -116,16 +104,17 @@ export declare abstract class ApiBase {
     protected getFreeTextColumnApi(): FreeTextColumnApi;
     protected getGridApi(): GridApi;
     protected getLayoutApi(): LayoutApi;
+    protected getGridFilterApi(): GridFilterApi;
+    protected getColumnFilterApi(): ColumnFilterApi;
     protected getPlusMinusApi(): PlusMinusApi;
     protected getQuickSearchApi(): QuickSearchApi;
     protected getScheduleApi(): ScheduleApi;
     protected getShortcutApi(): ShortcutApi;
     protected getSmartEditApi(): SmartEditApi;
-    protected getFilterApi(): FilterApi;
     protected getSystemStatusApi(): SystemStatusApi;
     protected getThemeApi(): ThemeApi;
     protected getUserInterfaceApi(): UserInterfaceApi;
-    protected getQueryApi(): QueryApi;
+    protected getNamedQueryApi(): NamedQueryApi;
     protected getExpressionApi(): ExpressionApi;
     protected getPluginsApi(): PluginsApi;
     protected getSettingsPanelApi(): SettingsPanelApi;

package/src/Api/Implementation/ApiBase.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiBase = void 0;
-const tslib_1 = require("tslib");
-const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const Uuid_1 = require("../../PredefinedConfig/Uuid");
+import Helper from '../../Utilities/Helpers/Helper';
+import { createUuid } from '../../PredefinedConfig/Uuid';
 // Base class for the Api - provides checking dispatching methods
-class ApiBase {
+export class ApiBase {
     /**
      * Constructor for all the api classes which simply takes and assigns an instance of Adaptable
      * @param adaptable the core IAdaptable object
@@ -34,7 +30,7 @@ class ApiBase {
      * @param type the actual type of the object being checked
      */
     checkItemExists(item, name, type) {
-        if (Helper_1.default.objectNotExists(item)) {
+        if (Helper.objectNotExists(item)) {
             this.logError(`No ${type} found with the name: ${name}`);
             return false;
         }
@@ -78,7 +74,7 @@ class ApiBase {
     // It's generally done in Redux also but no harm checking in Api also in case we missed it.
     addUidToAdaptableObject(adaptableObject) {
         if (!adaptableObject.Uuid) {
-            adaptableObject.Uuid = (0, Uuid_1.createUuid)();
+            adaptableObject.Uuid = createUuid();
         }
     }
     getModuleInfoByModuleId(module) {
@@ -144,8 +140,8 @@ class ApiBase {
     getMenuOptions() {
         return this.getOptions().menuOptions;
     }
-    getFilterOptions() {
-        return this.getOptions().filterOptions;
+    getColumnFilterOptions() {
+        return this.getOptions().columnFilterOptions;
     }
     getExpressionOptions() {
         return this.getOptions().expressionOptions;
@@ -258,6 +254,12 @@ class ApiBase {
     getLayoutApi() {
         return this.getAdaptableApi().layoutApi;
     }
+    getGridFilterApi() {
+        return this.getAdaptableApi().gridFilterApi;
+    }
+    getColumnFilterApi() {
+        return this.getAdaptableApi().columnFilterApi;
+    }
     getPlusMinusApi() {
         return this.getAdaptableApi().plusMinusApi;
     }
@@ -273,9 +275,6 @@ class ApiBase {
     getSmartEditApi() {
         return this.getAdaptableApi().smartEditApi;
     }
-    getFilterApi() {
-        return this.getAdaptableApi().filterApi;
-    }
     getSystemStatusApi() {
         return this.getAdaptableApi().systemStatusApi;
     }
@@ -285,8 +284,8 @@ class ApiBase {
     getUserInterfaceApi() {
         return this.getAdaptableApi().userInterfaceApi;
     }
-    getQueryApi() {
-        return this.getAdaptableApi().queryApi;
+    getNamedQueryApi() {
+        return this.getAdaptableApi().namedQueryApi;
     }
     getExpressionApi() {
         return this.getAdaptableApi().expressionApi;
@@ -325,4 +324,3 @@ class ApiBase {
         delete this.adaptable;
     }
 }
-exports.ApiBase = ApiBase;

package/src/Api/Implementation/ApplicationApiImpl.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApplicationApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
-const ApplicationRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ApplicationRedux"));
-class ApplicationApiImpl extends ApiBase_1.ApiBase {
+import { ApiBase } from './ApiBase';
+import * as ApplicationRedux from '../../Redux/ActionsReducers/ApplicationRedux';
+export class ApplicationApiImpl extends ApiBase {
     getApplicationState() {
         return this.getAdaptableState().Application;
     }
@@ -36,4 +32,3 @@ class ApplicationApiImpl extends ApiBase_1.ApiBase {
         return entries.filter((e) => e.Value === value);
     }
 }
-exports.ApplicationApiImpl = ApplicationApiImpl;

package/src/Api/Implementation/BulkUpdateApiImpl.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BulkUpdateApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-class BulkUpdateApiImpl extends ApiBase_1.ApiBase {
+import { ApiBase } from './ApiBase';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
+import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+export class BulkUpdateApiImpl extends ApiBase {
     getBulkUpdateValue() {
         return this.getAdaptableState().System.BulkUpdateValue;
     }
@@ -23,4 +19,3 @@ class BulkUpdateApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(SystemRedux.BulkUpdateChangeValue(bulkUpdateValue));
     }
 }
-exports.BulkUpdateApiImpl = BulkUpdateApiImpl;

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CalculatedColumnApiImpl = void 0;
-const tslib_1 = require("tslib");
-const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
-const ApiBase_1 = require("./ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
-class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
+import * as CalculatedColumnRedux from '../../Redux/ActionsReducers/CalculatedColumnRedux';
+import { ApiBase } from './ApiBase';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import { CalculatedColumnInternalApi } from '../Internal/CalculatedColumnInternalApi';
+export class CalculatedColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new CalculatedColumnInternalApi_1.CalculatedColumnInternalApi(adaptable);
+        this.internalApi = new CalculatedColumnInternalApi(adaptable);
     }
     getCalculatedColumnState() {
         return this.getAdaptableState().CalculatedColumn;
@@ -75,4 +71,3 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
 }
-exports.CalculatedColumnApiImpl = CalculatedColumnApiImpl;