@adaptabletools/adaptable-cjs 22.0.0-canary.3 → 22.0.0-canary.4

package/src/AdaptableState/Common/Schedule.d.ts

@@ -1,9 +1,8 @@
-import { AdaptableObject } from './AdaptableObject';
-import { SuspendableObject } from './SuspendableObject';
+import { NamedObject, SuspendableObject } from './AdaptableObject';
 /**
  * Defines when an action will be run - either one-off or recurring
  */
-export interface Schedule extends AdaptableObject {
+export interface Schedule {
     /**
      * Hour the Schedule will run
      */
@@ -24,7 +23,7 @@ export interface Schedule extends AdaptableObject {
 /**
  * Base Schedule object - typically overriden by Functions
  */
-export interface BaseSchedule extends SuspendableObject {
+export interface BaseSchedule extends NamedObject, SuspendableObject {
     /**
      * The Schedule to run
      */

package/src/AdaptableState/Common/SystemStatusMessageInfo.d.ts

@@ -1,9 +1,9 @@
 import { AdaptableMessageType } from './AdaptableMessageType';
-import { AdaptableObject } from '../../types';
+import { Identifiable } from '../../types';
 /**
  * Wraps a System Status Message
  */
-export interface SystemStatusMessageInfo extends AdaptableObject {
+export interface SystemStatusMessageInfo extends Identifiable {
     /**
      * The Message to be displayed
      */

package/src/AdaptableState/CustomSortState.d.ts

@@ -1,5 +1,5 @@
 import { BaseState } from './BaseState';
-import { SuspendableObject } from './Common/SuspendableObject';
+import { NamedObject, SuspendableObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Custom Sort Module
  */
@@ -12,7 +12,7 @@ export interface CustomSortState extends BaseState {
 /**
  * Custom Sort object used in Custom Sort function.
  */
-export interface CustomSort extends SuspendableObject {
+export interface CustomSort extends SuspendableObject, NamedObject {
     /**
      * Id of Column on which Custom Sort will be applied
      */

package/src/AdaptableState/DashboardState.d.ts

@@ -1,6 +1,6 @@
 import { BaseState } from './BaseState';
 import { AdaptableDashboardToolbars, AdaptableModuleButtons } from './Common/Types';
-import { AdaptableObject } from './Common/AdaptableObject';
+import { AdaptableObject, NamedObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for the AdapTable Dashboard
  */
@@ -56,7 +56,7 @@ export interface DashboardState extends BaseState {
 /**
  * Defines a named set of Toolbars in the AdapTable Dashboard
  */
-export interface DashboardTab extends AdaptableObject {
+export interface DashboardTab extends NamedObject {
     /**
      * Name of the tab - as appears in the Dashboard
      */

package/src/AdaptableState/ExportState.d.ts

@@ -2,7 +2,7 @@ import { BaseState } from './BaseState';
 import { BaseSchedule } from './Common/Schedule';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnBase } from './Common/AdaptableColumn';
-import { AdaptableObject } from './Common/AdaptableObject';
+import { NamedObject } from './Common/AdaptableObject';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
 import { ExportDestinationType } from '../AdaptableOptions/ExportOptions';
@@ -26,7 +26,7 @@ export interface ExportState extends BaseState {
 /**
  * A Report which can export data from AdapTable
  */
-export interface Report extends AdaptableObject {
+export interface Report extends NamedObject {
     /**
      * Name of Report
      */

package/src/AdaptableState/FlashingCellState.d.ts

@@ -4,7 +4,7 @@ import { AdaptableColumnPredicate, ColumnScope } from '../types';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
-import { SuspendableObject } from '../../types';
+import { NamedObject, SuspendableObject } from '../../types';
 /**
  * Adaptable State Section for Flashing Cell module
  */
@@ -33,7 +33,7 @@ export type FlashTargetTypes = 'row' | 'cell' | 'aggFuncCell';
 /**
  * The Flashing Cell Definition
  */
-export interface FlashingCellDefinition extends SuspendableObject {
+export interface FlashingCellDefinition extends NamedObject, SuspendableObject {
     /**
      * Which Columns, DataTypes or Column Types can Flash
      */

package/src/AdaptableState/FormatColumnState.d.ts

@@ -3,11 +3,11 @@ import { AdaptableStyle } from './Common/AdaptableStyle';
 import { AdaptableFormat } from './Common/AdaptableFormat';
 import { ColumnScope } from './Common/ColumnScope';
 import { RowScope } from './Common/RowScope';
-import { SuspendableObject } from './Common/SuspendableObject';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { TypeHint } from './Common/Types';
 import { AdaptableBooleanQuery, LayoutExtendedConfig } from '../types';
 import { AdaptableColumnPredicate } from './Common/AdaptablePredicate';
+import { NamedObject, SuspendableObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Format Column Module
  */
@@ -20,7 +20,7 @@ export interface FormatColumnState extends BaseState {
 /**
  * Object used in Format Column function
  */
-export interface FormatColumn extends SuspendableObject {
+export interface FormatColumn extends SuspendableObject, NamedObject {
     /**
      * Where Format will be applied: whole Row, some Columns, or Columns of DataType
      */

package/src/AdaptableState/LayoutState.d.ts

@@ -1,8 +1,8 @@
 import { BaseState } from './BaseState';
-import { AdaptableObject } from './Common/AdaptableObject';
+import { AdaptableObject, NamedObject } from './Common/AdaptableObject';
 import { ColumnSort } from './Common/ColumnSort';
 import { ColumnFilter, GridFilter } from '../types';
-import { TableAggregationColumns, PivotAggregationColumns } from './Common/AggregationColumns';
+import { PivotAggregationColumns, TableAggregationColumns } from './Common/AggregationColumns';
 import { RowSummary } from './Common/RowSummary';
 import { NonEmptyArray } from '../Utilities/Extensions/ArrayExtensions';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
@@ -30,7 +30,7 @@ export interface LayoutState extends BaseState {
 /**
  * Base object for both Table and Pivot Layouts
  */
-export interface LayoutBase extends AdaptableObject {
+export interface LayoutBase extends NamedObject {
     /**
      * Name of Layout as will appear in Layout toolbar and tool panel
      */
@@ -165,6 +165,11 @@ export interface PivotLayout extends LayoutBase {
      * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
      */
     PivotColumnTotal?: PivotTotalPosition;
+    /**
+     * Ordered list of Pivot Result Column Ids to control their display order.
+     * Set to `true` to enable tracking the current display order (will be populated automatically).
+     */
+    PivotResultColumns?: string[] | boolean;
 }
 /**
  * Defines the position of Pivot Total position - 'before' or 'after' the Value Column(s)

package/src/AdaptableState/NamedQueryState.d.ts

@@ -1,6 +1,6 @@
 import { BaseState } from './BaseState';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
-import { AdaptableObject } from './Common/AdaptableObject';
+import { NamedObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Named Query Module
  */
@@ -13,7 +13,7 @@ export interface NamedQueryState extends BaseState {
 /**
  * Defines a Query which can be referenced in AdaptableQL Expressions
  */
-export interface NamedQuery extends AdaptableBooleanQuery, AdaptableObject {
+export interface NamedQuery extends AdaptableBooleanQuery, NamedObject {
     /**
      * Name of the Query - how it will appear in the Expression
      */

package/src/AdaptableState/PlusMinusState.d.ts

@@ -1,7 +1,7 @@
 import { BaseState } from './BaseState';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
-import { SuspendableObject } from './Common/SuspendableObject';
+import { NamedObject, SuspendableObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Plus Minus Module
  */
@@ -14,7 +14,7 @@ export interface PlusMinusState extends BaseState {
 /**
  * Defines a Plus Minus Rule - used in the Plus Minus Module
  */
-export interface PlusMinusNudge extends SuspendableObject {
+export interface PlusMinusNudge extends NamedObject, SuspendableObject {
     /**
      * Where Rule is applied
      */

package/src/AdaptableState/ShortcutState.d.ts

@@ -1,6 +1,6 @@
 import { BaseState } from './BaseState';
 import { ColumnScope } from './Common/ColumnScope';
-import { SuspendableObject } from './Common/SuspendableObject';
+import { NamedObject, SuspendableObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Shortcut Module
  */
@@ -17,7 +17,7 @@ export type ShortcutScopeDataType = 'number';
 /**
  * Used to define a Shortcut as used in Shortcut State
  */
-export interface Shortcut extends SuspendableObject {
+export interface Shortcut extends NamedObject, SuspendableObject {
     /**
      * Numeric Columns where Shortcut is applied
      */

package/src/AdaptableState/StyledColumnState.d.ts

@@ -1,9 +1,9 @@
 import { BaseState } from './BaseState';
-import { SuspendableObject } from './Common/SuspendableObject';
 import { AdaptablePredicate, AdaptableStyle, AdaptableBooleanQuery, AdaptableIcon } from '../types';
 import { TypeHint } from './Common/Types';
 import { RowScope } from './Common/RowScope';
 import { AgSparklineOptions } from 'ag-charts-types';
+import { SuspendableObject } from './Common/AdaptableObject';
 /**
  * Adaptable State Section for Styled Column Module
  */

package/src/AdaptableState/ThemeState.d.ts

@@ -1,5 +1,5 @@
 import { BaseState } from './BaseState';
-import { AdaptableObject } from './Common/AdaptableObject';
+import { NamedObject } from './Common/AdaptableObject';
 import { TypeHint } from './Common/Types';
 /**
  * Theme section of Adaptable State
@@ -21,7 +21,7 @@ export interface ThemeState extends BaseState {
 /**
  * Used for creating User (i.e. Custom) Themes
  */
-export interface AdaptableTheme extends AdaptableObject {
+export interface AdaptableTheme extends NamedObject {
     /**
      * Name of the Theme
      */

package/src/Api/CustomSortApi.d.ts

@@ -52,11 +52,14 @@ export interface CustomSortApi {
     addCustomSort(customSort: CustomSort): CustomSort;
     /**
      * Creates new Custom Sort based on given values
-     * @param columnId Id of Column to which to apply Custom Sort
-     * @param values Custom Sort values to apply
+     * @param params Parameters for creating a Custom Sort
      * @returns Custom Sort
      */
-    createCustomSort(columnId: string, values: string[]): CustomSort;
+    createCustomSort(params: {
+        name: string;
+        columnId: string;
+        values: string[];
+    }): CustomSort;
     /**
      * Updates existing Custom Sort with new set of Sorted Values
      * @param columnId Id of Column on which to edit the Custom Sort

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

@@ -18,7 +18,11 @@ export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi
     getCustomSortByColumn(column: string): CustomSort;
     getCustomSortForColumn(columnId: string): CustomSort | undefined;
     addCustomSort(customSort: CustomSort): CustomSort;
-    createCustomSort(columnId: string, values: string[]): CustomSort;
+    createCustomSort(params: {
+        name: string;
+        columnId: string;
+        values: string[];
+    }): CustomSort;
     editCustomSortValues(columnId: string, values: string[]): CustomSort;
     editCustomSort(customSort: CustomSort): CustomSort;
     deleteCustomSort(column: string): void;

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -74,8 +74,8 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(CustomSortRedux.CustomSortAdd(customSort));
         return this.getCustomSortById(customSort.Uuid);
     }
-    createCustomSort(columnId, values) {
-        let customSort = { ColumnId: columnId, SortedValues: values };
+    createCustomSort(params) {
+        let customSort = { Name: params.name, ColumnId: params.columnId, SortedValues: params.values };
         return this.addCustomSort(customSort);
     }
     editCustomSortValues(columnId, values) {

package/src/Api/Implementation/LayoutHelpers.js

@@ -290,6 +290,7 @@ const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
         GrandTotalRow: pivotLayout.GrandTotalRow,
         PivotGrandTotal: pivotLayout.PivotGrandTotal,
         PivotColumnTotal: pivotLayout.PivotColumnTotal,
+        PivotResultColumns: pivotLayout.PivotResultColumns,
         RowGroupValues: (0, exports.toRowGroupValuesForLayoutModel)(pivotLayout.RowGroupValues),
         ColumnGroupValues: pivotLayout.ColumnGroupValues
             ? pivotLayout.ColumnGroupValues.ColumnGroupDefaultBehavior === 'always-expanded' ||
@@ -525,6 +526,12 @@ const pivotLayoutModelToPivotLayout = (layoutModel) => {
     else {
         delete pivotLayout.PivotColumnTotal;
     }
+    if (layoutModel.PivotResultColumns != null) {
+        pivotLayout.PivotResultColumns = layoutModel.PivotResultColumns;
+    }
+    else {
+        delete pivotLayout.PivotResultColumns;
+    }
     if (layoutModel.PivotAggregationColumns) {
         pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, Total }) => ({
             ColumnId,

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -158,6 +158,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
                 header: reminderSchedule.Header,
                 message: reminderSchedule.Message,
                 alertDefinition: {
+                    Name: reminderSchedule.Header,
                     MessageType: reminderSchedule.MessageType,
                     AlertProperties: {
                         DisplayNotification: reminderSchedule.DisplayNotification,

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

@@ -168,11 +168,11 @@ export declare const getColumnFilterSelector: (state: AdaptableState, columnId:
     Predicates: import("../../types").ColumnFilterPredicate[];
     PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
-    Uuid?: import("../../AdaptableState/Uuid").TypeUuid;
     Source?: "InitialState" | "User";
     AdaptableVersion?: import("../../types").AdaptableVersion;
     IsReadOnly?: boolean;
     Tags?: import("../../types").AdaptableObjectTag[];
     Metadata?: any;
+    Uuid?: import("../../AdaptableState/Uuid").TypeUuid;
 };
 export declare const LayoutReducer: Redux.Reducer<LayoutState>;

package/src/Strategy/AlertModule.js

@@ -187,6 +187,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const alertType = (0, getAlertType_1.getAlertType)(alert);
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [alert.Name],
+                },
                 (0, getAlertTypeViewItems_1.getAlertTypeViewItems)(alert),
                 alertType === 'DataChange' && {
                     ...(0, getScopeViewItems_1.getScopeViewItems)(alert.Scope, this.api),

package/src/Strategy/CustomSortModule.js

@@ -51,6 +51,10 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toView(customSort) {
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [customSort.Name],
+                },
                 (0, getCustomSortColumnViewItems_1.getCustomSortColumnViewItems)(customSort, this.api),
                 (0, getCustomSortSortOrderViewItems_1.getCustomSortSortOrderViewItems)(customSort),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(customSort, this.api),

package/src/Strategy/FlashingCellModule.js

@@ -186,6 +186,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 }
                 return [
                     this.createMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
+                        Name: `Any Change [${column.columnId}]`,
                         Scope: {
                             ColumnIds: [column.columnId],
                         },
@@ -251,6 +252,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toView(flashingCell) {
         return {
             items: [
+                {
+                    name: 'Name',
+                    values: [flashingCell.Name],
+                },
                 { ...(0, getScopeViewItems_1.getScopeViewItems)(flashingCell.Scope, this.api), label: 'Trigger' },
                 {
                     ...(0, getRuleViewItems_1.getRuleViewItems)(flashingCell.Rule, this.api),

package/src/Strategy/FormatColumnModule.js

@@ -86,6 +86,10 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             abObject: formatColumn,
             items: [
+                {
+                    name: 'Name',
+                    values: [formatColumn.Name],
+                },
                 (0, getScopeViewItems_1.getScopeViewItems)(formatColumn.Scope, this.api),
                 (0, getFormatColumnSettingsTargetItems_1.getFormatColumnSettingsTargetItems)(formatColumn),
                 formatColumn.Rule && (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),

package/src/Strategy/LayoutModule.js

@@ -303,14 +303,14 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return {
             items: [
-                {
-                    name: 'Grid Type',
-                    values: [(0, LayoutHelpers_1.isPivotLayout)(layout) ? 'Pivot' : 'Table'],
-                },
                 {
                     name: 'Name',
                     values: [layout.Name],
                 },
+                {
+                    name: 'Grid Type',
+                    values: [(0, LayoutHelpers_1.isPivotLayout)(layout) ? 'Pivot' : 'Table'],
+                },
                 /**
                  * Hide pivot columns.
                  *

package/src/Strategy/PlusMinusModule.js

@@ -204,6 +204,10 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             abObject: plusMinus,
             items: [
+                {
+                    name: 'Name',
+                    values: [plusMinus.Name],
+                },
                 {
                     name: 'Target',
                     ...(0, getScopeViewItems_1.getScopeViewItems)(plusMinus.Scope, this.api),

package/src/Strategy/ScheduleModule.js

@@ -136,6 +136,10 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             abObject: schedule,
             items: [
+                {
+                    name: 'Name',
+                    values: [schedule.Name],
+                },
                 {
                     name: 'Settings',
                     values: (0, ScheduleSettingsSummary_1.getScheduleSettingsValues)(schedule).map((description) => `${description.label}: ${description.value}`),

package/src/Strategy/ShortcutModule.js

@@ -86,6 +86,10 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             abObject: shortcut,
             items: [
+                {
+                    name: 'Name',
+                    values: [shortcut.Name],
+                },
                 (0, getScopeViewItems_1.getScopeViewItems)(shortcut.Scope, this.api),
                 (0, getShortcutSettingsViewItems_1.getShortcutSettingsViewItems)(shortcut),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(shortcut, this.api),

package/src/Utilities/Extensions/StringExtensions.d.ts

@@ -17,6 +17,7 @@ export declare function Humanize(str: string): string;
 export declare function ReplaceEmptySpacesWithUnderscore(str?: string): string;
 export declare function IsNumeric(str: string): boolean;
 export declare function UnescapeHtmlEntities(str: string): string;
+export declare function ReplaceAllOccurencesExceptLastOne(str: string, searchTerm: string, replacement: string): string;
 export declare const StringExtensions: {
     IsNull: typeof IsNull;
     IsNotNull: typeof IsNotNull;
@@ -37,5 +38,6 @@ export declare const StringExtensions: {
     ReplaceEmptySpacesWithUnderscore: typeof ReplaceEmptySpacesWithUnderscore;
     IsNumeric: typeof IsNumeric;
     UnescapeHtmlEntities: typeof UnescapeHtmlEntities;
+    ReplaceAllOccurencesExceptLastOne: typeof ReplaceAllOccurencesExceptLastOne;
 };
 export default StringExtensions;

package/src/Utilities/Extensions/StringExtensions.js

@@ -20,6 +20,7 @@ exports.Humanize = Humanize;
 exports.ReplaceEmptySpacesWithUnderscore = ReplaceEmptySpacesWithUnderscore;
 exports.IsNumeric = IsNumeric;
 exports.UnescapeHtmlEntities = UnescapeHtmlEntities;
+exports.ReplaceAllOccurencesExceptLastOne = ReplaceAllOccurencesExceptLastOne;
 const tslib_1 = require("tslib");
 const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
 function IsNull(stringToCheck) {
@@ -115,6 +116,21 @@ function UnescapeHtmlEntities(str) {
     }
     return preparedStr;
 }
+function ReplaceAllOccurencesExceptLastOne(str, searchTerm, replacement) {
+    // Find the index of the last occurrence of the search string
+    const lastIndex = str.lastIndexOf(searchTerm);
+    // If the string is not found, return the original string
+    if (lastIndex === -1) {
+        return str;
+    }
+    // Slice the string into two parts: before and after the last occurrence
+    const partBeforeLast = str.slice(0, lastIndex);
+    const partAfterLast = str.slice(lastIndex);
+    // Replace all occurrences in the first part
+    const replacedPart = partBeforeLast.replaceAll(searchTerm, replacement);
+    // Recombine the modified first part with the untouched second part
+    return replacedPart + partAfterLast;
+}
 exports.StringExtensions = {
     IsNull,
     IsNotNull,
@@ -135,5 +151,6 @@ exports.StringExtensions = {
     ReplaceEmptySpacesWithUnderscore,
     IsNumeric,
     UnescapeHtmlEntities,
+    ReplaceAllOccurencesExceptLastOne,
 };
 exports.default = exports.StringExtensions;

package/src/Utilities/Helpers/FormatHelper.js

@@ -34,7 +34,6 @@ function NumberFormatter(input, options = {}, rowNode, column, api) {
     if (isNaN(n)) {
         return preparedInput.toString();
     }
-    const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
     if (options.Multiplier !== undefined) {
         n *= multiplier;
@@ -71,6 +70,7 @@ function NumberFormatter(input, options = {}, rowNode, column, api) {
     }
     let s;
     let digitsToUse;
+    const fractionsSepatator = options.FractionSeparator ?? '.';
     if (options.Truncate || options.Ceiling || options.Round || options.Floor) {
         digitsToUse = 0;
     }
@@ -90,7 +90,14 @@ function NumberFormatter(input, options = {}, rowNode, column, api) {
         s = s.replace(/\./g, options.FractionSeparator);
     }
     if (options.IntegerSeparator !== undefined) {
-        s = s.replace(/\,/g, options.IntegerSeparator);
+        // if fraction separator is not a comma then simply replace all instances
+        if (options.FractionSeparator !== ',') {
+            s = s.replace(/\,/g, options.IntegerSeparator);
+        }
+        else {
+            // otherwise don't replace the last instance
+            s = StringExtensions_1.default.ReplaceAllOccurencesExceptLastOne(s, ',', options.IntegerSeparator);
+        }
     }
     s = (options.Prefix || '') + s + (options.Suffix || '');
     if (options.Parentheses === true && preparedInput < 0) {

package/src/Utilities/ObjectFactory.js

@@ -48,7 +48,7 @@ const Toastify_1 = require("../components/Toastify");
 const UIHelper_1 = require("../View/UIHelper");
 const LayoutHelpers_1 = require("../Api/Implementation/LayoutHelpers");
 function CreateEmptyCustomSort() {
-    return { Uuid: (0, Uuid_1.createUuid)(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
+    return { Uuid: (0, Uuid_1.createUuid)(), Name: GeneralConstants_1.EMPTY_STRING, ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 function CreateAdaptableComment(text, api) {
     const comment = {
@@ -86,6 +86,7 @@ function CreateEmptyNamedQuery(expression) {
 function CreateEmptyPlusMinusNudge() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: undefined,
         Rule: undefined,
         NudgeValue: ObjectDefaultConstants_1.PLUS_MINUS_DEFAULT_NUDGE_VALUE,
@@ -123,6 +124,7 @@ function CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, rowDa
 function CreateEmptyAlertDefinition() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: { All: true },
         Rule: {
             Predicates: [],
@@ -134,6 +136,7 @@ function CreateEmptyAlertDefinition() {
 function CreateEmptyFlashingCellDefinition() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: { ColumnIds: [] },
         Rule: {
             Predicates: [
@@ -150,6 +153,7 @@ function CreateInternalAlertDefinitionForMessages(messageType, alertProperties)
     };
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: undefined,
         Rule: {
             Predicates: [],
@@ -171,6 +175,7 @@ function CreateEmptyReport() {
 function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: scheduleType,
         Schedule: CreateEmptySchedule(),
     };
@@ -178,6 +183,7 @@ function CreateEmptyBaseSchedule(scheduleType) {
 function CreateEmptyReminderSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.Reminder,
         Schedule: CreateEmptySchedule(),
         Header: GeneralConstants_1.EMPTY_STRING,
@@ -190,6 +196,7 @@ function CreateEmptyReminderSchedule() {
 function CreateEmptyReportSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: GeneralConstants_1.EMPTY_STRING,
@@ -214,6 +221,7 @@ function CreateEmptyOpenFinReport() {
 function CreateEmptyIPushPullSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: CreateEmptyIPushPullReport(),
@@ -223,6 +231,7 @@ function CreateEmptyIPushPullSchedule() {
 function CreateEmptyOpenFinSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.OpenFin,
         Schedule: CreateEmptySchedule(),
         OpenFinReport: CreateEmptyOpenFinReport(),
@@ -232,6 +241,7 @@ function CreateEmptyOpenFinSchedule() {
 function CreateIPushPullSchedule(iPushPullReport) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: iPushPullReport,
@@ -241,6 +251,7 @@ function CreateIPushPullSchedule(iPushPullReport) {
 function CreateReportSchedule(reportName, reportFormat) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         ScheduleType: Enums_1.ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: reportName,
@@ -249,7 +260,6 @@ function CreateReportSchedule(reportName, reportFormat) {
 }
 function CreateEmptySchedule() {
     return {
-        Uuid: (0, Uuid_1.createUuid)(),
         OneOffDate: undefined,
         DaysOfWeek: [],
         Hour: 0,
@@ -259,6 +269,7 @@ function CreateEmptySchedule() {
 function CreateEmptyShortcut() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: undefined,
         ShortcutKey: GeneralConstants_1.EMPTY_STRING,
         ShortcutValue: undefined,
@@ -267,6 +278,8 @@ function CreateEmptyShortcut() {
 }
 function CreateEmptyFormatColumn() {
     return {
+        Uuid: (0, Uuid_1.createUuid)(),
+        Name: GeneralConstants_1.EMPTY_STRING,
         Scope: undefined,
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,