@oneuptime/common 14.0.7 → 14.0.8
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.
- package/Models/DatabaseModels/Incident.ts +267 -1
- package/Models/DatabaseModels/IncidentCustomField.ts +202 -0
- package/Models/DatabaseModels/IncidentEpisode.ts +30 -0
- package/Models/DatabaseModels/IncidentTemplate.ts +126 -1
- package/Models/DatabaseModels/StatusPage.ts +55 -0
- package/Models/DatabaseModels/StatusPageSubscriber.ts +128 -0
- package/Server/API/IncidentAPI.ts +162 -0
- package/Server/API/StatusPageAPI.ts +487 -171
- package/Server/API/StatusPageSubscriberAPI.ts +63 -15
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795300000000-SkipHiddenIncidentCreatedNotifications.ts +49 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795400000000-AddIncidentStatusPageScope.ts +108 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795500000000-AddIncidentTemplateStatusPageScopeFlag.ts +33 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795600000000-AddStatusPageSubscriberUnsubscribeToken.ts +51 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795700000000-AddStatusPageSubscriberIsAddedByTeam.ts +33 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795800000000-AddIncidentCustomFieldCreateAndNotificationSettings.ts +168 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1795900000000-AddSubscriberNotificationClaimedAt.ts +44 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +14 -0
- package/Server/Infrastructure/Semaphore.ts +10 -0
- package/Server/Middleware/IdentityRateLimit.ts +108 -3
- package/Server/Middleware/SubscriberNotificationPreviewRateLimit.ts +237 -0
- package/Server/Middleware/SubscriberNotificationTestSendRateLimit.ts +304 -0
- package/Server/Services/DatabaseService.ts +93 -10
- package/Server/Services/IncidentCustomFieldService.ts +276 -1
- package/Server/Services/IncidentEpisodePublicNoteService.ts +28 -0
- package/Server/Services/IncidentEpisodeService.ts +15 -0
- package/Server/Services/IncidentEpisodeStateTimelineService.ts +27 -1
- package/Server/Services/IncidentPublicNoteService.ts +30 -1
- package/Server/Services/IncidentService.ts +1535 -65
- package/Server/Services/IncidentStateTimelineService.ts +13 -0
- package/Server/Services/IncidentTemplateService.ts +109 -0
- package/Server/Services/ScheduledMaintenancePublicNoteService.ts +30 -1
- package/Server/Services/ScheduledMaintenanceService.ts +68 -18
- package/Server/Services/SmsService.ts +10 -0
- package/Server/Services/StatusPageService.ts +65 -8
- package/Server/Services/StatusPageSubscriberNotificationTemplateService.ts +299 -37
- package/Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.ts +129 -0
- package/Server/Services/StatusPageSubscriberService.ts +1161 -64
- package/Server/Types/Markdown.ts +153 -6
- package/Server/Types/Workflow/Components/Email.ts +61 -2
- package/Server/Utils/CustomField/CustomFieldRename.ts +378 -0
- package/Server/Utils/DataSource/EgressGuard.ts +66 -21
- package/Server/Utils/Mail/PinnedSmtpSocket.ts +130 -0
- package/Server/Utils/Monitor/MonitorCriteriaObservationBuilder.ts +10 -0
- package/Server/Utils/SSRFProtection.ts +76 -16
- package/Server/Utils/StatusPage/IncidentStatusPageScope.ts +948 -0
- package/Server/Utils/StatusPage/IncidentSubscriberAudienceBuilder.ts +656 -0
- package/Server/Utils/StatusPage/IncidentTemplateVariableBuilder.ts +805 -0
- package/Server/Utils/StatusPage/StatusPageExclusion.ts +18 -0
- package/Server/Utils/StatusPage/StatusPageReadAccess.ts +125 -0
- package/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeNotice.ts +151 -0
- package/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeToken.ts +70 -0
- package/Server/Utils/StatusPage/SubscriberIncidentEmailBuilder.ts +421 -0
- package/Server/Utils/StatusPage/SubscriberNotificationClaim.ts +107 -0
- package/Server/Utils/StatusPage/SubscriberNotificationDeliveryRecord.ts +1049 -0
- package/Server/Utils/StatusPage/SubscriberNotificationFanOut.ts +180 -0
- package/Server/Utils/StatusPage/SubscriberNotificationPreviewBuilder.ts +839 -0
- package/Server/Utils/StatusPage/SubscriberNotificationResendAccess.ts +393 -0
- package/Server/Utils/StatusPage/SubscriberNotificationRunLimit.ts +246 -0
- package/Server/Utils/StatusPage/SubscriberNotificationTiming.ts +133 -0
- package/Server/Utils/StatusPage/SubscriberTemplateIncidentRecordAccess.ts +215 -0
- package/Server/Utils/StatusPageResource.ts +51 -20
- package/Server/Utils/VM/VMAPI.ts +1 -0
- package/Server/Utils/VM/VMRunner.ts +10 -0
- package/Server/Utils/Workflow/OAuth2TokenClient.ts +10 -0
- package/Server/Views/Partials/SensitiveUrlToken.ejs +8 -5
- package/Tests/App/Accounts/RegisterVerifyEmail.test.tsx +748 -0
- package/Tests/App/Accounts/ResendVerificationEmail.test.tsx +1222 -0
- package/Tests/App/Accounts/VerificationEmailResendUtils.test.ts +797 -0
- package/Tests/App/Accounts/VerifyEmailPending.test.tsx +538 -0
- package/Tests/App/Accounts/VerifyEmailResend.test.tsx +779 -0
- package/Tests/App/Dashboard/CustomFieldsSettingsIncidentOptions.test.tsx +357 -0
- package/Tests/App/Dashboard/EventNotes.test.tsx +776 -0
- package/Tests/App/Dashboard/EventNotesPages.test.tsx +119 -0
- package/Tests/App/Dashboard/EventNotesUtil.test.ts +116 -17
- package/Tests/App/Dashboard/EventOverviewPages.test.tsx +242 -5
- package/Tests/App/Dashboard/IncidentChangeStateNotifyDefault.test.tsx +91 -1
- package/Tests/App/Dashboard/IncidentCreateDetailsStep.test.tsx +643 -0
- package/Tests/App/Dashboard/IncidentCreateFromAlerts.test.tsx +8 -1
- package/Tests/App/Dashboard/IncidentCreateStatusPageScope.test.tsx +601 -0
- package/Tests/App/Dashboard/IncidentCustomFieldTemplateVariables.test.tsx +386 -0
- package/Tests/App/Dashboard/IncidentNoteTemplatePlaceholders.test.tsx +124 -0
- package/Tests/App/Dashboard/IncidentNoteTemplateVariablesLoader.test.ts +305 -0
- package/Tests/App/Dashboard/IncidentOverviewNotifyDefault.test.tsx +112 -0
- package/Tests/App/Dashboard/IncidentSettingsRenotifyOnPublish.test.tsx +674 -0
- package/Tests/App/Dashboard/IncidentSettingsStatusPageScope.test.tsx +1051 -0
- package/Tests/App/Dashboard/IncidentTemplateCustomFields.test.tsx +384 -0
- package/Tests/App/Dashboard/IncidentTemplateStatusPageScopeCard.test.tsx +215 -0
- package/Tests/App/Dashboard/PublicNotePagesNotifyDefault.test.tsx +113 -1
- package/Tests/App/Dashboard/SubscriberAudienceSummary.test.tsx +512 -0
- package/Tests/App/Dashboard/SubscriberNotificationPreviewModal.test.tsx +837 -0
- package/Tests/App/Dashboard/SubscriberNotificationStatusLabel.test.tsx +88 -0
- package/Tests/App/Dashboard/SubscriberNotificationStatusResend.test.tsx +473 -0
- package/Tests/App/Dashboard/SubscriberTemplateLivePreview.test.tsx +196 -0
- package/Tests/App/Dashboard/TeamAddedSubscribersUnsubscribedNotice.test.tsx +248 -0
- package/Tests/App/SensitiveUrlTokenBootstrap.test.ts +64 -3
- package/Tests/App/StatusPage/StatusPageUnsubscribePage.test.tsx +412 -0
- package/Tests/Models/IncidentCustomFieldApiSchemaContract.test.ts +217 -0
- package/Tests/Models/IncidentCustomFieldCreateSettingsColumns.test.ts +252 -0
- package/Tests/Models/StatusPageSubscriberUnsubscribeColumns.test.ts +218 -0
- package/Tests/Server/API/ExpiredSessionRouteGuards.test.ts +7 -0
- package/Tests/Server/API/IncidentSubscriberAudienceAPI.test.ts +1408 -0
- package/Tests/Server/API/StatusPageIncidentScope.test.ts +1868 -0
- package/Tests/Server/API/StatusPageIncidentScopePostgres.test.ts +790 -0
- package/Tests/Server/API/StatusPageManageSubscriptionRecipient.test.ts +10 -1
- package/Tests/Server/API/StatusPageManageSubscriptionTemplateVariables.test.ts +206 -18
- package/Tests/Server/API/StatusPagePostmortemVisibility.test.ts +14 -2
- package/Tests/Server/API/StatusPageSubscriberCreateResponse.test.ts +217 -0
- package/Tests/Server/API/StatusPageSubscriberOwnership.test.ts +103 -2
- package/Tests/Server/API/StatusPageUnsubscribeAPI.test.ts +396 -0
- package/Tests/Server/Infrastructure/Postgres/AddIncidentStatusPageScopeMigration.test.ts +395 -0
- package/Tests/Server/Infrastructure/Postgres/AddIncidentTemplateStatusPageScopeFlagMigration.test.ts +150 -0
- package/Tests/Server/Infrastructure/Postgres/AddSubscriberNotificationClaimedAtMigration.test.ts +156 -0
- package/Tests/Server/Infrastructure/Postgres/SkipHiddenIncidentCreatedNotificationsMigration.test.ts +410 -0
- package/Tests/Server/Middleware/IdentityRateLimit.test.ts +551 -1
- package/Tests/Server/Middleware/SubscriberNotificationPreviewRateLimit.test.ts +238 -0
- package/Tests/Server/Middleware/SubscriberNotificationTestSendRateLimit.test.ts +245 -0
- package/Tests/Server/Services/AddStatusPageSubscriberUnsubscribeTokenMigration.test.ts +152 -0
- package/Tests/Server/Services/CrossProjectRelationWriteGuard.test.ts +221 -36
- package/Tests/Server/Services/DatabaseServiceCompareAndSetColumns.test.ts +191 -0
- package/Tests/Server/Services/IncidentCreatedRenotifyOnPublish.test.ts +681 -0
- package/Tests/Server/Services/IncidentCreatedResend.test.ts +775 -0
- package/Tests/Server/Services/IncidentCustomFieldRenamePostgres.test.ts +713 -0
- package/Tests/Server/Services/IncidentCustomFieldService.test.ts +751 -0
- package/Tests/Server/Services/IncidentCustomFieldValueValidation.test.ts +556 -0
- package/Tests/Server/Services/IncidentStatusPageScope.test.ts +2971 -0
- package/Tests/Server/Services/IncidentStatusPageScopeFeed.test.ts +131 -0
- package/Tests/Server/Services/IncidentStatusPageScopePostgres.test.ts +625 -0
- package/Tests/Server/Services/IncidentTemplateCustomFieldsCopy.test.ts +311 -0
- package/Tests/Server/Services/IncidentTemplateStatusPageScope.test.ts +363 -0
- package/Tests/Server/Services/PublicNoteEditFeedEventType.test.ts +213 -0
- package/Tests/Server/Services/PublicNoteResendAccess.test.ts +994 -0
- package/Tests/Server/Services/ScheduledMaintenanceSubscriberTemplateFormats.test.ts +289 -9
- package/Tests/Server/Services/SmsServiceFailIfNotSent.test.ts +67 -0
- package/Tests/Server/Services/StatusPageReportIncidentCounts.test.ts +610 -0
- package/Tests/Server/Services/StatusPageSubscriberAudienceCounts.test.ts +201 -0
- package/Tests/Server/Services/StatusPageSubscriberAudienceCountsPostgres.test.ts +271 -0
- package/Tests/Server/Services/StatusPageSubscriberConfirmationTemplateEscaping.test.ts +200 -0
- package/Tests/Server/Services/StatusPageSubscriberNotificationLogRedaction.test.ts +54 -0
- package/Tests/Server/Services/StatusPageSubscriberNotificationTemplateCompile.test.ts +37 -0
- package/Tests/Server/Services/StatusPageSubscriberNotificationTemplateIncidentRecordAccess.test.ts +772 -0
- package/Tests/Server/Services/StatusPageSubscriberNotificationTemplateLookup.test.ts +506 -0
- package/Tests/Server/Services/StatusPageSubscriberNotificationTemplateLookupPostgres.test.ts +261 -0
- package/Tests/Server/Services/StatusPageSubscriberReport.test.ts +21 -5
- package/Tests/Server/Services/StatusPageSubscriberUnsubscribe.test.ts +1618 -0
- package/Tests/Server/Services/StatusPageSubscriberUnsubscribeLinkSenders.test.ts +373 -0
- package/Tests/Server/Services/StatusPageSubscriberUnsubscribePostgres.test.ts +388 -0
- package/Tests/Server/Services/SubscriberNotificationInFlightRequeue.test.ts +500 -0
- package/Tests/Server/Types/MarkdownEmailLinks.test.ts +320 -0
- package/Tests/Server/Types/Workflow/Components/Email.test.ts +491 -1
- package/Tests/Server/Types/Workflow/Components/EmailSmtpPinning.test.ts +398 -0
- package/Tests/Server/Utils/CustomField/CustomFieldRename.test.ts +586 -0
- package/Tests/Server/Utils/DataSource/EgressGuard.test.ts +246 -10
- package/Tests/Server/Utils/DataSource/EgressGuardDeploymentConfig.test.ts +226 -0
- package/Tests/Server/Utils/DataSource/EgressGuardPinning.test.ts +131 -0
- package/Tests/Server/Utils/DataSource/HttpFetch.test.ts +4 -0
- package/Tests/Server/Utils/EgressPolicyEnvironment.ts +45 -0
- package/Tests/Server/Utils/Mail/PinnedSmtpSocket.test.ts +409 -0
- package/Tests/Server/Utils/Monitor/MonitorCriteriaObservationBuilderUnits.test.ts +23 -0
- package/Tests/Server/Utils/SSRFProtection.test.ts +4 -0
- package/Tests/Server/Utils/SSRFProtectionCloudServiceAddresses.test.ts +4 -0
- package/Tests/Server/Utils/SSRFProtectionPrivateNetwork.test.ts +4 -0
- package/Tests/Server/Utils/SSRFProtectionResolutionDetail.test.ts +314 -0
- package/Tests/Server/Utils/StatusPage/IncidentStatusPageScope.test.ts +1699 -0
- package/Tests/Server/Utils/StatusPage/IncidentStatusPageScopeQueriesPostgres.test.ts +508 -0
- package/Tests/Server/Utils/StatusPage/IncidentSubscriberAudienceCallerPermission.test.ts +246 -0
- package/Tests/Server/Utils/StatusPage/IncidentTemplateVariableBuilder.test.ts +1348 -0
- package/Tests/Server/Utils/StatusPage/StatusPageReadAccess.test.ts +221 -0
- package/Tests/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeNotice.test.ts +132 -0
- package/Tests/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeToken.test.ts +155 -0
- package/Tests/Server/Utils/StatusPage/SubscriberIncidentEmailBuilder.test.ts +708 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationClaim.test.ts +255 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationClaimPostgres.test.ts +528 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationDeliveryRecord.test.ts +1238 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationFanOut.test.ts +472 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationPreviewBuilder.test.ts +1168 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationRunLimit.test.ts +275 -0
- package/Tests/Server/Utils/StatusPage/SubscriberNotificationTiming.test.ts +131 -0
- package/Tests/Server/Utils/StatusPageResource.test.ts +98 -0
- package/Tests/Server/Utils/VM/VMRunnerPrivateNetworkWiring.test.ts +17 -0
- package/Tests/Server/Utils/VM/VMRunnerSsrf.test.ts +75 -0
- package/Tests/Types/CustomField/CustomFieldSavedViews.test.ts +247 -0
- package/Tests/Types/CustomField/CustomFieldTemplateValues.test.ts +186 -0
- package/Tests/Types/CustomField/CustomFieldTypeCorrespondence.test.ts +48 -0
- package/Tests/Types/CustomField/CustomFieldValueFormat.test.ts +215 -0
- package/Tests/Types/CustomField/CustomFieldValueValidator.test.ts +343 -0
- package/Tests/Types/CustomField/CustomFieldVariableKey.test.ts +364 -0
- package/Tests/Types/SafeHtml.test.ts +102 -0
- package/Tests/Types/StatusPage/IncidentCreatedRenotify.test.ts +419 -0
- package/Tests/Types/StatusPage/IncidentCreatedResend.test.ts +118 -0
- package/Tests/Types/StatusPage/IncidentScopeAddedPagesNotification.test.ts +558 -0
- package/Tests/Types/StatusPage/IncidentSubscriberAudience.test.ts +284 -0
- package/Tests/Types/StatusPage/StatusPageSubscriberUnsubscribe.test.ts +341 -0
- package/Tests/Types/StatusPage/SubscriberNotificationPreview.test.ts +196 -0
- package/Tests/Types/StatusPage/SubscriberNotificationResend.test.ts +201 -0
- package/Tests/Types/StatusPage/SubscriberNotificationTemplateCompiler.test.ts +277 -0
- package/Tests/Types/StatusPage/SubscriberNotificationTemplatePreview.test.ts +179 -0
- package/Tests/Types/StatusPage/SubscriberNotificationTemplateVariables.test.ts +324 -0
- package/Tests/Types/StatusPage/SubscriberUpdateNotification.test.ts +60 -13
- package/Tests/UI/Components/CustomFields/CustomFieldFormFields.test.ts +432 -0
- package/Tests/UI/Components/CustomFields/CustomFieldModelFormFields.test.tsx +685 -0
- package/Tests/UI/Components/CustomFields/CustomFieldsDetailOrder.test.tsx +469 -0
- package/Tests/UI/Components/Forms/ModelFormCustomFieldInputs.test.tsx +325 -0
- package/Tests/UI/Components/Forms/ModelFormDropdownOptionsRefused.test.tsx +358 -0
- package/Tests/UI/Components/ModelTable/CustomFieldColumns.test.tsx +22 -0
- package/Tests/UI/Monitor/NetworkPathView.test.tsx +289 -0
- package/Tests/Utils/Incident/IncidentNoteTemplateVariables.test.ts +623 -0
- package/Tests/Utils/Markdown/MarkdownEscape.test.ts +89 -0
- package/Tests/Utils/ProbeNetworkFailureUtil.test.ts +992 -0
- package/Tests/Utils/RequestFailedDetails.test.ts +575 -0
- package/Types/CustomField/CustomFieldOrder.ts +55 -0
- package/Types/CustomField/CustomFieldSavedViews.ts +225 -0
- package/Types/CustomField/CustomFieldTemplateMerge.ts +71 -0
- package/Types/CustomField/CustomFieldType.ts +14 -0
- package/Types/CustomField/CustomFieldValueFormat.ts +161 -0
- package/Types/CustomField/CustomFieldValueValidator.ts +488 -0
- package/Types/CustomField/CustomFieldVariableKey.ts +211 -0
- package/Types/SafeHtml.ts +93 -0
- package/Types/StatusPage/IncidentCreatedRenotify.ts +224 -0
- package/Types/StatusPage/IncidentCreatedResend.ts +108 -0
- package/Types/StatusPage/IncidentScopeAddedPagesNotification.ts +343 -0
- package/Types/StatusPage/IncidentSubscriberAudience.ts +332 -0
- package/Types/StatusPage/StatusPageSubscriberUnsubscribe.ts +405 -0
- package/Types/StatusPage/SubscriberNotificationInterruption.ts +32 -0
- package/Types/StatusPage/SubscriberNotificationPreview.ts +322 -0
- package/Types/StatusPage/SubscriberNotificationResend.ts +132 -0
- package/Types/StatusPage/SubscriberNotificationTemplateCompiler.ts +180 -0
- package/Types/StatusPage/SubscriberNotificationTemplatePreview.ts +301 -0
- package/Types/StatusPage/SubscriberNotificationTemplateVariables.ts +217 -4
- package/Types/StatusPage/SubscriberUpdateNotification.ts +32 -11
- package/UI/Components/CustomFields/CustomFieldFormFields.ts +317 -0
- package/UI/Components/CustomFields/CustomFieldModelFormFields.tsx +395 -0
- package/UI/Components/CustomFields/CustomFieldsDetail.tsx +95 -55
- package/UI/Components/Forms/ModelForm.tsx +70 -8
- package/UI/Components/Forms/Validation.ts +1 -1
- package/UI/Components/ModelFormModal/ModelFormModal.tsx +2 -4
- package/UI/Components/ModelTable/AnalyticsModelTable.tsx +2 -6
- package/UI/Components/ModelTable/BaseModelTable.tsx +9 -8
- package/UI/Components/ModelTable/CustomFieldColumns.tsx +14 -1
- package/UI/Components/ModelTable/ModelTable.tsx +6 -7
- package/UI/Utils/SensitiveUrlToken.ts +10 -5
- package/Utils/API.ts +247 -2
- package/Utils/Incident/IncidentNoteTemplateVariables.ts +304 -0
- package/Utils/Markdown/MarkdownEscape.ts +65 -0
- package/Utils/ProbeNetworkFailureUtil.ts +673 -0
- package/build/dist/Models/DatabaseModels/Incident.js +267 -1
- package/build/dist/Models/DatabaseModels/Incident.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentCustomField.js +207 -1
- package/build/dist/Models/DatabaseModels/IncidentCustomField.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentEpisode.js +31 -0
- package/build/dist/Models/DatabaseModels/IncidentEpisode.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentTemplate.js +124 -1
- package/build/dist/Models/DatabaseModels/IncidentTemplate.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPage.js +56 -0
- package/build/dist/Models/DatabaseModels/StatusPage.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPageSubscriber.js +131 -0
- package/build/dist/Models/DatabaseModels/StatusPageSubscriber.js.map +1 -1
- package/build/dist/Server/API/IncidentAPI.js +100 -1
- package/build/dist/Server/API/IncidentAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageAPI.js +417 -176
- package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageSubscriberAPI.js +52 -13
- package/build/dist/Server/API/StatusPageSubscriberAPI.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795300000000-SkipHiddenIncidentCreatedNotifications.js +41 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795300000000-SkipHiddenIncidentCreatedNotifications.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795400000000-AddIncidentStatusPageScope.js +57 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795400000000-AddIncidentStatusPageScope.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795500000000-AddIncidentTemplateStatusPageScopeFlag.js +23 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795500000000-AddIncidentTemplateStatusPageScopeFlag.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795600000000-AddStatusPageSubscriberUnsubscribeToken.js +40 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795600000000-AddStatusPageSubscriberUnsubscribeToken.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795700000000-AddStatusPageSubscriberIsAddedByTeam.js +26 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795700000000-AddStatusPageSubscriberIsAddedByTeam.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795800000000-AddIncidentCustomFieldCreateAndNotificationSettings.js +89 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795800000000-AddIncidentCustomFieldCreateAndNotificationSettings.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795900000000-AddSubscriberNotificationClaimedAt.js +29 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1795900000000-AddSubscriberNotificationClaimedAt.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +14 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Infrastructure/Semaphore.js +3 -0
- package/build/dist/Server/Infrastructure/Semaphore.js.map +1 -1
- package/build/dist/Server/Middleware/IdentityRateLimit.js +89 -3
- package/build/dist/Server/Middleware/IdentityRateLimit.js.map +1 -1
- package/build/dist/Server/Middleware/SubscriberNotificationPreviewRateLimit.js +149 -0
- package/build/dist/Server/Middleware/SubscriberNotificationPreviewRateLimit.js.map +1 -0
- package/build/dist/Server/Middleware/SubscriberNotificationTestSendRateLimit.js +190 -0
- package/build/dist/Server/Middleware/SubscriberNotificationTestSendRateLimit.js.map +1 -0
- package/build/dist/Server/Services/DatabaseService.js +56 -7
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/IncidentCustomFieldService.js +204 -8
- package/build/dist/Server/Services/IncidentCustomFieldService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodePublicNoteService.js +24 -0
- package/build/dist/Server/Services/IncidentEpisodePublicNoteService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodeService.js +14 -0
- package/build/dist/Server/Services/IncidentEpisodeService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js +26 -0
- package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/IncidentPublicNoteService.js +26 -1
- package/build/dist/Server/Services/IncidentPublicNoteService.js.map +1 -1
- package/build/dist/Server/Services/IncidentService.js +1052 -0
- package/build/dist/Server/Services/IncidentService.js.map +1 -1
- package/build/dist/Server/Services/IncidentStateTimelineService.js +12 -0
- package/build/dist/Server/Services/IncidentStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/IncidentTemplateService.js +83 -0
- package/build/dist/Server/Services/IncidentTemplateService.js.map +1 -1
- package/build/dist/Server/Services/ScheduledMaintenancePublicNoteService.js +26 -1
- package/build/dist/Server/Services/ScheduledMaintenancePublicNoteService.js.map +1 -1
- package/build/dist/Server/Services/ScheduledMaintenanceService.js +47 -17
- package/build/dist/Server/Services/ScheduledMaintenanceService.js.map +1 -1
- package/build/dist/Server/Services/SmsService.js +2 -22
- package/build/dist/Server/Services/SmsService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageService.js +47 -9
- package/build/dist/Server/Services/StatusPageService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateService.js +237 -32
- package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.js +109 -0
- package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageSubscriberService.js +925 -99
- package/build/dist/Server/Services/StatusPageSubscriberService.js.map +1 -1
- package/build/dist/Server/Types/Markdown.js +110 -6
- package/build/dist/Server/Types/Markdown.js.map +1 -1
- package/build/dist/Server/Types/Workflow/Components/Email.js +55 -6
- package/build/dist/Server/Types/Workflow/Components/Email.js.map +1 -1
- package/build/dist/Server/Utils/CustomField/CustomFieldRename.js +211 -0
- package/build/dist/Server/Utils/CustomField/CustomFieldRename.js.map +1 -0
- package/build/dist/Server/Utils/DataSource/EgressGuard.js +41 -12
- package/build/dist/Server/Utils/DataSource/EgressGuard.js.map +1 -1
- package/build/dist/Server/Utils/Mail/PinnedSmtpSocket.js +101 -0
- package/build/dist/Server/Utils/Mail/PinnedSmtpSocket.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaObservationBuilder.js +9 -0
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaObservationBuilder.js.map +1 -1
- package/build/dist/Server/Utils/SSRFProtection.js +48 -6
- package/build/dist/Server/Utils/SSRFProtection.js.map +1 -1
- package/build/dist/Server/Utils/StatusPage/IncidentStatusPageScope.js +631 -0
- package/build/dist/Server/Utils/StatusPage/IncidentStatusPageScope.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/IncidentSubscriberAudienceBuilder.js +403 -0
- package/build/dist/Server/Utils/StatusPage/IncidentSubscriberAudienceBuilder.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/IncidentTemplateVariableBuilder.js +451 -0
- package/build/dist/Server/Utils/StatusPage/IncidentTemplateVariableBuilder.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageExclusion.js +13 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageExclusion.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageReadAccess.js +91 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageReadAccess.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeNotice.js +101 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeNotice.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeToken.js +47 -0
- package/build/dist/Server/Utils/StatusPage/StatusPageSubscriberUnsubscribeToken.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberIncidentEmailBuilder.js +273 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberIncidentEmailBuilder.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationClaim.js +73 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationClaim.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationDeliveryRecord.js +722 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationDeliveryRecord.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationFanOut.js +102 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationFanOut.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationPreviewBuilder.js +527 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationPreviewBuilder.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationResendAccess.js +278 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationResendAccess.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationRunLimit.js +137 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationRunLimit.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationTiming.js +103 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberNotificationTiming.js.map +1 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberTemplateIncidentRecordAccess.js +114 -0
- package/build/dist/Server/Utils/StatusPage/SubscriberTemplateIncidentRecordAccess.js.map +1 -0
- package/build/dist/Server/Utils/StatusPageResource.js +39 -7
- package/build/dist/Server/Utils/StatusPageResource.js.map +1 -1
- package/build/dist/Server/Utils/VM/VMAPI.js.map +1 -1
- package/build/dist/Server/Utils/VM/VMRunner.js +1 -0
- package/build/dist/Server/Utils/VM/VMRunner.js.map +1 -1
- package/build/dist/Server/Utils/Workflow/OAuth2TokenClient.js +3 -0
- package/build/dist/Server/Utils/Workflow/OAuth2TokenClient.js.map +1 -1
- package/build/dist/Types/CustomField/CustomFieldOrder.js +36 -0
- package/build/dist/Types/CustomField/CustomFieldOrder.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldSavedViews.js +135 -0
- package/build/dist/Types/CustomField/CustomFieldSavedViews.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldTemplateMerge.js +27 -0
- package/build/dist/Types/CustomField/CustomFieldTemplateMerge.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldType.js +12 -0
- package/build/dist/Types/CustomField/CustomFieldType.js.map +1 -1
- package/build/dist/Types/CustomField/CustomFieldValueFormat.js +126 -0
- package/build/dist/Types/CustomField/CustomFieldValueFormat.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldValueValidator.js +280 -0
- package/build/dist/Types/CustomField/CustomFieldValueValidator.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldVariableKey.js +150 -0
- package/build/dist/Types/CustomField/CustomFieldVariableKey.js.map +1 -0
- package/build/dist/Types/SafeHtml.js +84 -0
- package/build/dist/Types/SafeHtml.js.map +1 -0
- package/build/dist/Types/StatusPage/IncidentCreatedRenotify.js +117 -0
- package/build/dist/Types/StatusPage/IncidentCreatedRenotify.js.map +1 -0
- package/build/dist/Types/StatusPage/IncidentCreatedResend.js +86 -0
- package/build/dist/Types/StatusPage/IncidentCreatedResend.js.map +1 -0
- package/build/dist/Types/StatusPage/IncidentScopeAddedPagesNotification.js +246 -0
- package/build/dist/Types/StatusPage/IncidentScopeAddedPagesNotification.js.map +1 -0
- package/build/dist/Types/StatusPage/IncidentSubscriberAudience.js +183 -0
- package/build/dist/Types/StatusPage/IncidentSubscriberAudience.js.map +1 -0
- package/build/dist/Types/StatusPage/StatusPageSubscriberUnsubscribe.js +277 -0
- package/build/dist/Types/StatusPage/StatusPageSubscriberUnsubscribe.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationInterruption.js +27 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationInterruption.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationPreview.js +190 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationPreview.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationResend.js +102 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationResend.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplateCompiler.js +97 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplateCompiler.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplatePreview.js +175 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplatePreview.js.map +1 -0
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplateVariables.js +144 -4
- package/build/dist/Types/StatusPage/SubscriberNotificationTemplateVariables.js.map +1 -1
- package/build/dist/Types/StatusPage/SubscriberUpdateNotification.js +29 -9
- package/build/dist/Types/StatusPage/SubscriberUpdateNotification.js.map +1 -1
- package/build/dist/UI/Components/CustomFields/CustomFieldFormFields.js +169 -0
- package/build/dist/UI/Components/CustomFields/CustomFieldFormFields.js.map +1 -0
- package/build/dist/UI/Components/CustomFields/CustomFieldModelFormFields.js +212 -0
- package/build/dist/UI/Components/CustomFields/CustomFieldModelFormFields.js.map +1 -0
- package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js +64 -49
- package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js.map +1 -1
- package/build/dist/UI/Components/Forms/ModelForm.js +39 -5
- package/build/dist/UI/Components/Forms/ModelForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/Validation.js +1 -1
- package/build/dist/UI/Components/Forms/Validation.js.map +1 -1
- package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/AnalyticsModelTable.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +2 -2
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js +13 -1
- package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/ModelTable.js +1 -1
- package/build/dist/UI/Components/ModelTable/ModelTable.js.map +1 -1
- package/build/dist/UI/Utils/SensitiveUrlToken.js +10 -5
- package/build/dist/UI/Utils/SensitiveUrlToken.js.map +1 -1
- package/build/dist/Utils/API.js +177 -1
- package/build/dist/Utils/API.js.map +1 -1
- package/build/dist/Utils/Incident/IncidentNoteTemplateVariables.js +155 -0
- package/build/dist/Utils/Incident/IncidentNoteTemplateVariables.js.map +1 -0
- package/build/dist/Utils/Markdown/MarkdownEscape.js +48 -0
- package/build/dist/Utils/Markdown/MarkdownEscape.js.map +1 -1
- package/build/dist/Utils/ProbeNetworkFailureUtil.js +460 -0
- package/build/dist/Utils/ProbeNetworkFailureUtil.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,610 @@
|
|
|
1
|
+
import StatusPage from "../../../Models/DatabaseModels/StatusPage";
|
|
2
|
+
import StatusPageGroup from "../../../Models/DatabaseModels/StatusPageGroup";
|
|
3
|
+
import StatusPageResource from "../../../Models/DatabaseModels/StatusPageResource";
|
|
4
|
+
import IncidentService from "../../../Server/Services/IncidentService";
|
|
5
|
+
import MonitorGroupService from "../../../Server/Services/MonitorGroupService";
|
|
6
|
+
import StatusPageGroupService from "../../../Server/Services/StatusPageGroupService";
|
|
7
|
+
import StatusPageService, {
|
|
8
|
+
INCIDENT_COUNT_STATUS_PAGE_SELECT,
|
|
9
|
+
StatusPageReport,
|
|
10
|
+
StatusPageReportItem,
|
|
11
|
+
} from "../../../Server/Services/StatusPageService";
|
|
12
|
+
import Dictionary from "../../../Types/Dictionary";
|
|
13
|
+
import BadDataException from "../../../Types/Exception/BadDataException";
|
|
14
|
+
import ObjectID from "../../../Types/ObjectID";
|
|
15
|
+
import PositiveNumber from "../../../Types/PositiveNumber";
|
|
16
|
+
import StatusPageReportPeriodType from "../../../Types/StatusPage/StatusPageReportPeriodType";
|
|
17
|
+
import { StatusPageReportGroupMetrics } from "../../../Types/StatusPage/StatusPageReport";
|
|
18
|
+
import StatusPageReportPeriodUtil, {
|
|
19
|
+
StatusPageReportPeriod,
|
|
20
|
+
} from "../../../Utils/StatusPage/ReportPeriod";
|
|
21
|
+
import {
|
|
22
|
+
afterEach,
|
|
23
|
+
beforeEach,
|
|
24
|
+
describe,
|
|
25
|
+
expect,
|
|
26
|
+
jest,
|
|
27
|
+
test,
|
|
28
|
+
} from "@jest/globals";
|
|
29
|
+
|
|
30
|
+
/*
|
|
31
|
+
* The incident counts in a status page's emailed report - the page total,
|
|
32
|
+
* each resource and each group - count what the page shows. Through
|
|
33
|
+
* IncidentStatusPageScope.countIncidentsForStatusPage, an incident limited
|
|
34
|
+
* to other status pages is not counted on this one, a page that only shows
|
|
35
|
+
* incidents limited to it counts only those, and (new with the scope) only
|
|
36
|
+
* the project's incidents that are visible on status pages count.
|
|
37
|
+
*
|
|
38
|
+
* IncidentService.countBy is answered by a small in-memory database that
|
|
39
|
+
* evaluates each query the way Postgres would: the monitors join, the
|
|
40
|
+
* created-at window, project, visibility, and the scope split with its
|
|
41
|
+
* IncidentStatusPage join.
|
|
42
|
+
*/
|
|
43
|
+
|
|
44
|
+
const PROJECT_ID: ObjectID = new ObjectID(
|
|
45
|
+
"10000000-0000-4000-8000-000000000001",
|
|
46
|
+
);
|
|
47
|
+
const OTHER_PROJECT_ID: ObjectID = new ObjectID(
|
|
48
|
+
"10000000-0000-4000-8000-000000000002",
|
|
49
|
+
);
|
|
50
|
+
|
|
51
|
+
const SITE_A: string = "b0000000-0000-4000-8000-00000000000a";
|
|
52
|
+
const SITE_B: string = "b0000000-0000-4000-8000-00000000000b";
|
|
53
|
+
// Only shows incidents limited to it.
|
|
54
|
+
const SITE_C: string = "b0000000-0000-4000-8000-00000000000c";
|
|
55
|
+
|
|
56
|
+
const SHARED_MONITOR: string = "c0000000-0000-4000-8000-000000000001";
|
|
57
|
+
const SECOND_MONITOR: string = "c0000000-0000-4000-8000-000000000002";
|
|
58
|
+
const UNLISTED_MONITOR: string = "c0000000-0000-4000-8000-000000000003";
|
|
59
|
+
|
|
60
|
+
const REGION_GROUP: string = "d0000000-0000-4000-8000-000000000001";
|
|
61
|
+
|
|
62
|
+
const HISTORY_DAYS: number = 14;
|
|
63
|
+
|
|
64
|
+
function reportPeriod(): StatusPageReportPeriod {
|
|
65
|
+
return StatusPageReportPeriodUtil.getReportPeriod({
|
|
66
|
+
periodType: StatusPageReportPeriodType.Rolling,
|
|
67
|
+
reportDataInDays: HISTORY_DAYS,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function daysAgo(days: number): Date {
|
|
72
|
+
return new Date(Date.now() - days * 24 * 60 * 60 * 1000);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
interface IncidentFixture {
|
|
76
|
+
name: string;
|
|
77
|
+
projectId: ObjectID;
|
|
78
|
+
monitorIds: Array<string>;
|
|
79
|
+
// null: not limited to any status page.
|
|
80
|
+
scopedTo: Array<string> | null;
|
|
81
|
+
isVisibleOnStatusPage: boolean;
|
|
82
|
+
createdAt: Date;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
const INCIDENTS: Array<IncidentFixture> = [
|
|
86
|
+
{
|
|
87
|
+
name: "unscoped on the shared monitor",
|
|
88
|
+
projectId: PROJECT_ID,
|
|
89
|
+
monitorIds: [SHARED_MONITOR],
|
|
90
|
+
scopedTo: null,
|
|
91
|
+
isVisibleOnStatusPage: true,
|
|
92
|
+
createdAt: daysAgo(2),
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
name: "unscoped on the second monitor",
|
|
96
|
+
projectId: PROJECT_ID,
|
|
97
|
+
monitorIds: [SECOND_MONITOR],
|
|
98
|
+
scopedTo: null,
|
|
99
|
+
isVisibleOnStatusPage: true,
|
|
100
|
+
createdAt: daysAgo(3),
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
name: "limited to Site A",
|
|
104
|
+
projectId: PROJECT_ID,
|
|
105
|
+
monitorIds: [SHARED_MONITOR],
|
|
106
|
+
scopedTo: [SITE_A],
|
|
107
|
+
isVisibleOnStatusPage: true,
|
|
108
|
+
createdAt: daysAgo(4),
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
name: "limited to Sites A and C, on both monitors",
|
|
112
|
+
projectId: PROJECT_ID,
|
|
113
|
+
monitorIds: [SHARED_MONITOR, SECOND_MONITOR],
|
|
114
|
+
scopedTo: [SITE_A, SITE_C],
|
|
115
|
+
isVisibleOnStatusPage: true,
|
|
116
|
+
createdAt: daysAgo(5),
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
name: "limited to Site B",
|
|
120
|
+
projectId: PROJECT_ID,
|
|
121
|
+
monitorIds: [SHARED_MONITOR],
|
|
122
|
+
scopedTo: [SITE_B],
|
|
123
|
+
isVisibleOnStatusPage: true,
|
|
124
|
+
createdAt: daysAgo(5),
|
|
125
|
+
},
|
|
126
|
+
{
|
|
127
|
+
name: "limited to a deleted page",
|
|
128
|
+
projectId: PROJECT_ID,
|
|
129
|
+
monitorIds: [SHARED_MONITOR],
|
|
130
|
+
scopedTo: [],
|
|
131
|
+
isVisibleOnStatusPage: true,
|
|
132
|
+
createdAt: daysAgo(6),
|
|
133
|
+
},
|
|
134
|
+
{
|
|
135
|
+
name: "unscoped, hidden from status pages",
|
|
136
|
+
projectId: PROJECT_ID,
|
|
137
|
+
monitorIds: [SHARED_MONITOR],
|
|
138
|
+
scopedTo: null,
|
|
139
|
+
isVisibleOnStatusPage: false,
|
|
140
|
+
createdAt: daysAgo(6),
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
name: "limited to Site A, hidden from status pages",
|
|
144
|
+
projectId: PROJECT_ID,
|
|
145
|
+
monitorIds: [SHARED_MONITOR],
|
|
146
|
+
scopedTo: [SITE_A],
|
|
147
|
+
isVisibleOnStatusPage: false,
|
|
148
|
+
createdAt: daysAgo(6),
|
|
149
|
+
},
|
|
150
|
+
{
|
|
151
|
+
name: "another project's, on the shared monitor",
|
|
152
|
+
projectId: OTHER_PROJECT_ID,
|
|
153
|
+
monitorIds: [SHARED_MONITOR],
|
|
154
|
+
scopedTo: null,
|
|
155
|
+
isVisibleOnStatusPage: true,
|
|
156
|
+
createdAt: daysAgo(2),
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
name: "unscoped, before the window",
|
|
160
|
+
projectId: PROJECT_ID,
|
|
161
|
+
monitorIds: [SHARED_MONITOR],
|
|
162
|
+
scopedTo: null,
|
|
163
|
+
isVisibleOnStatusPage: true,
|
|
164
|
+
createdAt: daysAgo(HISTORY_DAYS + 10),
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
name: "unscoped, on a monitor the page does not list",
|
|
168
|
+
projectId: PROJECT_ID,
|
|
169
|
+
monitorIds: [UNLISTED_MONITOR],
|
|
170
|
+
scopedTo: null,
|
|
171
|
+
isVisibleOnStatusPage: true,
|
|
172
|
+
createdAt: daysAgo(2),
|
|
173
|
+
},
|
|
174
|
+
];
|
|
175
|
+
|
|
176
|
+
function parametersOf(operator: unknown): Array<unknown> {
|
|
177
|
+
return Object.values(
|
|
178
|
+
(operator as { objectLiteralParameters?: Dictionary<unknown> })
|
|
179
|
+
.objectLiteralParameters || {},
|
|
180
|
+
);
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
function idList(value: unknown): Array<string> {
|
|
184
|
+
return (value as Array<ObjectID | string>).map(
|
|
185
|
+
(id: ObjectID | string): string => {
|
|
186
|
+
return id.toString().toLowerCase();
|
|
187
|
+
},
|
|
188
|
+
);
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
function matches(
|
|
192
|
+
incident: IncidentFixture,
|
|
193
|
+
query: Dictionary<unknown>,
|
|
194
|
+
): boolean {
|
|
195
|
+
return Object.entries(query).every(
|
|
196
|
+
([key, expected]: [string, unknown]): boolean => {
|
|
197
|
+
switch (key) {
|
|
198
|
+
case "projectId":
|
|
199
|
+
return incident.projectId.toString() === String(expected);
|
|
200
|
+
case "isVisibleOnStatusPage":
|
|
201
|
+
return incident.isVisibleOnStatusPage === expected;
|
|
202
|
+
case "isScopedToStatusPages":
|
|
203
|
+
return (incident.scopedTo !== null) === expected;
|
|
204
|
+
case "monitors": {
|
|
205
|
+
const monitorIds: Array<string> = idList(expected);
|
|
206
|
+
return incident.monitorIds.some((id: string): boolean => {
|
|
207
|
+
return monitorIds.includes(id);
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
case "statusPages": {
|
|
211
|
+
const statusPageIds: Array<string> = idList(expected);
|
|
212
|
+
return (incident.scopedTo || []).some((id: string): boolean => {
|
|
213
|
+
return statusPageIds.includes(id);
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
case "createdAt": {
|
|
217
|
+
const [start, end] = parametersOf(expected) as [Date, Date];
|
|
218
|
+
const time: number = incident.createdAt.getTime();
|
|
219
|
+
return start.getTime() <= time && time <= end.getTime();
|
|
220
|
+
}
|
|
221
|
+
default:
|
|
222
|
+
throw new Error(`Unexpected incident count query key: ${key}`);
|
|
223
|
+
}
|
|
224
|
+
},
|
|
225
|
+
);
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
type CountQuery = Dictionary<unknown>;
|
|
229
|
+
|
|
230
|
+
let countQueries: Array<CountQuery> = [];
|
|
231
|
+
|
|
232
|
+
function mockIncidentCounts(): void {
|
|
233
|
+
countQueries = [];
|
|
234
|
+
|
|
235
|
+
jest
|
|
236
|
+
.spyOn(IncidentService, "countBy")
|
|
237
|
+
.mockImplementation(async (args: any) => {
|
|
238
|
+
const query: CountQuery = args.query as CountQuery;
|
|
239
|
+
countQueries.push(query);
|
|
240
|
+
return new PositiveNumber(
|
|
241
|
+
INCIDENTS.filter((incident: IncidentFixture) => {
|
|
242
|
+
return matches(incident, query);
|
|
243
|
+
}).length,
|
|
244
|
+
) as never;
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
function makePage(data: {
|
|
249
|
+
id: string;
|
|
250
|
+
onlyShowScopedIncidents?: boolean | undefined;
|
|
251
|
+
projectId?: ObjectID | null | undefined;
|
|
252
|
+
}): StatusPage {
|
|
253
|
+
const page: StatusPage = new StatusPage();
|
|
254
|
+
page._id = data.id;
|
|
255
|
+
|
|
256
|
+
if (data.projectId !== null) {
|
|
257
|
+
page.projectId = data.projectId || PROJECT_ID;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
if (data.onlyShowScopedIncidents !== undefined) {
|
|
261
|
+
page.onlyShowScopedIncidents = data.onlyShowScopedIncidents;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
return page;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
function count(page: StatusPage, monitorIds: Array<string>): Promise<number> {
|
|
268
|
+
const period: StatusPageReportPeriod = reportPeriod();
|
|
269
|
+
|
|
270
|
+
return StatusPageService.getIncidentCountByMonitorIds({
|
|
271
|
+
statusPage: page,
|
|
272
|
+
monitorIds: monitorIds.map((id: string): ObjectID => {
|
|
273
|
+
return new ObjectID(id);
|
|
274
|
+
}),
|
|
275
|
+
startDate: period.startDate,
|
|
276
|
+
endDate: period.endDate,
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
describe("StatusPageService report incident counts", () => {
|
|
281
|
+
beforeEach(() => {
|
|
282
|
+
mockIncidentCounts();
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
afterEach(() => {
|
|
286
|
+
jest.restoreAllMocks();
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
describe("getIncidentCountByMonitorIds", () => {
|
|
290
|
+
test("counts on a page the unscoped incidents and those limited to it, visible and in its project", async () => {
|
|
291
|
+
/*
|
|
292
|
+
* unscoped on the shared monitor, limited to Site A, limited to Sites A
|
|
293
|
+
* and C. Not: limited to B, limited to a deleted page, the two hidden
|
|
294
|
+
* ones, the other project's, the one before the window.
|
|
295
|
+
*/
|
|
296
|
+
expect(
|
|
297
|
+
await count(makePage({ id: SITE_A, onlyShowScopedIncidents: false }), [
|
|
298
|
+
SHARED_MONITOR,
|
|
299
|
+
]),
|
|
300
|
+
).toBe(3);
|
|
301
|
+
|
|
302
|
+
// unscoped on the shared monitor, limited to Site B.
|
|
303
|
+
expect(
|
|
304
|
+
await count(makePage({ id: SITE_B, onlyShowScopedIncidents: false }), [
|
|
305
|
+
SHARED_MONITOR,
|
|
306
|
+
]),
|
|
307
|
+
).toBe(2);
|
|
308
|
+
});
|
|
309
|
+
|
|
310
|
+
test("counts over every monitor asked about, in one count", async () => {
|
|
311
|
+
expect(
|
|
312
|
+
await count(makePage({ id: SITE_A, onlyShowScopedIncidents: false }), [
|
|
313
|
+
SHARED_MONITOR,
|
|
314
|
+
SECOND_MONITOR,
|
|
315
|
+
]),
|
|
316
|
+
).toBe(4);
|
|
317
|
+
});
|
|
318
|
+
|
|
319
|
+
test("a page that only shows incidents limited to it counts only those", async () => {
|
|
320
|
+
expect(
|
|
321
|
+
await count(makePage({ id: SITE_C, onlyShowScopedIncidents: true }), [
|
|
322
|
+
SHARED_MONITOR,
|
|
323
|
+
SECOND_MONITOR,
|
|
324
|
+
]),
|
|
325
|
+
).toBe(1);
|
|
326
|
+
|
|
327
|
+
// It never asks about unscoped incidents.
|
|
328
|
+
expect(
|
|
329
|
+
countQueries.map((query: CountQuery) => {
|
|
330
|
+
return query["isScopedToStatusPages"];
|
|
331
|
+
}),
|
|
332
|
+
).toEqual([true]);
|
|
333
|
+
});
|
|
334
|
+
|
|
335
|
+
test("a page whose onlyShowScopedIncidents was not loaded counts only scoped incidents (fails closed)", async () => {
|
|
336
|
+
expect(await count(makePage({ id: SITE_A }), [SHARED_MONITOR])).toBe(2);
|
|
337
|
+
});
|
|
338
|
+
|
|
339
|
+
test("asks in two disjoint halves, each on the project's visible incidents in the window", async () => {
|
|
340
|
+
const page: StatusPage = makePage({
|
|
341
|
+
id: SITE_A,
|
|
342
|
+
onlyShowScopedIncidents: false,
|
|
343
|
+
});
|
|
344
|
+
|
|
345
|
+
await count(page, [SHARED_MONITOR]);
|
|
346
|
+
|
|
347
|
+
expect(countQueries).toHaveLength(2);
|
|
348
|
+
|
|
349
|
+
for (const query of countQueries) {
|
|
350
|
+
expect(String(query["projectId"])).toBe(PROJECT_ID.toString());
|
|
351
|
+
expect(query["isVisibleOnStatusPage"]).toBe(true);
|
|
352
|
+
expect(idList(query["monitors"])).toEqual([SHARED_MONITOR]);
|
|
353
|
+
expect(parametersOf(query["createdAt"])).toHaveLength(2);
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
expect(countQueries[0]!["isScopedToStatusPages"]).toBe(false);
|
|
357
|
+
expect(countQueries[0]).not.toHaveProperty("statusPages");
|
|
358
|
+
expect(countQueries[1]!["isScopedToStatusPages"]).toBe(true);
|
|
359
|
+
expect(countQueries[1]!["statusPages"]).toEqual([SITE_A]);
|
|
360
|
+
});
|
|
361
|
+
|
|
362
|
+
test("counts nothing, and asks nothing, for no monitors", async () => {
|
|
363
|
+
expect(
|
|
364
|
+
await count(
|
|
365
|
+
makePage({ id: SITE_A, onlyShowScopedIncidents: false }),
|
|
366
|
+
[],
|
|
367
|
+
),
|
|
368
|
+
).toBe(0);
|
|
369
|
+
expect(countQueries).toEqual([]);
|
|
370
|
+
});
|
|
371
|
+
|
|
372
|
+
test("refuses a page without its project rather than counting every project", async () => {
|
|
373
|
+
await expect(
|
|
374
|
+
count(
|
|
375
|
+
makePage({
|
|
376
|
+
id: SITE_A,
|
|
377
|
+
onlyShowScopedIncidents: false,
|
|
378
|
+
projectId: null,
|
|
379
|
+
}),
|
|
380
|
+
[SHARED_MONITOR],
|
|
381
|
+
),
|
|
382
|
+
).rejects.toBeInstanceOf(BadDataException);
|
|
383
|
+
expect(countQueries).toEqual([]);
|
|
384
|
+
});
|
|
385
|
+
});
|
|
386
|
+
|
|
387
|
+
describe("getIncidentCountOnStatusPage", () => {
|
|
388
|
+
test("counts over every monitor on the page, scoped to it", async () => {
|
|
389
|
+
jest
|
|
390
|
+
.spyOn(StatusPageService, "getMonitorIdsOnStatusPage")
|
|
391
|
+
.mockResolvedValue({
|
|
392
|
+
monitorsOnStatusPage: [
|
|
393
|
+
new ObjectID(SHARED_MONITOR),
|
|
394
|
+
new ObjectID(SECOND_MONITOR),
|
|
395
|
+
],
|
|
396
|
+
monitorsInGroup: {},
|
|
397
|
+
});
|
|
398
|
+
|
|
399
|
+
const period: StatusPageReportPeriod = reportPeriod();
|
|
400
|
+
|
|
401
|
+
expect(
|
|
402
|
+
await StatusPageService.getIncidentCountOnStatusPage({
|
|
403
|
+
statusPage: makePage({ id: SITE_B, onlyShowScopedIncidents: false }),
|
|
404
|
+
startDate: period.startDate,
|
|
405
|
+
endDate: period.endDate,
|
|
406
|
+
}),
|
|
407
|
+
).toBe(3);
|
|
408
|
+
|
|
409
|
+
expect(StatusPageService.getMonitorIdsOnStatusPage).toHaveBeenCalledWith({
|
|
410
|
+
statusPageId: new ObjectID(SITE_B),
|
|
411
|
+
});
|
|
412
|
+
});
|
|
413
|
+
});
|
|
414
|
+
|
|
415
|
+
describe("getReportGroupMetrics", () => {
|
|
416
|
+
test("counts a group's incidents scoped to the page", async () => {
|
|
417
|
+
const group: StatusPageGroup = new StatusPageGroup();
|
|
418
|
+
group._id = REGION_GROUP;
|
|
419
|
+
group.name = "Region";
|
|
420
|
+
|
|
421
|
+
const resources: Array<StatusPageResource> = [
|
|
422
|
+
SHARED_MONITOR,
|
|
423
|
+
SECOND_MONITOR,
|
|
424
|
+
].map((monitorId: string): StatusPageResource => {
|
|
425
|
+
const resource: StatusPageResource = new StatusPageResource();
|
|
426
|
+
resource.monitorId = new ObjectID(monitorId);
|
|
427
|
+
resource.statusPageGroupId = new ObjectID(REGION_GROUP);
|
|
428
|
+
return resource;
|
|
429
|
+
});
|
|
430
|
+
|
|
431
|
+
jest
|
|
432
|
+
.spyOn(StatusPageService, "getMergedDowntimeForStatusPage")
|
|
433
|
+
.mockResolvedValue({ coveredSeconds: 0, downtimeSeconds: 0 });
|
|
434
|
+
|
|
435
|
+
const period: StatusPageReportPeriod = reportPeriod();
|
|
436
|
+
|
|
437
|
+
const metricsFor: (
|
|
438
|
+
page: StatusPage,
|
|
439
|
+
) => Promise<Dictionary<StatusPageReportGroupMetrics>> = (
|
|
440
|
+
page: StatusPage,
|
|
441
|
+
) => {
|
|
442
|
+
return StatusPageService.getReportGroupMetrics({
|
|
443
|
+
statusPage: page,
|
|
444
|
+
statusPageGroups: [group],
|
|
445
|
+
entries: resources.map((resource: StatusPageResource) => {
|
|
446
|
+
return {
|
|
447
|
+
statusPageResource: resource,
|
|
448
|
+
reportItem: {
|
|
449
|
+
resourceName: "",
|
|
450
|
+
totalIncidentCount: 0,
|
|
451
|
+
uptimePercent: 100,
|
|
452
|
+
uptimePercentAsString: "100%",
|
|
453
|
+
downtimeInHoursAndMinutes: "0",
|
|
454
|
+
} as StatusPageReportItem,
|
|
455
|
+
};
|
|
456
|
+
}),
|
|
457
|
+
monitorIdsByResourceIndex: resources.map(
|
|
458
|
+
(resource: StatusPageResource) => {
|
|
459
|
+
return [resource.monitorId!];
|
|
460
|
+
},
|
|
461
|
+
),
|
|
462
|
+
downtimeMonitorStatusIds: [],
|
|
463
|
+
reportWindow: {
|
|
464
|
+
startDate: period.startDate,
|
|
465
|
+
endDate: period.endDate,
|
|
466
|
+
},
|
|
467
|
+
});
|
|
468
|
+
};
|
|
469
|
+
|
|
470
|
+
expect(
|
|
471
|
+
(
|
|
472
|
+
await metricsFor(
|
|
473
|
+
makePage({ id: SITE_A, onlyShowScopedIncidents: false }),
|
|
474
|
+
)
|
|
475
|
+
)[REGION_GROUP]!.totalIncidentCount,
|
|
476
|
+
).toBe(4);
|
|
477
|
+
|
|
478
|
+
expect(
|
|
479
|
+
(
|
|
480
|
+
await metricsFor(
|
|
481
|
+
makePage({ id: SITE_C, onlyShowScopedIncidents: true }),
|
|
482
|
+
)
|
|
483
|
+
)[REGION_GROUP]!.totalIncidentCount,
|
|
484
|
+
).toBe(1);
|
|
485
|
+
});
|
|
486
|
+
});
|
|
487
|
+
|
|
488
|
+
describe("getReportByStatusPage", () => {
|
|
489
|
+
function mockReport(page: StatusPage): void {
|
|
490
|
+
const resources: Array<StatusPageResource> = [
|
|
491
|
+
SHARED_MONITOR,
|
|
492
|
+
SECOND_MONITOR,
|
|
493
|
+
].map((monitorId: string, index: number): StatusPageResource => {
|
|
494
|
+
const resource: StatusPageResource = new StatusPageResource();
|
|
495
|
+
resource._id = `e0000000-0000-4000-8000-00000000000${index}`;
|
|
496
|
+
resource.monitorId = new ObjectID(monitorId);
|
|
497
|
+
resource.displayName =
|
|
498
|
+
monitorId === SHARED_MONITOR ? "Checkout" : "Payments";
|
|
499
|
+
return resource;
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
jest
|
|
503
|
+
.spyOn(StatusPageService, "findOneById")
|
|
504
|
+
.mockResolvedValue(page as never);
|
|
505
|
+
jest
|
|
506
|
+
.spyOn(StatusPageService, "getStatusPageResources")
|
|
507
|
+
.mockResolvedValue(resources as never);
|
|
508
|
+
jest.spyOn(StatusPageGroupService, "findBy").mockResolvedValue([]);
|
|
509
|
+
jest
|
|
510
|
+
.spyOn(MonitorGroupService, "getMonitorIdsInMonitorGroups")
|
|
511
|
+
.mockResolvedValue({});
|
|
512
|
+
jest
|
|
513
|
+
.spyOn(StatusPageService, "getUptimeDailyAggregateForStatusPage")
|
|
514
|
+
.mockResolvedValue({
|
|
515
|
+
monitors: [],
|
|
516
|
+
isComplete: true,
|
|
517
|
+
completeFrom: null,
|
|
518
|
+
} as never);
|
|
519
|
+
jest
|
|
520
|
+
.spyOn(StatusPageService, "getMergedDowntimeForStatusPage")
|
|
521
|
+
.mockResolvedValue({ coveredSeconds: 0, downtimeSeconds: 0 });
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
function resourceCounts(report: StatusPageReport): Dictionary<number> {
|
|
525
|
+
const counts: Dictionary<number> = {};
|
|
526
|
+
|
|
527
|
+
for (const item of report.resources) {
|
|
528
|
+
counts[item.resourceName] = item.totalIncidentCount;
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
return counts;
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
test("loads what the counts are scoped by with the page", async () => {
|
|
535
|
+
mockReport(makePage({ id: SITE_A, onlyShowScopedIncidents: false }));
|
|
536
|
+
|
|
537
|
+
await StatusPageService.getReportByStatusPage({
|
|
538
|
+
statusPageId: new ObjectID(SITE_A),
|
|
539
|
+
reportPeriod: reportPeriod(),
|
|
540
|
+
});
|
|
541
|
+
|
|
542
|
+
const select: Dictionary<unknown> = (
|
|
543
|
+
(StatusPageService.findOneById as unknown as jest.Mock).mock
|
|
544
|
+
.calls[0]![0] as { select: Dictionary<unknown> }
|
|
545
|
+
).select;
|
|
546
|
+
|
|
547
|
+
expect(INCIDENT_COUNT_STATUS_PAGE_SELECT).toEqual({
|
|
548
|
+
_id: true,
|
|
549
|
+
projectId: true,
|
|
550
|
+
onlyShowScopedIncidents: true,
|
|
551
|
+
});
|
|
552
|
+
expect(select).toEqual(
|
|
553
|
+
expect.objectContaining({
|
|
554
|
+
_id: true,
|
|
555
|
+
projectId: true,
|
|
556
|
+
onlyShowScopedIncidents: true,
|
|
557
|
+
downtimeMonitorStatuses: true,
|
|
558
|
+
}),
|
|
559
|
+
);
|
|
560
|
+
});
|
|
561
|
+
|
|
562
|
+
test("reports on a page the incidents it shows, in total and per resource", async () => {
|
|
563
|
+
mockReport(makePage({ id: SITE_A, onlyShowScopedIncidents: false }));
|
|
564
|
+
|
|
565
|
+
const report: StatusPageReport =
|
|
566
|
+
await StatusPageService.getReportByStatusPage({
|
|
567
|
+
statusPageId: new ObjectID(SITE_A),
|
|
568
|
+
reportPeriod: reportPeriod(),
|
|
569
|
+
});
|
|
570
|
+
|
|
571
|
+
expect(report.totalIncidents).toBe(4);
|
|
572
|
+
expect(resourceCounts(report)).toEqual({
|
|
573
|
+
Checkout: 3,
|
|
574
|
+
Payments: 2,
|
|
575
|
+
});
|
|
576
|
+
});
|
|
577
|
+
|
|
578
|
+
test("reports on another page sharing the monitors only what that page shows", async () => {
|
|
579
|
+
mockReport(makePage({ id: SITE_B, onlyShowScopedIncidents: false }));
|
|
580
|
+
|
|
581
|
+
const report: StatusPageReport =
|
|
582
|
+
await StatusPageService.getReportByStatusPage({
|
|
583
|
+
statusPageId: new ObjectID(SITE_B),
|
|
584
|
+
reportPeriod: reportPeriod(),
|
|
585
|
+
});
|
|
586
|
+
|
|
587
|
+
expect(report.totalIncidents).toBe(3);
|
|
588
|
+
expect(resourceCounts(report)).toEqual({
|
|
589
|
+
Checkout: 2,
|
|
590
|
+
Payments: 1,
|
|
591
|
+
});
|
|
592
|
+
});
|
|
593
|
+
|
|
594
|
+
test("reports on a page that only shows incidents limited to it only those", async () => {
|
|
595
|
+
mockReport(makePage({ id: SITE_C, onlyShowScopedIncidents: true }));
|
|
596
|
+
|
|
597
|
+
const report: StatusPageReport =
|
|
598
|
+
await StatusPageService.getReportByStatusPage({
|
|
599
|
+
statusPageId: new ObjectID(SITE_C),
|
|
600
|
+
reportPeriod: reportPeriod(),
|
|
601
|
+
});
|
|
602
|
+
|
|
603
|
+
expect(report.totalIncidents).toBe(1);
|
|
604
|
+
expect(resourceCounts(report)).toEqual({
|
|
605
|
+
Checkout: 1,
|
|
606
|
+
Payments: 1,
|
|
607
|
+
});
|
|
608
|
+
});
|
|
609
|
+
});
|
|
610
|
+
});
|