@adaptabletools/adaptable 13.0.0-canary.8 → 13.0.0

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 (263) hide show
  1. package/agGrid.d.ts +10 -10
  2. package/agGrid.js +10 -10
  3. package/base.css +1231 -733
  4. package/base.css.map +1 -0
  5. package/bundle.cjs.js +237 -220
  6. package/index.css +1249 -734
  7. package/index.css.map +1 -0
  8. package/package.json +5 -5
  9. package/publishTimestamp.d.ts +1 -1
  10. package/publishTimestamp.js +1 -1
  11. package/src/AdaptableInterfaces/IAdaptable.d.ts +7 -3
  12. package/src/AdaptableOptions/AdaptableOptions.d.ts +0 -2
  13. package/src/AdaptableOptions/AdaptableQLOptions.d.ts +116 -35
  14. package/src/AdaptableOptions/ExportOptions.d.ts +2 -2
  15. package/src/AdaptableOptions/FinsemblePluginOptions.d.ts +32 -0
  16. package/src/{Api/ConditionalStyleApi.js → AdaptableOptions/FinsemblePluginOptions.js} +0 -0
  17. package/src/AdaptableOptions/GeneralOptions.d.ts +0 -6
  18. package/src/AdaptableOptions/LayoutOptions.d.ts +2 -1
  19. package/src/AdaptableOptions/UserInterfaceOptions.d.ts +2 -2
  20. package/src/Api/AdaptableApi.d.ts +2 -5
  21. package/src/Api/ColumnApi.d.ts +8 -2
  22. package/src/Api/ConfigApi.d.ts +0 -6
  23. package/src/Api/ExportApi.d.ts +6 -6
  24. package/src/Api/FinsembleApi.d.ts +10 -0
  25. package/src/{Strategy/Interface/IConditionalStyleModule.js → Api/FinsembleApi.js} +0 -0
  26. package/src/Api/FormatColumnApi.d.ts +46 -73
  27. package/src/Api/Implementation/AdaptableApiImpl.d.ts +2 -2
  28. package/src/Api/Implementation/AdaptableApiImpl.js +2 -3
  29. package/src/Api/Implementation/AlertApiImpl.js +9 -4
  30. package/src/Api/Implementation/ColumnApiImpl.d.ts +2 -1
  31. package/src/Api/Implementation/ColumnApiImpl.js +15 -11
  32. package/src/Api/Implementation/ConfigApiImpl.d.ts +0 -2
  33. package/src/Api/Implementation/ConfigApiImpl.js +0 -11
  34. package/src/Api/Implementation/ExportApiImpl.d.ts +4 -4
  35. package/src/Api/Implementation/ExportApiImpl.js +14 -14
  36. package/src/Api/Implementation/FlashingCellApiImpl.js +4 -1
  37. package/src/Api/Implementation/FormatColumnApiImpl.d.ts +24 -22
  38. package/src/Api/Implementation/FormatColumnApiImpl.js +57 -224
  39. package/src/Api/Implementation/InternalApiImpl.d.ts +1 -1
  40. package/src/Api/Implementation/InternalApiImpl.js +4 -3
  41. package/src/Api/Implementation/PluginsApiImpl.d.ts +2 -0
  42. package/src/Api/Implementation/PluginsApiImpl.js +6 -0
  43. package/src/Api/Implementation/QueryLanguageApiImpl.d.ts +2 -1
  44. package/src/Api/Implementation/QueryLanguageApiImpl.js +9 -15
  45. package/src/Api/Implementation/ScopeApiImpl.d.ts +1 -1
  46. package/src/Api/Implementation/StyledColumnApiImpl.d.ts +25 -0
  47. package/src/Api/Implementation/StyledColumnApiImpl.js +193 -0
  48. package/src/Api/InternalApi.d.ts +1 -1
  49. package/src/Api/PluginsApi.d.ts +5 -0
  50. package/src/Api/QueryLanguageApi.d.ts +3 -2
  51. package/src/Api/ScopeApi.d.ts +1 -1
  52. package/src/Api/StyledColumnApi.d.ts +106 -0
  53. package/src/Api/StyledColumnApi.js +2 -0
  54. package/src/PredefinedConfig/AdaptableState.d.ts +2 -0
  55. package/src/PredefinedConfig/Common/AdaptableIcon.d.ts +1 -1
  56. package/src/PredefinedConfig/Common/Types.d.ts +3 -3
  57. package/src/PredefinedConfig/Common/Types.js +1 -0
  58. package/src/PredefinedConfig/ConditionalStyleState.d.ts +10 -19
  59. package/src/PredefinedConfig/FormatColumnState.d.ts +6 -96
  60. package/src/PredefinedConfig/PredefinedConfig.d.ts +5 -0
  61. package/src/PredefinedConfig/StyledColumnState.d.ts +119 -0
  62. package/src/PredefinedConfig/StyledColumnState.js +2 -0
  63. package/src/Redux/ActionsReducers/PluginsRedux.d.ts +4 -4
  64. package/src/Redux/ActionsReducers/PluginsRedux.js +5 -5
  65. package/src/Redux/ActionsReducers/StyledColumnRedux.d.ts +49 -0
  66. package/src/Redux/ActionsReducers/StyledColumnRedux.js +92 -0
  67. package/src/Redux/DeadRedux.d.ts +6 -0
  68. package/src/Redux/DeadRedux.js +19 -1
  69. package/src/Redux/Store/AdaptableStore.js +9 -8
  70. package/src/Strategy/ConditionalStyleModule.d.ts +2 -27
  71. package/src/Strategy/ConditionalStyleModule.js +0 -219
  72. package/src/Strategy/DataChangeHistoryModule.d.ts +1 -0
  73. package/src/Strategy/DataChangeHistoryModule.js +12 -0
  74. package/src/Strategy/FormatColumnModule.d.ts +0 -2
  75. package/src/Strategy/FormatColumnModule.js +30 -221
  76. package/src/Strategy/LayoutModule.js +0 -4
  77. package/src/Strategy/StyledColumnModule.d.ts +24 -0
  78. package/src/Strategy/StyledColumnModule.js +165 -0
  79. package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.d.ts +1 -1
  80. package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js +3 -4
  81. package/src/Strategy/Utilities/FormatColumn/getFormatColumnStyleViewItems.js +1 -16
  82. package/src/Strategy/Utilities/getScopeViewItems.js +1 -1
  83. package/src/Utilities/Constants/ModuleConstants.d.ts +3 -0
  84. package/src/Utilities/Constants/ModuleConstants.js +4 -1
  85. package/src/Utilities/Defaults/DefaultAdaptableOptions.js +6 -13
  86. package/src/Utilities/Defaults/DefaultSettingsPanel.js +1 -1
  87. package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts +1 -1
  88. package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js +3 -4
  89. package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts +1 -1
  90. package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js +3 -4
  91. package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.d.ts +1 -1
  92. package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js +3 -4
  93. package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts +2 -5
  94. package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js +3 -4
  95. package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts +1 -1
  96. package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js +3 -4
  97. package/src/Utilities/ObjectFactory.d.ts +5 -2
  98. package/src/Utilities/ObjectFactory.js +14 -7
  99. package/src/Utilities/Services/ModuleService.js +2 -2
  100. package/src/Utilities/Services/QueryLanguageService.d.ts +1 -3
  101. package/src/Utilities/Services/QueryLanguageService.js +49 -53
  102. package/src/Utilities/Services/ReportService.js +6 -6
  103. package/src/View/AdaptablePopover/index.js +1 -1
  104. package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js +15 -14
  105. package/src/View/Alert/Wizard/AlertButtonsEditor.js +24 -1
  106. package/src/View/Alert/Wizard/AlertDisplayWizardSection.js +6 -5
  107. package/src/View/Alert/Wizard/BaseAlertRulesWizardSection.js +3 -3
  108. package/src/View/Alert/Wizard/BaseAlertScopeWizardSection.js +3 -3
  109. package/src/View/Alert/Wizard/isValidAlertRules.js +1 -1
  110. package/src/View/BulkUpdate/BulkUpdatePopup.js +1 -1
  111. package/src/View/CalculatedColumn/CalculatedColumnSummary.d.ts +1 -1
  112. package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js +1 -1
  113. package/src/View/Components/AdaptableObjectRow/index.js +1 -6
  114. package/src/View/Components/Buttons/ButtonInfo.d.ts +1 -3
  115. package/src/View/Components/Buttons/ButtonInfo.js +3 -5
  116. package/src/View/Components/EntityRulesEditor/index.js +8 -17
  117. package/src/View/Components/FilterForm/FilterForm.js +11 -16
  118. package/src/View/Components/FilterForm/ListBoxFilterForm.js +2 -1
  119. package/src/View/Components/FilterForm/QuickFilterForm.js +7 -13
  120. package/src/View/Components/NewScopeComponent.js +3 -3
  121. package/src/View/Components/Panels/PanelWithButton.js +1 -5
  122. package/src/View/Components/Panels/PanelWithImage.js +1 -5
  123. package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js +2 -2
  124. package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.d.ts +1 -0
  125. package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.js +3 -16
  126. package/src/View/Components/Popups/AdaptablePopup/PopupPanel.js +1 -1
  127. package/src/View/Components/Popups/AdaptablePopupTeamSharing.js +5 -5
  128. package/src/View/Components/RangesComponent.d.ts +8 -1
  129. package/src/View/Components/RangesComponent.js +60 -24
  130. package/src/View/Components/ScopeComponent.js +6 -6
  131. package/src/View/Components/Selectors/ColumnSelector.d.ts +1 -0
  132. package/src/View/Components/Selectors/ColumnSelector.js +2 -1
  133. package/src/View/Components/Selectors/ColumnValueSelector.js +2 -2
  134. package/src/View/Components/StyleComponent.js +14 -19
  135. package/src/View/Components/ToolPanel/AdaptableToolPanel.d.ts +1 -11
  136. package/src/View/Components/ToolPanel/AdaptableToolPanel.js +21 -9
  137. package/src/View/Components/ToolPanel/CustomToolPanelContent.js +1 -1
  138. package/src/View/Components/ToolPanel/ToolPanelPopup.d.ts +1 -1
  139. package/src/View/DataSet/DataSetSelector.js +1 -1
  140. package/src/View/DataSet/DataSetViewPanel.d.ts +1 -1
  141. package/src/View/Export/ExportViewPanel.d.ts +1 -1
  142. package/src/View/Export/ExportViewPanel.js +4 -4
  143. package/src/View/Export/ReportExportDropdown.js +1 -1
  144. package/src/View/Export/Wizard/ReportNameWizardSection.js +10 -11
  145. package/src/View/Filter/FilterSummary.d.ts +1 -1
  146. package/src/View/Filter/FilterViewPanel.d.ts +1 -1
  147. package/src/View/FlashingCell/FlashingCellStyle.js +3 -3
  148. package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.js +3 -3
  149. package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.js +6 -6
  150. package/src/View/FlashingCell/Wizard/FlashingCellWizard.js +4 -4
  151. package/src/View/FormatColumn/FormatColumnSummary.js +1 -1
  152. package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js +27 -27
  153. package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.js +4 -5
  154. package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.js +1 -1
  155. package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js +2 -28
  156. package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.d.ts +3 -3
  157. package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js +6 -301
  158. package/src/View/FormatColumn/Wizard/FormatColumnWizard.js +3 -10
  159. package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js +7 -7
  160. package/src/View/GridInfo/ColumnInfoComponent.js +0 -7
  161. package/src/View/Layout/LayoutRadioSelector.js +1 -1
  162. package/src/View/Layout/LayoutViewPanel.d.ts +1 -1
  163. package/src/View/Layout/Wizard/Components/ColumnLabels.js +1 -1
  164. package/src/View/Layout/Wizard/sections/AggregationsSection.js +1 -1
  165. package/src/View/Layout/Wizard/sections/ColumnsSection.js +7 -6
  166. package/src/View/Layout/Wizard/sections/SettingsSection.js +2 -2
  167. package/src/View/PlusMinus/Wizard/PlusMinusRuleWizardSection.js +1 -1
  168. package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js +3 -3
  169. package/src/View/Query/QueryViewPanel.d.ts +1 -1
  170. package/src/View/Query/Wizard/NamedQuerySettingsWizardSection.js +1 -1
  171. package/src/View/QuickSearch/QuickSearchPopup.js +2 -2
  172. package/src/View/QuickSearch/QuickSearchViewPanel.d.ts +1 -1
  173. package/src/View/Schedule/Wizard/ScheduleScheduleWizard.js +5 -5
  174. package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsGlue42.js +1 -1
  175. package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsIPushPull.js +5 -5
  176. package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsOpenFin.js +1 -1
  177. package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReminder.js +5 -5
  178. package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.js +2 -2
  179. package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.js +3 -3
  180. package/src/View/SmartEdit/SmartEditPopup.js +3 -3
  181. package/src/View/SpecialColumnSettingsWizardStep.js +10 -10
  182. package/src/View/StateManagement/StateManagementPopup.js +4 -4
  183. package/src/View/StyledColumn/Wizard/StyledColumnWizard.d.ts +7 -0
  184. package/src/View/StyledColumn/Wizard/StyledColumnWizard.js +77 -0
  185. package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.d.ts +9 -0
  186. package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.js +65 -0
  187. package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection.d.ts +9 -0
  188. package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection.js +234 -0
  189. package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.d.ts +7 -0
  190. package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.js +59 -0
  191. package/src/View/SystemStatus/SystemStatusEntityRow.js +4 -6
  192. package/src/View/SystemStatus/SystemStatusViewPanel.d.ts +1 -1
  193. package/src/View/TeamSharing/SharedEntityObjectView.js +1 -1
  194. package/src/View/TeamSharing/TeamSharingApplyButton.js +1 -1
  195. package/src/View/Theme/ThemePopup.js +1 -1
  196. package/src/View/Wizard/OnePageAdaptableWizard.d.ts +1 -1
  197. package/src/View/Wizard/OnePageAdaptableWizard.js +1 -2
  198. package/src/agGrid/ActionColumnRenderer.d.ts +2 -0
  199. package/src/agGrid/ActionColumnRenderer.js +94 -62
  200. package/src/agGrid/Adaptable.d.ts +12 -13
  201. package/src/agGrid/Adaptable.js +162 -236
  202. package/src/agGrid/CheckboxRenderer.js +1 -1
  203. package/src/agGrid/FilterWrapper.js +60 -16
  204. package/src/agGrid/FloatingFilterWrapper.d.ts +2 -2
  205. package/src/agGrid/FloatingFilterWrapper.js +71 -32
  206. package/src/agGrid/PercentBarRenderer.d.ts +6 -2
  207. package/src/agGrid/PercentBarRenderer.js +19 -17
  208. package/src/agGrid/agGridHelper.d.ts +6 -2
  209. package/src/agGrid/agGridHelper.js +17 -17
  210. package/src/agGrid/createAgStatusPanelComponent.d.ts +1 -1
  211. package/src/agGrid/createAgStatusPanelComponent.js +17 -0
  212. package/src/agGrid/editors/AdaptableDateEditor/index.d.ts +4 -1
  213. package/src/agGrid/editors/AdaptableDateEditor/index.js +84 -17
  214. package/src/agGrid/editors/AdaptableNumberEditor/InternalAdaptableNumberEditor.js +1 -1
  215. package/src/agGrid/editors/AdaptableNumberEditor/index.d.ts +2 -3
  216. package/src/agGrid/editors/AdaptableNumberEditor/index.js +78 -27
  217. package/src/agGrid/weightedAverage.js +19 -11
  218. package/src/components/CheckBox/index.js +7 -2
  219. package/src/components/Datepicker/index.d.ts +1 -1
  220. package/src/components/ExpressionEditor/BaseEditorInput.js +13 -32
  221. package/src/components/ExpressionEditor/index.js +9 -17
  222. package/src/components/FormLayout/index.js +1 -1
  223. package/src/components/StylePreview.js +2 -1
  224. package/src/components/icons/brush.d.ts +3 -0
  225. package/src/components/icons/brush.js +7 -0
  226. package/src/components/icons/index.js +2 -0
  227. package/src/metamodel/adaptable.metamodel.d.ts +178 -104
  228. package/src/metamodel/adaptable.metamodel.js +1 -1
  229. package/src/renderReactRoot.d.ts +2 -0
  230. package/src/renderReactRoot.js +11 -9
  231. package/src/types.d.ts +7 -5
  232. package/themes/dark.css +8 -4
  233. package/themes/dark.css.map +1 -0
  234. package/themes/light.css +4 -1
  235. package/themes/light.css.map +1 -0
  236. package/version.d.ts +1 -1
  237. package/version.js +1 -1
  238. package/src/AdaptableComponents.d.ts +0 -1
  239. package/src/AdaptableComponents.js +0 -5
  240. package/src/Api/ConditionalStyleApi.d.ts +0 -128
  241. package/src/Api/Implementation/ConditionalStyleApiImpl.d.ts +0 -29
  242. package/src/Api/Implementation/ConditionalStyleApiImpl.js +0 -98
  243. package/src/Redux/ActionsReducers/ConditionalStyleRedux.d.ts +0 -49
  244. package/src/Redux/ActionsReducers/ConditionalStyleRedux.js +0 -95
  245. package/src/Strategy/Interface/IConditionalStyleModule.d.ts +0 -6
  246. package/src/Strategy/Utilities/getStyleViewItems.d.ts +0 -2
  247. package/src/Strategy/Utilities/getStyleViewItems.js +0 -16
  248. package/src/View/ConditionalStyle/ConditionalStylePopupHeader.d.ts +0 -2
  249. package/src/View/ConditionalStyle/ConditionalStylePopupHeader.js +0 -18
  250. package/src/View/ConditionalStyle/ConditionalStyleSummary.d.ts +0 -25
  251. package/src/View/ConditionalStyle/ConditionalStyleSummary.js +0 -108
  252. package/src/View/ConditionalStyle/Wizard/ConditionalStyleRuleWizardSection.d.ts +0 -9
  253. package/src/View/ConditionalStyle/Wizard/ConditionalStyleRuleWizardSection.js +0 -42
  254. package/src/View/ConditionalStyle/Wizard/ConditionalStyleScopeWizardSection.d.ts +0 -8
  255. package/src/View/ConditionalStyle/Wizard/ConditionalStyleScopeWizardSection.js +0 -43
  256. package/src/View/ConditionalStyle/Wizard/ConditionalStyleSettingsWizardSettings.d.ts +0 -8
  257. package/src/View/ConditionalStyle/Wizard/ConditionalStyleSettingsWizardSettings.js +0 -29
  258. package/src/View/ConditionalStyle/Wizard/ConditionalStyleStyleWizardSection.d.ts +0 -8
  259. package/src/View/ConditionalStyle/Wizard/ConditionalStyleStyleWizardSection.js +0 -23
  260. package/src/View/ConditionalStyle/Wizard/ConditionalStyleWizard.d.ts +0 -6
  261. package/src/View/ConditionalStyle/Wizard/ConditionalStyleWizard.js +0 -114
  262. package/src/View/ConditionalStyle/Wizard/DEFAULT_PREDICATE_ID_FOR_CONDITIONAL_STYLE.d.ts +0 -1
  263. package/src/View/ConditionalStyle/Wizard/DEFAULT_PREDICATE_ID_FOR_CONDITIONAL_STYLE.js +0 -4
@@ -1,7 +1,7 @@
1
1
  import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
2
2
  import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../PredefinedConfig/ExportState';
3
3
  import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
4
- import { CustomDestination, CustomReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
4
+ import { CustomDestination, ServerReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
5
5
  import { ExportDestination } from '../PredefinedConfig/Common/Enums';
6
6
  /**
7
7
  * Provides run-time access to the Export Module and Report state
@@ -50,7 +50,7 @@ export interface ExportApi {
50
50
  /**
51
51
  * Returns any Custom Reports that have been provided to Export Options
52
52
  */
53
- getAllCustomReports(): CustomReport[] | undefined;
53
+ getAllServerReports(): ServerReport[] | undefined;
54
54
  /**
55
55
  * Retrieves System Reports section of Export State
56
56
  */
@@ -139,14 +139,14 @@ export interface ExportApi {
139
139
  exportVisualDataToExcel(): void;
140
140
  /**
141
141
  * Whether a Report is a Custom Report
142
- * @param customReportName Report to Check
142
+ * @param report Report to Check
143
143
  */
144
- isCustomReport(report: Report): boolean;
144
+ isServerReport(report: Report): boolean;
145
145
  /**
146
- * Runs the report function of the CustomReport with the given reportName
146
+ * Runs the report function of the ServerReport with the given reportName
147
147
  * @param reportName custom report name
148
148
  */
149
- runCustomReport(reportName: string): ReportData | undefined;
149
+ runServerReport(reportName: string): ReportData | undefined;
150
150
  /**
151
151
  * Returns the ReportData for the Report with the given name
152
152
  * @param reportName - the name of the report
@@ -0,0 +1,10 @@
1
+ import { FinsemblePluginOptions } from '../AdaptableOptions/FinsemblePluginOptions';
2
+ /**
3
+ * Provides run-time access to the Finsemble Plugin
4
+ */
5
+ export interface FinsembleApi {
6
+ /**
7
+ * Retrieves the FinsemblePlugOptions provided in Finsemble Plugin
8
+ */
9
+ getPluginOptions(): FinsemblePluginOptions;
10
+ }
@@ -1,4 +1,4 @@
1
- import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
1
+ import { FormatColumnState, FormatColumn } from '../PredefinedConfig/FormatColumnState';
2
2
  import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope } from '../types';
3
3
  import { RowNode } from '@ag-grid-community/core';
4
4
  /**
@@ -38,15 +38,10 @@ export interface FormatColumnApi {
38
38
  */
39
39
  getAllFormatColumnWithStyle(): FormatColumn[];
40
40
  /**
41
- * Retrieves the ColumnComparison property, if there, from a Format Column (Column Style)
42
- * @param formatColumn Format Column to Add
43
- */
44
- getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
45
- /**
46
- * Returns any ColumnIds referenced in a Column Comparison
47
- * @param columnComparision Column Comparison to check
41
+ * Retrieves all Format Columns in Adaptable State with the `Style` or the `CellAlignment` property set
42
+ * @returns format columns
48
43
  */
49
- getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
44
+ getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
50
45
  /**
51
46
  * Retrieves all Format Columns in Adaptable State with `DisplayFormat` property set
52
47
  * @returns format columns
@@ -105,23 +100,21 @@ export interface FormatColumnApi {
105
100
  */
106
101
  showFormatColumnPopup(): void;
107
102
  /**
108
- * Gets an active Format Column, if any, for given Column
103
+ * Gets all FormatColumns which are defined for the given column
109
104
  * @param column The Column for which to retrieve the Format Column
110
105
  * @returns format column
111
106
  */
112
- getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
113
- /**
114
- * Gets Format Column, if any, for given Column
115
- * @param column The Column for which to retrieve the Format Column
116
- * @returns format column
117
- */
118
- getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
107
+ getFormatColumnsForColumn(column: AdaptableColumn, config?: {
108
+ includeSuspended?: boolean;
109
+ }): FormatColumn[];
119
110
  /**
120
- * Gets Format Column, if any, for given ColumnId
111
+ * Gets all FormatColumns which are defined for the column with the given columnId
121
112
  * @param columnId ColumnId for which to retrieve the Format Column
122
113
  * @returns format column
123
114
  */
124
- getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
115
+ getFormatColumnsForColumnId(columnId: string, config?: {
116
+ includeSuspended?: boolean;
117
+ }): FormatColumn[];
125
118
  /**
126
119
  * Get Format Column which has Scope of Single Column, if any, for given ColumnId
127
120
  * @param columnId ColumnId for which to retrieve the Format Column
@@ -129,67 +122,35 @@ export interface FormatColumnApi {
129
122
  */
130
123
  getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
131
124
  /**
132
- * Gets Format Column if any for given Column which includes Style element
133
- * @param column The Column for which to retrieve the Format Column
134
- * @returns format column
135
- */
136
- getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
137
- /**
138
- * Retrieves all format columns with style for a column
139
- * @param column The Column for which to retrieve the Format Column
140
- */
141
- getColumnFormatColumnsWithStyle(column: AdaptableColumn): FormatColumn[];
142
- /**
143
- * Retrieves all Format Columns with style for the whole row
144
- * @returns format columns
125
+ * Get all FormatColumns which are defined for this column and have a custom AdaptableStyle
126
+ * @param column
127
+ * @param config
128
+ * @returns list of FormatColumn
145
129
  */
146
- getRowFormatColumnsWithStyle(): FormatColumn[];
130
+ getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
131
+ includeSuspended?: boolean;
132
+ }): FormatColumn[];
147
133
  /**
148
134
  * Gets Format Column if any for given Column which includes Style element with ClassName
149
135
  * @param column The Column for which to retrieve the Format Column
150
136
  * @returns format columns
151
137
  */
152
- getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn[];
138
+ getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
139
+ includeSuspended?: boolean;
140
+ }): FormatColumn[];
153
141
  /**
154
- * Will get the most appropriate one i.e. first named Column, then DataType, then All
142
+ * Get all FormatColumns which are defined for this column and have a custom DisplayFormat
155
143
  * @param column
156
- * @returns format column
144
+ * @param config
145
+ * @returns list of FormatColumn
157
146
  */
158
- getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
147
+ getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
148
+ includeSuspended?: boolean;
149
+ }): FormatColumn[];
159
150
  /**
160
151
  * Returns true if Format State includes Format Columns with a Style property
161
152
  */
162
153
  hasStyleFormatColumns(): boolean;
163
- /**
164
- * Gets the Minimum Value to display for a Numeric Style
165
- * @param numericStyle Numeric Style to check
166
- * @param rowNode current Row Node
167
- * @param cellValue current Cell Value
168
- */
169
- getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
170
- /**
171
- * Gets the Maximum Value to display for a Numeric Style
172
- * @param numericStyle Numeric Style to check
173
- * @param rowNode current Row Node
174
- * @param cellValue current Cell Value
175
- */
176
- getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
177
- getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
178
- getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
179
- /**
180
- * Returns first Format Column that contains checkbox style
181
- * @param columnId column to check
182
- */
183
- getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
184
- /**
185
- * Whether given column is a (boolean) checkbox column
186
- * @param columnId column to check
187
- */
188
- isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
189
- /**
190
- * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
191
- */
192
- fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
193
154
  /**
194
155
  * Format value according to format options.
195
156
  *
@@ -226,28 +187,40 @@ export interface FormatColumnApi {
226
187
  */
227
188
  getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
228
189
  /**
229
- * Checks if format column is active for a given row
190
+ * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
230
191
  *
231
192
  * @param formatColumn
193
+ * @param column
232
194
  * @param params
233
195
  */
234
- isFormatColumnActiveForRow(formatColumn: FormatColumn, params: {
196
+ isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
235
197
  node: RowNode;
198
+ value: any;
236
199
  }): boolean;
237
200
  /**
238
- * Checks if format column is active for a given cell
201
+ * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
239
202
  *
240
- * @param formatColumn
203
+ * @param formatColumns
241
204
  * @param column
242
205
  * @param params
243
206
  */
244
- isFormatColumnActiveForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
207
+ getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
245
208
  node: RowNode;
246
209
  value: any;
247
- }): boolean;
210
+ }): FormatColumn[];
248
211
  /**
249
212
  * Retrieves all Format Columns which have an Expression
250
213
  * @returns Format Columns with Expression
251
214
  */
252
215
  getFormatColumnsWithExpression(): FormatColumn[] | undefined;
216
+ /**
217
+ * Increment the precedence of the given FormatColumn
218
+ * @param formatColumn
219
+ */
220
+ incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
221
+ /**
222
+ * Decrement the precedence of the given FormatColumn
223
+ * @param formatColumn
224
+ */
225
+ decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
253
226
  }
@@ -4,7 +4,6 @@ import { AlertApi } from '../AlertApi';
4
4
  import { BulkUpdateApi } from '../BulkUpdateApi';
5
5
  import { CalculatedColumnApi } from '../CalculatedColumnApi';
6
6
  import { CellSummaryApi } from '../CellSummaryApi';
7
- import { ConditionalStyleApi } from '../ConditionalStyleApi';
8
7
  import { ConfigApi } from '../ConfigApi';
9
8
  import { CustomSortApi } from '../CustomSortApi';
10
9
  import { DashboardApi } from '../DashboardApi';
@@ -39,6 +38,7 @@ import { FlashingCellApi } from '../FlashingCellApi';
39
38
  import { ChartingApi } from '../ChartingApi';
40
39
  import { StatusBarApi } from '../StatusBarApi';
41
40
  import { ActionApi } from '../../../types';
41
+ import { StyledColumnApi } from '../StyledColumnApi';
42
42
  export declare class AdaptableApiImpl implements AdaptableApi {
43
43
  protected adaptable: IAdaptable;
44
44
  actionApi: ActionApi;
@@ -50,7 +50,6 @@ export declare class AdaptableApiImpl implements AdaptableApi {
50
50
  calculatedColumnApi: CalculatedColumnApi;
51
51
  cellSummaryApi: CellSummaryApi;
52
52
  columnApi: ColumnApi;
53
- conditionalStyleApi: ConditionalStyleApi;
54
53
  configApi: ConfigApi;
55
54
  customSortApi: CustomSortApi;
56
55
  dashboardApi: DashboardApi;
@@ -75,6 +74,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
75
74
  queryApi: QueryApi;
76
75
  queryLanguageApi: QueryLanguageApi;
77
76
  settingsPanelApi: SettingsPanelApi;
77
+ styledColumnApi: StyledColumnApi;
78
78
  toolPanelApi: ToolPanelApi;
79
79
  teamSharingApi: TeamSharingApi;
80
80
  scopeApi: ScopeApi;
@@ -8,7 +8,6 @@ const PluginsApiImpl_1 = require("./PluginsApiImpl");
8
8
  const BulkUpdateApiImpl_1 = require("./BulkUpdateApiImpl");
9
9
  const CalculatedColumnApiImpl_1 = require("./CalculatedColumnApiImpl");
10
10
  const CellSummaryApiImpl_1 = require("./CellSummaryApiImpl");
11
- const ConditionalStyleApiImpl_1 = require("./ConditionalStyleApiImpl");
12
11
  const ConfigApiImpl_1 = require("./ConfigApiImpl");
13
12
  const CustomSortApiImpl_1 = require("./CustomSortApiImpl");
14
13
  const DashboardApiImpl_1 = require("./DashboardApiImpl");
@@ -41,6 +40,7 @@ const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
41
40
  const ChartingApiImpl_1 = require("./ChartingApiImpl");
42
41
  const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
43
42
  const ActionApiImpl_1 = require("./ActionApiImpl");
43
+ const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
44
44
  class AdaptableApiImpl {
45
45
  constructor(adaptable) {
46
46
  this.adaptable = adaptable;
@@ -56,7 +56,6 @@ class AdaptableApiImpl {
56
56
  this.calculatedColumnApi = new CalculatedColumnApiImpl_1.CalculatedColumnApiImpl(adaptable);
57
57
  this.cellSummaryApi = new CellSummaryApiImpl_1.CellSummaryApiImpl(adaptable);
58
58
  this.columnApi = new ColumnApiImpl_1.ColumnApiImpl(adaptable);
59
- this.conditionalStyleApi = new ConditionalStyleApiImpl_1.ConditionalStyleApiImpl(adaptable);
60
59
  this.configApi = new ConfigApiImpl_1.ConfigApiImpl(adaptable);
61
60
  this.customSortApi = new CustomSortApiImpl_1.CustomSortApiImpl(adaptable);
62
61
  this.dashboardApi = new DashboardApiImpl_1.DashboardApiImpl(adaptable);
@@ -79,6 +78,7 @@ class AdaptableApiImpl {
79
78
  this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
80
79
  this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);
81
80
  this.queryLanguageApi = new QueryLanguageApiImpl_1.QueryLanguageApiImpl(adaptable);
81
+ this.styledColumnApi = new StyledColumnApiImpl_1.StyledColumnApiImpl(adaptable);
82
82
  this.toolPanelApi = new ToolPanelApiImpl_1.ToolPanelApiImpl(adaptable);
83
83
  this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
84
84
  this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);
@@ -103,7 +103,6 @@ class AdaptableApiImpl {
103
103
  this.cellSummaryApi = null;
104
104
  this.chartingApi = null;
105
105
  this.columnApi = null;
106
- this.conditionalStyleApi = null;
107
106
  this.configApi = null;
108
107
  this.customSortApi = null;
109
108
  this.dashboardApi = null;
@@ -133,10 +133,15 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
133
133
  this.adaptable.api.gridApi.jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId);
134
134
  }
135
135
  if (actionName === 'jump-to-row' &&
136
- gridDataChangedInfo &&
137
- // no sense to jump to a deleted(non-existing) row
138
- (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete') {
139
- const [firstRowNode] = gridDataChangedInfo.rowNodes;
136
+ // either a cell change
137
+ (cellDataChangedInfo ||
138
+ // or a grid change, but NOT row deletion
139
+ (gridDataChangedInfo &&
140
+ // no sense to jump to a deleted(non-existing) row
141
+ (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete'))) {
142
+ const [firstRowNode] = cellDataChangedInfo
143
+ ? [cellDataChangedInfo.rowNode]
144
+ : gridDataChangedInfo.rowNodes;
140
145
  const targetRowNodePrimaryKeyValue = this.adaptable.api.gridApi.getPrimaryKeyValueForRowNode(firstRowNode);
141
146
  if (targetRowNodePrimaryKeyValue) {
142
147
  this.adaptable.api.gridApi.jumpToRow(targetRowNodePrimaryKeyValue);
@@ -22,7 +22,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
22
22
  isCalculatedColumn(columnId: string): boolean;
23
23
  isFreeTextColumn(columnId: string): boolean;
24
24
  isActionColumn(columnId: string): boolean;
25
- isFormatNumericStyleColumn(column: AdaptableColumn): boolean;
25
+ isStyledNumericColumn(column: AdaptableColumn): boolean;
26
26
  isNumericColumn(column: AdaptableColumn): boolean;
27
27
  isBooleanColumn(column: AdaptableColumn): boolean;
28
28
  isDateColumn(column: AdaptableColumn): boolean;
@@ -61,6 +61,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
61
61
  getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
62
62
  getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
63
63
  getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
64
+ getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
64
65
  getDistinctVisibleRawValuesForColumn(columnId: string): any[];
65
66
  private sortDistinctValues;
66
67
  getPrimaryKeyColumn(): AdaptableColumn;
@@ -79,12 +79,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
79
79
  return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
80
80
  null);
81
81
  }
82
- isFormatNumericStyleColumn(column) {
82
+ isStyledNumericColumn(column) {
83
83
  if (column) {
84
- return this.adaptable.api.formatColumnApi
85
- .getAllFormatColumn()
86
- .filter((fc) => { var _a, _b; return ((_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) || ((_b = fc.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle); })
87
- .some((formatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, formatColumn.Scope));
84
+ const styledColmn = this.adaptable.api.styledColumnApi
85
+ .getAllActiveStyledColumn()
86
+ .find((sc) => !sc.CheckBoxStyle && sc.ColumnId == column.columnId);
87
+ return styledColmn != null;
88
88
  }
89
89
  return false;
90
90
  }
@@ -343,11 +343,17 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
343
343
  if (abColumn == undefined) {
344
344
  return [];
345
345
  }
346
- const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
347
- return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
346
+ return this.sortDistinctValues(this.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode), abColumn).map((cv) => {
348
347
  return cv.rawValue;
349
348
  });
350
349
  }
350
+ getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
351
+ const abColumn = this.getColumnFromId(columnId);
352
+ if (abColumn == undefined) {
353
+ return [];
354
+ }
355
+ return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
356
+ }
351
357
  getDistinctVisibleRawValuesForColumn(columnId) {
352
358
  const abColumn = this.getColumnFromId(columnId);
353
359
  if (abColumn == undefined) {
@@ -424,15 +430,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
424
430
  if (column.dataType !== 'Number') {
425
431
  return undefined;
426
432
  }
427
- // can we cache this in some way?
428
- return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
433
+ return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
429
434
  }
430
435
  getMaxValueForNumericColumn(column) {
431
436
  if (column.dataType !== 'Number') {
432
437
  return undefined;
433
438
  }
434
- // can we cache this in some way?
435
- return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
439
+ return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
436
440
  }
437
441
  getTypesForColumn(columnId) {
438
442
  var _a;
@@ -7,7 +7,6 @@ import { FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
7
7
  import { ExportState } from '../../PredefinedConfig/ExportState';
8
8
  import { DashboardState } from '../../PredefinedConfig/DashboardState';
9
9
  import { CustomSortState } from '../../PredefinedConfig/CustomSortState';
10
- import { ConditionalStyleState } from '../../PredefinedConfig/ConditionalStyleState';
11
10
  import { CalculatedColumnState } from '../../PredefinedConfig/CalculatedColumnState';
12
11
  import { AlertState } from '../../PredefinedConfig/AlertState';
13
12
  import { ConfigState } from '../../PredefinedConfig/ConfigState';
@@ -48,7 +47,6 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
48
47
  getApplicationState(returnJson?: boolean): ApplicationState;
49
48
  getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
50
49
  getChartingState(returnJson?: boolean): ChartingState;
51
- getConditionalStyleState(returnJson?: boolean): ConditionalStyleState;
52
50
  getCustomSortState(returnJson?: boolean): CustomSortState;
53
51
  getDashboardState(returnJson?: boolean): DashboardState;
54
52
  getExportState(returnJson?: boolean): ExportState;
@@ -12,7 +12,6 @@ const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Ale
12
12
  const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
13
13
  const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
14
14
  const ChartingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ChartingRedux"));
15
- const ConditionalStyleRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ConditionalStyleRedux"));
16
15
  const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
17
16
  const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
18
17
  const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
@@ -170,10 +169,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
170
169
  return returnJson
171
170
  ? JSON.stringify(this.getAdaptableState().Charting)
172
171
  : this.getAdaptableState().Charting;
173
- case 'ConditionalStyle':
174
- return returnJson
175
- ? JSON.stringify(this.getAdaptableState().ConditionalStyle)
176
- : this.getAdaptableState().ConditionalStyle;
177
172
  case 'CustomSort':
178
173
  return returnJson
179
174
  ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -250,9 +245,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
250
245
  getChartingState(returnJson = false) {
251
246
  return this.getUserStateByStateKey('Charting', returnJson);
252
247
  }
253
- getConditionalStyleState(returnJson = false) {
254
- return this.getUserStateByStateKey('ConditionalStyle', returnJson);
255
- }
256
248
  getCustomSortState(returnJson = false) {
257
249
  return this.getUserStateByStateKey('CustomSort', returnJson);
258
250
  }
@@ -306,9 +298,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
306
298
  case 'Charting':
307
299
  this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
308
300
  break;
309
- case 'ConditionalStyle':
310
- this.dispatchAction(ConditionalStyleRedux.ConditionalStyleReady(this.getConditionalStyleState()));
311
- break;
312
301
  case 'CustomSort':
313
302
  this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));
314
303
  break;
@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
3
3
  import { ApiBase } from './ApiBase';
4
4
  import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
5
5
  import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
6
- import { CustomDestination, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
6
+ import { CustomDestination, ServerReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
7
7
  import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
8
8
  export declare class ExportApiImpl extends ApiBase implements ExportApi {
9
9
  getExportState(): ExportState;
@@ -30,8 +30,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
30
30
  editReports(reports: Report[]): Report[];
31
31
  isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
32
32
  exportVisualDataToExcel(): void;
33
- getAllCustomReports(): CustomReport[] | undefined;
34
- isCustomReport(report: Report): boolean;
35
- runCustomReport(customReportName: string): ReportData | undefined;
33
+ getAllServerReports(): ServerReport[] | undefined;
34
+ isServerReport(report: Report): boolean;
35
+ runServerReport(serverReportName: string): ReportData | undefined;
36
36
  getReportDataForReport(reportName: string): ReportData | undefined;
37
37
  }
@@ -61,10 +61,10 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
61
61
  const reports = this.getAvailableSystemReports()
62
62
  .map((s) => this.getReportByName(s))
63
63
  .concat(this.getExportState().Reports);
64
- const customReports = this.getAllCustomReports();
65
- if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
66
- reports.push(...customReports.map((c) => {
67
- return ObjectFactory_1.default.CreateCustomReport(c.name);
64
+ const serverReports = this.getAllServerReports();
65
+ if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
66
+ reports.push(...serverReports.map((c) => {
67
+ return ObjectFactory_1.default.CreateServerReport(c.name);
68
68
  }));
69
69
  }
70
70
  return reports;
@@ -120,7 +120,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
120
120
  return true;
121
121
  }
122
122
  // if its a Custom Report then the User has to run it so we just ignore completely
123
- if (this.isCustomReport(report)) {
123
+ if (this.isServerReport(report)) {
124
124
  return false;
125
125
  }
126
126
  // Start with the DataChanged Column and go through all possibilities
@@ -178,21 +178,21 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
178
178
  exportVisualDataToExcel() {
179
179
  this.adaptable.exportVisualDataToExcel();
180
180
  }
181
- getAllCustomReports() {
182
- return this.getExportOptions().customReports;
181
+ getAllServerReports() {
182
+ return this.getExportOptions().serverReports;
183
183
  }
184
- isCustomReport(report) {
184
+ isServerReport(report) {
185
185
  var _a;
186
- return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
186
+ return ((_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
187
187
  }
188
- runCustomReport(customReportName) {
188
+ runServerReport(serverReportName) {
189
189
  var _a;
190
- const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
191
- if (!customReport) {
192
- (0, LoggingHelper_1.LogAdaptableWarning)(`Custom Report '${customReportName}' not found!`);
190
+ const serverReport = (_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
191
+ if (!serverReport) {
192
+ (0, LoggingHelper_1.LogAdaptableWarning)(`Server Report '${serverReportName}' not found!`);
193
193
  return undefined;
194
194
  }
195
- return customReport.onRunReport();
195
+ return serverReport.onRunReport();
196
196
  }
197
197
  getReportDataForReport(reportName) {
198
198
  const report = this.getReportByName(reportName);
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
6
6
  const FlashingCellRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FlashingCellRedux"));
7
7
  const ApiBase_1 = require("./ApiBase");
8
+ const Helper_1 = require("../../Utilities/Helpers/Helper");
8
9
  class FlashingCellApiImpl extends ApiBase_1.ApiBase {
9
10
  getFlashingCellState() {
10
11
  return this.getAdaptableState().FlashingCell;
@@ -17,10 +18,12 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
17
18
  });
18
19
  }
19
20
  mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition) {
20
- const flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
21
+ let flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
21
22
  if (!flashingDefaults) {
22
23
  return flashingCellDefinition;
23
24
  }
25
+ // deep clone it, otherwise we will mutate&share(!!) the global flashingCellOptions object
26
+ flashingDefaults = (0, Helper_1.cloneObject)(flashingDefaults);
24
27
  if (!flashingCellDefinition.DownChangeStyle && flashingDefaults.defaultDownChangeStyle) {
25
28
  flashingCellDefinition.DownChangeStyle = flashingDefaults.defaultDownChangeStyle;
26
29
  }