@adaptabletools/adaptable 13.0.0-canary.18 → 13.0.0-canary.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.18",
+  "version": "13.0.0-canary.19",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1663874702068;
+declare const _default: 1664114694163;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1663874702068;
+exports.default = 1664114694163;

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -30,7 +30,7 @@ export interface ExportOptions {
     /**
      * Reports run entirely by users (and not AdapTable)
      */
-    customReports?: CustomReport[];
+    serverReports?: ServerReport[];
     /**
      * System Reports to use; leave blank for all, empty array for none
      *
@@ -57,7 +57,7 @@ export declare type DataFormatType = 'rawValue' | 'formattedValue';
 /**
  * Defines a Report where all the data is provided entirely by the user
  */
-export interface CustomReport {
+export interface ServerReport {
     /**
      * Name of the Report
      */

package/src/Api/ExportApi.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../PredefinedConfig/ExportState';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, CustomReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
+import { CustomDestination, ServerReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 /**
  * Provides run-time access to the Export Module and Report state
@@ -50,7 +50,7 @@ export interface ExportApi {
     /**
      * Returns any Custom Reports that have been provided to Export Options
      */
-    getAllCustomReports(): CustomReport[] | undefined;
+    getAllServerReports(): ServerReport[] | undefined;
     /**
      * Retrieves System Reports section of Export State
      */
@@ -139,14 +139,14 @@ export interface ExportApi {
     exportVisualDataToExcel(): void;
     /**
      * Whether a Report is a Custom Report
-     * @param customReportName Report to Check
+     * @param report Report to Check
      */
-    isCustomReport(report: Report): boolean;
+    isServerReport(report: Report): boolean;
     /**
-     * Runs the report function of the CustomReport with the given reportName
+     * Runs the report function of the ServerReport with the given reportName
      * @param reportName custom report name
      */
-    runCustomReport(reportName: string): ReportData | undefined;
+    runServerReport(reportName: string): ReportData | undefined;
     /**
      * Returns the ReportData for the Report with the given name
      * @param reportName - the name of the report

package/src/Api/FormatColumnApi.d.ts

@@ -213,4 +213,14 @@ export interface FormatColumnApi {
      * @returns Format Columns with Expression
      */
     getFormatColumnsWithExpression(): FormatColumn[] | undefined;
+    /**
+     * Increment the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
+    /**
+     * Decrement the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
 }

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

@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ServerReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -30,8 +30,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     editReports(reports: Report[]): Report[];
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
-    getAllCustomReports(): CustomReport[] | undefined;
-    isCustomReport(report: Report): boolean;
-    runCustomReport(customReportName: string): ReportData | undefined;
+    getAllServerReports(): ServerReport[] | undefined;
+    isServerReport(report: Report): boolean;
+    runServerReport(serverReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -61,10 +61,10 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const customReports = this.getAllCustomReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
-            reports.push(...customReports.map((c) => {
-                return ObjectFactory_1.default.CreateCustomReport(c.name);
+        const serverReports = this.getAllServerReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
+            reports.push(...serverReports.map((c) => {
+                return ObjectFactory_1.default.CreateServerReport(c.name);
             }));
         }
         return reports;
@@ -120,7 +120,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.isCustomReport(report)) {
+        if (this.isServerReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities
@@ -178,21 +178,21 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
-    getAllCustomReports() {
-        return this.getExportOptions().customReports;
+    getAllServerReports() {
+        return this.getExportOptions().serverReports;
     }
-    isCustomReport(report) {
+    isServerReport(report) {
         var _a;
-        return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return ((_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
     }
-    runCustomReport(customReportName) {
+    runServerReport(serverReportName) {
         var _a;
-        const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
-        if (!customReport) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Custom Report '${customReportName}' not found!`);
+        const serverReport = (_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
+        if (!serverReport) {
+            (0, LoggingHelper_1.LogAdaptableWarning)(`Server Report '${serverReportName}' not found!`);
             return undefined;
         }
-        return customReport.onRunReport();
+        return serverReport.onRunReport();
     }
     getReportDataForReport(reportName) {
         const report = this.getReportByName(reportName);

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

@@ -68,4 +68,6 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     private shouldRunStyle;
     private evaluateExpression;
     getFormatColumnsWithExpression(): FormatColumn[] | undefined;
+    incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
+    decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
 }

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -265,5 +265,11 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnsWithExpression() {
         return this.getAllFormatColumn().filter((fc) => { var _a; return !!((_a = fc.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression); });
     }
+    incrementFormatColumnPrecedence(formatColumn) {
+        this.dispatchAction(FormatColumnRedux.FormatColumnMoveUp(formatColumn));
+    }
+    decrementFormatColumnPrecedence(formatColumn) {
+        this.dispatchAction(FormatColumnRedux.FormatColumnMoveDown(formatColumn));
+    }
 }
 exports.FormatColumnApiImpl = FormatColumnApiImpl;

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -51,7 +51,7 @@ export interface FormatColumn extends SuspendableObject {
     IncludeGroupedRows?: boolean;
 }
 /**
- * The Format Column Rule - can be either a Predicate or an Expression
+ * The Format Column Rule - can be either a Predicate or a BooleanExpression
  */
 export declare type FormatColumnRule = XOR<{
     Predicate: FormatColumnPredicate;
@@ -59,9 +59,11 @@ export declare type FormatColumnRule = XOR<{
 export interface FormatColumnPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFormatColumnPredicateId>;
 }
-declare type SystemFormatColumnPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
+export declare type SystemFormatColumnPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
 /**
  * Special Style used when Formatting Columns: Gradient, PercentBar or CheckBox
+ *
+ * @deprecated use StyledColumn instead
  */
 export interface ColumnStyle {
     /**
@@ -77,4 +79,3 @@ export interface ColumnStyle {
      */
     CheckBoxStyle?: boolean;
 }
-export {};

package/src/Redux/ActionsReducers/ConditionalStyleRedux.d.ts

@@ -1,28 +1,10 @@
 import * as Redux from 'redux';
 import { ConditionalStyleState, ConditionalStyle } from '../../PredefinedConfig/ConditionalStyleState';
-/**
- * @ReduxAction A Conditional Style has been added
- */
 export declare const CONDITIONAL_STYLE_ADD = "CONDITIONAL_STYLE_ADD";
-/**
- * @ReduxAction A Conditional Style has been edited
- */
 export declare const CONDITIONAL_STYLE_EDIT = "CONDITIONAL_STYLE_EDIT";
-/**
- * @ReduxAction A Conditional Style has been deleted
- */
 export declare const CONDITIONAL_STYLE_DELETE = "CONDITIONAL_STYLE_DELETE";
-/**
- * @ReduxAction Conditional Style Module is ready
- */
 export declare const CONDITIONAL_STYLE_READY = "CONDITIONAL_STYLE_READY";
-/**
- * @ReduxAction Conditional Style is suspended
- */
 export declare const CONDITIONAL_STYLE_SUSPEND = "CONDITIONAL_STYLE_SUSPEND";
-/**
- * @ReduxAction Conditional Style is unsuspended, or activated
- */
 export declare const CONDITIONAL_STYLE_UNSUSPEND = "CONDITIONAL_STYLE_UNSUSPEND";
 export interface ConditionalStyleAction extends Redux.Action {
     conditionalStyle: ConditionalStyle;

package/src/Redux/ActionsReducers/ConditionalStyleRedux.js

@@ -5,29 +5,11 @@ const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const utils_1 = require("./utils");
-/**
- * @ReduxAction A Conditional Style has been added
- */
 exports.CONDITIONAL_STYLE_ADD = 'CONDITIONAL_STYLE_ADD';
-/**
- * @ReduxAction A Conditional Style has been edited
- */
 exports.CONDITIONAL_STYLE_EDIT = 'CONDITIONAL_STYLE_EDIT';
-/**
- * @ReduxAction A Conditional Style has been deleted
- */
 exports.CONDITIONAL_STYLE_DELETE = 'CONDITIONAL_STYLE_DELETE';
-/**
- * @ReduxAction Conditional Style Module is ready
- */
 exports.CONDITIONAL_STYLE_READY = 'CONDITIONAL_STYLE_READY';
-/**
- * @ReduxAction Conditional Style is suspended
- */
 exports.CONDITIONAL_STYLE_SUSPEND = 'CONDITIONAL_STYLE_SUSPEND';
-/**
- * @ReduxAction Conditional Style is unsuspended, or activated
- */
 exports.CONDITIONAL_STYLE_UNSUSPEND = 'CONDITIONAL_STYLE_UNSUSPEND';
 const ConditionalStyleAdd = (conditionalStyle) => ({
     type: exports.CONDITIONAL_STYLE_ADD,

package/src/Redux/ActionsReducers/PluginsRedux.d.ts

@@ -162,19 +162,19 @@ export declare const GLUE42_LIVE_REPORT_CLEAR = "GLUE42_LIVE_REPORT_CLEAR";
 /**
  * @ReduxAction Glue43 is now available
  */
-export declare const SET_GLUE42_AVAILABLE_ON = "SET_GLUE42_AVAILABLE_ON";
+export declare const GLUE42_SET_AVAILABLE_ON = "GLUE42_SET_AVAILABLE_ON";
 /**
  * @ReduxAction Glue43 is no longer available
  */
-export declare const SET_GLUE42_AVAILABLE_OFF = "SET_GLUE42_AVAILABLE_OFF";
+export declare const GLUE42_SET_AVAILABLE_OFF = "GLUE42_SET_AVAILABLE_OFF";
 /**
  * @ReduxAction Glue43 is now running
  */
-export declare const SET_GLUE42_RUNNING_ON = "SET_GLUE42_RUNNING_ON";
+export declare const GLUE42_SET_RUNNING_ON = "GLUE42_SET_RUNNING_ON";
 /**
  * @ReduxAction Glue43 is no longer running
  */
-export declare const SET_GLUE42_RUNNING_OFF = "SET_GLUE42_RUNNING_OFF";
+export declare const GLUE42_SET_RUNNING_OFF = "SET_GLGLUE42_SET_RUNNING_OFFUE42_RUNNING_OFF";
 export interface PluginsAction extends Redux.Action {
     pluginState: any;
     pluginId: string;

package/src/Redux/ActionsReducers/PluginsRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginsReducer = exports.PluginsSetPluginState = exports.SET_GLUE42_RUNNING_OFF = exports.SET_GLUE42_RUNNING_ON = exports.SET_GLUE42_AVAILABLE_OFF = exports.SET_GLUE42_AVAILABLE_ON = exports.GLUE42_LIVE_REPORT_CLEAR = exports.GLUE42_LIVE_REPORT_SET = exports.GLUE42_STOP_LIVE_DATA = exports.GLUE42_START_LIVE_DATA = exports.GLUE42_SEND_SNAPSHOT = exports.GLUE42_SET_THROTTLE_TIME = exports.GLUE42_SET_LOGIN_ERROR_MESSAGE = exports.GLUE42_LOGIN = exports.OPENFIN_SET_CURRENT_REPORTNAME = exports.OPENFIN_SET_RUNNING_OFF = exports.OPENFIN_SET_RUNNING_ON = exports.OPENFIN_SET_AVAILABLE_OFF = exports.OPENFIN_SET_AVAILABLE_ON = exports.OPENFIN_LIVE_REPORT_CLEAR = exports.OPENFIN_LIVE_REPORT_SET = exports.OPENFIN_STOP_LIVE_DATA = exports.OPENFIN_START_LIVE_DATA = exports.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = exports.IPUSHPULL_SET_CURRENT_PAGE = exports.IPUSHPULL_SET_CURRENT_FOLDER = exports.IPUSHPULL_SET_CURRENT_REPORTNAME = exports.IPUSHPULL_DOMAIN_PAGES_CLEAR = exports.IPUSHPULL_DOMAIN_PAGES_SET = exports.IPUSHPULL_LIVE_REPORT_CLEAR = exports.IPUSHPULL_LIVE_REPORT_SET = exports.IPUSHPULL_SET_RUNNING_OFF = exports.IPUSHPULL_SET_RUNNING_ON = exports.IPUSHPULL_SET_AVAILABLE_OFF = exports.IPUSHPULL_SET_AVAILABLE_ON = exports.IPUSHPULL_SET_LOGIN_DETAILS = exports.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = exports.IPUSHPULL_LOGOUT = exports.IPUSHPULL_LOGIN = exports.IPUSHPULL_ADD_PAGE = exports.IPUSHPULL_STOP_LIVE_DATA = exports.IPUSHPULL_START_LIVE_DATA = exports.IPUSHPULL_REPORT_SELECT = exports.IPUSHPULL_SEND_SNAPSHOT = exports.IPUSHPULL_SET_THROTTLE_TIME = exports.PLUGINS_SET_PLUGIN_STATE = void 0;
+exports.PluginsReducer = exports.PluginsSetPluginState = exports.GLUE42_SET_RUNNING_OFF = exports.GLUE42_SET_RUNNING_ON = exports.GLUE42_SET_AVAILABLE_OFF = exports.GLUE42_SET_AVAILABLE_ON = exports.GLUE42_LIVE_REPORT_CLEAR = exports.GLUE42_LIVE_REPORT_SET = exports.GLUE42_STOP_LIVE_DATA = exports.GLUE42_START_LIVE_DATA = exports.GLUE42_SEND_SNAPSHOT = exports.GLUE42_SET_THROTTLE_TIME = exports.GLUE42_SET_LOGIN_ERROR_MESSAGE = exports.GLUE42_LOGIN = exports.OPENFIN_SET_CURRENT_REPORTNAME = exports.OPENFIN_SET_RUNNING_OFF = exports.OPENFIN_SET_RUNNING_ON = exports.OPENFIN_SET_AVAILABLE_OFF = exports.OPENFIN_SET_AVAILABLE_ON = exports.OPENFIN_LIVE_REPORT_CLEAR = exports.OPENFIN_LIVE_REPORT_SET = exports.OPENFIN_STOP_LIVE_DATA = exports.OPENFIN_START_LIVE_DATA = exports.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = exports.IPUSHPULL_SET_CURRENT_PAGE = exports.IPUSHPULL_SET_CURRENT_FOLDER = exports.IPUSHPULL_SET_CURRENT_REPORTNAME = exports.IPUSHPULL_DOMAIN_PAGES_CLEAR = exports.IPUSHPULL_DOMAIN_PAGES_SET = exports.IPUSHPULL_LIVE_REPORT_CLEAR = exports.IPUSHPULL_LIVE_REPORT_SET = exports.IPUSHPULL_SET_RUNNING_OFF = exports.IPUSHPULL_SET_RUNNING_ON = exports.IPUSHPULL_SET_AVAILABLE_OFF = exports.IPUSHPULL_SET_AVAILABLE_ON = exports.IPUSHPULL_SET_LOGIN_DETAILS = exports.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = exports.IPUSHPULL_LOGOUT = exports.IPUSHPULL_LOGIN = exports.IPUSHPULL_ADD_PAGE = exports.IPUSHPULL_STOP_LIVE_DATA = exports.IPUSHPULL_START_LIVE_DATA = exports.IPUSHPULL_REPORT_SELECT = exports.IPUSHPULL_SEND_SNAPSHOT = exports.IPUSHPULL_SET_THROTTLE_TIME = exports.PLUGINS_SET_PLUGIN_STATE = void 0;
 /**
  * @ReduxAction Plugins have been instantiated
  */
@@ -164,19 +164,19 @@ exports.GLUE42_LIVE_REPORT_CLEAR = 'GLUE42_LIVE_REPORT_CLEAR';
 /**
  * @ReduxAction Glue43 is now available
  */
-exports.SET_GLUE42_AVAILABLE_ON = 'SET_GLUE42_AVAILABLE_ON';
+exports.GLUE42_SET_AVAILABLE_ON = 'GLUE42_SET_AVAILABLE_ON';
 /**
  * @ReduxAction Glue43 is no longer available
  */
-exports.SET_GLUE42_AVAILABLE_OFF = 'SET_GLUE42_AVAILABLE_OFF';
+exports.GLUE42_SET_AVAILABLE_OFF = 'GLUE42_SET_AVAILABLE_OFF';
 /**
  * @ReduxAction Glue43 is now running
  */
-exports.SET_GLUE42_RUNNING_ON = 'SET_GLUE42_RUNNING_ON';
+exports.GLUE42_SET_RUNNING_ON = 'GLUE42_SET_RUNNING_ON';
 /**
  * @ReduxAction Glue43 is no longer running
  */
-exports.SET_GLUE42_RUNNING_OFF = 'SET_GLUE42_RUNNING_OFF';
+exports.GLUE42_SET_RUNNING_OFF = 'SET_GLGLUE42_SET_RUNNING_OFFUE42_RUNNING_OFF';
 const PluginsSetPluginState = (pluginId, pluginState) => ({
     type: exports.PLUGINS_SET_PLUGIN_STATE,
     pluginId,

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -119,7 +119,7 @@ exports.DefaultAdaptableOptions = {
         exportFormatType: 'rawValue',
         exportDateFormat: undefined,
         customDestinations: undefined,
-        customReports: undefined,
+        serverReports: undefined,
         appendFileTimestamp: false,
         systemExportDestinations: [
             Enums_1.ExportDestination.Excel,

package/src/Utilities/ObjectFactory.d.ts

@@ -40,7 +40,7 @@ export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
 export declare function CreateEmptyReport(): Report;
-export declare function CreateCustomReport(reportName: string): Report;
+export declare function CreateServerReport(reportName: string): Report;
 export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
@@ -82,7 +82,7 @@ export declare const ObjectFactory: {
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
-    CreateCustomReport: typeof CreateCustomReport;
+    CreateServerReport: typeof CreateServerReport;
     CreateEmptyReport: typeof CreateEmptyReport;
     CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
     CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateCustomReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -130,7 +130,7 @@ function CreateEmptyReport() {
     };
 }
 exports.CreateEmptyReport = CreateEmptyReport;
-function CreateCustomReport(reportName) {
+function CreateServerReport(reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
         Name: reportName,
@@ -140,7 +140,7 @@ function CreateCustomReport(reportName) {
         Query: undefined,
     };
 }
-exports.CreateCustomReport = CreateCustomReport;
+exports.CreateServerReport = CreateServerReport;
 function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -447,7 +447,7 @@ exports.ObjectFactory = {
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
-    CreateCustomReport,
+    CreateServerReport,
     CreateEmptyReport,
     CreateEmptyBaseSchedule,
     CreateEmptyReminderSchedule,

package/src/Utilities/Services/ReportService.js

@@ -91,7 +91,7 @@ class ReportService {
     }
     GetReportColumnScopeShortDescription(report) {
         var _a, _b;
-        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+        if (this.adaptableApi.exportApi.isServerReport(report)) {
             return ['[Custom Columns]'];
         }
         switch (report.ReportColumnScope) {
@@ -109,7 +109,7 @@ class ReportService {
         }
     }
     GetReportColumnScopeLongDescription(report) {
-        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+        if (this.adaptableApi.exportApi.isServerReport(report)) {
             return '[Custom Columns]';
         }
         switch (report.ReportColumnScope) {
@@ -124,7 +124,7 @@ class ReportService {
         }
     }
     GetReportExpressionDescription(report, cols) {
-        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+        if (this.adaptableApi.exportApi.isServerReport(report)) {
             return '[Custom Data]';
         }
         if (this.IsSystemReport(report.Name)) {
@@ -160,7 +160,7 @@ class ReportService {
     GetReportColumnsForReport(report, includePrimaryKey = false) {
         let reportColumns = [];
         let gridColumns = this.adaptableApi.columnApi.getColumns();
-        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+        if (this.adaptableApi.exportApi.isServerReport(report)) {
             return reportColumns;
         }
         // first get the cols depending on the Column Scope
@@ -204,8 +204,8 @@ class ReportService {
             friendlyName: column.friendlyName,
             dataType: column.dataType,
         }));
-        if (this.adaptableApi.exportApi.isCustomReport(report)) {
-            return this.adaptableApi.exportApi.runCustomReport(report.Name);
+        if (this.adaptableApi.exportApi.isServerReport(report)) {
+            return this.adaptableApi.exportApi.runServerReport(report.Name);
         }
         if (ArrayExtensions_1.default.IsNullOrEmpty(columns)) {
             return { columns: [], rows: [] };

package/src/View/Export/ExportViewPanel.js

@@ -84,7 +84,7 @@ class ExportViewPanelComponent extends React.Component {
                 React.createElement(DropdownButton_1.default, { disabled: currentReportId === constants_1.SELECT_REPORT_STRING, width: "100%", fontSize: "small", items: destinationItems, columns: ['label'], className: `ab-${elementType}__Export__export`, onClear: () => this.onSelectedDestinationChanged(null), showClearButton: !!currentDestination, variant: "outlined", marginRight: 2 }, currentDestinationId)),
             React.createElement(rebass_1.Flex, { className: (0, join_1.default)(accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Export__controls`), style: { width: '100%' } },
                 React.createElement(ButtonExport_1.ButtonExport, { onClick: () => onApplyExport(), tooltip: "Export Report", className: `ab-${elementType}__Export__export`, disabled: currentReport == null || currentDestination == null }),
-                React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || this.props.api.exportApi.isCustomReport(currentReport), accessLevel: accessLevel }),
+                React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || this.props.api.exportApi.isServerReport(currentReport), accessLevel: accessLevel }),
                 React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => this.props.onNewReport(this.props.moduleInfo.Popup), tooltip: "Create New Report", accessLevel: accessLevel }),
                 React.createElement(ButtonDelete_1.ButtonDelete, { tooltip: "Delete Report", className: `ab-${elementType}__Export__delete`, disabled: currentReport == null, ConfirmAction: ExportRedux.ReportDelete(currentReport), ConfirmationMsg: deleteMessage, ConfirmationTitle: 'Delete Report', accessLevel: accessLevel }),
                 this.props.api.internalApi
@@ -102,9 +102,9 @@ class ExportViewPanelComponent extends React.Component {
             ...this.props.api.exportApi.getAvailableSystemReports(),
             ...this.props.UserReports.map((r) => r.Name),
         ];
-        const customReports = this.props.api.exportApi.getAllCustomReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
-            reportNames.push(...customReports.map((r) => r.name));
+        const serverReports = this.props.api.exportApi.getAllServerReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
+            reportNames.push(...serverReports.map((r) => r.name));
         }
         return reportNames;
     }

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection.js

@@ -104,15 +104,11 @@ const StyledColumnWizardStyleSection = (props) => {
     };
     // percentbar
     const onUpdatePercentBarStyleColumnComparison = (columnComparison) => {
-        const PercentBarStyle = {
-            ColumnComparison: columnComparison,
-        };
+        const PercentBarStyle = Object.assign(Object.assign({}, data.PercentBarStyle), { ColumnComparison: columnComparison });
         props.onChange(Object.assign(Object.assign({}, data), { PercentBarStyle }));
     };
     const onUpdatePercentBarStyleRanges = (ranges) => {
-        const PercentBarStyle = {
-            CellRanges: ranges,
-        };
+        const PercentBarStyle = Object.assign(Object.assign({}, data.PercentBarStyle), { CellRanges: ranges });
         props.onChange(Object.assign(Object.assign({}, data), { PercentBarStyle }));
     };
     const onPercentBarCellTextCellValueChanged = (checked) => {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1931,17 +1931,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
-    CustomReport: {
-        name: string;
-        kind: string;
-        description: string;
-        properties: {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-        }[];
-    };
     CustomSettingsPanel: {
         name: string;
         kind: string;
@@ -3050,6 +3039,11 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
+    FormatColumnRule: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     FormatColumnState: {
         name: string;
         kind: string;
@@ -4511,6 +4505,17 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    ServerReport: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+        }[];
+    };
     SettingsPanelApi: {
         name: string;
         kind: string;