@adaptabletools/adaptable 18.0.0-canary.11 → 18.0.0-canary.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/base.css +4 -0
  2. package/base.css.map +1 -1
  3. package/index.css +6 -0
  4. package/index.css.map +1 -1
  5. package/package.json +1 -1
  6. package/src/AdaptableOptions/AdaptableOptions.d.ts +2 -2
  7. package/src/AdaptableOptions/ColumnOptions.d.ts +7 -4
  8. package/src/AdaptableOptions/CommentOptions.d.ts +9 -7
  9. package/src/AdaptableOptions/NoteOptions.d.ts +4 -1
  10. package/src/Api/AdaptableApi.d.ts +2 -2
  11. package/src/Api/ColumnApi.d.ts +4 -0
  12. package/src/Api/CommentApi.d.ts +11 -12
  13. package/src/Api/ConfigApi.d.ts +2 -2
  14. package/src/Api/EventApi.d.ts +7 -9
  15. package/src/Api/Events/CommentChanged.d.ts +11 -0
  16. package/src/Api/GridApi.d.ts +4 -0
  17. package/src/Api/Implementation/AdaptableApiImpl.d.ts +2 -2
  18. package/src/Api/Implementation/AdaptableApiImpl.js +2 -2
  19. package/src/Api/Implementation/ApiBase.d.ts +2 -2
  20. package/src/Api/Implementation/ApiBase.js +1 -1
  21. package/src/Api/Implementation/ColumnApiImpl.d.ts +1 -0
  22. package/src/Api/Implementation/ColumnApiImpl.js +10 -0
  23. package/src/Api/Implementation/CommentsApiImpl.d.ts +1 -2
  24. package/src/Api/Implementation/ConfigApiImpl.d.ts +2 -2
  25. package/src/Api/Implementation/ConfigApiImpl.js +2 -2
  26. package/src/Api/Implementation/GridApiImpl.d.ts +1 -0
  27. package/src/Api/Implementation/GridApiImpl.js +9 -0
  28. package/src/Api/Implementation/{NotesApiImpl.d.ts → NoteApiImpl.d.ts} +7 -7
  29. package/src/Api/Implementation/{NotesApiImpl.js → NoteApiImpl.js} +5 -5
  30. package/src/Api/Implementation/OptionsApiImpl.d.ts +4 -5
  31. package/src/Api/Implementation/OptionsApiImpl.js +2 -12
  32. package/src/Api/Internal/AdaptableInternalApi.d.ts +1 -1
  33. package/src/Api/Internal/ExportInternalApi.d.ts +2 -1
  34. package/src/Api/Internal/ExportInternalApi.js +4 -1
  35. package/src/Api/Internal/NotesInternalApi.d.ts +1 -1
  36. package/src/Api/Internal/NotesInternalApi.js +1 -1
  37. package/src/Api/{NotesApi.d.ts → NoteApi.d.ts} +14 -14
  38. package/src/Api/OptionsApi.d.ts +8 -12
  39. package/src/PredefinedConfig/AdaptableState.d.ts +2 -2
  40. package/src/PredefinedConfig/CommentState.d.ts +13 -13
  41. package/src/PredefinedConfig/Common/RowSummary.d.ts +6 -0
  42. package/src/PredefinedConfig/{NotesState.d.ts → NoteState.d.ts} +2 -2
  43. package/src/PredefinedConfig/PredefinedConfig.d.ts +2 -2
  44. package/src/PredefinedConfig/Selection/GridCell.d.ts +13 -0
  45. package/src/PredefinedConfig/SystemState.d.ts +2 -3
  46. package/src/Redux/ActionsReducers/NotesRedux.d.ts +6 -6
  47. package/src/Redux/ActionsReducers/NotesRedux.js +1 -1
  48. package/src/Redux/ActionsReducers/SystemRedux.js +3 -3
  49. package/src/Redux/Store/AdaptableStore.js +4 -10
  50. package/src/Strategy/CommentsModule.js +4 -4
  51. package/src/Strategy/NotesModule.js +5 -5
  52. package/src/Utilities/Services/CellPopupService.js +2 -2
  53. package/src/Utilities/Services/Interface/IReportService.d.ts +1 -4
  54. package/src/Utilities/Services/ReportService.d.ts +7 -5
  55. package/src/Utilities/Services/ReportService.js +238 -22
  56. package/src/View/Components/NewScopeComponent.js +2 -2
  57. package/src/View/Components/Popups/GridCellPopup/GridCellPopup.js +1 -1
  58. package/src/View/Layout/LayoutViewPanel.js +2 -1
  59. package/src/View/Layout/Wizard/LayoutWizard.js +3 -2
  60. package/src/View/Notes/NotesPopup.js +3 -3
  61. package/src/View/SpecialColumnSettingsWizardStep.js +1 -1
  62. package/src/agGrid/AdaptableAgGrid.d.ts +2 -0
  63. package/src/agGrid/AdaptableAgGrid.js +93 -54
  64. package/src/agGrid/AgGridAdapter.d.ts +1 -0
  65. package/src/agGrid/AgGridAdapter.js +3 -0
  66. package/src/agGrid/AgGridColumnAdapter.d.ts +1 -1
  67. package/src/agGrid/AgGridColumnAdapter.js +2 -2
  68. package/src/agGrid/AgGridOptionsService.d.ts +4 -1
  69. package/src/agGrid/AgGridOptionsService.js +22 -0
  70. package/src/env.js +2 -2
  71. package/src/metamodel/adaptable.metamodel.d.ts +41 -3
  72. package/src/metamodel/adaptable.metamodel.js +1 -1
  73. package/src/types.d.ts +22 -20
  74. package/tsconfig.esm.tsbuildinfo +1 -1
  75. package/src/Api/Events/CommentsChangedInfo.d.ts +0 -5
  76. package/src/PredefinedConfig/CellAddress.d.ts +0 -13
  77. package/src/PredefinedConfig/CellAddress.js +0 -4
  78. /package/src/Api/Events/{CommentsChangedInfo.js → CommentChanged.js} +0 -0
  79. /package/src/Api/{NotesApi.js → NoteApi.js} +0 -0
  80. /package/src/PredefinedConfig/{NotesState.js → NoteState.js} +0 -0
@@ -1,47 +1,47 @@
1
- import { AdaptableNote, AdaptableNotes, NotesState } from '../PredefinedConfig/NotesState';
2
- import { CellAddress } from '../PredefinedConfig/CellAddress';
1
+ import { AdaptableNote, AdaptableNotes, NoteState } from '../PredefinedConfig/NoteState';
2
+ import { CellAddress } from '../../types';
3
3
  /**
4
4
  * Provides run-time access to Notes Module and related State
5
5
  */
6
- export interface NotesApi {
6
+ export interface NoteApi {
7
7
  /**
8
- *
8
+ * Adds a new Note
9
9
  * @param note
10
10
  * @param primaryKeyValue
11
11
  * @param columnId
12
12
  */
13
13
  addNote(note: string, primaryKeyValue: any, columnId: string): void;
14
14
  /**
15
- * Edit note
15
+ * Edits a Note
16
16
  * @param note
17
17
  */
18
18
  editNote(note: AdaptableNote): void;
19
19
  /**
20
- * Edit note text
21
- * @param noteStr
20
+ * Edits text of a Note
21
+ * @param notetext
22
22
  * @param note
23
23
  */
24
- updateNoteText(noteStr: string, note: AdaptableNote): void;
24
+ updateNoteText(notetext: string, note: AdaptableNote): void;
25
25
  /**
26
- *
26
+ * Deletes a Note
27
27
  * @param note
28
28
  */
29
29
  deleteNote(note: AdaptableNote): void;
30
30
  /**
31
- * Gets the Notes State
31
+ * Gets the Note State
32
32
  */
33
- getNotesState(): NotesState;
33
+ getNoteState(): NoteState;
34
34
  /**
35
- * Gets all notes
35
+ * Gets all Notes
36
36
  */
37
37
  getAllNotes(): AdaptableNotes;
38
38
  /**
39
- * Gets all notes for a cell
39
+ * Gets all Notes for a cell
40
40
  * @param CellAddress note position
41
41
  */
42
42
  getCellNotes(CellAddress: CellAddress): AdaptableNote[];
43
43
  /**
44
- * Returns a note by uuid
44
+ * Returns a Note by uuid
45
45
  * @param uuid note uuid
46
46
  */
47
47
  getNoteByUuid(uuid: string): AdaptableNote | undefined;
@@ -1,11 +1,11 @@
1
1
  import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
2
2
  import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
3
3
  import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
4
- import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, GridFilterOptions, LayoutOptions, MenuOptions, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
4
+ import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, GridFilterOptions, LayoutOptions, MenuOptions, NoteOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
5
5
  import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
6
6
  import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
7
7
  import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
8
- import { CommentsOptions } from '../AdaptableOptions/CommentOptions';
8
+ import { CommentOptions } from '../AdaptableOptions/CommentOptions';
9
9
  /**
10
10
  * Range of functions to access Adaptable Options
11
11
  */
@@ -42,10 +42,6 @@ export interface OptionsApi {
42
42
  * Returns `AdaptableOptions.actionColumnOptions`
43
43
  */
44
44
  getActionColumnOptions(): Readonly<ActionColumnOptions>;
45
- /**
46
- * Returns available columns types defined under columnOptions.columnTypes
47
- */
48
- getColumnTypes(): string[];
49
45
  /**
50
46
  * Returns `AdaptableOptions.actionRowOptions`
51
47
  */
@@ -79,13 +75,9 @@ export interface OptionsApi {
79
75
  */
80
76
  getColumnOptions(): Readonly<ColumnOptions>;
81
77
  /**
82
- * Returns `AdaptableOptions.noteOptions`
78
+ * Returns `AdaptableOptions.commentOptions`
83
79
  */
84
- getNotesOptions(): Readonly<NotesOptions>;
85
- /**
86
- * Returns `AdaptableOptions.commentsOptions`
87
- */
88
- getCommentsOptions(): Readonly<CommentsOptions>;
80
+ getCommentOptions(): Readonly<CommentOptions>;
89
81
  /**
90
82
  * Returns `AdaptableOptions.customSortOptions`
91
83
  */
@@ -150,6 +142,10 @@ export interface OptionsApi {
150
142
  * Returns `AdaptableOptions.formatColumnOptions`
151
143
  */
152
144
  getFormatColumnOptions(): Readonly<FormatColumnOptions>;
145
+ /**
146
+ * Returns `AdaptableOptions.noteOptions`
147
+ */
148
+ getNoteOptions(): Readonly<NoteOptions>;
153
149
  /**
154
150
  * Returns `AdaptableOptions.settingsPanelOptions`
155
151
  */
@@ -23,7 +23,7 @@ import { FlashingCellState } from './FlashingCellState';
23
23
  import { StatusBarState } from './StatusBarState';
24
24
  import { ChartingState } from './ChartingState';
25
25
  import { StyledColumnState } from './StyledColumnState';
26
- import { NotesState } from './NotesState';
26
+ import { NoteState } from './NoteState';
27
27
  import { NamedQueryState } from './NamedQueryState';
28
28
  import { CommentState } from './CommentState';
29
29
  /**
@@ -57,7 +57,7 @@ export interface AdaptablePersistentState {
57
57
  Theme: ThemeState;
58
58
  ToolPanel: ToolPanelState;
59
59
  Charting: ChartingState;
60
- Notes: NotesState;
60
+ Notes: NoteState;
61
61
  /**
62
62
  * @deprecated
63
63
  */
@@ -1,19 +1,28 @@
1
1
  import { AdaptableObject } from '../types';
2
2
  import { ConfigState } from './ConfigState';
3
3
  /**
4
- * Note that can be applied to a Cell in AdapTable
4
+ * Predefined Configuration for Comments Module
5
+ */
6
+ export interface CommentState extends ConfigState {
7
+ /**
8
+ * Collection of AdapTable Comments
9
+ */
10
+ CommentThreads?: CommentThread[];
11
+ }
12
+ /**
13
+ * Comment that can be applied to a Cell in AdapTable
5
14
  */
6
15
  export interface AdaptableComment extends AdaptableObject {
7
16
  /**
8
- * When Note was made
17
+ * When Comment was made
9
18
  */
10
19
  Timestamp: number;
11
20
  /**
12
- * Value of the Note
21
+ * Content of the Comment
13
22
  */
14
23
  Value: string;
15
24
  /**
16
- * Author of the Note
25
+ * Author of the Comment
17
26
  */
18
27
  Author?: {
19
28
  UserName: string;
@@ -37,12 +46,3 @@ export interface CommentThread extends AdaptableObject {
37
46
  */
38
47
  Comments: AdaptableComment[];
39
48
  }
40
- /**
41
- * Predefined Configuration for Notes Module
42
- */
43
- export interface CommentState extends ConfigState {
44
- /**
45
- * Collection of AdapTable Notes
46
- */
47
- CommentThreads?: CommentThread[];
48
- }
@@ -1,6 +1,12 @@
1
1
  import { SummarySupportedExpression } from '../../Utilities/Services/SummaryService';
2
2
  export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
3
+ /**
4
+ * Position of Row Summary - 'Top' or 'Bottom'
5
+ */
3
6
  export type RowSummaryPosition = 'Top' | 'Bottom';
7
+ /**
8
+ * Defines a Row Summary used in a Layout
9
+ */
4
10
  export interface RowSummary {
5
11
  Position?: RowSummaryPosition;
6
12
  ColumnsMap: Record<string, SummarySupportedExpression>;
@@ -3,7 +3,7 @@ import { ConfigState } from './ConfigState';
3
3
  /**
4
4
  * Predefined Configuration for Notes Module
5
5
  */
6
- export interface NotesState extends ConfigState {
6
+ export interface NoteState extends ConfigState {
7
7
  /**
8
8
  * Collection of AdapTable Notes
9
9
  */
@@ -18,7 +18,7 @@ export interface AdaptableNote extends AdaptableObject {
18
18
  */
19
19
  Timestamp: number;
20
20
  /**
21
- * Value of the Note
21
+ * Content of the Note
22
22
  */
23
23
  Text: string;
24
24
  /**
@@ -17,7 +17,7 @@ import { ToolPanelState } from './ToolPanelState';
17
17
  import { StatusBarState } from './StatusBarState';
18
18
  import { ChartingState } from './ChartingState';
19
19
  import { StyledColumnState } from './StyledColumnState';
20
- import { NotesState } from './NotesState';
20
+ import { NoteState } from './NoteState';
21
21
  import { NamedQueryState } from '../types';
22
22
  /**
23
23
  * This is the main Predefined Config interface which developers will populate at design-time
@@ -46,7 +46,7 @@ export interface PredefinedConfig {
46
46
  /**
47
47
  * Collection of personal Notes that are edited at Cell level
48
48
  */
49
- Notes?: NotesState;
49
+ Notes?: NoteState;
50
50
  /**
51
51
  * 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
52
52
  */
@@ -1,5 +1,18 @@
1
1
  import { IRowNode } from '@ag-grid-community/core';
2
2
  import { AdaptableColumn } from '../Common/AdaptableColumn';
3
+ /**
4
+ * Very lightweight object to define an AdapTable Cell
5
+ */
6
+ export type CellAddress = {
7
+ /**
8
+ * Value in Primary Key Column
9
+ */
10
+ PrimaryKeyValue: string | number;
11
+ /**
12
+ * Id of Column containing the Note
13
+ */
14
+ ColumnId: string;
15
+ };
3
16
  /**
4
17
  * Defines a Cell in Adaptable - every cell is an intersection of a Column Id and a Primary Key Value
5
18
  */
@@ -1,7 +1,7 @@
1
1
  import { PreviewInfo } from '../Utilities/Interface/Preview';
2
2
  import { InternalState } from './InternalState';
3
3
  import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
4
- import { CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
4
+ import { CellAddress, CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
5
5
  import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
6
6
  import { OpenFinState, OpenFinReport } from './OpenFinState';
7
7
  import { AdaptableAlert } from './Common/AdaptableAlert';
@@ -12,7 +12,6 @@ import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
12
12
  import { TypeUuid } from './Uuid';
13
13
  import { SummaryOperation } from './Common/Enums';
14
14
  import { ChartModel } from '@ag-grid-community/core';
15
- import { CellAddress } from './CellAddress';
16
15
  import { ExternalChartDefinition } from './ChartingState';
17
16
  import { CachedQuery } from './NamedQueryState';
18
17
  export type { IPushPullReport, IPushPullDomain };
@@ -97,7 +96,7 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
97
96
  */
98
97
  DisableDeleteConfirmation: boolean;
99
98
  Export: {
100
- inProgressVisualData: boolean;
99
+ visualDataExportInProgress: boolean;
101
100
  };
102
101
  QuickSearch?: {
103
102
  floatingVisible?: boolean;
@@ -1,4 +1,4 @@
1
- import { AdaptableNote, NotesState } from '../../PredefinedConfig/NotesState';
1
+ import { AdaptableNote, NoteState } from '../../PredefinedConfig/NoteState';
2
2
  import * as Redux from 'redux';
3
3
  import { CellAddress } from '../../types';
4
4
  /**
@@ -27,12 +27,12 @@ export interface AdaptableNotesEditAction extends AdaptableNoteAction {
27
27
  export interface AdaptableNotesDeleteAction extends AdaptableNoteAction {
28
28
  }
29
29
  export interface NoteReadyAction extends Redux.Action {
30
- notesState: NotesState;
30
+ noteState: NoteState;
31
31
  }
32
32
  export declare const NotesAdd: (note: AdaptableNote) => AdaptableNotesAddAction;
33
33
  export declare const NotesEdit: (note: AdaptableNote) => AdaptableNotesEditAction;
34
34
  export declare const NotesDelete: (note: AdaptableNote) => AdaptableNotesDeleteAction;
35
- export declare const NotesReady: (note: NotesState) => NoteReadyAction;
36
- export declare const GetAllNotesSelector: (state: NotesState) => AdaptableNote[];
37
- export declare const GetNotesSelector: (state: NotesState, address: CellAddress) => AdaptableNote[];
38
- export declare const NotesReducer: Redux.Reducer<NotesState>;
35
+ export declare const NotesReady: (note: NoteState) => NoteReadyAction;
36
+ export declare const GetAllNotesSelector: (state: NoteState) => AdaptableNote[];
37
+ export declare const GetNotesSelector: (state: NoteState, address: CellAddress) => AdaptableNote[];
38
+ export declare const NotesReducer: Redux.Reducer<NoteState>;
@@ -30,7 +30,7 @@ export const NotesDelete = (note) => ({
30
30
  });
31
31
  export const NotesReady = (note) => ({
32
32
  type: NOTES_READY,
33
- notesState: note,
33
+ noteState: note,
34
34
  });
35
35
  export const GetAllNotesSelector = (state) => state.Notes;
36
36
  export const GetNotesSelector = (state, address) => {
@@ -395,7 +395,7 @@ const initialState = {
395
395
  },
396
396
  DisableDeleteConfirmation: false,
397
397
  Export: {
398
- inProgressVisualData: false,
398
+ visualDataExportInProgress: false,
399
399
  },
400
400
  };
401
401
  export const SystemReducer = (state = initialState, action) => {
@@ -728,12 +728,12 @@ export const SystemReducer = (state = initialState, action) => {
728
728
  }
729
729
  case SYSTEM_VISUAL_EXPORT_BEGIN: {
730
730
  return Object.assign(Object.assign({}, state), { Export: {
731
- inProgressVisualData: true,
731
+ visualDataExportInProgress: true,
732
732
  } });
733
733
  }
734
734
  case SYSTEM_VISUAL_EXPORT_END: {
735
735
  return Object.assign(Object.assign({}, state), { Export: {
736
- inProgressVisualData: false,
736
+ visualDataExportInProgress: false,
737
737
  } });
738
738
  }
739
739
  case SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY: {
@@ -39,7 +39,7 @@ import * as SmartEditRedux from '../ActionsReducers/SmartEditRedux';
39
39
  import * as StatusBarRedux from '../ActionsReducers/StatusBarRedux';
40
40
  import * as StyledColumnRedux from '../ActionsReducers/StyledColumnRedux';
41
41
  import * as SystemRedux from '../ActionsReducers/SystemRedux';
42
- import { SYSTEM_PROGRESS_INDICATOR_HIDE, SYSTEM_PROGRESS_INDICATOR_SHOW, SYSTEM_VISUAL_EXPORT_BEGIN, SYSTEM_VISUAL_EXPORT_END, } from '../ActionsReducers/SystemRedux';
42
+ import { SYSTEM_PROGRESS_INDICATOR_HIDE, SYSTEM_PROGRESS_INDICATOR_SHOW, } from '../ActionsReducers/SystemRedux';
43
43
  import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
44
44
  import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
45
45
  import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
@@ -900,9 +900,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
900
900
  requestAnimationFrame(() => {
901
901
  var _a, _b;
902
902
  const commentThreads = adaptable.api.commentApi.getCommentThreads();
903
- adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
903
+ adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getCommentThreads());
904
904
  (_b = (_a = adaptable.api.optionsApi
905
- .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
905
+ .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
906
906
  });
907
907
  }
908
908
  return returnAction;
@@ -927,7 +927,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
927
927
  }
928
928
  }
929
929
  // This cannot be called because it would trigger an infinite loop
930
- // adaptable.api.eventApi.emit('CommentsChanged', commentThreads);
930
+ // adaptable.api.eventApi.emit('CommentChanged', commentThreads);
931
931
  // refresh all comments cells to show or hide the triangle
932
932
  [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
933
933
  const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
@@ -1266,12 +1266,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
1266
1266
  }
1267
1267
  return next(action);
1268
1268
  }
1269
- case SYSTEM_VISUAL_EXPORT_BEGIN:
1270
- case SYSTEM_VISUAL_EXPORT_END: {
1271
- let returnAction = next(action);
1272
- adaptable.ReportService.resetExcelStyleMemoization();
1273
- return returnAction;
1274
- }
1275
1269
  /*******************
1276
1270
  * CHARTING ACTIONS
1277
1271
  *******************/
@@ -14,7 +14,7 @@ export class CommentsModule extends AdaptableModuleBase {
14
14
  this.loadComments();
15
15
  }
16
16
  isModuleAvailable() {
17
- const options = this.adaptable.api.optionsApi.getCommentsOptions();
17
+ const options = this.adaptable.api.optionsApi.getCommentOptions();
18
18
  if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
19
19
  return false;
20
20
  }
@@ -23,7 +23,7 @@ export class CommentsModule extends AdaptableModuleBase {
23
23
  async loadComments() {
24
24
  var _a, _b;
25
25
  const commentThreads = await ((_b = (_a = this.api.optionsApi
26
- .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, createBaseContext(this.adaptable.api)));
26
+ .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, createBaseContext(this.adaptable.api)));
27
27
  this.api.commentApi.loadCommentThreads(commentThreads);
28
28
  }
29
29
  addContextMenuItems(menuContext) {
@@ -32,11 +32,11 @@ export class CommentsModule extends AdaptableModuleBase {
32
32
  return undefined;
33
33
  }
34
34
  const items = [];
35
- const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentsOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
35
+ const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
36
36
  if (!isCellCommentable ||
37
37
  isCellCommentable({
38
38
  adaptableApi: this.adaptable.api,
39
- address: {
39
+ cellAddress: {
40
40
  PrimaryKeyValue: menuContext.primaryKeyValue,
41
41
  ColumnId: menuContext.adaptableColumn.columnId,
42
42
  },
@@ -11,7 +11,7 @@ export class NotesModule extends AdaptableModuleBase {
11
11
  return undefined;
12
12
  }
13
13
  const items = [];
14
- const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNotesOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
14
+ const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
15
15
  if (!isCellNotable ||
16
16
  isCellNotable({
17
17
  adaptableApi: this.adaptable.api,
@@ -28,23 +28,23 @@ export class NotesModule extends AdaptableModuleBase {
28
28
  getAddRemoveNoteMenuItems(menuContext) {
29
29
  var _a;
30
30
  const items = [];
31
- if (!this.api.notesApi.internalApi.areNotesAvailable()) {
31
+ if (!this.api.noteApi.internalApi.areNotesAvailable()) {
32
32
  return items;
33
33
  }
34
34
  // does not have note
35
- const [note] = (_a = this.adaptable.api.notesApi.getCellNotes({
35
+ const [note] = (_a = this.adaptable.api.noteApi.getCellNotes({
36
36
  PrimaryKeyValue: menuContext.primaryKeyValue,
37
37
  ColumnId: menuContext.adaptableColumn.columnId,
38
38
  })) !== null && _a !== void 0 ? _a : [];
39
39
  if (note) {
40
40
  items.push(this.createColumnMenuItemClickFunction('Remove Note', this.moduleInfo.Glyph, () => {
41
- this.api.notesApi.deleteNote(note);
41
+ this.api.noteApi.deleteNote(note);
42
42
  }));
43
43
  }
44
44
  else {
45
45
  items.push(this.createColumnMenuItemClickFunction('Add Note', this.moduleInfo.Glyph, () => {
46
46
  // add an empty one
47
- this.api.notesApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
47
+ this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
48
48
  this.api.internalApi.getCellPopupService().showPopup({
49
49
  PrimaryKeyValue: menuContext.primaryKeyValue,
50
50
  ColumnId: menuContext.adaptableColumn.columnId,
@@ -74,7 +74,7 @@ export class CellPopupService {
74
74
  this.hidePopup();
75
75
  return;
76
76
  }
77
- const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellPosition);
77
+ const cellNotes = this.adaptable.api.noteApi.getCellNotes(cellPosition);
78
78
  const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
79
79
  const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
80
80
  // call only if it is different
@@ -92,7 +92,7 @@ export class CellPopupService {
92
92
  return;
93
93
  }
94
94
  // if open but this has no note, close
95
- const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellAddress);
95
+ const cellNotes = this.adaptable.api.noteApi.getCellNotes(cellAddress);
96
96
  const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
97
97
  const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
98
98
  if (openCellAddress && !hasNotesOrComments) {
@@ -4,11 +4,8 @@ import { IAdaptableService } from './IAdaptableService';
4
4
  import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
5
5
  import { CustomDestination, SystemExportDestination } from '../../../types';
6
6
  export interface IReportService extends IAdaptableService {
7
- resetExcelStyleMemoization(): void;
8
- registerExcelStyle(excelStyle: Partial<ExcelStyle>, cellClassKey: string): void;
9
- getRegisteredExcelStyles(): ExcelStyle[];
7
+ buildExcelStylesForVisualReports(): ExcelStyle[];
10
8
  getExcelStyleIdForCellClassKey(cellClassKey: string): string;
11
- registerExcelStyleWithFormattedDate(cellClassId: string, isoFormattedValue: string): void;
12
9
  getExcelStyleWithFormattedDate(cellClassId: string): string;
13
10
  CreateSystemReport(systemReportName: SystemReportName): Report;
14
11
  IsSystemReport(reportName: string): boolean;
@@ -10,11 +10,8 @@ export declare class ReportService implements IReportService {
10
10
  private cellClassKey2excelStyleIdMap;
11
11
  private excelStylesWithFormattedDate;
12
12
  constructor(adaptableApi: AdaptableApi);
13
- resetExcelStyleMemoization(): void;
14
- registerExcelStyle(excelStyle: Partial<ExcelStyle>, cellClassKey: string): void;
15
- getRegisteredExcelStyles(): ExcelStyle[];
13
+ destroy(): void;
16
14
  getExcelStyleIdForCellClassKey(cellClassKey: string): string;
17
- registerExcelStyleWithFormattedDate(cellClassId: string, isoFormattedValue: string): void;
18
15
  getExcelStyleWithFormattedDate(cellClassId: string): string;
19
16
  CreateSystemReport(systemReportName: SystemReportName): Report;
20
17
  IsSystemReport(reportName: string): boolean;
@@ -33,7 +30,12 @@ export declare class ReportService implements IReportService {
33
30
  getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
34
31
  getCellExportValueFromRawValue(rowNode: IRowNode, cellRawValue: any, columnId: string): any;
35
32
  getReportFileName(reportName: string, destination: SystemExportDestination | CustomDestination): string;
36
- destroy(): void;
37
33
  private getCustomExportDateFormat;
38
34
  private getCellExportValueFromRawValueByType;
35
+ buildExcelStylesForVisualReports(): ExcelStyle[];
36
+ createExcelStyleMemoization(): void;
37
+ private convertCSSToExcelStyle;
38
+ private resetExcelStyleMemoization;
39
+ private registerExcelStyle;
40
+ private registerExcelStyleWithFormattedDate;
39
41
  }