@oneuptime/common 12.0.6 → 12.0.7

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 (424) hide show
  1. package/Models/DatabaseModels/AIInsight.ts +1 -1
  2. package/Models/DatabaseModels/DatabaseBaseModel/FileModel.ts +2 -3
  3. package/Models/DatabaseModels/DeletedProject.ts +595 -0
  4. package/Models/DatabaseModels/Index.ts +2 -0
  5. package/Models/DatabaseModels/Monitor.ts +111 -0
  6. package/Models/DatabaseModels/Project.ts +3 -3
  7. package/Models/DatabaseModels/WorkspaceProjectAuthToken.ts +19 -1
  8. package/Server/API/FileAPI.ts +15 -2
  9. package/Server/API/MicrosoftTeamsAPI.ts +6 -1
  10. package/Server/API/ProjectAPI.ts +214 -0
  11. package/Server/API/StatusPageAPI.ts +39 -6
  12. package/Server/Infrastructure/Postgres/SchemaMigrations/1786446545142-MigrationName.ts +50 -0
  13. package/Server/Infrastructure/Postgres/SchemaMigrations/1786449497966-AddMonitorDependency.ts +67 -0
  14. package/Server/Infrastructure/Postgres/SchemaMigrations/1786461136170-AddDeletedProjectTable.ts +39 -0
  15. package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +6 -0
  16. package/Server/Services/AIAgentService.ts +20 -0
  17. package/Server/Services/DashboardDomainService.ts +73 -28
  18. package/Server/Services/DatabaseService.ts +1 -0
  19. package/Server/Services/DeletedProjectService.ts +138 -0
  20. package/Server/Services/FileService.ts +61 -0
  21. package/Server/Services/IncidentEpisodePublicNoteService.ts +18 -0
  22. package/Server/Services/IncidentPublicNoteService.ts +18 -0
  23. package/Server/Services/Index.ts +2 -0
  24. package/Server/Services/MonitorService.ts +311 -0
  25. package/Server/Services/ProbeService.ts +20 -0
  26. package/Server/Services/ProjectService.ts +297 -1
  27. package/Server/Services/PushNotificationService.ts +71 -0
  28. package/Server/Services/ScheduledMaintenancePublicNoteService.ts +18 -0
  29. package/Server/Services/StatusPageAnnouncementService.ts +53 -0
  30. package/Server/Services/StatusPageDomainService.ts +73 -28
  31. package/Server/Services/TeamMemberService.ts +117 -12
  32. package/Server/Services/TelemetryIngestionKeyService.ts +1 -0
  33. package/Server/Services/UserWebhookService.ts +34 -109
  34. package/Server/Services/WorkspaceNotificationRuleService.ts +69 -0
  35. package/Server/Services/WorkspaceProjectAuthTokenService.ts +37 -1
  36. package/Server/Types/Database/DeleteById.ts +2 -0
  37. package/Server/Types/Database/DeleteOneBy.ts +6 -0
  38. package/Server/Types/Domain.ts +41 -0
  39. package/Server/Types/Workflow/Components/API/Delete.ts +2 -1
  40. package/Server/Types/Workflow/Components/API/Get.ts +2 -1
  41. package/Server/Types/Workflow/Components/API/Patch.ts +2 -1
  42. package/Server/Types/Workflow/Components/API/Post.ts +2 -1
  43. package/Server/Types/Workflow/Components/API/Put.ts +2 -1
  44. package/Server/Types/Workflow/Components/API/Utils.ts +41 -2
  45. package/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts +25 -19
  46. package/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts +6 -5
  47. package/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts +32 -14
  48. package/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts +31 -13
  49. package/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts +29 -20
  50. package/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts +28 -21
  51. package/Server/Types/Workflow/Components/BaseModel/LogComponentError.ts +89 -0
  52. package/Server/Types/Workflow/Components/BaseModel/ModelArguments.ts +208 -0
  53. package/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts +11 -0
  54. package/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts +41 -18
  55. package/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts +45 -19
  56. package/Server/Types/Workflow/Components/Discord/SendMessageToChannel.ts +16 -9
  57. package/Server/Types/Workflow/Components/IncomingWebhookUtils.ts +66 -0
  58. package/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts +15 -9
  59. package/Server/Types/Workflow/Components/Slack/SendMessageToChannel.ts +17 -0
  60. package/Server/Utils/AI/Chat/ObservabilityChatPrompt.ts +1 -1
  61. package/Server/Utils/AI/CodeFix/CodeAgentWorkspaceGuard.ts +171 -0
  62. package/Server/Utils/AI/SRE/FixFromIncidentTaskTrigger.ts +3 -3
  63. package/Server/Utils/AI/SRE/Insights/FixRouting.ts +3 -2
  64. package/Server/Utils/AI/SRE/TelemetryImprovementTaskTrigger.ts +1 -1
  65. package/Server/Utils/AI/Toolbox/CodeWriteTools.ts +6 -6
  66. package/Server/Utils/CodeRepository/GitHub/GitHub.ts +43 -5
  67. package/Server/Utils/DataSource/EgressGuard.ts +176 -16
  68. package/Server/Utils/DataSource/HttpFetch.ts +6 -45
  69. package/Server/Utils/Execute.ts +8 -0
  70. package/Server/Utils/InlineImageAccessTokenSync.ts +23 -0
  71. package/Server/Utils/LLM/LLMService.ts +57 -12
  72. package/Server/Utils/Monitor/MonitorAlert.ts +40 -0
  73. package/Server/Utils/Monitor/MonitorDependencySuppression.ts +192 -0
  74. package/Server/Utils/Monitor/MonitorIncident.ts +40 -0
  75. package/Server/Utils/Monitor/MonitorResource.ts +36 -0
  76. package/Server/Utils/Response.ts +142 -6
  77. package/Server/Utils/SSRFProtection.ts +273 -60
  78. package/Server/Utils/StartServer.ts +8 -0
  79. package/Server/Utils/VM/VMRunner.ts +88 -1
  80. package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts +555 -49
  81. package/Server/Utils/Workspace/Slack/Slack.ts +25 -2
  82. package/Server/Utils/Workspace/WorkspaceBase.ts +6 -0
  83. package/Tests/App/Dashboard/DangerZone.test.tsx +334 -0
  84. package/Tests/App/Dashboard/DashboardVariableAllContract.test.tsx +539 -0
  85. package/Tests/App/Dashboard/DashboardVariableSelector.test.tsx +678 -0
  86. package/Tests/App/Dashboard/DashboardVariablesDiscard.test.tsx +706 -0
  87. package/Tests/App/Dashboard/DashboardVariablesModal.test.tsx +508 -0
  88. package/Tests/App/PublicDashboard/DashboardVariableSelector.test.tsx +470 -0
  89. package/Tests/App/StatusPage/StatusPageDetailPagesNotFound.test.tsx +308 -0
  90. package/Tests/Models/DatabaseModels/DeletedProjectModel.test.ts +251 -0
  91. package/Tests/Models/DatabaseModels/SavedViewJSONColumnTuples.test.ts +115 -0
  92. package/Tests/Server/API/FileAPIAccessControl.test.ts +316 -0
  93. package/Tests/Server/API/ProjectAPI.test.ts +299 -1
  94. package/Tests/Server/API/ProjectAPIAdjustBalance.test.ts +459 -0
  95. package/Tests/Server/API/ProjectAPIAdjustBalanceBillingDisabled.test.ts +177 -0
  96. package/Tests/Server/Services/DatabaseServiceDeletionReason.test.ts +123 -0
  97. package/Tests/Server/Services/DeletedProjectService.test.ts +415 -0
  98. package/Tests/Server/Services/DeletedProjectServiceSelfHosted.test.ts +70 -0
  99. package/Tests/Server/Services/DomainSubdomainHooks.test.ts +94 -0
  100. package/Tests/Server/Services/FileIsPublicBooleanMigration.test.ts +244 -0
  101. package/Tests/Server/Services/FileServiceMimeType.test.ts +89 -0
  102. package/Tests/Server/Services/MonitorServiceDependencyValidation.test.ts +702 -0
  103. package/Tests/Server/Services/ProjectServiceAdjustBalance.test.ts +615 -0
  104. package/Tests/Server/Services/ProjectServiceDeleteAudit.test.ts +406 -0
  105. package/Tests/Server/Services/PublishTimeImageVisibility.test.ts +450 -0
  106. package/Tests/Server/Services/TeamMemberAutoAcceptInvitation.test.ts +669 -0
  107. package/Tests/Server/Services/UserWebhookSSRF.test.ts +174 -0
  108. package/Tests/Server/Services/WebPushEndpointAllowlist.test.ts +133 -0
  109. package/Tests/Server/Services/WorkspaceProjectAuthTokenRepoint.test.ts +618 -0
  110. package/Tests/Server/Types/Workflow/Components/ApiComponentErrorPort.test.ts +26 -1
  111. package/Tests/Server/Types/Workflow/Components/ApiComponentSsrf.test.ts +215 -0
  112. package/Tests/Server/Types/Workflow/Components/BaseModelDatabaseComponents.test.ts +742 -0
  113. package/Tests/Server/Types/Workflow/Components/ChatWebhookComponents.test.ts +256 -0
  114. package/Tests/Server/Types/Workflow/Components/ModelArguments.test.ts +371 -0
  115. package/Tests/Server/Utils/AI/CodeAgentCommandGuard.test.ts +204 -0
  116. package/Tests/Server/Utils/AI/CodeAgentWriteLimits.test.ts +213 -0
  117. package/Tests/Server/Utils/AI/CodeWriteTools.test.ts +52 -5
  118. package/Tests/Server/Utils/AI/LLMServiceBaseUrl.test.ts +3 -0
  119. package/Tests/Server/Utils/AI/LLMServiceEgressGuard.test.ts +315 -0
  120. package/Tests/Server/Utils/AI/LLMServiceModelCompatibility.test.ts +3 -0
  121. package/Tests/Server/Utils/AI/LLMServiceRequestPolicy.test.ts +17 -5
  122. package/Tests/Server/Utils/AI/LLMServiceToolCalling.test.ts +14 -1
  123. package/Tests/Server/Utils/AI/ObservabilityChatPrompt.test.ts +35 -0
  124. package/Tests/Server/Utils/AI/StubLLMEgressGuard.ts +25 -0
  125. package/Tests/Server/Utils/Dashboard/PublicDashboardResourceListPolicy.test.ts +62 -7
  126. package/Tests/Server/Utils/DataSource/EgressGuard.test.ts +69 -0
  127. package/Tests/Server/Utils/DataSource/EgressGuardPinning.test.ts +330 -0
  128. package/Tests/Server/Utils/GitHubCreatePullRequestWithToken.test.ts +393 -0
  129. package/Tests/Server/Utils/InlineImageAccessTokenSync.test.ts +202 -0
  130. package/Tests/Server/Utils/Monitor/MonitorDependencySuppression.test.ts +811 -0
  131. package/Tests/Server/Utils/Monitor/MonitorDependencySuppressionCreatorSkip.test.ts +604 -0
  132. package/Tests/Server/Utils/ResponseSendFileResponse.test.ts +192 -0
  133. package/Tests/Server/Utils/SSRFProtectionBypasses.test.ts +406 -0
  134. package/Tests/Server/Utils/VM/VMRunnerSsrf.test.ts +194 -0
  135. package/Tests/Server/Utils/Workspace/MicrosoftTeamsChannelSend.test.ts +1169 -0
  136. package/Tests/Server/Utils/Workspace/MicrosoftTeamsChannelsList.test.ts +2 -0
  137. package/Tests/Server/Utils/Workspace/MicrosoftTeamsTeamInstalls.test.ts +1605 -0
  138. package/Tests/Server/Utils/Workspace/MicrosoftTeamsTenantResolution.test.ts +1218 -0
  139. package/Tests/Types/AI/AIChatMessageStatus.test.ts +79 -0
  140. package/Tests/Types/AI/AIInsightStatus.test.ts +40 -0
  141. package/Tests/Types/API/HostnameAuthorityParsing.test.ts +157 -0
  142. package/Tests/Types/Dashboard/DashboardTemplateInvariants.test.ts +27 -0
  143. package/Tests/Types/DataSource/DataSourceLimits.test.ts +71 -0
  144. package/Tests/Types/DataSource/DataSourceType.test.ts +181 -0
  145. package/Tests/Types/DomainSubdomainValidation.test.ts +90 -0
  146. package/Tests/Types/JSONFunctions.test.ts +252 -1
  147. package/Tests/Types/Monitor/SnmpMonitor/SnmpAuthProtocol.test.ts +61 -0
  148. package/Tests/Types/Monitor/SnmpMonitor/SnmpPrivProtocol.test.ts +62 -0
  149. package/Tests/Types/Monitor/SnmpMonitor/SnmpSecurityLevel.test.ts +68 -0
  150. package/Tests/Types/Monitor/SnmpMonitor/SnmpVersion.test.ts +51 -0
  151. package/Tests/UI/Components/404.test.tsx +1 -1
  152. package/Tests/UI/Components/Alert.test.tsx +1 -1
  153. package/Tests/UI/Components/Badge.test.tsx +1 -1
  154. package/Tests/UI/Components/BasicForm.test.tsx +39 -10
  155. package/Tests/UI/Components/Button.test.tsx +1 -1
  156. package/Tests/UI/Components/Card.test.tsx +1 -1
  157. package/Tests/UI/Components/Charts/AxisTickColor.test.tsx +1 -1
  158. package/Tests/UI/Components/ColorViewer.test.tsx +1 -1
  159. package/Tests/UI/Components/ComponentsModal.test.tsx +7 -1
  160. package/Tests/UI/Components/DictionaryOfStrings.test.tsx +1 -1
  161. package/Tests/UI/Components/Dropdown.test.tsx +1 -1
  162. package/Tests/UI/Components/FilePicker.test.tsx +1 -1
  163. package/Tests/UI/Components/HiddenText.test.tsx +1 -1
  164. package/Tests/UI/Components/Input.test.tsx +1 -1
  165. package/Tests/UI/Components/Loader.test.tsx +1 -1
  166. package/Tests/UI/Components/LogTimeRangePicker.test.tsx +1 -1
  167. package/Tests/UI/Components/MasterPage.test.tsx +1 -1
  168. package/Tests/UI/Components/ModalPortalDismissal.test.tsx +489 -0
  169. package/Tests/UI/Components/ModelDelete.test.tsx +214 -0
  170. package/Tests/UI/Components/ModelTable/BaseModelTableBulkSelectAll.test.tsx +1 -1
  171. package/Tests/UI/Components/ModelTable/BaseModelTableColumnCustomization.test.tsx +1 -1
  172. package/Tests/UI/Components/ModelTable/BaseModelTableSearchLabels.test.tsx +1 -1
  173. package/Tests/UI/Components/ModelTable/BaseModelTableUrlState.test.tsx +1 -1
  174. package/Tests/UI/Components/ModelTable/CustomFieldColumns.test.tsx +1 -1
  175. package/Tests/UI/Components/NavBar.test.tsx +1 -1
  176. package/Tests/UI/Components/OperatorSelectorKeyboard.test.tsx +1 -1
  177. package/Tests/UI/Components/Pagination.test.tsx +1 -1
  178. package/Tests/UI/Components/Pill.test.tsx +1 -1
  179. package/Tests/UI/Components/Probe.test.tsx +1 -1
  180. package/Tests/UI/Components/ProgressBar.test.tsx +1 -1
  181. package/Tests/UI/Components/RadioButtons.test.tsx +1 -1
  182. package/Tests/UI/Components/SideMenuItem.test.tsx +1 -1
  183. package/Tests/UI/Components/SideOver.test.tsx +500 -6
  184. package/Tests/UI/Components/Tabs.test.tsx +1 -1
  185. package/Tests/UI/Components/TelemetrySearchBar.test.tsx +1 -1
  186. package/Tests/UI/Components/TelemetryTimeRangePicker.test.tsx +1 -1
  187. package/Tests/UI/Components/TextArea.test.tsx +1 -1
  188. package/Tests/UI/Components/Toast.test.tsx +1 -1
  189. package/Tests/UI/Components/Toggle.test.tsx +1 -1
  190. package/Tests/UI/Components/TopSection.test.tsx +1 -1
  191. package/Tests/UI/Components/UseLiveLogsRefresh.test.tsx +1 -1
  192. package/Tests/UI/Rum/ReplayScrubber.test.tsx +1 -1
  193. package/Tests/UI/Rum/ReplayStage.test.tsx +1 -1
  194. package/Tests/UI/Telemetry/TelemetrySnapshotWindowAlert.test.tsx +1 -1
  195. package/Tests/UI/Utils/LocalStorageArrayRoundTrip.test.ts +72 -0
  196. package/Tests/Utils/Dashboard/HtmlWidgetDocument.test.ts +19 -2
  197. package/Tests/Utils/Dashboard/ModelQueryVariableInterpolation.test.ts +44 -0
  198. package/Tests/Utils/Dashboard/VariableInterpolation.test.ts +288 -5
  199. package/Tests/Utils/Dashboard/VariableUrlState.test.ts +42 -0
  200. package/Tests/Utils/DataSource/DataSourceQueryText.test.ts +27 -0
  201. package/Tests/Utils/LegacySerializedArray.test.ts +139 -0
  202. package/Tests/Utils/Monitor/MonitorDependencyRule.test.ts +190 -0
  203. package/Tests/Utils/Realtime.test.ts +78 -0
  204. package/Tests/Utils/Telemetry/SavedViewFilters.test.ts +246 -0
  205. package/Tests/__mocks__/i18next-browser-languagedetector.js +21 -0
  206. package/Types/AI/FixPullRequestCiStatus.ts +1 -1
  207. package/Types/AI/FixVerificationStatus.ts +2 -2
  208. package/Types/API/Hostname.ts +92 -4
  209. package/Types/API/URL.ts +43 -25
  210. package/Types/Billing/BalanceAdjustmentType.ts +14 -0
  211. package/Types/Billing/ProjectBalanceType.ts +13 -0
  212. package/Types/Domain.ts +26 -0
  213. package/Types/File/MimeType.ts +11 -0
  214. package/Types/JSONFunctions.ts +15 -0
  215. package/Types/Telemetry/TelemetrySavedViewState.ts +9 -1
  216. package/Types/Workflow/Components/BaseModel.ts +92 -28
  217. package/Typings/Index.d.ts +12 -0
  218. package/UI/Components/GanttChart/ChartContainer.tsx +4 -3
  219. package/UI/Components/Modal/ConfirmModal.tsx +10 -5
  220. package/UI/Components/Modal/Modal.tsx +27 -47
  221. package/UI/Components/ModelDelete/ModelDelete.tsx +23 -6
  222. package/UI/Components/SideOver/SideOver.tsx +195 -68
  223. package/UI/Utils/PageScrollLock.ts +66 -0
  224. package/Utils/Dashboard/HtmlWidgetDocument.ts +4 -2
  225. package/Utils/Dashboard/VariableInterpolation.ts +19 -1
  226. package/Utils/LegacySerializedArray.ts +60 -0
  227. package/Utils/Monitor/MonitorDependencyRule.ts +88 -0
  228. package/Utils/Telemetry/SavedViewFilters.ts +88 -0
  229. package/build/dist/Models/DatabaseModels/AIInsight.js +1 -1
  230. package/build/dist/Models/DatabaseModels/AIInsight.js.map +1 -1
  231. package/build/dist/Models/DatabaseModels/DatabaseBaseModel/FileModel.js +2 -3
  232. package/build/dist/Models/DatabaseModels/DatabaseBaseModel/FileModel.js.map +1 -1
  233. package/build/dist/Models/DatabaseModels/DeletedProject.js +640 -0
  234. package/build/dist/Models/DatabaseModels/DeletedProject.js.map +1 -0
  235. package/build/dist/Models/DatabaseModels/Index.js +2 -0
  236. package/build/dist/Models/DatabaseModels/Index.js.map +1 -1
  237. package/build/dist/Models/DatabaseModels/Monitor.js +106 -0
  238. package/build/dist/Models/DatabaseModels/Monitor.js.map +1 -1
  239. package/build/dist/Models/DatabaseModels/Project.js +3 -3
  240. package/build/dist/Models/DatabaseModels/Project.js.map +1 -1
  241. package/build/dist/Models/DatabaseModels/WorkspaceProjectAuthToken.js.map +1 -1
  242. package/build/dist/Server/API/FileAPI.js +14 -2
  243. package/build/dist/Server/API/FileAPI.js.map +1 -1
  244. package/build/dist/Server/API/MicrosoftTeamsAPI.js +6 -1
  245. package/build/dist/Server/API/MicrosoftTeamsAPI.js.map +1 -1
  246. package/build/dist/Server/API/ProjectAPI.js +157 -4
  247. package/build/dist/Server/API/ProjectAPI.js.map +1 -1
  248. package/build/dist/Server/API/StatusPageAPI.js +27 -3
  249. package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
  250. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786446545142-MigrationName.js +34 -0
  251. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786446545142-MigrationName.js.map +1 -0
  252. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786449497966-AddMonitorDependency.js +30 -0
  253. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786449497966-AddMonitorDependency.js.map +1 -0
  254. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786461136170-AddDeletedProjectTable.js +20 -0
  255. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786461136170-AddDeletedProjectTable.js.map +1 -0
  256. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +6 -0
  257. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
  258. package/build/dist/Server/Services/AIAgentService.js +17 -0
  259. package/build/dist/Server/Services/AIAgentService.js.map +1 -1
  260. package/build/dist/Server/Services/DashboardDomainService.js +55 -18
  261. package/build/dist/Server/Services/DashboardDomainService.js.map +1 -1
  262. package/build/dist/Server/Services/DatabaseService.js +1 -0
  263. package/build/dist/Server/Services/DatabaseService.js.map +1 -1
  264. package/build/dist/Server/Services/DeletedProjectService.js +124 -0
  265. package/build/dist/Server/Services/DeletedProjectService.js.map +1 -0
  266. package/build/dist/Server/Services/FileService.js +52 -0
  267. package/build/dist/Server/Services/FileService.js.map +1 -1
  268. package/build/dist/Server/Services/IncidentEpisodePublicNoteService.js +10 -1
  269. package/build/dist/Server/Services/IncidentEpisodePublicNoteService.js.map +1 -1
  270. package/build/dist/Server/Services/IncidentPublicNoteService.js +10 -1
  271. package/build/dist/Server/Services/IncidentPublicNoteService.js.map +1 -1
  272. package/build/dist/Server/Services/Index.js +2 -0
  273. package/build/dist/Server/Services/Index.js.map +1 -1
  274. package/build/dist/Server/Services/MonitorService.js +232 -0
  275. package/build/dist/Server/Services/MonitorService.js.map +1 -1
  276. package/build/dist/Server/Services/ProbeService.js +17 -0
  277. package/build/dist/Server/Services/ProbeService.js.map +1 -1
  278. package/build/dist/Server/Services/ProjectService.js +228 -6
  279. package/build/dist/Server/Services/ProjectService.js.map +1 -1
  280. package/build/dist/Server/Services/PushNotificationService.js +56 -0
  281. package/build/dist/Server/Services/PushNotificationService.js.map +1 -1
  282. package/build/dist/Server/Services/ScheduledMaintenancePublicNoteService.js +10 -1
  283. package/build/dist/Server/Services/ScheduledMaintenancePublicNoteService.js.map +1 -1
  284. package/build/dist/Server/Services/StatusPageAnnouncementService.js +54 -0
  285. package/build/dist/Server/Services/StatusPageAnnouncementService.js.map +1 -1
  286. package/build/dist/Server/Services/StatusPageDomainService.js +55 -18
  287. package/build/dist/Server/Services/StatusPageDomainService.js.map +1 -1
  288. package/build/dist/Server/Services/TeamMemberService.js +97 -6
  289. package/build/dist/Server/Services/TeamMemberService.js.map +1 -1
  290. package/build/dist/Server/Services/TelemetryIngestionKeyService.js +1 -0
  291. package/build/dist/Server/Services/TelemetryIngestionKeyService.js.map +1 -1
  292. package/build/dist/Server/Services/UserWebhookService.js +31 -87
  293. package/build/dist/Server/Services/UserWebhookService.js.map +1 -1
  294. package/build/dist/Server/Services/WorkspaceNotificationRuleService.js +65 -0
  295. package/build/dist/Server/Services/WorkspaceNotificationRuleService.js.map +1 -1
  296. package/build/dist/Server/Services/WorkspaceProjectAuthTokenService.js +23 -0
  297. package/build/dist/Server/Services/WorkspaceProjectAuthTokenService.js.map +1 -1
  298. package/build/dist/Server/Types/Domain.js +37 -0
  299. package/build/dist/Server/Types/Domain.js.map +1 -1
  300. package/build/dist/Server/Types/Workflow/Components/API/Delete.js +2 -1
  301. package/build/dist/Server/Types/Workflow/Components/API/Delete.js.map +1 -1
  302. package/build/dist/Server/Types/Workflow/Components/API/Get.js +2 -1
  303. package/build/dist/Server/Types/Workflow/Components/API/Get.js.map +1 -1
  304. package/build/dist/Server/Types/Workflow/Components/API/Patch.js +2 -1
  305. package/build/dist/Server/Types/Workflow/Components/API/Patch.js.map +1 -1
  306. package/build/dist/Server/Types/Workflow/Components/API/Post.js +2 -1
  307. package/build/dist/Server/Types/Workflow/Components/API/Post.js.map +1 -1
  308. package/build/dist/Server/Types/Workflow/Components/API/Put.js +2 -1
  309. package/build/dist/Server/Types/Workflow/Components/API/Put.js.map +1 -1
  310. package/build/dist/Server/Types/Workflow/Components/API/Utils.js +35 -2
  311. package/build/dist/Server/Types/Workflow/Components/API/Utils.js.map +1 -1
  312. package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.js +15 -11
  313. package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.js.map +1 -1
  314. package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.js +2 -3
  315. package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.js.map +1 -1
  316. package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.js +21 -10
  317. package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.js.map +1 -1
  318. package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.js +21 -10
  319. package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.js.map +1 -1
  320. package/build/dist/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.js +18 -13
  321. package/build/dist/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.js.map +1 -1
  322. package/build/dist/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.js +18 -13
  323. package/build/dist/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.js.map +1 -1
  324. package/build/dist/Server/Types/Workflow/Components/BaseModel/LogComponentError.js +43 -0
  325. package/build/dist/Server/Types/Workflow/Components/BaseModel/LogComponentError.js.map +1 -0
  326. package/build/dist/Server/Types/Workflow/Components/BaseModel/ModelArguments.js +116 -0
  327. package/build/dist/Server/Types/Workflow/Components/BaseModel/ModelArguments.js.map +1 -0
  328. package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js +7 -0
  329. package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js.map +1 -1
  330. package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.js +24 -13
  331. package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.js.map +1 -1
  332. package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.js +27 -13
  333. package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.js.map +1 -1
  334. package/build/dist/Server/Types/Workflow/Components/Discord/SendMessageToChannel.js +14 -6
  335. package/build/dist/Server/Types/Workflow/Components/Discord/SendMessageToChannel.js.map +1 -1
  336. package/build/dist/Server/Types/Workflow/Components/IncomingWebhookUtils.js +42 -0
  337. package/build/dist/Server/Types/Workflow/Components/IncomingWebhookUtils.js.map +1 -0
  338. package/build/dist/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.js +15 -6
  339. package/build/dist/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.js.map +1 -1
  340. package/build/dist/Server/Types/Workflow/Components/Slack/SendMessageToChannel.js +10 -2
  341. package/build/dist/Server/Types/Workflow/Components/Slack/SendMessageToChannel.js.map +1 -1
  342. package/build/dist/Server/Utils/AI/Chat/ObservabilityChatPrompt.js +1 -1
  343. package/build/dist/Server/Utils/AI/CodeFix/CodeAgentWorkspaceGuard.js +141 -0
  344. package/build/dist/Server/Utils/AI/CodeFix/CodeAgentWorkspaceGuard.js.map +1 -1
  345. package/build/dist/Server/Utils/AI/SRE/Insights/FixRouting.js.map +1 -1
  346. package/build/dist/Server/Utils/AI/SRE/TelemetryImprovementTaskTrigger.js +1 -1
  347. package/build/dist/Server/Utils/AI/Toolbox/CodeWriteTools.js +6 -6
  348. package/build/dist/Server/Utils/AI/Toolbox/CodeWriteTools.js.map +1 -1
  349. package/build/dist/Server/Utils/CodeRepository/GitHub/GitHub.js +39 -5
  350. package/build/dist/Server/Utils/CodeRepository/GitHub/GitHub.js.map +1 -1
  351. package/build/dist/Server/Utils/DataSource/EgressGuard.js +94 -10
  352. package/build/dist/Server/Utils/DataSource/EgressGuard.js.map +1 -1
  353. package/build/dist/Server/Utils/DataSource/HttpFetch.js +1 -19
  354. package/build/dist/Server/Utils/DataSource/HttpFetch.js.map +1 -1
  355. package/build/dist/Server/Utils/Execute.js +2 -2
  356. package/build/dist/Server/Utils/Execute.js.map +1 -1
  357. package/build/dist/Server/Utils/InlineImageAccessTokenSync.js +13 -0
  358. package/build/dist/Server/Utils/InlineImageAccessTokenSync.js.map +1 -1
  359. package/build/dist/Server/Utils/LLM/LLMService.js +43 -12
  360. package/build/dist/Server/Utils/LLM/LLMService.js.map +1 -1
  361. package/build/dist/Server/Utils/Monitor/MonitorAlert.js +44 -24
  362. package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map +1 -1
  363. package/build/dist/Server/Utils/Monitor/MonitorDependencySuppression.js +158 -0
  364. package/build/dist/Server/Utils/Monitor/MonitorDependencySuppression.js.map +1 -0
  365. package/build/dist/Server/Utils/Monitor/MonitorIncident.js +50 -30
  366. package/build/dist/Server/Utils/Monitor/MonitorIncident.js.map +1 -1
  367. package/build/dist/Server/Utils/Monitor/MonitorResource.js +32 -0
  368. package/build/dist/Server/Utils/Monitor/MonitorResource.js.map +1 -1
  369. package/build/dist/Server/Utils/Response.js +112 -5
  370. package/build/dist/Server/Utils/Response.js.map +1 -1
  371. package/build/dist/Server/Utils/SSRFProtection.js +219 -53
  372. package/build/dist/Server/Utils/SSRFProtection.js.map +1 -1
  373. package/build/dist/Server/Utils/StartServer.js +7 -0
  374. package/build/dist/Server/Utils/StartServer.js.map +1 -1
  375. package/build/dist/Server/Utils/VM/VMRunner.js +73 -1
  376. package/build/dist/Server/Utils/VM/VMRunner.js.map +1 -1
  377. package/build/dist/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.js +445 -43
  378. package/build/dist/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.js.map +1 -1
  379. package/build/dist/Server/Utils/Workspace/Slack/Slack.js +18 -1
  380. package/build/dist/Server/Utils/Workspace/Slack/Slack.js.map +1 -1
  381. package/build/dist/Server/Utils/Workspace/WorkspaceBase.js.map +1 -1
  382. package/build/dist/Types/AI/FixPullRequestCiStatus.js +1 -1
  383. package/build/dist/Types/AI/FixVerificationStatus.js +2 -2
  384. package/build/dist/Types/API/Hostname.js +73 -4
  385. package/build/dist/Types/API/Hostname.js.map +1 -1
  386. package/build/dist/Types/API/URL.js +42 -24
  387. package/build/dist/Types/API/URL.js.map +1 -1
  388. package/build/dist/Types/Billing/BalanceAdjustmentType.js +15 -0
  389. package/build/dist/Types/Billing/BalanceAdjustmentType.js.map +1 -0
  390. package/build/dist/Types/Billing/ProjectBalanceType.js +14 -0
  391. package/build/dist/Types/Billing/ProjectBalanceType.js.map +1 -0
  392. package/build/dist/Types/Domain.js +22 -0
  393. package/build/dist/Types/Domain.js.map +1 -1
  394. package/build/dist/Types/File/MimeType.js +11 -0
  395. package/build/dist/Types/File/MimeType.js.map +1 -1
  396. package/build/dist/Types/JSONFunctions.js +14 -0
  397. package/build/dist/Types/JSONFunctions.js.map +1 -1
  398. package/build/dist/Types/Workflow/Components/BaseModel.js +83 -28
  399. package/build/dist/Types/Workflow/Components/BaseModel.js.map +1 -1
  400. package/build/dist/UI/Components/GanttChart/ChartContainer.js +4 -3
  401. package/build/dist/UI/Components/GanttChart/ChartContainer.js.map +1 -1
  402. package/build/dist/UI/Components/Modal/ConfirmModal.js +3 -1
  403. package/build/dist/UI/Components/Modal/ConfirmModal.js.map +1 -1
  404. package/build/dist/UI/Components/Modal/Modal.js +24 -34
  405. package/build/dist/UI/Components/Modal/Modal.js.map +1 -1
  406. package/build/dist/UI/Components/ModelDelete/ModelDelete.js +11 -6
  407. package/build/dist/UI/Components/ModelDelete/ModelDelete.js.map +1 -1
  408. package/build/dist/UI/Components/SideOver/SideOver.js +105 -30
  409. package/build/dist/UI/Components/SideOver/SideOver.js.map +1 -1
  410. package/build/dist/UI/Utils/PageScrollLock.js +52 -0
  411. package/build/dist/UI/Utils/PageScrollLock.js.map +1 -0
  412. package/build/dist/Utils/Dashboard/HtmlWidgetDocument.js +4 -2
  413. package/build/dist/Utils/Dashboard/HtmlWidgetDocument.js.map +1 -1
  414. package/build/dist/Utils/Dashboard/VariableInterpolation.js +19 -1
  415. package/build/dist/Utils/Dashboard/VariableInterpolation.js.map +1 -1
  416. package/build/dist/Utils/LegacySerializedArray.js +51 -0
  417. package/build/dist/Utils/LegacySerializedArray.js.map +1 -0
  418. package/build/dist/Utils/Monitor/MonitorDependencyRule.js +47 -0
  419. package/build/dist/Utils/Monitor/MonitorDependencyRule.js.map +1 -0
  420. package/build/dist/Utils/Telemetry/SavedViewFilters.js +52 -0
  421. package/build/dist/Utils/Telemetry/SavedViewFilters.js.map +1 -0
  422. package/jest.config.json +3 -0
  423. package/package.json +1 -1
  424. package/tsconfig.json +3 -1
@@ -14,6 +14,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
14
14
  import Text from "../../../../../Types/Text";
15
15
  import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
16
16
  import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
17
+ import { normalizeModelKeys } from "./ModelArguments";
18
+ import logComponentError from "./LogComponentError";
17
19
  export default class FindOneBaseModel extends ComponentCode {
18
20
  constructor(modelService) {
19
21
  super();
@@ -31,6 +33,7 @@ export default class FindOneBaseModel extends ComponentCode {
31
33
  this.modelService = modelService;
32
34
  }
33
35
  async run(args, options) {
36
+ var _a;
34
37
  const successPort = this.getMetadata().outPorts.find((p) => {
35
38
  return p.id === "success";
36
39
  });
@@ -56,9 +59,6 @@ export default class FindOneBaseModel extends ComponentCode {
56
59
  if (typeof args["query"] !== "object") {
57
60
  throw options.onError(new BadDataException("Query is should be of type object."));
58
61
  }
59
- if (this.modelService.getModel().getTenantColumn()) {
60
- args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
61
- }
62
62
  if (!args["select"]) {
63
63
  throw options.onError(new BadDataException("Select Fields is undefined."));
64
64
  }
@@ -68,16 +68,18 @@ export default class FindOneBaseModel extends ComponentCode {
68
68
  if (typeof args["select"] !== "object") {
69
69
  throw options.onError(new BadDataException("Select Fields is should be of type object."));
70
70
  }
71
- let query = args["query"];
72
- if (query) {
73
- query = JSONFunctions.deserialize(args["query"]);
74
- }
75
- let select = args["select"];
76
- if (select) {
77
- select = JSONFunctions.deserialize(args["select"]);
71
+ const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
72
+ /*
73
+ * The tenant column goes on the deserialized query, not on args["query"]
74
+ * - JSONFunctions.deserialize returns a new object, so anything written
75
+ * to args after it runs never reaches the database.
76
+ */
77
+ if (this.modelService.getModel().getTenantColumn()) {
78
+ query[this.modelService.getModel().getTenantColumn()] = options.projectId;
78
79
  }
80
+ const select = JSONFunctions.deserialize(normalizeModelKeys(args["select"], this.modelService.getModel()));
79
81
  const model = await this.modelService.findOneBy({
80
- query: query || {},
82
+ query: query,
81
83
  select: select,
82
84
  props: {
83
85
  isRoot: true,
@@ -94,8 +96,11 @@ export default class FindOneBaseModel extends ComponentCode {
94
96
  };
95
97
  }
96
98
  catch (err) {
97
- options.log("Error running component");
98
- options.log(err.message ? err.message : JSON.stringify(err, null, 2));
99
+ logComponentError({
100
+ error: err,
101
+ model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
102
+ log: options.log,
103
+ });
99
104
  return {
100
105
  returnValues: {},
101
106
  executePort: errorPort,
@@ -1 +1 @@
1
- {"version":3,"file":"FindOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FindOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,43 @@
1
+ import logger from "../../../../Utils/Logger";
2
+ import { ID_ARGUMENT_KEY, PRIMARY_KEY_COLUMN, describeModelColumns, } from "./ModelArguments";
3
+ /*
4
+ * TypeORM's EntityPropertyNotFoundError reads
5
+ * `Property "foo" was not found in "Monitor". Make sure your query is correct.`
6
+ * On its own that tells a workflow builder nothing they can act on: it names
7
+ * neither the argument at fault nor anything they can pick from, and it says
8
+ * "query" even when the offending key was in Data. Everything the builder
9
+ * needs is already on the model, so the components append it.
10
+ */
11
+ const UNKNOWN_PROPERTY_PATTERN = /Property "([^"]+)" was not found in "([^"]+)"/;
12
+ export const buildColumnHint = (message, model) => {
13
+ const match = message.match(UNKNOWN_PROPERTY_PATTERN);
14
+ if (!match) {
15
+ return null;
16
+ }
17
+ const property = match[1];
18
+ const modelName = model.singularName || match[2];
19
+ if (property === ID_ARGUMENT_KEY) {
20
+ return `Tip: "${ID_ARGUMENT_KEY}" is not a column on ${modelName}. Use "${PRIMARY_KEY_COLUMN}" instead. Columns you can use: ${describeModelColumns(model)}.`;
21
+ }
22
+ return `Tip: "${property}" is not a column on ${modelName}. Check every key in this component's Query, Select and Data arguments. Columns you can use: ${describeModelColumns(model)}.`;
23
+ };
24
+ /*
25
+ * Every database component failed the same way before this: two lines in the
26
+ * workflow log and, for all but Create One, nothing at all in the server log.
27
+ */
28
+ const logComponentError = (data) => {
29
+ const { error, model, log } = data;
30
+ logger.error(error);
31
+ const errorMessage = error === null || error === void 0 ? void 0 : error.message;
32
+ const message = typeof errorMessage === "string" && errorMessage
33
+ ? errorMessage
34
+ : JSON.stringify(error, null, 2);
35
+ log("Error running component");
36
+ log(message);
37
+ const hint = model ? buildColumnHint(message, model) : null;
38
+ if (hint) {
39
+ log(hint);
40
+ }
41
+ };
42
+ export default logComponentError;
43
+ //# sourceMappingURL=LogComponentError.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"LogComponentError.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/LogComponentError.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,MAAM,wBAAwB,GAC5B,+CAA+C,CAAC;AAOlD,MAAM,CAAC,MAAM,eAAe,GAA4B,CACtD,OAAe,EACf,KAAgB,EACD,EAAE;IACjB,MAAM,KAAK,GAA4B,OAAO,CAAC,KAAK,CAClD,wBAAwB,CACzB,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAW,KAAK,CAAC,CAAC,CAAW,CAAC;IAC5C,MAAM,SAAS,GAAW,KAAK,CAAC,YAAY,IAAK,KAAK,CAAC,CAAC,CAAY,CAAC;IAErE,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;QACjC,OAAO,SAAS,eAAe,wBAAwB,SAAS,UAAU,kBAAkB,mCAAmC,oBAAoB,CACjJ,KAAK,CACN,GAAG,CAAC;IACP,CAAC;IAED,OAAO,SAAS,QAAQ,wBAAwB,SAAS,gGAAgG,oBAAoB,CAC3K,KAAK,CACN,GAAG,CAAC;AACP,CAAC,CAAC;AAQF;;;GAGG;AACH,MAAM,iBAAiB,GAA8B,CAAC,IAIrD,EAAQ,EAAE;IACT,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAEnC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEpB,MAAM,YAAY,GAAa,KAAsC,aAAtC,KAAK,uBAAL,KAAK,CAChC,OAAO,CAAC;IAEZ,MAAM,OAAO,GACX,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY;QAC9C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAErC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC/B,GAAG,CAAC,OAAO,CAAC,CAAC;IAEb,MAAM,IAAI,GAAkB,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3E,IAAI,IAAI,EAAE,CAAC;QACT,GAAG,CAAC,IAAI,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
@@ -0,0 +1,116 @@
1
+ import TableColumnType from "../../../../../Types/Database/TableColumnType";
2
+ /*
3
+ * Workflow builders write "id", because that is what an ID is called
4
+ * everywhere they can see one: in the dashboard, in the API docs, and on the
5
+ * model itself (`monitor.id`). On a database model, though, "id" is only a
6
+ * TypeScript accessor - the persisted primary key column is "_id"
7
+ * (DatabaseBaseModel._id). A query, select or data object keyed on "id"
8
+ * therefore reached TypeORM verbatim and threw
9
+ * `Property "id" was not found in "Monitor". Make sure your query is correct.`,
10
+ * which is what https://github.com/OneUptime/oneuptime/issues/3132 reported.
11
+ *
12
+ * The create path has accepted "id" all along - DatabaseBaseModel._fromJSON
13
+ * rewrites it to "_id" - so the fix is to make every other workflow argument
14
+ * agree with create, rather than to take the alias away from create.
15
+ */
16
+ export const ID_ARGUMENT_KEY = "id";
17
+ export const PRIMARY_KEY_COLUMN = "_id";
18
+ const modelAliasesId = (model) => {
19
+ return (model.hasColumn(PRIMARY_KEY_COLUMN) && !model.hasColumn(ID_ARGUMENT_KEY));
20
+ };
21
+ const isColumnMap = (value) => {
22
+ if (value === null || value === undefined || typeof value !== "object") {
23
+ return false;
24
+ }
25
+ if (Array.isArray(value) || value instanceof Date) {
26
+ return false;
27
+ }
28
+ return value["_type"] === undefined;
29
+ };
30
+ /*
31
+ * Relations are queried and selected one level deep - `{"project": {"id":
32
+ * true}}` - so the alias has to follow the relation into the related model
33
+ * rather than stopping at the top level.
34
+ */
35
+ const normalizeValue = (value, columnName, model) => {
36
+ if (!isColumnMap(value)) {
37
+ return value;
38
+ }
39
+ const metadata = model.getTableColumnMetadata(columnName);
40
+ if (!metadata ||
41
+ !metadata.modelType ||
42
+ (metadata.type !== TableColumnType.Entity &&
43
+ metadata.type !== TableColumnType.EntityArray)) {
44
+ return value;
45
+ }
46
+ return normalizeModelKeys(value, new metadata.modelType());
47
+ };
48
+ /*
49
+ * Returns a copy of `json` with the "id" alias resolved to the "_id" column,
50
+ * including inside related-model objects one level down. Everything else is
51
+ * copied through untouched - this deliberately does not validate column names,
52
+ * so an argument that works today keeps working.
53
+ */
54
+ export const normalizeModelKeys = (json, model) => {
55
+ const normalized = {};
56
+ const aliasesId = modelAliasesId(model);
57
+ /*
58
+ * Someone who spells out "_id" meant "_id". If both spellings are present
59
+ * the explicit column wins and the alias is dropped, so the result never
60
+ * depends on key order.
61
+ */
62
+ const explicitPrimaryKeyGiven = json[PRIMARY_KEY_COLUMN] !== undefined;
63
+ for (const key of Object.keys(json)) {
64
+ let columnName = key;
65
+ if (key === ID_ARGUMENT_KEY && aliasesId) {
66
+ if (explicitPrimaryKeyGiven) {
67
+ continue;
68
+ }
69
+ columnName = PRIMARY_KEY_COLUMN;
70
+ }
71
+ normalized[columnName] = normalizeValue(json[key], columnName, model);
72
+ }
73
+ return normalized;
74
+ };
75
+ /*
76
+ * Stamps the record being written with the project the workflow runs in.
77
+ *
78
+ * Setting the scalar tenant column is not enough on its own. Every tenant
79
+ * model also exposes that same physical column through its many-to-one
80
+ * relation - Monitor.project is @JoinColumn({name: "projectId"}) - and TypeORM
81
+ * reads the relation property first, writing the column once. So a payload
82
+ * carrying {"project": "<some other project>"} silently beat the stamp and
83
+ * moved the record into that project. The relation keys pointing at the tenant
84
+ * column are therefore dropped before the scalar is written.
85
+ */
86
+ export const applyTenantColumn = (json, model, tenantId) => {
87
+ const tenantColumn = model.getTenantColumn();
88
+ if (!tenantColumn) {
89
+ return json;
90
+ }
91
+ const stamped = {};
92
+ for (const key of Object.keys(json)) {
93
+ if (key === tenantColumn) {
94
+ continue;
95
+ }
96
+ const metadata = model.getTableColumnMetadata(key);
97
+ if (metadata && metadata.manyToOneRelationColumn === tenantColumn) {
98
+ continue;
99
+ }
100
+ stamped[key] = json[key];
101
+ }
102
+ stamped[tenantColumn] = tenantId;
103
+ return stamped;
104
+ };
105
+ /*
106
+ * The raw TypeORM failure ("Property "foo" was not found in "Monitor") names
107
+ * neither the argument at fault nor anything the builder can pick from, so the
108
+ * components append the real column list to it.
109
+ */
110
+ export const describeModelColumns = (model) => {
111
+ const columns = [...model.getTableColumns().columns].sort((a, b) => {
112
+ return a.localeCompare(b);
113
+ });
114
+ return columns.join(", ");
115
+ };
116
+ //# sourceMappingURL=ModelArguments.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ModelArguments.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/ModelArguments.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,7 @@ import ObjectID from "../../../../../Types/ObjectID";
20
20
  import Text from "../../../../../Types/Text";
21
21
  import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
22
22
  import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
23
+ import { normalizeModelKeys } from "./ModelArguments";
23
24
  export default class OnTriggerBaseModel extends TriggerCode {
24
25
  constructor(modelService, type) {
25
26
  super();
@@ -106,6 +107,12 @@ export default class OnTriggerBaseModel extends TriggerCode {
106
107
  select[key] = false;
107
108
  }
108
109
  }
110
+ /*
111
+ * "id" is only a TypeScript accessor on the model - the column is "_id".
112
+ * Selecting "id" reached TypeORM verbatim and threw, and this trigger
113
+ * has no error port, so it took the whole workflow run down with it.
114
+ */
115
+ select = normalizeModelKeys(select, this.service.getModel());
109
116
  }
110
117
  const model = await this.service.findOneById({
111
118
  id: new ObjectID(data["_id"].toString()),
@@ -1 +1 @@
1
- {"version":3,"file":"OnTriggerBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OnTriggerBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,8 @@ import PositiveNumber from "../../../../../Types/PositiveNumber";
15
15
  import Text from "../../../../../Types/Text";
16
16
  import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
17
17
  import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
18
+ import { applyTenantColumn, normalizeModelKeys } from "./ModelArguments";
19
+ import logComponentError from "./LogComponentError";
18
20
  export default class UpdateManyBaseModel extends ComponentCode {
19
21
  constructor(modelService) {
20
22
  super();
@@ -32,6 +34,7 @@ export default class UpdateManyBaseModel extends ComponentCode {
32
34
  this.modelService = modelService;
33
35
  }
34
36
  async run(args, options) {
37
+ var _a;
35
38
  const successPort = this.getMetadata().outPorts.find((p) => {
36
39
  return p.id === "success";
37
40
  });
@@ -57,9 +60,7 @@ export default class UpdateManyBaseModel extends ComponentCode {
57
60
  if (typeof args["data"] !== "object") {
58
61
  throw options.onError(new BadDataException("JSON is should be of type object."));
59
62
  }
60
- if (this.modelService.getModel().getTenantColumn()) {
61
- args["data"][this.modelService.getModel().getTenantColumn()] = options.projectId;
62
- }
63
+ args["data"] = applyTenantColumn(normalizeModelKeys(args["data"], this.modelService.getModel()), this.modelService.getModel(), options.projectId);
63
64
  if (!args["query"]) {
64
65
  throw options.onError(new BadDataException("Query is undefined."));
65
66
  }
@@ -87,15 +88,19 @@ export default class UpdateManyBaseModel extends ComponentCode {
87
88
  options.log("Setting the limit to " + LIMIT_PER_PROJECT);
88
89
  args["limit"] = LIMIT_PER_PROJECT;
89
90
  }
90
- let query = args["query"];
91
- if (query) {
92
- query = JSONFunctions.deserialize(args["query"]);
93
- }
91
+ const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
92
+ /*
93
+ * The tenant column goes on the deserialized query, not on args["query"].
94
+ * JSONFunctions.deserialize returns a new object, so writing the tenant
95
+ * column to args afterwards left the query that actually ran unscoped -
96
+ * and an update as root is not re-scoped by the permission layer, so an
97
+ * Update Many could reach rows in other projects.
98
+ */
94
99
  if (this.modelService.getModel().getTenantColumn()) {
95
- args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
100
+ query[this.modelService.getModel().getTenantColumn()] = options.projectId;
96
101
  }
97
- await this.modelService.updateBy({
98
- query: query || {},
102
+ const itemsUpdated = await this.modelService.updateBy({
103
+ query: query,
99
104
  data: args["data"],
100
105
  limit: new PositiveNumber(args["limit"]),
101
106
  skip: new PositiveNumber(args["skip"]),
@@ -104,14 +109,20 @@ export default class UpdateManyBaseModel extends ComponentCode {
104
109
  tenantId: options.projectId,
105
110
  },
106
111
  });
112
+ options.log(`Updated ${itemsUpdated} ${this.modelService.getModel().singularName || "record"}(s).`);
107
113
  return {
108
- returnValues: {},
114
+ returnValues: {
115
+ "items-updated": itemsUpdated,
116
+ },
109
117
  executePort: successPort,
110
118
  };
111
119
  }
112
120
  catch (err) {
113
- options.log("Error running component");
114
- options.log(err.message ? err.message : JSON.stringify(err, null, 2));
121
+ logComponentError({
122
+ error: err,
123
+ model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
124
+ log: options.log,
125
+ });
115
126
  return {
116
127
  returnValues: {},
117
128
  executePort: errorPort,
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateManyBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UpdateManyBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
13
13
  import Text from "../../../../../Types/Text";
14
14
  import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
15
15
  import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
16
+ import { applyTenantColumn, normalizeModelKeys } from "./ModelArguments";
17
+ import logComponentError from "./LogComponentError";
16
18
  export default class UpdateOneBaseModel extends ComponentCode {
17
19
  constructor(modelService) {
18
20
  super();
@@ -30,6 +32,7 @@ export default class UpdateOneBaseModel extends ComponentCode {
30
32
  this.modelService = modelService;
31
33
  }
32
34
  async run(args, options) {
35
+ var _a;
33
36
  const successPort = this.getMetadata().outPorts.find((p) => {
34
37
  return p.id === "success";
35
38
  });
@@ -55,9 +58,7 @@ export default class UpdateOneBaseModel extends ComponentCode {
55
58
  if (typeof args["data"] !== "object") {
56
59
  throw options.onError(new BadDataException("JSON is should be of type object."));
57
60
  }
58
- if (this.modelService.getModel().getTenantColumn()) {
59
- args["data"][this.modelService.getModel().getTenantColumn()] = options.projectId;
60
- }
61
+ args["data"] = applyTenantColumn(normalizeModelKeys(args["data"], this.modelService.getModel()), this.modelService.getModel(), options.projectId);
61
62
  if (!args["query"]) {
62
63
  throw options.onError(new BadDataException("Query is undefined."));
63
64
  }
@@ -67,29 +68,42 @@ export default class UpdateOneBaseModel extends ComponentCode {
67
68
  if (typeof args["query"] !== "object") {
68
69
  throw options.onError(new BadDataException("Query is should be of type object."));
69
70
  }
71
+ const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
72
+ /*
73
+ * The tenant column goes on the deserialized query, not on args["query"]
74
+ * - JSONFunctions.deserialize returns a new object, so anything written
75
+ * to args after it runs never reaches the database.
76
+ */
70
77
  if (this.modelService.getModel().getTenantColumn()) {
71
- args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
72
- }
73
- let query = args["query"];
74
- if (query) {
75
- query = JSONFunctions.deserialize(args["query"]);
78
+ query[this.modelService.getModel().getTenantColumn()] = options.projectId;
76
79
  }
77
- await this.modelService.updateOneBy({
78
- query: query || {},
80
+ const itemsUpdated = await this.modelService.updateOneBy({
81
+ query: query,
79
82
  data: args["data"],
80
83
  props: {
81
84
  isRoot: true,
82
85
  tenantId: options.projectId,
83
86
  },
84
87
  });
88
+ /*
89
+ * A query that matches nothing is not an error, but reporting it as a
90
+ * bare success left builders with no way to tell "updated" from "found
91
+ * nothing to update".
92
+ */
93
+ options.log(`Updated ${itemsUpdated} ${this.modelService.getModel().singularName || "record"}(s).`);
85
94
  return {
86
- returnValues: {},
95
+ returnValues: {
96
+ "items-updated": itemsUpdated,
97
+ },
87
98
  executePort: successPort,
88
99
  };
89
100
  }
90
101
  catch (err) {
91
- options.log("Error running component");
92
- options.log(err.message ? err.message : JSON.stringify(err, null, 2));
102
+ logComponentError({
103
+ error: err,
104
+ model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
105
+ log: options.log,
106
+ });
93
107
  return {
94
108
  returnValues: {},
95
109
  executePort: errorPort,
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UpdateOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts"],"names":[],"mappings":"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"}
@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
10
  import ComponentCode from "../../ComponentCode";
11
+ import IncomingWebhookUtils, { DISCORD_WEBHOOK_DOMAINS, } from "../IncomingWebhookUtils";
11
12
  import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse";
12
- import URL from "../../../../../Types/API/URL";
13
13
  import APIException from "../../../../../Types/Exception/ApiException";
14
14
  import BadDataException from "../../../../../Types/Exception/BadDataException";
15
15
  import ComponentID from "../../../../../Types/Workflow/ComponentID";
@@ -28,7 +28,6 @@ export default class SendMessageToChannel extends ComponentCode {
28
28
  this.setMetadata(Component);
29
29
  }
30
30
  async run(args, options) {
31
- var _a;
32
31
  const successPort = this.getMetadata().outPorts.find((p) => {
33
32
  return p.id === "success";
34
33
  });
@@ -44,10 +43,12 @@ export default class SendMessageToChannel extends ComponentCode {
44
43
  if (!args["text"]) {
45
44
  throw options.onError(new BadDataException("Discord message not found"));
46
45
  }
47
- if (!args["webhook-url"]) {
48
- throw options.onError(new BadDataException("Discord Webhook URL not found"));
49
- }
50
- args["webhook-url"] = URL.fromString((_a = args["webhook-url"]) === null || _a === void 0 ? void 0 : _a.toString());
46
+ args["webhook-url"] = IncomingWebhookUtils.getPinnedWebhookUrl({
47
+ args,
48
+ options,
49
+ allowedDomains: DISCORD_WEBHOOK_DOMAINS,
50
+ vendorName: "Discord",
51
+ });
51
52
  let apiResult = null;
52
53
  try {
53
54
  // https://discord.com/developers/docs/resources/webhook#execute-webhook
@@ -56,6 +57,13 @@ export default class SendMessageToChannel extends ComponentCode {
56
57
  data: {
57
58
  content: args["text"],
58
59
  },
60
+ /*
61
+ * The host is pinned above; following a redirect would hand the
62
+ * destination back to whoever controls that host.
63
+ */
64
+ options: {
65
+ doNotFollowRedirects: true,
66
+ },
59
67
  });
60
68
  if (apiResult instanceof HTTPErrorResponse) {
61
69
  return Promise.resolve({
@@ -1 +1 @@
1
- {"version":3,"file":"SendMessageToChannel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/Discord/SendMessageToChannel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SendMessageToChannel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/Discord/SendMessageToChannel.ts"],"names":[],"mappings":"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"}