@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const PlusMinusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PlusMinusRedux"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class PlusMinusApiImpl extends ApiBase_1.ApiBase {
     getPlusMinusState() {
         return this.getAdaptableState().PlusMinus;
@@ -31,10 +30,6 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
     applyPlusMinus(cellUpdateRequests) {
         this.dispatchAction(PlusMinusRedux.PlusMinusApply(cellUpdateRequests));
     }
-    showPlusMinusPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'PlusMinusApi', 'showPlusMinusPopup', 'openPlusMinusSettingsPanel');
-        this.openPlusMinusSettingsPanel();
-    }
     openPlusMinusSettingsPanel() {
         this.showModulePopup(ModuleConstants.PlusMinusModuleId);
     }

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
 import { PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId, AdaptableScope } from '../../types';
+import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnPredicate } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
@@ -16,16 +16,9 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getCustomPredicateDefById(predicateId: string): AdaptablePredicateDef;
     predicateToString(predicate: AdaptableColumnPredicate): string | undefined;
     isValidPredicate(predicate: AdaptableColumnPredicate | undefined): boolean;
-    arePredicatesValid(predicates: AdaptablePredicate[]): boolean;
     isEveryPredicateValid(predicates: AdaptablePredicate[]): boolean;
     handleColumnPredicate(predicate: AdaptableColumnPredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     handleColumnPredicates(predicates: AdaptableColumnPredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
-    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
-    hasPredicateValues(predicate: AdaptablePredicate): boolean;
-    getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
-    getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
-    getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
-    getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -6,7 +6,6 @@ const ApiBase_1 = require("./ApiBase");
 const AdaptablePredicate_1 = require("../../PredefinedConfig/Common/AdaptablePredicate");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const PredicateInternalApi_1 = require("../Internal/PredicateInternalApi");
 class PredicateApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -20,7 +19,8 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         return AdaptablePredicate_1.SystemPredicateDefs;
     }
     getCustomPredicateDefs() {
-        return this.getAdaptableQLOptions().customPredicateDefs;
+        var _a;
+        return (_a = this.getAdaptableQLOptions().predicateOptions) === null || _a === void 0 ? void 0 : _a.customPredicateDefs;
     }
     getPredicateDefsByModuleScope(moduleScope) {
         return this.getPredicateDefs().filter((p) => p.moduleScope.includes(moduleScope));
@@ -67,10 +67,6 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         return !(['Values', 'ExcludeValues'].includes(predicate.PredicateId) &&
             ArrayExtensions_1.default.IsNullOrEmpty(predicate.Inputs));
     }
-    arePredicatesValid(predicates) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'PredicateApi', 'arePredicatesValid', 'isEveryPredicateValid');
-        return this.isEveryPredicateValid(predicates);
-    }
     isEveryPredicateValid(predicates) {
         return predicates.every((predicate) => this.isValidPredicate(predicate));
     }
@@ -115,29 +111,5 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         }
         return predicates === null || predicates === void 0 ? void 0 : predicates.every((p) => this.handlePredicate(p, params, defaultReturn));
     }
-    getEqualityPredicateForDataType(dataType) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getEqualityPredicateForDataType');
-        return this.internalApi.getEqualityPredicateForDataType(dataType);
-    }
-    hasPredicateValues(predicate) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'hasPredicateValues');
-        return this.internalApi.hasPredicateValues(predicate);
-    }
-    getFilterPredicateDefs(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFilterPredicateDefs');
-        return this.internalApi.getFilterPredicateDefs(scope);
-    }
-    getAlertPredicateDefs(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getAlertPredicateDefs');
-        return this.internalApi.getAlertPredicateDefs(scope);
-    }
-    getFormatColumnPredicateDefs(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFormatColumnPredicateDefs');
-        return this.internalApi.getFormatColumnPredicateDefs(scope);
-    }
-    getFlashingCellPredicateDefs(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFlashingCellPredicateDefs');
-        return this.internalApi.getFlashingCellPredicateDefs(scope);
-    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

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

@@ -7,20 +7,15 @@ export declare class QueryApiImpl extends ApiBase implements QueryApi {
     internalApi: QueryInternalApi;
     constructor(adaptable: IAdaptable);
     getQueryState(): QueryState;
-    getAllNamedQuery(): NamedQuery[];
     getNamedQueries(): NamedQuery[];
     getNamedQueryByName(namedQueryName: string): NamedQuery | undefined;
     isValidNamedQueryName(namedQuery: NamedQuery): {
         valid: boolean;
         message: string;
     };
-    showQueryPopup(): void;
     openQuerySettingsPanel(): void;
     setCurrentQuery(query: string): void;
     clearCurrentQuery(): void;
     getCurrentQuery(): string | undefined;
-    getReferencedNamedQueryNames(expression?: string): string[];
-    getNamedQueryModuleReferences(namedQueryName: string): string[];
     expandCurrentQuery(query?: string): void;
-    fireQueryRunEvent(): void;
 }

package/src/Api/Implementation/QueryApiImpl.js

@@ -8,7 +8,6 @@ const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions"
 const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 const windowFactory_1 = require("../../View/Components/Popups/WindowPopups/windowFactory");
 const QueryInternalApi_1 = require("../Internal/QueryInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class QueryApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -17,10 +16,6 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
     getQueryState() {
         return this.getAdaptableState().Query;
     }
-    getAllNamedQuery() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QueryApi', 'getAllNamedQuery', 'getNamedQueries');
-        return this.getNamedQueries();
-    }
     getNamedQueries() {
         return this.getQueryState().NamedQueries || [];
     }
@@ -41,10 +36,6 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         }
         return { valid: true, message: '' };
     }
-    showQueryPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QueryApi', 'showQueryPopup', 'openQuerySettingsPanel');
-        this.openQuerySettingsPanel();
-    }
     openQuerySettingsPanel() {
         this.showModulePopup(ModuleConstants.QueryModuleId);
     }
@@ -57,14 +48,6 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
     getCurrentQuery() {
         return this.getQueryState().CurrentQuery;
     }
-    getReferencedNamedQueryNames(expression = '') {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'getReferencedNamedQueryNames');
-        return this.internalApi.getReferencedNamedQueryNames(expression);
-    }
-    getNamedQueryModuleReferences(namedQueryName) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'getNamedQueryModuleReferences');
-        return this.internalApi.getNamedQueryModuleReferences(namedQueryName);
-    }
     expandCurrentQuery(query) {
         const preparedQuery = query !== null && query !== void 0 ? query : this.getCurrentQuery();
         this.getAdaptableApi().internalApi.showPopupWindow({
@@ -77,9 +60,5 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
             },
         });
     }
-    fireQueryRunEvent() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'QueryApi', 'fireQueryRunEvent');
-        this.internalApi.fireQueryRunEvent();
-    }
 }
 exports.QueryApiImpl = QueryApiImpl;

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

@@ -9,6 +9,5 @@ export declare class QuickSearchApiImpl extends ApiBase implements QuickSearchAp
     getQuickSearchValue(): string;
     getQuickSearchStyle(): AdaptableStyle;
     setQuickSearchStyle(style: AdaptableStyle): void;
-    showQuickSearchPopup(): void;
     openQuickSearchSettingsPanel(): void;
 }

package/src/Api/Implementation/QuickSearchApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class QuickSearchApiImpl extends ApiBase_1.ApiBase {
     getQuickSearchState() {
         return this.getAdaptableState().QuickSearch;
@@ -25,10 +24,6 @@ class QuickSearchApiImpl extends ApiBase_1.ApiBase {
     setQuickSearchStyle(style) {
         this.dispatchAction(QuickSearchRedux.QuickSearchSetStyle(style));
     }
-    showQuickSearchPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'QuickSearchApi', 'showQuickSearchPopup', 'openQuickSearchSettingsPanel');
-        this.openQuickSearchSettingsPanel();
-    }
     openQuickSearchSettingsPanel() {
         this.showModulePopup(ModuleConstants.QuickSearchModuleId);
     }

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

@@ -1,4 +1,4 @@
-import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
+import { ApiBase } from './ApiBase';
 import { ScheduleApi } from '../ScheduleApi';
 import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
 import { ReportSchedule } from '../../PredefinedConfig/ExportState';
@@ -8,68 +8,52 @@ import { OpenFinSchedule } from '../../PredefinedConfig/OpenFinState';
 import { ReminderSchedule, ScheduleState } from '../../PredefinedConfig/ScheduleState';
 export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     getScheduleState(): ScheduleState;
-    getAllSchedule(): BaseSchedule[];
     getSchedules(): BaseSchedule[];
-    getAllReminderSchedule(config?: LayoutAssociatedObjectLoadConfig): ReminderSchedule[];
     getReminderSchedules(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): ReminderSchedule[];
     getScheduleById(id: BaseSchedule['Uuid']): BaseSchedule;
-    getAllActiveReminderSchedule(): ReminderSchedule[];
     getActiveReminderSchedules(): ReminderSchedule[];
-    getAllSuspendedReminderSchedule(): ReminderSchedule[];
     getSuspendedReminderSchedules(): ReminderSchedule[];
     addReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     deleteReminderSchedule(schedule: ReminderSchedule): void;
     editReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     suspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
     unSuspendReminderSchedule(schedule: ReminderSchedule): ReminderSchedule;
-    getAllReportSchedule(config?: LayoutAssociatedObjectLoadConfig): ReportSchedule[];
     getReportSchedules(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): ReportSchedule[];
-    getAllActiveReportSchedule(): ReportSchedule[];
     getActiveReportSchedules(): ReportSchedule[];
-    getAllSuspendedReportSchedule(): ReportSchedule[];
     getSuspendedReportSchedules(): ReportSchedule[];
     addReportSchedule(schedule: ReportSchedule): ReportSchedule;
     editReportSchedule(schedule: ReportSchedule): ReportSchedule;
     deleteReportSchedule(schedule: ReportSchedule): void;
     suspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
     unSuspendReportSchedule(schedule: ReportSchedule): ReportSchedule;
-    getAllIPushPullSchedule(config?: LayoutAssociatedObjectLoadConfig): IPushPullSchedule[];
     getIPushPullSchedules(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): IPushPullSchedule[];
-    getAllActiveIPushPullSchedule(): IPushPullSchedule[];
     getActiveIPushPullSchedules(): IPushPullSchedule[];
-    getAllSuspendedIPushPullSchedule(): IPushPullSchedule[];
     getSuspendedIPushPullSchedules(): IPushPullSchedule[];
     addIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
     editIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
     deleteIPushPullSchedule(schedule: IPushPullSchedule): void;
     suspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
     unSuspendIPushPullSchedule(schedule: IPushPullSchedule): IPushPullSchedule;
-    getAllGlue42Schedule(config?: LayoutAssociatedObjectLoadConfig): Glue42Schedule[];
     getGlue42Schedules(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): Glue42Schedule[];
-    getAllActiveGlue42Schedule(): Glue42Schedule[];
     getActiveGlue42Schedules(): Glue42Schedule[];
-    getAllSuspendedGlue42Schedule(): Glue42Schedule[];
     getSuspendedGlue42Schedules(): Glue42Schedule[];
     addGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
     editGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
     deleteGlue42Schedule(schedule: Glue42Schedule): void;
     suspendGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
     unSuspendGlue42Schedule(schedule: Glue42Schedule): Glue42Schedule;
-    getAllOpenFinSchedule(config?: LayoutAssociatedObjectLoadConfig): OpenFinSchedule[];
     getOpenFinSchedules(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): OpenFinSchedule[];
-    getAllActiveOpenFinSchedule(): OpenFinSchedule[];
     getActiveOpenFinSchedules(): OpenFinSchedule[];
-    getAllSuspendedOpenFinSchedule(): OpenFinSchedule[];
     getSuspendedOpenFinSchedules(): OpenFinSchedule[];
     addOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;
     editOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;
@@ -77,6 +61,5 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     suspendOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;
     unSuspendOpenFinSchedule(schedule: OpenFinSchedule): OpenFinSchedule;
     applySchedule(schedule: BaseSchedule, scheduleType: 'Report' | 'ipushpull' | 'Glue42' | 'Reminder' | 'OpenFin'): void;
-    showSchedulePopup(): void;
     openScheduleSettingsPanel(): void;
 }

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -5,15 +5,10 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ScheduleRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ScheduleRedux"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class ScheduleApiImpl extends ApiBase_1.ApiBase {
     getScheduleState() {
         return this.getAdaptableState().Schedule;
     }
-    getAllSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSchedule', 'getSchedules');
-        return this.getSchedules();
-    }
     getSchedules() {
         let allSchedules = [];
         allSchedules.push(...this.getReminderSchedules());
@@ -23,10 +18,6 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         allSchedules.push(...this.getOpenFinSchedules());
         return allSchedules;
     }
-    getAllReminderSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllReminderSchedule', 'getReminderSchedules');
-        return this.getReminderSchedules(config);
-    }
     getReminderSchedules(config) {
         var _a;
         return ((_a = this.handleLayoutAssociatedObjects(this.getScheduleState().Reminders, 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
@@ -34,17 +25,9 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
     getScheduleById(id) {
         return this.getSchedules().find((schedule) => (schedule === null || schedule === void 0 ? void 0 : schedule.Uuid) === id);
     }
-    getAllActiveReminderSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveReminderSchedule', 'getActiveReminderSchedules');
-        return this.getActiveReminderSchedules();
-    }
     getActiveReminderSchedules() {
         return this.getReminderSchedules().filter((schedule) => !schedule.IsSuspended);
     }
-    getAllSuspendedReminderSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedReminderSchedule', 'getSuspendedReminderSchedules');
-        return this.getSuspendedReminderSchedules();
-    }
     getSuspendedReminderSchedules() {
         return this.getReminderSchedules().filter((schedule) => schedule.IsSuspended);
     }
@@ -67,25 +50,13 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ScheduleRedux.ReminderScheduleUnSuspend(schedule));
         return this.getScheduleById(schedule.Uuid);
     }
-    getAllReportSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllReportSchedule', 'getReportSchedules');
-        return this.getReportSchedules();
-    }
     getReportSchedules(config) {
         var _a;
         return ((_a = this.handleLayoutAssociatedObjects(this.adaptable.api.exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
-    getAllActiveReportSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveReportSchedule', 'getActiveReportSchedules');
-        return this.getActiveReportSchedules();
-    }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
     }
-    getAllSuspendedReportSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedReportSchedule', 'getSuspendedReportSchedules');
-        return this.getSuspendedReportSchedules();
-    }
     getSuspendedReportSchedules() {
         return this.getReportSchedules().filter((schedule) => schedule.IsSuspended);
     }
@@ -108,26 +79,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ScheduleRedux.ReportScheduleUnSuspend(schedule));
         return this.getScheduleById(schedule.Uuid);
     }
-    getAllIPushPullSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllIPushPullSchedule', 'getIPushPullSchedules');
-        return this.getIPushPullSchedules();
-    }
     getIPushPullSchedules(config) {
         var _a;
         const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
-    getAllActiveIPushPullSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveIPushPullSchedule', 'getActiveIPushPullSchedules');
-        return this.getActiveIPushPullSchedules();
-    }
     getActiveIPushPullSchedules() {
         return this.getIPushPullSchedules().filter((schedule) => !schedule.IsSuspended);
     }
-    getAllSuspendedIPushPullSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedIPushPullSchedule', 'getSuspendedIPushPullSchedules');
-        return this.getSuspendedIPushPullSchedules();
-    }
     getSuspendedIPushPullSchedules() {
         return this.getIPushPullSchedules().filter((schedule) => schedule.IsSuspended);
     }
@@ -150,26 +109,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ScheduleRedux.IPushPullScheduleUnSuspend(schedule));
         return this.getScheduleById(schedule.Uuid);
     }
-    getAllGlue42Schedule(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllGlue42Schedule', 'getGlue42Schedules');
-        return this.getGlue42Schedules();
-    }
     getGlue42Schedules(config) {
         var _a;
         const glue42Api = this.adaptable.api.pluginsApi.getGlue42PluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(glue42Api === null || glue42Api === void 0 ? void 0 : glue42Api.getGlue42Schedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
-    getAllActiveGlue42Schedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveGlue42Schedule', 'getActiveGlue42Schedules');
-        return this.getActiveGlue42Schedules();
-    }
     getActiveGlue42Schedules() {
         return this.getGlue42Schedules().filter((schedule) => !schedule.IsSuspended);
     }
-    getAllSuspendedGlue42Schedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedGlue42Schedule', 'getSuspendedGlue42Schedules');
-        return this.getSuspendedGlue42Schedules();
-    }
     getSuspendedGlue42Schedules() {
         return this.getGlue42Schedules().filter((schedule) => schedule.IsSuspended);
     }
@@ -192,26 +139,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ScheduleRedux.Glue42ScheduleUnSuspend(schedule));
         return this.getScheduleById(schedule.Uuid);
     }
-    getAllOpenFinSchedule(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllOpenFinSchedule', 'getOpenFinSchedules');
-        return this.getOpenFinSchedules();
-    }
     getOpenFinSchedules(config) {
         var _a;
         const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
-    getAllActiveOpenFinSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllActiveOpenFinSchedule', 'getActiveOpenFinSchedules');
-        return this.getActiveOpenFinSchedules();
-    }
     getActiveOpenFinSchedules() {
         return this.getOpenFinSchedules().filter((schedule) => !schedule.IsSuspended);
     }
-    getAllSuspendedOpenFinSchedule() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'getAllSuspendedOpenFinSchedule', 'getSuspendedOpenFinSchedules');
-        return this.getSuspendedOpenFinSchedules();
-    }
     getSuspendedOpenFinSchedules() {
         return this.getOpenFinSchedules().filter((schedule) => schedule.IsSuspended);
     }
@@ -283,10 +218,6 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         // now also send the action to Store so it can be audited if required
         this.dispatchAction(ScheduleRedux.ScheduleJobRun(schedule, scheduleType));
     }
-    showSchedulePopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ScheduleApi', 'showSchedulePopup', 'openScheduleSettingsPanel');
-        this.openScheduleSettingsPanel();
-    }
     openScheduleSettingsPanel() {
         this.showModulePopup(ModuleConstants.ScheduleModuleId);
     }

package/src/Api/Implementation/ScopeApiImpl.js

@@ -118,7 +118,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     isPrimaryKeyColumnInScopeColumns(scope) {
         return ('ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            scope.ColumnIds.find((c) => c == this.adaptable.api.internalApi.getPrimaryKey()) != null);
+            scope.ColumnIds.find((c) => c == this.adaptable.api.optionsApi.getPrimaryKey()) != null);
     }
     getScopeToString(scope) {
         if ('All' in scope) {

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

@@ -2,8 +2,6 @@ import { SettingsPanelApi } from '../SettingsPanelApi';
 import { ApiBase } from './ApiBase';
 import { AdaptableModule } from '../../../types';
 export declare class SettingsPanelApiImpl extends ApiBase implements SettingsPanelApi {
-    showSettingsPanel(moduleName?: AdaptableModule): void;
     openSettingsPanel(moduleName?: AdaptableModule): void;
-    showCustomSettingsPanel(name: string): void;
     openCustomSettingsPanel(name: string): void;
 }

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -4,12 +4,7 @@ exports.SettingsPanelApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class SettingsPanelApiImpl extends ApiBase_1.ApiBase {
-    showSettingsPanel(moduleName) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SettingsPanelApi', 'showSettingsPanel', 'openSettingsPanel');
-        this.openSettingsPanel(moduleName);
-    }
     openSettingsPanel(moduleName) {
         const moduleInfo = this.adaptable.ModuleService.getModuleInfoByModule(moduleName);
         if (!moduleInfo) {
@@ -18,10 +13,6 @@ class SettingsPanelApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo.Popup));
     }
-    showCustomSettingsPanel(name) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SettingsPanelApi', 'showCustomSettingsPanel', 'openCustomSettingsPanel');
-        this.openCustomSettingsPanel(name);
-    }
     openCustomSettingsPanel(name) {
         this.dispatchAction(PopupRedux.PopupShowScreen(null, name));
     }

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

@@ -1,23 +1,18 @@
-import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
+import { ApiBase } from './ApiBase';
 import { ShortcutApi } from '../ShortcutApi';
 import { Shortcut, ShortcutState } from '../../PredefinedConfig/ShortcutState';
 export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getShortcutState(): ShortcutState;
-    getAllShortcut(config?: LayoutAssociatedObjectLoadConfig): Shortcut[];
     getShortcuts(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): Shortcut[];
     getShortcutById(id: Shortcut['Uuid']): Shortcut;
-    getAllActiveShortcut(): Shortcut[];
     getActiveShortcuts(): Shortcut[];
-    getAllSuspendedShortcut(): Shortcut[];
     getSuspendedShortcuts(): Shortcut[];
     addShortcut(shortcut: Shortcut): Shortcut;
     deleteShortcut(shortcut: Shortcut): void;
-    deleteAllShortcut(): void;
     deleteAllShortcuts(): void;
     suspendShortcut(shortcut: Shortcut): Shortcut;
     unSuspendShortcut(shortcut: Shortcut): Shortcut;
-    showShortcutPopup(): void;
     openShortcutSettingsPanel(): void;
 }

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -5,15 +5,10 @@ const tslib_1 = require("tslib");
 const ShortcutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ShortcutRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class ShortcutApiImpl extends ApiBase_1.ApiBase {
     getShortcutState() {
         return this.getAdaptableState().Shortcut;
     }
-    getAllShortcut(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllShortcut', 'getShortcuts');
-        return this.getShortcuts(config);
-    }
     getShortcuts(config) {
         var _a;
         return ((_a = this.handleLayoutAssociatedObjects(this.getShortcutState().Shortcuts, 'Shortcut', config)) !== null && _a !== void 0 ? _a : []);
@@ -21,17 +16,9 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
     getShortcutById(id) {
         return this.getShortcuts().find((shortcut) => (shortcut === null || shortcut === void 0 ? void 0 : shortcut.Uuid) === id);
     }
-    getAllActiveShortcut() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllActiveShortcut', 'getActiveShortcuts');
-        return this.getActiveShortcuts();
-    }
     getActiveShortcuts() {
         return this.getShortcuts().filter((shortcut) => !shortcut.IsSuspended);
     }
-    getAllSuspendedShortcut() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'getAllSuspendedShortcut', 'getSuspendedShortcuts');
-        return this.getSuspendedShortcuts();
-    }
     getSuspendedShortcuts() {
         return this.getShortcuts().filter((shortcut) => shortcut.IsSuspended);
     }
@@ -43,10 +30,6 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
     deleteShortcut(shortcut) {
         this.dispatchAction(ShortcutRedux.ShortcutDelete(shortcut));
     }
-    deleteAllShortcut() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'deleteAllShortcut', 'deleteAllShortcuts');
-        this.deleteAllShortcuts();
-    }
     deleteAllShortcuts() {
         this.getShortcuts().forEach((s) => {
             this.deleteShortcut(s);
@@ -60,10 +43,6 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ShortcutRedux.ShortcutUnSuspend(shortcut));
         return this.getShortcutById(shortcut.Uuid);
     }
-    showShortcutPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ShortcutApi', 'showShortcutPopup', 'openShortcutSettingsPanel');
-        this.openShortcutSettingsPanel();
-    }
     openShortcutSettingsPanel() {
         this.showModulePopup(ModuleConstants.ShortcutModuleId);
     }

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

@@ -8,7 +8,6 @@ export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
     getSmartEditOperation(): SmartEditOperation;
     setSmartEditValue(smartEditValue: number): void;
     getSmartEditValue(): number;
-    showSmartEditPopup(): void;
     openSmartEditSettingsPanel(): void;
     applySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
     getSmartEditCustomOperations(): SmartEditCustomOperation[];

package/src/Api/Implementation/SmartEditApiImpl.js

@@ -6,7 +6,6 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ApiBase_1 = require("./ApiBase");
 const SmartEditRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SmartEditRedux"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class SmartEditApiImpl extends ApiBase_1.ApiBase {
     setSmartEditOperation(mathOperation) {
         this.dispatchAction(SystemRedux.SmartEditChangeOperation(mathOperation));
@@ -20,10 +19,6 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
     getSmartEditValue() {
         return this.getAdaptableState().System.SmartEditValue;
     }
-    showSmartEditPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SmartEditApi', 'showSmartEditPopup', 'openSmartEditSettingsPanel');
-        this.openSmartEditSettingsPanel();
-    }
     openSmartEditSettingsPanel() {
         this.showModulePopup(ModuleConstants.SmartEditModuleId);
     }

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

@@ -1,4 +1,4 @@
-import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
+import { ApiBase } from './ApiBase';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { StyledColumn, StyledColumnState } from '../../PredefinedConfig/StyledColumnState';
 import { AdaptableColumn } from '../../types';
@@ -8,16 +8,12 @@ export declare class StyledColumnApiImpl extends ApiBase implements StyledColumn
     internalApi: StyledColumnInternalApi;
     constructor(adaptable: IAdaptable);
     getStyledColumnState(): StyledColumnState;
-    getAllStyledColumn(config?: LayoutAssociatedObjectLoadConfig): StyledColumn[];
     getStyledColumns(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): StyledColumn[];
     getStyledColumnById(id: StyledColumn['Uuid']): StyledColumn;
-    getStyledColumnByColumnId(id: StyledColumn['Uuid']): StyledColumn;
     getStyledColumnForColumnId(columnId: StyledColumn['ColumnId']): StyledColumn;
-    getAllActiveStyledColumn(): StyledColumn[];
     getActiveStyledColumns(): StyledColumn[];
-    getAllSuspendedStyledColumn(): StyledColumn[];
     getSuspendedStyledColumns(): StyledColumn[];
     deleteStyledColumn(styledColumn: StyledColumn): void;
     addStyledColumn(styledColumn: StyledColumn): void;