@adaptabletools/adaptable-cjs 17.0.0-canary.4 → 18.0.0-canary.1

package/src/Utilities/ExpressionFunctions/dateUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDateParam = exports.normalizeDateParams = void 0;
+exports.formatDate = exports.normalizeDateParam = exports.normalizeDateParams = void 0;
 const normalizeDateParams = (args) => {
     let [first, second] = args;
     if (typeof first === 'string') {
@@ -22,3 +22,20 @@ const normalizeDateParam = (args) => {
     return args;
 };
 exports.normalizeDateParam = normalizeDateParam;
+const formatDate = (date, format) => {
+    date = (0, exports.normalizeDateParam)(date);
+    const day = date.getDate();
+    const month = date.getMonth() + 1;
+    const year = date.getFullYear();
+    const hour = date.getHours();
+    const minute = date.getMinutes();
+    const second = date.getSeconds();
+    return format
+        .replace('DD', day.toString().padStart(2, '0'))
+        .replace('MM', month.toString().padStart(2, '0'))
+        .replace('YYYY', year.toString())
+        .replace('HH', hour.toString().padStart(2, '0'))
+        .replace('mm', minute.toString().padStart(2, '0'))
+        .replace('ss', second.toString().padStart(2, '0'));
+};
+exports.formatDate = formatDate;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
+export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'CURRENT_DAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -151,7 +151,7 @@ exports.scalarExpressionFunctions = {
     },
     IS_NOT_BLANK: {
         handler(args) {
-            return args[0] !== undefined && args[0] !== null && (String)(args[0]).trim() !== '';
+            return args[0] !== undefined && args[0] !== null && String(args[0]).trim() !== '';
         },
         category: 'special',
         description: 'Returns true if input value is not empty',
@@ -387,13 +387,13 @@ exports.scalarExpressionFunctions = {
         category: 'dates',
         returnType: 'date',
     },
-    TODAY: {
+    CURRENT_DAY: {
         handler() {
             return (0, startOfDay_1.default)(new Date());
         },
         description: 'Returns the current day',
-        signatures: ['TODAY()'],
-        examples: ['[col1] > TODAY()'],
+        signatures: ['CURRENT_DAY()'],
+        examples: ['[col1] > CURRENT_DAY()'],
         category: 'dates',
         returnType: 'date',
     },
@@ -443,7 +443,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
-        examples: ['ADD_DAYS(TODAY(), 5)', 'ADD_DAYS([col1], 5)'],
+        examples: ['ADD_DAYS(CURRENT_DAY(), 5)', 'ADD_DAYS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -453,7 +453,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
-        examples: ['ADD_WEEKS(TODAY(), 5)', 'ADD_WEEKS([col1], 5)'],
+        examples: ['ADD_WEEKS(CURRENT_DAY(), 5)', 'ADD_WEEKS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -463,7 +463,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
-        examples: ['ADD_MONTHS(TODAY(), 5)', 'ADD_MONTHS([col1], 5)'],
+        examples: ['ADD_MONTHS(CURRENT_DAY(), 5)', 'ADD_MONTHS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -473,7 +473,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
-        examples: ['ADD_YEARS(TODAY(), 5)', 'ADD_YEARS([col1], 5)'],
+        examples: ['ADD_YEARS(CURRENT_DAY(), 5)', 'ADD_YEARS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -485,7 +485,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in days between 2 dates',
         signatures: ['DIFF_DAYS(a: date, b: date)'],
-        examples: ['DIFF_DAYS([col1], TODAY())'],
+        examples: ['DIFF_DAYS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -497,7 +497,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in weeks between 2 dates',
         signatures: ['DIFF_WEEKS(a: date, b: date)'],
-        examples: ['DIFF_WEEKS([col1], TODAY())'],
+        examples: ['DIFF_WEEKS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -509,7 +509,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in months between 2 dates',
         signatures: ['DIFF_MONTHS(a: date, b: date)'],
-        examples: ['DIFF_MONTHS([col1], TODAY())'],
+        examples: ['DIFF_MONTHS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -521,7 +521,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in years between 2 dates',
         signatures: ['DIFF_YEARS(a: date, b: date)'],
-        examples: ['DIFF_YEARS([col1], TODAY())'],
+        examples: ['DIFF_YEARS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },

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

@@ -17,6 +17,7 @@ export declare function IsNotNullOrEmpty(arrayToCheck: any[] | undefined | null)
 export declare function IsNullOrEmptyOrContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function IsNotNullOrEmptyNorContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function HasSingleEmptyValue(arrayToCheck: any[]): boolean;
+export declare function getOccurrence(arrayToCheck: any[], valueToCheck: any): number;
 export declare function hasOneItem(arrayToCheck: any[]): boolean;
 export declare function hasItemsOfCount(arrayToCheck: any[], numberOfItems: number): boolean;
 export declare function moveArray(array: any[], from: number, to: number): void;
@@ -50,6 +51,7 @@ export declare const ArrayExtensions: {
     IsNullOrEmptyOrContainsSingleEmptyValue: typeof IsNullOrEmptyOrContainsSingleEmptyValue;
     IsNotNullOrEmptyNorContainsSingleEmptyValue: typeof IsNotNullOrEmptyNorContainsSingleEmptyValue;
     HasSingleEmptyValue: typeof HasSingleEmptyValue;
+    getOccurrence: typeof getOccurrence;
     hasOneItem: typeof hasOneItem;
     hasItemsOfCount: typeof hasItemsOfCount;
     moveArray: typeof moveArray;

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
+exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.getOccurrence = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 function GetLength(arrayToCheck) {
     return IsNotNull(arrayToCheck) ? arrayToCheck.length : 0;
@@ -95,6 +95,12 @@ function HasSingleEmptyValue(arrayToCheck) {
     return false;
 }
 exports.HasSingleEmptyValue = HasSingleEmptyValue;
+function getOccurrence(arrayToCheck, valueToCheck) {
+    var count = 0;
+    arrayToCheck.forEach((v) => v === valueToCheck && count++);
+    return count;
+}
+exports.getOccurrence = getOccurrence;
 function hasOneItem(arrayToCheck) {
     return hasItemsOfCount(arrayToCheck, 1);
 }
@@ -302,6 +308,7 @@ exports.ArrayExtensions = {
     IsNullOrEmptyOrContainsSingleEmptyValue,
     IsNotNullOrEmptyNorContainsSingleEmptyValue,
     HasSingleEmptyValue,
+    getOccurrence,
     hasOneItem,
     hasItemsOfCount,
     moveArray,

package/src/Utilities/Helpers/PreviewHelper.js

@@ -44,7 +44,8 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
                     normalisedValue: previewResult.computedValue,
                     rowNode: previewResult.rowNode,
                     column: previewInfo.column,
-                    isPivotCell: false, isRowGroupCell: false
+                    isPivotCell: false,
+                    isRowGroupCell: false,
                 });
             }
         }
@@ -59,7 +60,9 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
                 rawValue: pr.computedValue,
                 displayValue: pr.computedValue,
                 normalisedValue: pr.computedValue,
-                rowNode: pr.rowNode, isPivotCell: false, isRowGroupCell: false
+                rowNode: pr.rowNode,
+                isPivotCell: false,
+                isRowGroupCell: false,
             });
         });
     }

package/src/Utilities/ObjectFactory.d.ts

@@ -1,33 +1,33 @@
-import { ScheduleType } from '../PredefinedConfig/Common/Enums';
-import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
-import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
-import { Layout } from '../PredefinedConfig/LayoutState';
-import { Report, ReportSchedule } from '../PredefinedConfig/ExportState';
+import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
+import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
+import { ScheduleType } from '../PredefinedConfig/Common/Enums';
 import { BaseSchedule, Schedule } from '../PredefinedConfig/Common/Schedule';
-import { Shortcut } from '../PredefinedConfig/ShortcutState';
+import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { CustomSort } from '../PredefinedConfig/CustomSortState';
+import { Report, ReportSchedule } from '../PredefinedConfig/ExportState';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { Glue42Report, Glue42Schedule } from '../PredefinedConfig/Glue42State';
-import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
+import { Layout } from '../PredefinedConfig/LayoutState';
 import { OpenFinReport, OpenFinSchedule } from '../PredefinedConfig/OpenFinState';
+import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
-import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
-import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { Shortcut } from '../PredefinedConfig/ShortcutState';
+import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
-import { AdaptableApi, BadgeStyleDefinition, NamedQuery } from '../../types';
+import { AdaptableApi, AdaptableComment, BadgeStyleDefinition, CellAddress, NamedQuery } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
+export declare function CreateAdaptableComment(text: string, api: AdaptableApi): AdaptableComment;
 export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
@@ -43,13 +43,10 @@ export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): Bas
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
 export declare function CreateEmptyIPushPullReport(): IPushPullReport;
-export declare function CreateEmptyGlue42Report(): Glue42Report;
 export declare function CreateEmptyOpenFinReport(): OpenFinReport;
 export declare function CreateEmptyIPushPullSchedule(): IPushPullSchedule;
-export declare function CreateEmptyGlue42Schedule(): Glue42Schedule;
 export declare function CreateEmptyOpenFinSchedule(): OpenFinSchedule;
 export declare function CreateIPushPullSchedule(iPushPullReport: IPushPullReport): IPushPullSchedule;
-export declare function CreateGlue42Schedule(glue42Report: Glue42Report): Glue42Schedule;
 export declare function CreateReportSchedule(reportName: string): ReportSchedule;
 export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
@@ -68,6 +65,7 @@ export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefini
 export declare function CreateCustomDisplayFormatterContext(value: any, node: IRowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare const createBaseContext: (adaptableApi: AdaptableApi) => BaseContext;
 export declare function CreateEmptyTheme(name?: string): AdaptableTheme;
+export declare function CreateEmptyCommentThread(cellAddress: CellAddress): CommentThread;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
@@ -93,7 +91,6 @@ export declare const ObjectFactory: {
     CreateEmptyIPushPullSchedule: typeof CreateEmptyIPushPullSchedule;
     CreateEmptyIPushPullReport: typeof CreateEmptyIPushPullReport;
     CreateIPushPullSchedule: typeof CreateIPushPullSchedule;
-    CreateGlue42Schedule: typeof CreateGlue42Schedule;
     CreateReportSchedule: typeof CreateReportSchedule;
     CreateEmptyOpenFinReport: typeof CreateEmptyOpenFinReport;
     CreateEmptyOpenFinSchedule: typeof CreateEmptyOpenFinSchedule;
@@ -105,8 +102,6 @@ export declare const ObjectFactory: {
     CreateColumnFilter: typeof CreateColumnFilter;
     CreateEmptyStyle: typeof CreateEmptyStyle;
     CreateEmptyCellSummmary: typeof CreateEmptyCellSummmary;
-    CreateEmptyGlue42Schedule: typeof CreateEmptyGlue42Schedule;
-    CreateEmptyGlue42Report: typeof CreateEmptyGlue42Report;
     CreateSystemStatusMessageInfo: typeof CreateSystemStatusMessageInfo;
     CreateToastOptions: typeof CreateToastOptions;
     CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
@@ -114,5 +109,7 @@ export declare const ObjectFactory: {
     CreateDefaultStyledColumnBadge: typeof CreateDefaultStyledColumnBadge;
     CreateEmptyChartDefinition: typeof CreateEmptyChartDefinition;
     CreateEmptyTheme: typeof CreateEmptyTheme;
+    CreateEmptyCommentThread: typeof CreateEmptyCommentThread;
+    CreateAdaptableComment: typeof CreateAdaptableComment;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,15 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.createBaseContext = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = 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.CreateExternalReport = 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.CreateEmptyCommentThread = exports.CreateEmptyTheme = exports.createBaseContext = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateAdaptableComment = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
-const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
+const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Toastify_1 = require("../components/Toastify");
 const UIHelper_1 = require("../View/UIHelper");
 function CreateEmptyCustomSort() {
     return { Uuid: (0, Uuid_1.createUuid)(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
+function CreateAdaptableComment(text, api) {
+    const comment = {
+        Value: text,
+        AdaptableId: api.optionsApi.getAdaptableId(),
+        Author: {
+            UserName: api.optionsApi.getUserName(),
+        },
+        Timestamp: Date.now(),
+        Uuid: (0, Uuid_1.createUuid)(),
+    };
+    return comment;
+}
+exports.CreateAdaptableComment = CreateAdaptableComment;
 function CreateEmptyCalculatedColumn() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -184,13 +197,6 @@ function CreateEmptyIPushPullReport() {
     };
 }
 exports.CreateEmptyIPushPullReport = CreateEmptyIPushPullReport;
-function CreateEmptyGlue42Report() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ReportName: GeneralConstants_1.EMPTY_STRING,
-    };
-}
-exports.CreateEmptyGlue42Report = CreateEmptyGlue42Report;
 function CreateEmptyOpenFinReport() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -208,16 +214,6 @@ function CreateEmptyIPushPullSchedule() {
     };
 }
 exports.CreateEmptyIPushPullSchedule = CreateEmptyIPushPullSchedule;
-function CreateEmptyGlue42Schedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ScheduleType: Enums_1.ScheduleType.Glue42,
-        Schedule: CreateEmptySchedule(),
-        Glue42Report: CreateEmptyGlue42Report(),
-        Transmission: 'Snapshot',
-    };
-}
-exports.CreateEmptyGlue42Schedule = CreateEmptyGlue42Schedule;
 function CreateEmptyOpenFinSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -238,16 +234,6 @@ function CreateIPushPullSchedule(iPushPullReport) {
     };
 }
 exports.CreateIPushPullSchedule = CreateIPushPullSchedule;
-function CreateGlue42Schedule(glue42Report) {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ScheduleType: Enums_1.ScheduleType.Glue42,
-        Schedule: CreateEmptySchedule(),
-        Glue42Report: glue42Report,
-        Transmission: 'Snapshot',
-    };
-}
-exports.CreateGlue42Schedule = CreateGlue42Schedule;
 function CreateReportSchedule(reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -411,6 +397,40 @@ function CreateEmptyTheme(name) {
     };
 }
 exports.CreateEmptyTheme = CreateEmptyTheme;
+function CreateEmptyCommentThread(cellAddress) {
+    return Object.assign(Object.assign({}, cellAddress), { Comments: [] });
+}
+exports.CreateEmptyCommentThread = CreateEmptyCommentThread;
+function getToastPosition(position) {
+    switch (position) {
+        case 'BottomLeft':
+            return 'bottom-left';
+        case 'BottomCenter':
+            return 'bottom-center';
+        case 'BottomRight':
+            return 'bottom-right';
+        case 'TopLeft':
+            return 'top-left';
+        case 'TopCenter':
+            return 'top-center';
+        case 'TopRight':
+            return 'top-right';
+    }
+}
+function getToastTransition(transition) {
+    switch (transition) {
+        case 'Bounce':
+            return Toastify_1.Bounce;
+        case 'Slide':
+            return Toastify_1.Slide;
+        case 'Zoom':
+            return Toastify_1.Zoom;
+        case 'Flip':
+            return Toastify_1.Flip;
+        default:
+            return Toastify_1.Bounce;
+    }
+}
 function CreateToastOptions(notificationsOptions, { onClose, containerId }, overides) {
     var _a;
     const adaptableToastPosition = notificationsOptions.position;
@@ -437,34 +457,6 @@ function CreateToastOptions(notificationsOptions, { onClose, containerId }, over
     return toastProps;
 }
 exports.CreateToastOptions = CreateToastOptions;
-function getToastPosition(position) {
-    switch (position) {
-        case 'BottomLeft':
-            return Toastify_1.toast.POSITION.BOTTOM_LEFT;
-        case 'BottomCenter':
-            return Toastify_1.toast.POSITION.BOTTOM_CENTER;
-        case 'BottomRight':
-            return Toastify_1.toast.POSITION.BOTTOM_RIGHT;
-        case 'TopLeft':
-            return Toastify_1.toast.POSITION.TOP_LEFT;
-        case 'TopCenter':
-            return Toastify_1.toast.POSITION.TOP_CENTER;
-        case 'TopRight':
-            return Toastify_1.toast.POSITION.TOP_RIGHT;
-    }
-}
-function getToastTransition(transition) {
-    switch (transition) {
-        case 'Bounce':
-            return Toastify_1.Bounce;
-        case 'Slide':
-            return Toastify_1.Slide;
-        case 'Zoom':
-            return Toastify_1.Zoom;
-        case 'Flip':
-            return Toastify_1.Flip;
-    }
-}
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
     CreateEmptyCalculatedColumn,
@@ -484,7 +476,6 @@ exports.ObjectFactory = {
     CreateEmptyIPushPullSchedule,
     CreateEmptyIPushPullReport,
     CreateIPushPullSchedule,
-    CreateGlue42Schedule,
     CreateReportSchedule,
     CreateEmptyOpenFinReport,
     CreateEmptyOpenFinSchedule,
@@ -496,8 +487,6 @@ exports.ObjectFactory = {
     CreateColumnFilter,
     CreateEmptyStyle,
     CreateEmptyCellSummmary,
-    CreateEmptyGlue42Schedule,
-    CreateEmptyGlue42Report,
     CreateSystemStatusMessageInfo,
     CreateToastOptions,
     CreateCustomDisplayFormatterContext,
@@ -505,5 +494,7 @@ exports.ObjectFactory = {
     CreateDefaultStyledColumnBadge,
     CreateEmptyChartDefinition,
     CreateEmptyTheme,
+    CreateEmptyCommentThread,
+    CreateAdaptableComment,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/CellPopupService.d.ts

@@ -0,0 +1,23 @@
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableApi, CellAddress } from '../../types';
+/**
+ * This service controls the interaction between notes and comments
+ */
+export declare class CellPopupService {
+    private api;
+    adaptable: IAdaptable;
+    constructor(api: AdaptableApi);
+    private getAdaptableState;
+    private dispatchAction;
+    static isSameAddress(a: CellAddress, b: CellAddress): boolean;
+    private handleAdaptableReady;
+    private getCellPositionFromEvent;
+    private handleMouseEnter;
+    private handleCellSelected;
+    getOpenCellAddress(): CellAddress | undefined;
+    getEditMode(): boolean;
+    hidePopup(): void;
+    showPopup(cellAddress: CellAddress, editMode: boolean): void;
+    editFocusedEntity(entity: 'Note' | 'Comment'): void;
+    getNotePopupEditMode(): boolean;
+}

package/src/Utilities/Services/CellPopupService.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CellPopupService = void 0;
+const tslib_1 = require("tslib");
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+/**
+ * This service controls the interaction between notes and comments
+ */
+class CellPopupService {
+    constructor(api) {
+        this.api = api;
+        this.adaptable = api.internalApi.getAdaptableInstance();
+        this.adaptable = api.internalApi.getAdaptableInstance();
+        this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
+    }
+    getAdaptableState() {
+        return this.api.internalApi.getAdaptableState();
+    }
+    dispatchAction(action) {
+        this.api.internalApi.dispatchReduxAction(action);
+    }
+    static isSameAddress(a, b) {
+        if (!a || !b) {
+            return false;
+        }
+        if ((a === null || a === void 0 ? void 0 : a.ColumnId) === (b === null || b === void 0 ? void 0 : b.ColumnId) && (a === null || a === void 0 ? void 0 : a.PrimaryKeyValue) === (b === null || b === void 0 ? void 0 : b.PrimaryKeyValue)) {
+            return true;
+        }
+        // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
+        if ((typeof a.PrimaryKeyValue === 'number' && typeof b.PrimaryKeyValue === 'string') ||
+            (typeof b.PrimaryKeyValue === 'string' && typeof a.PrimaryKeyValue === 'number')) {
+            return (a.PrimaryKeyValue.toString() === b.PrimaryKeyValue.toString() && a.ColumnId === b.ColumnId);
+        }
+        return false;
+    }
+    handleAdaptableReady() {
+        this.adaptable._on('MouseEnter', (event) => this.handleMouseEnter(event));
+        this.api.eventApi.on('CellSelectionChanged', (params) => {
+            var _a;
+            const cells = params.selectedCellInfo.gridCells;
+            if ((cells === null || cells === void 0 ? void 0 : cells.length) === 1 && ((_a = cells[0].column) === null || _a === void 0 ? void 0 : _a.columnId) && cells[0].primaryKeyValue) {
+                const selectedCell = cells[0];
+                const cellSelected = {
+                    PrimaryKeyValue: selectedCell.primaryKeyValue,
+                    ColumnId: selectedCell.column.columnId,
+                };
+                this.handleCellSelected(cellSelected);
+            }
+        });
+    }
+    getCellPositionFromEvent(event) {
+        var _a, _b;
+        const target = event.target;
+        if (!((_b = (_a = target === null || target === void 0 ? void 0 : target.classList) === null || _a === void 0 ? void 0 : _a.contains) === null || _b === void 0 ? void 0 : _b.call(_a, 'ag-cell'))) {
+            return null;
+        }
+        try {
+            const PrimaryKeyValue = target.parentElement.getAttribute('row-id');
+            return {
+                PrimaryKeyValue,
+                ColumnId: target.getAttribute('col-id'),
+            };
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    handleMouseEnter(event) {
+        const editMode = this.getEditMode();
+        if (editMode) {
+            // ignore
+            return;
+        }
+        const cellPosition = this.getCellPositionFromEvent(event);
+        const openCellAddress = this.getOpenCellAddress();
+        // Hovering over someting that is not a cell and there is no open note
+        if (!cellPosition && openCellAddress) {
+            // need to close if the new cell does not have a note
+            this.hidePopup();
+            return;
+        }
+        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellPosition);
+        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
+        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        // call only if it is different
+        if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
+            return;
+        }
+        if (hasNotesOrComments) {
+            this.showPopup(cellPosition, false);
+        }
+    }
+    handleCellSelected(cellAddress) {
+        // if already opened - do nothing
+        const openCellAddress = this.getOpenCellAddress();
+        if (CellPopupService.isSameAddress(openCellAddress, cellAddress)) {
+            return;
+        }
+        // if open but this has no note, close
+        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellAddress);
+        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
+        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        if (openCellAddress && !hasNotesOrComments) {
+            // hide only if in edit mode
+            // because if you select a cell and move the mouse fast over another cell
+            // with a note, you do not want to close that note
+            // the selection is debounced, so the moment goes over the new cell this event is triggered
+            if (this.getEditMode()) {
+                this.hidePopup();
+            }
+            return;
+        }
+        // if open but the new selection has a note open that one in edit mode (because of click)
+        if (openCellAddress && hasNotesOrComments) {
+            this.showPopup(cellAddress, true);
+            return;
+        }
+    }
+    getOpenCellAddress() {
+        return SystemRedux.SystemCommentsAndNotesSelector(this.getAdaptableState().System);
+    }
+    getEditMode() {
+        return SystemRedux.SystemCommentsAndNotesEditModeSelector(this.getAdaptableState().System);
+    }
+    hidePopup() {
+        this.dispatchAction(SystemRedux.SystemCellPopupHide());
+    }
+    showPopup(cellAddress, editMode) {
+        this.dispatchAction(SystemRedux.SystemCellPopupShow(cellAddress, editMode));
+    }
+    editFocusedEntity(entity) {
+        this.dispatchAction(SystemRedux.SystemCellPopupEditFocusedEntity(entity));
+    }
+    getNotePopupEditMode() {
+        return SystemRedux.SystemCommentsAndNotesEditModeSelector(this.getAdaptableState().System);
+    }
+}
+exports.CellPopupService = CellPopupService;

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -17,7 +17,7 @@ export interface IReportService extends IAdaptableService {
     GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(Report: Report, cols: AdaptableColumn[]): string;
-    PublishLiveLiveDataChangedEvent(reportDestination: 'OpenFin' | 'ipushpull' | 'Glue42', liveDataChangedTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
+    PublishLiveLiveDataChangedEvent(reportDestination: 'OpenFin' | 'ipushpull', liveDataChangedTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getReportDataColumns(report: Report, includePrimaryKey?: boolean): AdaptableColumnBase[];
     getReportDataRows(report: Report, columns: AdaptableColumnBase[], includePrimaryKey?: boolean): Record<string, any>[];
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;