@adaptabletools/adaptable-cjs 17.0.0-canary.3 → 18.0.0-canary.0

package/src/PredefinedConfig/Common/AdaptableIcon.d.ts

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter';

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -38,7 +38,8 @@ exports.SystemPredicateDefs = [
             }
             if (column.dataType === 'Date') {
                 return inputs.some((input) => {
-                    if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions.filterValuesUsingTime) {
+                    if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions
+                        .filterValuesUsingTime) {
                         return (0, isEqual_1.default)(input, value);
                     }
                     else {

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -14,7 +14,6 @@ export declare enum ExportDestination {
 export declare enum ScheduleType {
     Report = "Report",
     ipushpull = "ipushpull",
-    Glue42 = "Glue42",
     Reminder = "Reminder",
     OpenFin = "OpenFin"
 }

package/src/PredefinedConfig/Common/Enums.js

@@ -22,7 +22,6 @@ var ScheduleType;
 (function (ScheduleType) {
     ScheduleType["Report"] = "Report";
     ScheduleType["ipushpull"] = "ipushpull";
-    ScheduleType["Glue42"] = "Glue42";
     ScheduleType["Reminder"] = "Reminder";
     ScheduleType["OpenFin"] = "OpenFin";
 })(ScheduleType = exports.ScheduleType || (exports.ScheduleType = {}));

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

@@ -32,7 +32,7 @@ export interface BaseSchedule extends SuspendableObject {
     /**
      * The type of Schedule
      */
-    ScheduleType: 'Report' | 'ipushpull' | 'Glue42' | 'Reminder' | 'OpenFin';
+    ScheduleType: 'Report' | 'ipushpull' | 'Reminder' | 'OpenFin';
 }
 export type Weekdays = Weekday[];
 export type Weekday = 'Sunday' | 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday';

package/src/PredefinedConfig/Common/Types.d.ts

@@ -6,7 +6,7 @@ export type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'Glue42' | 'IPushPull' | 'Layout' | 'GridFilter' | 'OpenFin' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'IPushPull' | 'Layout' | 'GridFilter' | 'OpenFin' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
 /**
  * Modules which can appear in the AdapTable Status Bar
@@ -28,18 +28,18 @@ export type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export type AdaptableStateKeys = AdaptableStateKey[];
-export type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
+export type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery';
+export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comments';
 export declare const ALL_MODULES: AdaptableModule[];
 /**
  * Modules which can appear in the Settings Panel
  */
-export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery';
+export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comments';
 export type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;

package/src/PredefinedConfig/Common/Types.js

@@ -14,7 +14,6 @@ exports.ALL_TOOLBARS = [
     'DataChangeHistory',
     'DataSet',
     'Export',
-    'Glue42',
     'IPushPull',
     'Layout',
     'ColumnFilter',
@@ -93,7 +92,6 @@ exports.ALL_MODULES = [
     ModuleConstants.FlashingCellModuleId,
     ModuleConstants.FormatColumnModuleId,
     ModuleConstants.FreeTextColumnModuleId,
-    ModuleConstants.Glue42ModuleId,
     ModuleConstants.GridInfoModuleId,
     ModuleConstants.IPushPullModuleId,
     ModuleConstants.LayoutModuleId,

package/src/PredefinedConfig/NotesState.d.ts

@@ -44,16 +44,3 @@ export interface NotesState extends ConfigState {
      */
     Notes?: AdaptableNotes;
 }
-/**
- * Cell that contains a Note
- */
-export type NoteGridCell = {
-    /**
-     * Value in Primary Key Column
-     */
-    PrimaryKeyValue: string | number;
-    /**
-     * Id of Column containing the Note
-     */
-    ColumnId: string;
-};

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -43,6 +43,9 @@ export interface PredefinedConfig {
      * Supplies a collection of *Custom Sort* objects to allow some columns to be sorted in non-standard (e.g. non alphabetical) ways
      */
     CustomSort?: CustomSortState;
+    /**
+     * Collection of notes that can be edited on cell level
+     */
     Notes?: NotesState;
     /**
      * Large series of properties to give users full control over the look and feel of the *Dashboard* - the section above the grid with toolbars and buttons

package/src/PredefinedConfig/ScheduleState.d.ts

@@ -1,5 +1,4 @@
 import { ConfigState } from './ConfigState';
-import { Glue42Schedule } from './Glue42State';
 import { IPushPullSchedule } from './IPushPullState';
 import { OpenFinSchedule } from './OpenFinState';
 import { AdaptableMessageType, ReportSchedule } from '../types';
@@ -21,10 +20,6 @@ export interface ScheduleState extends ConfigState {
      * Schedules connected to ipushpull Reports - available if ipushpull plugin is running
      */
     IPushPullSchedules?: IPushPullSchedule[];
-    /**
-     * Schedules connected to Glue42 exports - available if Glue42 plugin is running
-     */
-    Glue42Schedules?: Glue42Schedule[];
     /**
      * Schedules connected to OpenFin exports - available if OpenFin plugin is running
      */

package/src/PredefinedConfig/SystemState.d.ts

@@ -3,7 +3,6 @@ import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
 import { CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
-import { Glue42State, Glue42Report } from './Glue42State';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
 import { AdaptableAlert } from './Common/AdaptableAlert';
 import { CellHighlightInfo } from './Common/CellHighlightInfo';
@@ -13,11 +12,10 @@ import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
 import { ChartModel } from '@ag-grid-community/core';
-import { NoteGridCell } from './NotesState';
+import { CellAddress } from './CellAddress';
 import { ExternalChartDefinition } from './ChartingState';
 import { CachedQuery } from './NamedQueryState';
 export type { IPushPullReport, IPushPullDomain };
-export type { Glue42Report };
 export type { OpenFinReport };
 type ROW_PRIMARY_KEY = string;
 type COLUMN_ID_OR_WHOLE_ROW_LABEL = string;
@@ -25,7 +23,7 @@ export type DataChangeHistoryMode = 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';
 /**
  * Internal state, used by Adaptable during a session; none of it is provided through Predefined Config, nor is it persisted
  */
-export interface SystemState extends InternalState, IPushPullState, Glue42State, OpenFinState {
+export interface SystemState extends InternalState, IPushPullState, OpenFinState {
     AdaptableAlerts: AdaptableAlert[];
     AdaptableFlashingCells: Record<ROW_PRIMARY_KEY, Record<COLUMN_ID_OR_WHOLE_ROW_LABEL, TypeUuid>>;
     AdaptableFlashingCellsMap: Record<TypeUuid, AdaptableFlashingCell>;
@@ -100,9 +98,10 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
     QuickSearch?: {
         floatingVisible?: boolean;
     };
-    Notes?: {
+    NotesAndComments?: {
         editMode?: boolean;
-        popupPosition?: NoteGridCell | null;
+        focusedEntity?: 'Note' | 'Comment';
+        popupPosition?: CellAddress | null;
     };
 }
 export interface ProgressIndicator {

package/src/PredefinedConfig/ThemeState.d.ts

@@ -8,7 +8,7 @@ export interface ThemeState extends ConfigState {
     /**
      * Name of current theme (or theme to set at startup); leave blank if using 'Light Theme', set to 'dark' for 'Dark Theme' or provide name of Custom Theme
      */
-    CurrentTheme?: TypeHint<string, 'light' | 'dark'>;
+    CurrentTheme?: TypeHint<string, 'light' | 'dark' | 'os'>;
     /**
      * Which, if any, of the 2 themes shipped by Adaptable should be available; leave unset to provide both, or an empty array to provide neither.
      */

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

@@ -0,0 +1,79 @@
+import * as Redux from 'redux';
+import { CommentThread, AdaptableComment, CommentState } from '../../PredefinedConfig/CommentState';
+import { CellAddress } from '../../types';
+/**
+ * @ReduxAction A Comments has been added
+ */
+export declare const COMMENTS_ADD = "COMMENTS_ADD";
+/**
+ * @ReduxAction Cell Comments has been added
+ */
+export declare const COMMENTS_CELL_ADD = "COMMENTS_CELL_ADD";
+/**
+ * @ReduxAction Cell comments have been removed
+ */
+export declare const COMMENTS_CELL_DELETE = "COMMENTS_CELL_DELETE";
+/**
+ * @ReduxAction A Comments has been edited
+ */
+export declare const COMMENTS_EDIT = "COMMENTS_EDIT";
+/**
+ * @ReduxAction A Comments has been deleted
+ */
+export declare const COMMENTS_DELETE = "COMMENTS_DELETE";
+/**
+ * @ReduxAction Comments Module is ready
+ */
+export declare const COMMENTS_READY = "COMMENTS_READY";
+export declare const COMMENTS_LOAD = "COMMENTS_LOAD";
+export interface AdaptableCommentAction extends Redux.Action {
+    comment: AdaptableComment;
+    cellAddress: CellAddress;
+}
+export interface AdaptableCommentsAddAction extends AdaptableCommentAction {
+}
+export interface AdaptableCommentsCellAddAction extends Redux.Action {
+    commentThread: CommentThread;
+}
+export interface AdaptableCommentsSetAction extends Redux.Action {
+    commentThread: CommentThread[];
+}
+export interface AdaptableCommentsCellDeleteAction extends Redux.Action {
+    cellAddress: CellAddress;
+}
+export interface AdaptableCommentsEditAction extends AdaptableCommentAction {
+}
+export interface AdaptableCommentsDeleteAction extends Redux.Action {
+    commentUuid: AdaptableComment['Uuid'];
+    cellAddress: CellAddress;
+}
+export interface NoteReadyAction extends Redux.Action {
+    commentState: CommentState;
+}
+export declare const CommentsSet: ({ commentThread, }: {
+    commentThread: CommentThread[];
+}) => AdaptableCommentsSetAction;
+export declare const CommentsAdd: ({ comment, cellAddress, }: {
+    comment: AdaptableComment;
+    cellAddress: CellAddress;
+}) => AdaptableCommentsAddAction;
+export declare const CommentsCellAdd: ({ commentThread, }: {
+    commentThread: CommentThread;
+}) => AdaptableCommentsCellAddAction;
+export declare const CommentsCellDelete: ({ cellAddress: cellAddress, }: {
+    cellAddress: CellAddress;
+}) => AdaptableCommentsCellDeleteAction;
+export declare const CommentsEdit: ({ comment, cellAddress, }: {
+    comment: AdaptableComment;
+    cellAddress: CellAddress;
+}) => AdaptableCommentsEditAction;
+export declare const CommentsDelete: ({ commentUuid, cellAddress, }: {
+    commentUuid: AdaptableComment['Uuid'];
+    cellAddress: CellAddress;
+}) => AdaptableCommentsDeleteAction;
+export declare const CommentsReady: (commentstate: CommentState) => NoteReadyAction;
+export declare const GetGridCellCommentsSelector: (state: CommentState, address: CellAddress) => CommentThread;
+export declare const GetCommentsSelector: (state: CommentState, address: CellAddress) => AdaptableComment[] | undefined;
+export declare const GetGetCommentsByUuidSelector: (state: CommentState, uuid: string) => AdaptableComment | undefined;
+export declare const GetCellCommentSelector: (state: CommentState, address: CellAddress) => CommentThread | undefined;
+export declare const CommentsReducer: Redux.Reducer<CommentState>;

package/src/Redux/ActionsReducers/CommentsRedux.js

@@ -0,0 +1,189 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentsReducer = exports.GetCellCommentSelector = exports.GetGetCommentsByUuidSelector = exports.GetCommentsSelector = exports.GetGridCellCommentsSelector = exports.CommentsReady = exports.CommentsDelete = exports.CommentsEdit = exports.CommentsCellDelete = exports.CommentsCellAdd = exports.CommentsAdd = exports.CommentsSet = exports.COMMENTS_LOAD = exports.COMMENTS_READY = exports.COMMENTS_DELETE = exports.COMMENTS_EDIT = exports.COMMENTS_CELL_DELETE = exports.COMMENTS_CELL_ADD = exports.COMMENTS_ADD = void 0;
+const tslib_1 = require("tslib");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const CellPopupService_1 = require("../../Utilities/Services/CellPopupService");
+/**
+ * @ReduxAction A Comments has been added
+ */
+exports.COMMENTS_ADD = 'COMMENTS_ADD';
+/**
+ * @ReduxAction Cell Comments has been added
+ */
+exports.COMMENTS_CELL_ADD = 'COMMENTS_CELL_ADD';
+/**
+ * @ReduxAction Cell comments have been removed
+ */
+exports.COMMENTS_CELL_DELETE = 'COMMENTS_CELL_DELETE';
+/**
+ * @ReduxAction A Comments has been edited
+ */
+exports.COMMENTS_EDIT = 'COMMENTS_EDIT';
+/**
+ * @ReduxAction A Comments has been deleted
+ */
+exports.COMMENTS_DELETE = 'COMMENTS_DELETE';
+/**
+ * @ReduxAction Comments Module is ready
+ */
+exports.COMMENTS_READY = 'COMMENTS_READY';
+exports.COMMENTS_LOAD = 'COMMENTS_LOAD';
+const CommentsSet = ({ commentThread, }) => ({
+    type: exports.COMMENTS_LOAD,
+    commentThread,
+});
+exports.CommentsSet = CommentsSet;
+const CommentsAdd = ({ comment, cellAddress, }) => ({
+    type: exports.COMMENTS_ADD,
+    comment,
+    cellAddress,
+});
+exports.CommentsAdd = CommentsAdd;
+const CommentsCellAdd = ({ commentThread, }) => ({
+    type: exports.COMMENTS_CELL_ADD,
+    commentThread,
+});
+exports.CommentsCellAdd = CommentsCellAdd;
+const CommentsCellDelete = ({ cellAddress: cellAddress, }) => ({
+    type: exports.COMMENTS_CELL_DELETE,
+    cellAddress: cellAddress,
+});
+exports.CommentsCellDelete = CommentsCellDelete;
+const CommentsEdit = ({ comment, cellAddress, }) => ({
+    type: exports.COMMENTS_EDIT,
+    comment,
+    cellAddress,
+});
+exports.CommentsEdit = CommentsEdit;
+const CommentsDelete = ({ commentUuid, cellAddress, }) => ({
+    type: exports.COMMENTS_DELETE,
+    cellAddress,
+    commentUuid,
+});
+exports.CommentsDelete = CommentsDelete;
+const CommentsReady = (commentstate) => ({
+    type: exports.COMMENTS_READY,
+    commentState: commentstate,
+});
+exports.CommentsReady = CommentsReady;
+const GetGridCellCommentsSelector = (state, address) => {
+    var _a;
+    if (!address) {
+        return null;
+    }
+    return ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
+        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
+    });
+};
+exports.GetGridCellCommentsSelector = GetGridCellCommentsSelector;
+const GetCommentsSelector = (state, address) => {
+    var _a, _b;
+    if (!address) {
+        return [];
+    }
+    const comments = (_b = ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
+        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
+    })) === null || _b === void 0 ? void 0 : _b.Comments;
+    return comments;
+};
+exports.GetCommentsSelector = GetCommentsSelector;
+const GetGetCommentsByUuidSelector = (state, uuid) => {
+    var _a;
+    for (const commentThread of (_a = state.CommentThreads) !== null && _a !== void 0 ? _a : []) {
+        for (const comment of commentThread.Comments) {
+            if (comment.Uuid === uuid) {
+                return comment;
+            }
+        }
+    }
+    return undefined;
+};
+exports.GetGetCommentsByUuidSelector = GetGetCommentsByUuidSelector;
+const GetCellCommentSelector = (state, address) => {
+    var _a;
+    if (!address) {
+        return undefined;
+    }
+    return ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((commentThread) => {
+        return CellPopupService_1.CellPopupService.isSameAddress(commentThread, address);
+    });
+};
+exports.GetCellCommentSelector = GetCellCommentSelector;
+const initialState = {
+    CommentThreads: GeneralConstants_1.EMPTY_ARRAY,
+};
+const CommentsReducer = (state = initialState, action) => {
+    var _a, _b, _c, _d, _e;
+    switch (action.type) {
+        case exports.COMMENTS_ADD: {
+            const addAction = action;
+            const commentThread = (_a = state.CommentThreads) !== null && _a !== void 0 ? _a : [];
+            const cellCommentIndex = commentThread.findIndex((cellComments) => {
+                return CellPopupService_1.CellPopupService.isSameAddress(cellComments, addAction.cellAddress);
+            });
+            let comments = [...commentThread];
+            if (cellCommentIndex === -1) {
+                // new comments
+                comments.push(Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyCommentThread(addAction.cellAddress)), { Comments: [addAction.comment] }));
+            }
+            else {
+                const existing = Object.assign(Object.assign({}, commentThread[cellCommentIndex]), { Comments: [...commentThread[cellCommentIndex].Comments, addAction.comment] });
+                comments[cellCommentIndex] = existing;
+            }
+            return Object.assign(Object.assign({}, state), { CommentThreads: comments });
+        }
+        case exports.COMMENTS_CELL_ADD: {
+            return Object.assign(Object.assign({}, state), { CommentThreads: [
+                    ...((_b = state.CommentThreads) !== null && _b !== void 0 ? _b : []),
+                    action.commentThread,
+                ] });
+        }
+        case exports.COMMENTS_CELL_DELETE: {
+            const deleteAction = action;
+            return Object.assign(Object.assign({}, state), { CommentThreads: ((_c = state.CommentThreads) !== null && _c !== void 0 ? _c : []).filter((cellComments) => !CellPopupService_1.CellPopupService.isSameAddress(cellComments, deleteAction.cellAddress)) });
+        }
+        case exports.COMMENTS_EDIT: {
+            const editAction = action;
+            let edited = false;
+            const adaptableCellComments = ((_d = state.CommentThreads) !== null && _d !== void 0 ? _d : []).map((cellComments) => {
+                if (CellPopupService_1.CellPopupService.isSameAddress(cellComments, editAction.cellAddress)) {
+                    // found the place
+                    edited = true;
+                    return Object.assign(Object.assign({}, cellComments), { Comments: cellComments.Comments.map((comment) => {
+                            if (comment.Uuid === editAction.comment.Uuid) {
+                                return editAction.comment;
+                            }
+                            return comment;
+                        }) });
+                }
+            });
+            return Object.assign(Object.assign({}, state), { CommentThreads: adaptableCellComments });
+        }
+        case exports.COMMENTS_DELETE: {
+            const deleteAction = action;
+            const adaptableCellComments = ((_e = state.CommentThreads) !== null && _e !== void 0 ? _e : [])
+                .map((cellComments) => {
+                if (CellPopupService_1.CellPopupService.isSameAddress(cellComments, deleteAction.cellAddress)) {
+                    // found the place
+                    const newComments = cellComments.Comments.filter((comment) => comment.Uuid !== deleteAction.commentUuid);
+                    if (newComments.length === 0) {
+                        return null;
+                    }
+                    const newCellComments = Object.assign(Object.assign({}, cellComments), { Comments: newComments });
+                    return newCellComments;
+                }
+                return cellComments;
+            })
+                .filter((cellComments) => cellComments !== null);
+            return Object.assign(Object.assign({}, state), { CommentThreads: adaptableCellComments });
+        }
+        case exports.COMMENTS_LOAD: {
+            return Object.assign(Object.assign({}, state), { CommentThreads: action.commentThread });
+        }
+        default:
+            return state;
+    }
+};
+exports.CommentsReducer = CommentsReducer;

package/src/Redux/ActionsReducers/NotesRedux.js

@@ -69,8 +69,7 @@ const NotesReducer = (state = initialState, action) => {
         case exports.NOTES_ADD: {
             const note = action.adaptableNote;
             AdaptableHelper_1.default.addUuidAndSource(note);
-            adaptableNotes = [].concat(state.Notes);
-            adaptableNotes.push(note);
+            adaptableNotes = [...state.Notes, note];
             return Object.assign(Object.assign({}, state), { Notes: adaptableNotes });
         }
         case exports.NOTES_EDIT: {

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

@@ -127,54 +127,6 @@ export declare const OPENFIN_SET_RUNNING_OFF = "OPENFIN_SET_RUNNING_OFF";
  * @ReduxAction set current(selected) report name
  */
 export declare const OPENFIN_SET_CURRENT_REPORTNAME = "OPENFIN_SET_CURRENT_REPORTNAME";
-/**
- * @ReduxAction Logged in to Glue42
- */
-export declare const GLUE42_LOGIN = "GLUE42_LOGIN";
-/**
- * @ReduxAction Error message set from failed login
- */
-export declare const GLUE42_SET_LOGIN_ERROR_MESSAGE = "GLUE42_SET_LOGIN_ERROR_MESSAGE";
-/**
- * @ReduxAction Throttle time for live reports has been set
- */
-export declare const GLUE42_SET_THROTTLE_TIME = "GLUE42_SET_THROTTLE_TIME";
-/**
- * @ReduxAction A snapshot report has been sent
- */
-export declare const GLUE42_SEND_SNAPSHOT = "GLUE42_SEND_SNAPSHOT";
-/**
- * @ReduxAction Live data has been sent to Glue42
- */
-export declare const GLUE42_START_LIVE_DATA = "GLUE42_START_LIVE_DATA";
-/**
- * @ReduxAction Live data is not longer sent to Glue42
- */
-export declare const GLUE42_STOP_LIVE_DATA = "GLUE42_STOP_LIVE_DATA";
-/**
- * @ReduxAction A Glue42 live report has started
- */
-export declare const GLUE42_LIVE_REPORT_SET = "GLUE42_LIVE_REPORT_SET";
-/**
- * @ReduxAction A Glue42 live report has stopped
- */
-export declare const GLUE42_LIVE_REPORT_CLEAR = "GLUE42_LIVE_REPORT_CLEAR";
-/**
- * @ReduxAction Glue43 is now available
- */
-export declare const GLUE42_SET_AVAILABLE_ON = "GLUE42_SET_AVAILABLE_ON";
-/**
- * @ReduxAction Glue43 is no longer available
- */
-export declare const GLUE42_SET_AVAILABLE_OFF = "GLUE42_SET_AVAILABLE_OFF";
-/**
- * @ReduxAction Glue43 is now running
- */
-export declare const GLUE42_SET_RUNNING_ON = "GLUE42_SET_RUNNING_ON";
-/**
- * @ReduxAction Glue43 is no longer running
- */
-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.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;
+exports.PluginsReducer = exports.PluginsSetPluginState = 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
  */
@@ -129,54 +129,6 @@ exports.OPENFIN_SET_RUNNING_OFF = 'OPENFIN_SET_RUNNING_OFF';
  * @ReduxAction set current(selected) report name
  */
 exports.OPENFIN_SET_CURRENT_REPORTNAME = 'OPENFIN_SET_CURRENT_REPORTNAME';
-/**
- * @ReduxAction Logged in to Glue42
- */
-exports.GLUE42_LOGIN = 'GLUE42_LOGIN';
-/**
- * @ReduxAction Error message set from failed login
- */
-exports.GLUE42_SET_LOGIN_ERROR_MESSAGE = 'GLUE42_SET_LOGIN_ERROR_MESSAGE';
-/**
- * @ReduxAction Throttle time for live reports has been set
- */
-exports.GLUE42_SET_THROTTLE_TIME = 'GLUE42_SET_THROTTLE_TIME';
-/**
- * @ReduxAction A snapshot report has been sent
- */
-exports.GLUE42_SEND_SNAPSHOT = 'GLUE42_SEND_SNAPSHOT';
-/**
- * @ReduxAction Live data has been sent to Glue42
- */
-exports.GLUE42_START_LIVE_DATA = 'GLUE42_START_LIVE_DATA';
-/**
- * @ReduxAction Live data is not longer sent to Glue42
- */
-exports.GLUE42_STOP_LIVE_DATA = 'GLUE42_STOP_LIVE_DATA';
-/**
- * @ReduxAction A Glue42 live report has started
- */
-exports.GLUE42_LIVE_REPORT_SET = 'GLUE42_LIVE_REPORT_SET';
-/**
- * @ReduxAction A Glue42 live report has stopped
- */
-exports.GLUE42_LIVE_REPORT_CLEAR = 'GLUE42_LIVE_REPORT_CLEAR';
-/**
- * @ReduxAction Glue43 is now available
- */
-exports.GLUE42_SET_AVAILABLE_ON = 'GLUE42_SET_AVAILABLE_ON';
-/**
- * @ReduxAction Glue43 is no longer available
- */
-exports.GLUE42_SET_AVAILABLE_OFF = 'GLUE42_SET_AVAILABLE_OFF';
-/**
- * @ReduxAction Glue43 is now running
- */
-exports.GLUE42_SET_RUNNING_ON = 'GLUE42_SET_RUNNING_ON';
-/**
- * @ReduxAction Glue43 is no longer running
- */
-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/Redux/ActionsReducers/PlusMinusRedux.d.ts

@@ -33,6 +33,14 @@ export declare const PLUS_MINUS_RULE_SUSPEND_ALL = "PLUS_MINUS_RULE_SUSPEND_ALL"
  * @ReduxAction All Plus Minus Rules have been unsuspended
  */
 export declare const PLUS_MINUS_RULE_UNSUSPEND_ALL = "PLUS_MINUS_RULE_UNSUSPEND_ALL";
+/**
+ * @ReduxAction A Plus Minus Rule has been moved up
+ */
+export declare const PLUS_MINUS_RULE_MOVE_UP = "PLUS_MINUS_RULE_MOVE_UP";
+/**
+ * @ReduxAction A Plus Minus Rule has been moved down
+ */
+export declare const PLUS_MINUS_RULE_MOVE_DOWN = "PLUS_MINUS_RULE_MOVE_DOWN";
 /**
  * @ReduxAction PlusMinus Module is ready
  */
@@ -57,6 +65,12 @@ export interface PlusMinusNudgeSuspendAllAction extends Redux.Action {
 }
 export interface PlusMinusNudgeUnSuspendAllAction extends Redux.Action {
 }
+export interface PlusMinusMoveUpAction extends Redux.Action {
+    plusMinusNudge: PlusMinusNudge;
+}
+export interface PlusMinusMoveDownAction extends Redux.Action {
+    plusMinusNudge: PlusMinusNudge;
+}
 export interface PlusMinusReadyAction extends Redux.Action {
     plusMinusState: PlusMinusState;
 }
@@ -68,5 +82,7 @@ export declare const PlusMinusNudgeSuspend: (plusMinusNudge: PlusMinusNudge) =>
 export declare const PlusMinusNudgeUnSuspend: (plusMinusNudge: PlusMinusNudge) => PlusMinusNudgeUnSuspendAction;
 export declare const PlusMinusNudgeSuspendAll: () => PlusMinusNudgeSuspendAllAction;
 export declare const PlusMinusNudgeUnSuspendAll: () => PlusMinusNudgeUnSuspendAllAction;
+export declare const PlusMinusMoveUp: (plusMinusNudge: PlusMinusNudge) => PlusMinusMoveUpAction;
+export declare const PlusMinusMoveDown: (plusMinusNudge: PlusMinusNudge) => PlusMinusMoveDownAction;
 export declare const PlusMinusReady: (plusMinusState: PlusMinusState) => PlusMinusReadyAction;
 export declare const PlusMinusReducer: Redux.Reducer<PlusMinusState>;