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

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

@@ -13,6 +13,7 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getAllActiveFormatColumn(): FormatColumn[];
     getAllSuspendedFormatColumn(): FormatColumn[];
     getAllFormatColumnWithStyle(): FormatColumn[];
+    getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
     getAllFormatColumnWithDisplayFormat(): FormatColumn[];
     getAllFormatColumnWithCellAlignment(): FormatColumn[];
     addFormatColumn(formatColumn: FormatColumn): FormatColumn;
@@ -25,16 +26,24 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     suspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     unSuspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     applyFormatColumnDisplayFormats(): void;
-    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getColumnFormatColumnsWithStyle(column: AdaptableColumn): FormatColumn[];
-    getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
-    getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn[];
-    getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsForColumnId(columnId: string, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
     private getFormatColumnInColumnScope;
-    private getAppropriateFormatColumn;
+    private getFormatColumnWithColumnInScope;
     hasStyleFormatColumns(): boolean;
     showFormatColumnPopup(): void;
     getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
@@ -47,10 +56,11 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
     getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
     getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
-    isFormatColumnActiveForRow(formatColumn: FormatColumn, params: {
+    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
         node: RowNode;
-    }): boolean;
-    isFormatColumnActiveForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        value: any;
+    }): FormatColumn[];
+    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
         node: RowNode;
         value: any;
     }): boolean;
@@ -58,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

@@ -27,13 +27,16 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAllFormatColumn().filter((formatColumn) => formatColumn.IsSuspended);
     }
     getAllFormatColumnWithStyle() {
-        return this.getAllFormatColumn().filter((fc) => fc.Style != null || fc.CellAlignment);
+        return this.getAllFormatColumn().filter((fc) => fc.Style);
+    }
+    getAllFormatColumnWithStyleAndCellAlignment() {
+        return this.getAllFormatColumn().filter((fc) => fc.Style || fc.CellAlignment);
     }
     getAllFormatColumnWithDisplayFormat() {
-        return this.getAllFormatColumn().filter((fc) => fc.DisplayFormat != null);
+        return this.getAllFormatColumn().filter((fc) => fc.DisplayFormat);
     }
     getAllFormatColumnWithCellAlignment() {
-        return this.getAllFormatColumn().filter((fc) => fc.CellAlignment != null);
+        return this.getAllFormatColumn().filter((fc) => fc.CellAlignment);
     }
     addFormatColumn(formatColumn) {
         this.addUidToAdaptableObject(formatColumn);
@@ -77,37 +80,27 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     applyFormatColumnDisplayFormats() {
         throw 'This API method is deprecated - it is not needed anymore.';
     }
-    getActiveFormatColumnForColumn(column) {
-        const formatColumns = this.getAllActiveFormatColumn();
-        return this.getAppropriateFormatColumn(formatColumns, column);
-    }
-    getColumnFormatColumnsWithStyle(column) {
-        const formatColumns = this.getAllFormatColumnWithStyle();
-        return this.getFormatColumnInColumnScope(formatColumns, column).filter((scopedFormatColumn) => {
-            return this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope);
-        });
+    getFormatColumnsForColumn(column, config) {
+        const formatColumns = this.getAllFormatColumn().filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeSuspended) || !formatColumn.IsSuspended);
+        return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
-    getFormatColumnForColumn(column) {
-        const formatColumns = this.getAllFormatColumn();
-        return this.getAppropriateFormatColumn(formatColumns, column);
+    getFormatColumnsWithStyleForColumn(column, config) {
+        const formatColumns = this.getAllFormatColumnWithStyleAndCellAlignment().filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeSuspended) || !formatColumn.IsSuspended);
+        return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
-    getFormatColumnForColumnId(columnId) {
+    getFormatColumnsForColumnId(columnId, config) {
         const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
         if (!abColumn) {
             return undefined;
         }
-        return this.getFormatColumnForColumn(abColumn);
+        return this.getFormatColumnsForColumn(abColumn, config);
     }
-    getFormatColumnWithStyleForColumn(column) {
-        const formatColumns = this.getAllFormatColumnWithStyle();
-        return this.getAppropriateFormatColumn(formatColumns, column);
+    getFormatColumnWithStyleClassNameForColumn(column, config) {
+        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions_1.default.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
     }
-    getFormatColumnWithStyleClassNameForColumn(column) {
-        return this.getColumnFormatColumnsWithStyle(column).filter((fc) => { var _a; return StringExtensions_1.default.IsNotNullOrEmpty((_a = fc === null || fc === void 0 ? void 0 : fc.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
-    }
-    getFormatColumnWithDisplayFormatForColumn(column) {
-        const formatColumns = this.getAllFormatColumnWithDisplayFormat();
-        return this.getAppropriateFormatColumn(formatColumns, column);
+    getFormatColumnsWithDisplayFormatForColumn(column, config) {
+        const formatColumns = this.getAllFormatColumnWithDisplayFormat().filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeSuspended) || !formatColumn.IsSuspended);
+        return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     getFormatColumnWithSingleColumnScope(columnId) {
         const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
@@ -126,7 +119,8 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         });
         return returnFormatColumn;
     }
-    getFormatColumnInColumnScope(formatColumns, column) {
+    // TODO is this really needed, I don't think it achieves anything
+    getFormatColumnInColumnScope(formatColumns) {
         // we need to maintain the format columns order, therefore we will extract all 3 scope types in a single iteration
         return formatColumns.filter((fc) => {
             return (
@@ -138,8 +132,8 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
                 this.adaptable.api.scopeApi.scopeIsAll(fc.Scope));
         });
     }
-    getAppropriateFormatColumn(formatColumns, column) {
-        return this.getFormatColumnInColumnScope(formatColumns, column).find((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
+    getFormatColumnWithColumnInScope(formatColumns, column) {
+        return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
     }
     hasStyleFormatColumns() {
         return ArrayExtensions_1.default.IsNotNullOrEmpty(this.getAllFormatColumnWithStyle());
@@ -214,50 +208,35 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnDefsForScope(scope) {
         return this.getFormatColumnPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
-    isFormatColumnActiveForRow(formatColumn, params) {
-        // suspedned is important to be first
+    getFormatColumnsRelevantForColumn(formatColumns, column, params) {
+        return formatColumns.filter((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));
+    }
+    isFormatColumnRelevantForColumn(formatColumn, column, params) {
+        // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
         }
         if (!formatColumn.Rule) {
             return true;
         }
-        if (this.shouldRunStyle(formatColumn, params.node) &&
-            formatColumn.Rule.BooleanExpression &&
-            this.evaluateExpression(formatColumn, params.node)) {
-            return true;
-        }
-        // nothing has passed then return false
-        return false;
-    }
-    isFormatColumnActiveForColumn(formatColumn, column, params) {
-        // suspedned is important to be first
-        if (formatColumn.IsSuspended) {
+        if (!formatColumn.IncludeGroupedRows &&
+            this.adaptable.api.gridApi.isGroupRowNode(params.node)) {
             return false;
         }
-        if (!formatColumn.Rule) {
-            return true;
+        // first run the predicate
+        if (formatColumn.Rule.Predicate && formatColumn.Rule.Predicate.PredicateId) {
+            return this.evaluatePredicate({
+                formatColumn,
+                column,
+                value: params.value,
+                node: params.node,
+            });
         }
-        if (this.shouldRunStyle(formatColumn, params.node)) {
-            // first run the predicate
-            if (formatColumn.Rule.Predicate && formatColumn.Rule.Predicate.PredicateId) {
-                if (this.evaluatePredicate({
-                    formatColumn,
-                    column,
-                    value: params.value,
-                    node: params.node,
-                })) {
-                    return true;
-                }
-            }
-            else if (formatColumn.Rule.BooleanExpression) {
-                if (this.evaluateExpression(formatColumn, params.node)) {
-                    return true;
-                }
-            }
-            // nothing has passed then return false
-            return false;
+        else if (formatColumn.Rule.BooleanExpression) {
+            return this.evaluateExpression(formatColumn, params.node);
         }
+        // nothing has passed then return false
+        return false;
     }
     evaluatePredicate({ formatColumn, column, value, node, }) {
         const params = {
@@ -286,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/Strategy/FormatColumnModule.js

@@ -77,22 +77,12 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
-            // not fullproof as might be an All but its generally pretty good
-            let formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(column);
-            let formatExists = formatColumn
-                ? this.api.scopeApi.isColumnInScopeColumns(column, formatColumn.Scope)
-                : false;
-            if (formatColumn && formatColumn.IsReadOnly && formatColumn.IsReadOnly == true) {
-                formatExists = false;
-            }
-            let label = formatExists ? 'Edit ' : 'Create ';
             let popupParam = {
                 column: column,
-                action: formatExists ? 'Edit' : 'New',
+                action: 'New',
                 source: 'ColumnMenu',
-                value: formatColumn,
             };
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
+            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
         }
         return returnColumnMenuItems;
     }

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/AdaptablePopover/index.js

@@ -36,7 +36,7 @@ class AdaptablePopover extends React.Component {
         return (React.createElement(rebass_1.Flex, { alignItems: "center", className: this.props.className },
             React.createElement(OverlayTrigger_1.default, { showTriangle: true, render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
                     overflow: 'visible',
-                }, defaultZIndex: 100000 }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
+                }, defaultZIndex: 100000 }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
                 this.props.children,
                 showIcon && React.createElement(icons_1.Icon, { name: icon }))))));
     }