@oneuptime/common 12.0.13 → 12.0.14
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/OnCallDutyPolicySchedule.ts +14 -0
- package/Models/DatabaseModels/UserCall.ts +94 -3
- package/Models/DatabaseModels/UserEmail.ts +94 -3
- package/Models/DatabaseModels/UserIncomingCallNumber.ts +94 -3
- package/Models/DatabaseModels/UserPush.ts +37 -0
- package/Models/DatabaseModels/UserSMS.ts +94 -3
- package/Models/DatabaseModels/UserWhatsApp.ts +93 -2
- package/Server/API/BaseAPI.ts +79 -14
- package/Server/API/UserCallAPI.ts +53 -45
- package/Server/API/UserEmailAPI.ts +53 -44
- package/Server/API/UserIncomingCallNumberAPI.ts +48 -38
- package/Server/API/UserNotificationMethodAdminAPI.ts +481 -0
- package/Server/API/UserPushAPI.ts +126 -2
- package/Server/API/UserSmsAPI.ts +53 -44
- package/Server/API/UserWhatsAppAPI.ts +53 -50
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.ts +154 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.ts +17 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.ts +45 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +6 -0
- package/Server/Middleware/VerificationCodeRateLimit.ts +586 -0
- package/Server/Services/AnalyticsDatabaseService.ts +169 -0
- package/Server/Services/DatabaseService.ts +101 -0
- package/Server/Services/LogAggregationService.ts +5 -0
- package/Server/Services/PushNotificationService.ts +127 -12
- package/Server/Services/TeamMemberService.ts +53 -13
- package/Server/Services/UserCallService.ts +55 -24
- package/Server/Services/UserEmailService.ts +83 -17
- package/Server/Services/UserIncomingCallNumberService.ts +49 -85
- package/Server/Services/UserNotificationMethodAdminService.ts +1527 -0
- package/Server/Services/UserNotificationRuleService.ts +26 -0
- package/Server/Services/UserPushService.ts +89 -0
- package/Server/Services/UserSmsService.ts +50 -17
- package/Server/Services/UserWhatsAppService.ts +48 -15
- package/Server/Types/Database/QueryHelper.ts +30 -0
- package/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.ts +59 -0
- package/Server/Utils/ChannelVerification.ts +510 -0
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +13 -16
- package/Server/Utils/Monitor/MonitorAlert.ts +24 -21
- package/Server/Utils/Monitor/MonitorIncident.ts +21 -18
- package/Server/Utils/Monitor/MonitorResourceContext.ts +107 -0
- package/Server/Utils/Monitor/MonitorStepResourceIdentity.ts +442 -0
- package/Server/Utils/Monitor/SeriesResourceLabels.ts +3 -3
- package/Server/Utils/Monitor/SeriesResourceLinker.ts +96 -28
- package/Server/Utils/TotpAuth.ts +137 -9
- package/Server/Utils/UserRegistrationToken.ts +182 -0
- package/Server/Utils/VerificationCode.ts +134 -0
- package/Tests/App/Dashboard/AdminNotificationRulesPage.test.tsx +173 -94
- package/Tests/App/Dashboard/AdminUserNotificationMethodsPage.test.tsx +1151 -0
- package/Tests/App/Dashboard/AdminUserOnCallPages.test.tsx +905 -0
- package/Tests/App/Dashboard/DashboardCommandPalette.test.tsx +338 -0
- package/Tests/App/Dashboard/InvestigationPanel.test.tsx +1 -1
- package/Tests/App/Dashboard/MonitorTypePicker.test.tsx +28 -0
- package/Tests/Models/UserPushCriticalAlertColumn.test.ts +172 -0
- package/Tests/Server/API/BaseAPIGetListParallel.test.ts +519 -0
- package/Tests/Server/API/NotificationChannelVerificationAPI.test.ts +543 -0
- package/Tests/Server/API/UserIncomingCallNumberApi.test.ts +108 -18
- package/Tests/Server/API/UserNotificationMethodAdminAPI.test.ts +963 -0
- package/Tests/Server/API/UserPushCriticalAlertsApi.test.ts +114 -0
- package/Tests/Server/API/UserSmsApi.test.ts +107 -14
- package/Tests/Server/API/UserTotpAuthAPI.test.ts +427 -0
- package/Tests/Server/Infrastructure/Postgres/FixTotpOtpUrlAlgorithmMigration.test.ts +315 -0
- package/Tests/Server/Middleware/VerificationCodeRateLimit.test.ts +775 -0
- package/Tests/Server/Services/AddNetworkDeviceReachabilityColumnsMigration.test.ts +10 -62
- package/Tests/Server/Services/AnalyticsDatabasePaginationStability.test.ts +33 -13
- package/Tests/Server/Services/AnalyticsDatabaseSortKeyBoundary.test.ts +658 -0
- package/Tests/Server/Services/CriticalOnCallAlertDelivery.test.ts +458 -0
- package/Tests/Server/Services/CriticalPushAlertPayload.test.ts +301 -0
- package/Tests/Server/Services/DatabaseServiceAtomicIncrement.test.ts +143 -0
- package/Tests/Server/Services/DeliverNotificationForRuleExtraction.test.ts +1 -0
- package/Tests/Server/Services/LogAggregationScanMemory.test.ts +421 -0
- package/Tests/Server/Services/LogAggregationService.test.ts +2 -2
- package/Tests/Server/Services/NotificationChannelCodeIssuance.test.ts +401 -0
- package/Tests/Server/Services/PushNotificationDeliveryOptions.test.ts +204 -0
- package/Tests/Server/Services/TeamMemberAutoAcceptInvitation.test.ts +21 -1
- package/Tests/Server/Services/TeamMemberInviteRegistrationToken.test.ts +290 -0
- package/Tests/Server/Services/UserNotificationMethodAdminService.test.ts +948 -0
- package/Tests/Server/Services/UserNotificationRuleExecuteItem.test.ts +1 -0
- package/Tests/Server/Services/UserPushCriticalAlertToggle.test.ts +255 -0
- package/Tests/Server/Services/UserTotpAuthEnrolment.test.ts +218 -0
- package/Tests/Server/TestingUtils/AuthenticatorApp.ts +248 -0
- package/Tests/Server/Types/Database/Permissions/NotificationChannelVerificationColumns.test.ts +135 -0
- package/Tests/Server/Types/Database/Permissions/OnCallScheduleRelationSelect.test.ts +504 -0
- package/Tests/Server/Types/Database/QueryHelperFindWithSameTextAnyOf.test.ts +91 -0
- package/Tests/Server/Types/Workflow/Components/JsonToText.test.ts +384 -0
- package/Tests/Server/Types/Workflow/Components/MergeJson.test.ts +403 -0
- package/Tests/Server/Utils/Browser.test.ts +162 -0
- package/Tests/Server/Utils/ChannelVerification.test.ts +689 -0
- package/Tests/Server/Utils/Express.test.ts +371 -0
- package/Tests/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.test.ts +707 -0
- package/Tests/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.test.ts +698 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingEmailBodyCriteria.test.ts +243 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingRequestBodyCriteria.test.ts +278 -0
- package/Tests/Server/Utils/Monitor/MonitorAlertResourceLinking.test.ts +160 -20
- package/Tests/Server/Utils/Monitor/MonitorDependencySuppressionCreatorSkip.test.ts +13 -8
- package/Tests/Server/Utils/Monitor/MonitorIncidentResourceLinking.test.ts +162 -18
- package/Tests/Server/Utils/Monitor/MonitorResourceContext.test.ts +349 -0
- package/Tests/Server/Utils/Monitor/MonitorStepResourceIdentity.test.ts +690 -0
- package/Tests/Server/Utils/Monitor/MonitorSummaryPersistence.test.ts +7 -2
- package/Tests/Server/Utils/Monitor/SeriesResourceLinker.test.ts +92 -18
- package/Tests/Server/Utils/PushNotificationUtilCreators.test.ts +267 -0
- package/Tests/Server/Utils/Telemetry/OneuptimeLabel.test.ts +439 -0
- package/Tests/Server/Utils/TotpAuth.test.ts +719 -0
- package/Tests/Server/Utils/UserRegistrationToken.test.ts +322 -0
- package/Tests/Server/Utils/VerificationCode.test.ts +296 -0
- package/Tests/Types/AutoRemediation/AutoRemediationSuggestionStatus.test.ts +192 -0
- package/Tests/Types/Call/CallRequest.test.ts +189 -0
- package/Tests/Types/Dashboard/DashboardSize.test.ts +226 -0
- package/Tests/Types/Incident/IncidentSlaStatus.test.ts +191 -0
- package/Tests/Types/Metrics/MetricDashboardMetricType.test.ts +278 -0
- package/Tests/Types/Metrics/MetricPipelineRuleType.test.ts +517 -0
- package/Tests/Types/Monitor/IncomingMonitorDefaultCriteria.test.ts +470 -0
- package/Tests/Types/Monitor/MonitorCriteriaInstance.test.ts +6 -4
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCatalog.test.ts +262 -5
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCoverage.test.ts +1 -1
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationNotificationMode.test.ts +1 -1
- package/Tests/Types/Monitor/ServiceAlertTemplates.test.ts +905 -0
- package/Tests/Types/Service/ServiceLanguage.test.ts +255 -0
- package/Tests/Types/TextRandomGeneration.test.ts +211 -0
- package/Tests/UI/Components/Button.test.tsx +175 -1
- package/Tests/UI/Components/CodeBlockLanguages.test.tsx +236 -0
- package/Tests/UI/Components/CommandPalette/CommandPalette.test.tsx +568 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteKeyboard.test.tsx +239 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteProviders.test.tsx +400 -0
- package/Tests/UI/Components/CommandPalette/PaletteFilter.test.ts +234 -0
- package/Tests/UI/Components/CommandPalette/RecentCommands.test.ts +97 -0
- package/Tests/UI/Components/CountModelSideMenuItemGuard.test.tsx +198 -0
- package/Tests/UI/Components/FeedItemSafeMode.test.tsx +1 -1
- package/Tests/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.test.ts +267 -0
- package/Tests/UI/Components/List.test.tsx +9 -2
- package/Tests/UI/Components/ListLoadingStates.test.tsx +173 -0
- package/Tests/UI/Components/MarkdownLazy.test.tsx +113 -0
- package/Tests/UI/Components/MarkdownMermaidRetry.test.tsx +110 -0
- package/Tests/UI/Components/ModelTable/useCustomFieldColumns.test.tsx +8 -0
- package/Tests/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.test.ts +692 -0
- package/Tests/UI/Components/MoreMenuMotion.test.tsx +118 -0
- package/Tests/UI/Components/NavBarCommandKGating.test.tsx +178 -0
- package/Tests/UI/Components/OrderedStatesList.test.tsx +19 -2
- package/Tests/UI/Components/SideOverMotion.test.tsx +109 -0
- package/Tests/UI/Components/Skeleton.test.tsx +71 -0
- package/Tests/UI/Components/TableLoadingStates.test.tsx +279 -0
- package/Tests/UI/Components/Tabs.test.tsx +24 -0
- package/Tests/UI/Components/Toast.test.tsx +130 -7
- package/Tests/UI/Components/ToastStacking.test.tsx +198 -0
- package/Tests/UI/Utils/Dropdown.test.ts +423 -0
- package/Tests/UI/Utils/ModelAPITenantHeader.test.ts +122 -0
- package/Tests/UI/Utils/ModelListCache.test.ts +338 -0
- package/Tests/UI/Utils/ProjectListCacheInvalidation.test.ts +225 -0
- package/Tests/Utils/API.test.ts +16 -2
- package/Tests/Utils/Dashboard/Components/DashboardKubernetesResourceListShared.test.ts +347 -0
- package/Tests/Utils/Dashboard/Components/DashboardListSharedArgs.test.ts +259 -0
- package/Tests/Utils/Dashboard/Components/DashboardMonitorListComponent.test.ts +466 -0
- package/Tests/Utils/Rum/UrlScrubberSegments.test.ts +362 -0
- package/Types/Email/EmailTemplateType.ts +1 -0
- package/Types/Monitor/MonitorCriteriaInstance.ts +41 -20
- package/Types/Monitor/Recommendation/MonitorRecommendationCatalog.ts +131 -8
- package/Types/Monitor/Recommendation/MonitorRecommendationTypes.ts +48 -8
- package/Types/Monitor/ServiceAlertTemplates.ts +1352 -0
- package/Types/Permission.ts +35 -0
- package/Types/PushNotification/AndroidNotificationChannel.ts +26 -0
- package/Types/PushNotification/PushNotificationMessage.ts +15 -0
- package/Types/PushNotification/PushNotificationRequest.ts +8 -16
- package/Types/Service/ServiceLanguage.ts +144 -0
- package/Types/Text.ts +111 -19
- package/UI/Components/Button/Button.tsx +27 -14
- package/UI/Components/CodeBlock/CodeBlock.tsx +54 -7
- package/UI/Components/CodeBlock/LanguageRegistry.ts +103 -0
- package/UI/Components/CommandPalette/CommandPalette.tsx +790 -0
- package/UI/Components/CommandPalette/PaletteFilter.ts +196 -0
- package/UI/Components/CommandPalette/PaletteRow.tsx +173 -0
- package/UI/Components/CommandPalette/RecentCommands.ts +57 -0
- package/UI/Components/CommandPalette/Types.ts +49 -0
- package/UI/Components/CommandPalette/UseProviderSearch.ts +129 -0
- package/UI/Components/Dropdown/Dropdown.tsx +6 -1
- package/UI/Components/Feed/FeedItem.tsx +1 -1
- package/UI/Components/List/List.tsx +37 -5
- package/UI/Components/List/ListSkeleton.tsx +54 -0
- package/UI/Components/Markdown.tsx/LazyMarkdownViewer.tsx +6 -1
- package/UI/Components/Markdown.tsx/MarkdownViewer.tsx +71 -26
- package/UI/Components/Modal/Modal.tsx +2 -2
- package/UI/Components/ModelTable/BaseModelTable.tsx +1 -1
- package/UI/Components/ModelTable/useCustomFieldColumns.ts +11 -5
- package/UI/Components/MoreMenu/MoreMenu.tsx +39 -1
- package/UI/Components/Navbar/NavBar.tsx +14 -1
- package/UI/Components/OrderedStatesList/OrderedStatesList.tsx +50 -5
- package/UI/Components/SideMenu/CountModelSideMenuItem.tsx +40 -1
- package/UI/Components/SideOver/SideOver.tsx +37 -2
- package/UI/Components/Skeleton/Skeleton.tsx +53 -0
- package/UI/Components/Table/Table.tsx +74 -44
- package/UI/Components/Table/TableSkeletonRows.tsx +141 -0
- package/UI/Components/Tabs/Tab.tsx +1 -1
- package/UI/Components/Toast/Toast.tsx +118 -53
- package/UI/Components/Toast/ToastInit.tsx +82 -32
- package/UI/Styles/Theme.css +40 -0
- package/UI/Utils/ModelAPI/ModelAPI.ts +20 -10
- package/UI/Utils/ModelListCache.ts +188 -0
- package/UI/Utils/Project.ts +29 -0
- package/Utils/API.ts +6 -1
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js +14 -0
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserCall.js +101 -3
- package/build/dist/Models/DatabaseModels/UserCall.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserEmail.js +101 -3
- package/build/dist/Models/DatabaseModels/UserEmail.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js +101 -3
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserPush.js +38 -0
- package/build/dist/Models/DatabaseModels/UserPush.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserSMS.js +101 -3
- package/build/dist/Models/DatabaseModels/UserSMS.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js +100 -2
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js.map +1 -1
- package/build/dist/Server/API/BaseAPI.js +69 -13
- package/build/dist/Server/API/BaseAPI.js.map +1 -1
- package/build/dist/Server/API/UserCallAPI.js +42 -38
- package/build/dist/Server/API/UserCallAPI.js.map +1 -1
- package/build/dist/Server/API/UserEmailAPI.js +42 -38
- package/build/dist/Server/API/UserEmailAPI.js.map +1 -1
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js +37 -32
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js.map +1 -1
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js +341 -0
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js.map +1 -0
- package/build/dist/Server/API/UserPushAPI.js +95 -2
- package/build/dist/Server/API/UserPushAPI.js.map +1 -1
- package/build/dist/Server/API/UserSmsAPI.js +42 -38
- package/build/dist/Server/API/UserSmsAPI.js.map +1 -1
- package/build/dist/Server/API/UserWhatsAppAPI.js +42 -40
- package/build/dist/Server/API/UserWhatsAppAPI.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js +89 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js +40 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +6 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js +393 -0
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js.map +1 -0
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +136 -0
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +74 -0
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/LogAggregationService.js +5 -0
- package/build/dist/Server/Services/LogAggregationService.js.map +1 -1
- package/build/dist/Server/Services/PushNotificationService.js +69 -30
- package/build/dist/Server/Services/PushNotificationService.js.map +1 -1
- package/build/dist/Server/Services/TeamMemberService.js +43 -7
- package/build/dist/Server/Services/TeamMemberService.js.map +1 -1
- package/build/dist/Server/Services/UserCallService.js +54 -22
- package/build/dist/Server/Services/UserCallService.js.map +1 -1
- package/build/dist/Server/Services/UserEmailService.js +78 -17
- package/build/dist/Server/Services/UserEmailService.js.map +1 -1
- package/build/dist/Server/Services/UserIncomingCallNumberService.js +45 -74
- package/build/dist/Server/Services/UserIncomingCallNumberService.js.map +1 -1
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js +1117 -0
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js.map +1 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js +20 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Services/UserPushService.js +77 -0
- package/build/dist/Server/Services/UserPushService.js.map +1 -1
- package/build/dist/Server/Services/UserSmsService.js +50 -17
- package/build/dist/Server/Services/UserSmsService.js.map +1 -1
- package/build/dist/Server/Services/UserWhatsAppService.js +48 -15
- package/build/dist/Server/Services/UserWhatsAppService.js.map +1 -1
- package/build/dist/Server/Types/Database/QueryHelper.js +27 -0
- package/build/dist/Server/Types/Database/QueryHelper.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js +46 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js.map +1 -1
- package/build/dist/Server/Utils/ChannelVerification.js +348 -0
- package/build/dist/Server/Utils/ChannelVerification.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +13 -12
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js +20 -17
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js +17 -14
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js +95 -0
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js +313 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/SeriesResourceLabels.js +3 -3
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js +67 -26
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js.map +1 -1
- package/build/dist/Server/Utils/TotpAuth.js +127 -8
- package/build/dist/Server/Utils/TotpAuth.js.map +1 -1
- package/build/dist/Server/Utils/UserRegistrationToken.js +170 -0
- package/build/dist/Server/Utils/UserRegistrationToken.js.map +1 -0
- package/build/dist/Server/Utils/VerificationCode.js +120 -0
- package/build/dist/Server/Utils/VerificationCode.js.map +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js +42 -21
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js +77 -5
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js +18 -6
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js.map +1 -1
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js +1028 -0
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js.map +1 -0
- package/build/dist/Types/Permission.js +33 -0
- package/build/dist/Types/Permission.js.map +1 -1
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js +27 -0
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js.map +1 -0
- package/build/dist/Types/Service/ServiceLanguage.js +96 -0
- package/build/dist/Types/Service/ServiceLanguage.js.map +1 -0
- package/build/dist/Types/Text.js +82 -17
- package/build/dist/Types/Text.js.map +1 -1
- package/build/dist/UI/Components/Button/Button.js +22 -14
- package/build/dist/UI/Components/Button/Button.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js +35 -3
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js +57 -0
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js +439 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js +135 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js +83 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js +47 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/Types.js +2 -0
- package/build/dist/UI/Components/CommandPalette/Types.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js +88 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js.map +1 -0
- package/build/dist/UI/Components/Dropdown/Dropdown.js +6 -1
- package/build/dist/UI/Components/Dropdown/Dropdown.js.map +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js.map +1 -1
- package/build/dist/UI/Components/List/List.js +19 -5
- package/build/dist/UI/Components/List/List.js.map +1 -1
- package/build/dist/UI/Components/List/ListSkeleton.js +21 -0
- package/build/dist/UI/Components/List/ListSkeleton.js.map +1 -0
- package/build/dist/UI/Components/Markdown.tsx/LazyMarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js +52 -25
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Modal/Modal.js +2 -2
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js +9 -2
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js.map +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js +32 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBar.js +5 -1
- package/build/dist/UI/Components/Navbar/NavBar.js.map +1 -1
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js +29 -5
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js.map +1 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js +23 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js.map +1 -1
- package/build/dist/UI/Components/SideOver/SideOver.js +23 -2
- package/build/dist/UI/Components/SideOver/SideOver.js.map +1 -1
- package/build/dist/UI/Components/Skeleton/Skeleton.js +23 -0
- package/build/dist/UI/Components/Skeleton/Skeleton.js.map +1 -0
- package/build/dist/UI/Components/Table/Table.js +35 -24
- package/build/dist/UI/Components/Table/Table.js.map +1 -1
- package/build/dist/UI/Components/Table/TableSkeletonRows.js +52 -0
- package/build/dist/UI/Components/Table/TableSkeletonRows.js.map +1 -0
- package/build/dist/UI/Components/Tabs/Tab.js +1 -1
- package/build/dist/UI/Components/Tabs/Tab.js.map +1 -1
- package/build/dist/UI/Components/Toast/Toast.js +77 -23
- package/build/dist/UI/Components/Toast/Toast.js.map +1 -1
- package/build/dist/UI/Components/Toast/ToastInit.js +37 -15
- package/build/dist/UI/Components/Toast/ToastInit.js.map +1 -1
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js +18 -9
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js.map +1 -1
- package/build/dist/UI/Utils/ModelListCache.js +126 -0
- package/build/dist/UI/Utils/ModelListCache.js.map +1 -0
- package/build/dist/UI/Utils/Project.js +24 -1
- package/build/dist/UI/Utils/Project.js.map +1 -1
- package/build/dist/Utils/API.js +6 -1
- package/build/dist/Utils/API.js.map +1 -1
- package/jest.config.json +1 -1
- package/package.json +2 -3
- package/Server/Utils/Monitor/MonitorClusterContext.ts +0 -182
- package/Tests/__mocks__/otpauth.js +0 -30
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js +0 -141
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js.map +0 -1
|
@@ -13,6 +13,7 @@ import BadDataException from "../../Types/Exception/BadDataException";
|
|
|
13
13
|
import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
|
|
14
14
|
import UserPush from "../../Models/DatabaseModels/UserPush";
|
|
15
15
|
import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
|
|
16
|
+
import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
|
|
16
17
|
export class Service extends DatabaseService {
|
|
17
18
|
constructor() {
|
|
18
19
|
super(UserPush);
|
|
@@ -94,6 +95,76 @@ export class Service extends DatabaseService {
|
|
|
94
95
|
},
|
|
95
96
|
});
|
|
96
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Turn on-call critical alerts on or off for a handset.
|
|
100
|
+
*
|
|
101
|
+
* Keyed on the device TOKEN rather than a row id, because one phone owns one
|
|
102
|
+
* row per project it is registered against, and "ring me through silent
|
|
103
|
+
* mode" is a property of the phone. Toggling it per row would leave a
|
|
104
|
+
* responder loud for one project and silent for the next - a distinction
|
|
105
|
+
* nothing in the app offers to make and nobody would think to check.
|
|
106
|
+
* Deletion already works this way for the same reason (see the unregister
|
|
107
|
+
* route).
|
|
108
|
+
*
|
|
109
|
+
* Scoped to `userId` so a token cannot be used to reconfigure somebody
|
|
110
|
+
* else's device, and to the two mobile platforms because no browser can
|
|
111
|
+
* override a device's ringer: storing the preference on a web row would
|
|
112
|
+
* read back as though it did something.
|
|
113
|
+
*
|
|
114
|
+
* Returns how many rows were updated, so the caller can tell a real toggle
|
|
115
|
+
* apart from one that matched no device at all.
|
|
116
|
+
*/
|
|
117
|
+
async setCriticalAlertEnabledForDeviceToken(data) {
|
|
118
|
+
const devices = await this.findBy({
|
|
119
|
+
query: {
|
|
120
|
+
userId: data.userId,
|
|
121
|
+
deviceToken: data.deviceToken,
|
|
122
|
+
},
|
|
123
|
+
select: {
|
|
124
|
+
_id: true,
|
|
125
|
+
deviceType: true,
|
|
126
|
+
},
|
|
127
|
+
limit: LIMIT_PER_PROJECT,
|
|
128
|
+
skip: 0,
|
|
129
|
+
props: {
|
|
130
|
+
isRoot: true,
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
if (devices.length === 0) {
|
|
134
|
+
throw new BadDataException("No registered device was found for this device token.");
|
|
135
|
+
}
|
|
136
|
+
const mobileDeviceIds = devices
|
|
137
|
+
.filter((device) => {
|
|
138
|
+
return (device.deviceType === PushDeviceType.iOS ||
|
|
139
|
+
device.deviceType === PushDeviceType.Android);
|
|
140
|
+
})
|
|
141
|
+
.map((device) => {
|
|
142
|
+
return device._id.toString();
|
|
143
|
+
});
|
|
144
|
+
if (mobileDeviceIds.length === 0) {
|
|
145
|
+
throw new BadDataException("Critical alerts are only available on iOS and Android devices.");
|
|
146
|
+
}
|
|
147
|
+
let updatedCount = 0;
|
|
148
|
+
/*
|
|
149
|
+
* One update per row rather than an `_id: In([...])` query: the query
|
|
150
|
+
* builder used here takes a single value per column, and the count of
|
|
151
|
+
* projects a responder belongs to is small.
|
|
152
|
+
*/
|
|
153
|
+
for (const deviceId of mobileDeviceIds) {
|
|
154
|
+
updatedCount += await this.updateOneBy({
|
|
155
|
+
query: {
|
|
156
|
+
_id: deviceId,
|
|
157
|
+
},
|
|
158
|
+
data: {
|
|
159
|
+
isCriticalAlertEnabled: data.isEnabled,
|
|
160
|
+
},
|
|
161
|
+
props: {
|
|
162
|
+
isRoot: true,
|
|
163
|
+
},
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
return updatedCount;
|
|
167
|
+
}
|
|
97
168
|
}
|
|
98
169
|
__decorate([
|
|
99
170
|
CaptureSpan(),
|
|
@@ -125,5 +196,11 @@ __decorate([
|
|
|
125
196
|
__metadata("design:paramtypes", [String]),
|
|
126
197
|
__metadata("design:returntype", Promise)
|
|
127
198
|
], Service.prototype, "unverifyDevice", null);
|
|
199
|
+
__decorate([
|
|
200
|
+
CaptureSpan(),
|
|
201
|
+
__metadata("design:type", Function),
|
|
202
|
+
__metadata("design:paramtypes", [Object]),
|
|
203
|
+
__metadata("design:returntype", Promise)
|
|
204
|
+
], Service.prototype, "setCriticalAlertEnabledForDeviceToken", null);
|
|
128
205
|
export default new Service();
|
|
129
206
|
//# sourceMappingURL=UserPushService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserPushService.js","sourceRoot":"","sources":["../../../../Server/Services/UserPushService.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,2BAA2B,EAAE,EAElC,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAGtE,OAAO,cAAc,MAAM,6CAA6C,CAAC;AACzE,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAC5D,OAAO,WAAW,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"UserPushService.js","sourceRoot":"","sources":["../../../../Server/Services/UserPushService.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,8 @@ import UserNotificationRuleService, { NotificationMethodChannel, } from "./UserN
|
|
|
17
17
|
import LIMIT_MAX from "../../Types/Database/LimitMax";
|
|
18
18
|
import BadDataException from "../../Types/Exception/BadDataException";
|
|
19
19
|
import ObjectID from "../../Types/ObjectID";
|
|
20
|
-
import
|
|
20
|
+
import TooManyRequestsException from "../../Types/Exception/TooManyRequestsException";
|
|
21
|
+
import ChannelVerification from "../Utils/ChannelVerification";
|
|
21
22
|
import Model from "../../Models/DatabaseModels/UserSMS";
|
|
22
23
|
import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
|
|
23
24
|
export class Service extends DatabaseService {
|
|
@@ -107,7 +108,8 @@ export class Service extends DatabaseService {
|
|
|
107
108
|
}
|
|
108
109
|
async onCreateSuccess(_onCreate, createdItem) {
|
|
109
110
|
if (!createdItem.isVerified) {
|
|
110
|
-
|
|
111
|
+
// issue and send the first verification code
|
|
112
|
+
await this.issueAndSendVerificationCode(createdItem);
|
|
111
113
|
}
|
|
112
114
|
return createdItem;
|
|
113
115
|
}
|
|
@@ -119,9 +121,10 @@ export class Service extends DatabaseService {
|
|
|
119
121
|
},
|
|
120
122
|
select: {
|
|
121
123
|
phone: true,
|
|
122
|
-
verificationCode: true,
|
|
123
124
|
isVerified: true,
|
|
124
125
|
projectId: true,
|
|
126
|
+
userId: true,
|
|
127
|
+
verificationCodeSentAt: true,
|
|
125
128
|
},
|
|
126
129
|
});
|
|
127
130
|
if (!item) {
|
|
@@ -157,26 +160,50 @@ export class Service extends DatabaseService {
|
|
|
157
160
|
IsBillingEnabled) {
|
|
158
161
|
throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
|
|
159
162
|
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
163
|
+
/*
|
|
164
|
+
* Resend cooldown.
|
|
165
|
+
*
|
|
166
|
+
* Without it, spending the attempt budget on a code and asking for
|
|
167
|
+
* another one is free, which turns the attempt limit into a speed bump
|
|
168
|
+
* rather than a wall — and the resend control doubles as a way to send
|
|
169
|
+
* somebody unsolicited messages as fast as the network allows, at the
|
|
170
|
+
* project's expense.
|
|
171
|
+
*/
|
|
172
|
+
const retryAfterSeconds = ChannelVerification.getResendRetryAfterSeconds({
|
|
173
|
+
lastSentAt: item.verificationCodeSentAt,
|
|
174
|
+
});
|
|
175
|
+
if (retryAfterSeconds > 0) {
|
|
176
|
+
throw new TooManyRequestsException(`Please wait ${retryAfterSeconds} seconds before requesting another verification code.`);
|
|
177
|
+
}
|
|
178
|
+
await this.issueAndSendVerificationCode(item);
|
|
179
|
+
}
|
|
180
|
+
/*
|
|
181
|
+
* Mint a fresh code for this row, store only its digest, and send the
|
|
182
|
+
* plaintext to the channel.
|
|
183
|
+
*
|
|
184
|
+
* The plaintext exists in memory for exactly as long as it takes to hand it
|
|
185
|
+
* to the notification service and is never written anywhere. Everything
|
|
186
|
+
* about why — expiry, the attempt counter, rotation, the resend cooldown —
|
|
187
|
+
* is in Common/Server/Utils/ChannelVerification.ts.
|
|
188
|
+
*
|
|
189
|
+
* This does NOT check whether a send is allowed. Callers decide that:
|
|
190
|
+
* onCreateSuccess because a brand new row has never been sent to, and
|
|
191
|
+
* resendVerificationCode after the cooldown and the channel's own
|
|
192
|
+
* preconditions have passed.
|
|
193
|
+
*/
|
|
194
|
+
async issueAndSendVerificationCode(item) {
|
|
195
|
+
const plainCode = await ChannelVerification.issueCodeOnItem({
|
|
196
|
+
service: this,
|
|
197
|
+
itemId: item.id,
|
|
170
198
|
});
|
|
171
|
-
this.sendVerificationCode(item);
|
|
199
|
+
this.sendVerificationCode(item, plainCode);
|
|
172
200
|
}
|
|
173
|
-
sendVerificationCode(item) {
|
|
201
|
+
sendVerificationCode(item, code) {
|
|
174
202
|
(async () => {
|
|
175
203
|
const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(item.projectId);
|
|
176
204
|
await SmsService.sendSms({
|
|
177
205
|
to: item.phone,
|
|
178
|
-
message: "This message is from OneUptime. Your verification code is " +
|
|
179
|
-
item.verificationCode,
|
|
206
|
+
message: "This message is from OneUptime. Your verification code is " + code,
|
|
180
207
|
}, {
|
|
181
208
|
projectId: item.projectId,
|
|
182
209
|
customTwilioConfig: projectTwilioConfig,
|
|
@@ -218,5 +245,11 @@ __decorate([
|
|
|
218
245
|
__metadata("design:paramtypes", [ObjectID]),
|
|
219
246
|
__metadata("design:returntype", Promise)
|
|
220
247
|
], Service.prototype, "resendVerificationCode", null);
|
|
248
|
+
__decorate([
|
|
249
|
+
CaptureSpan(),
|
|
250
|
+
__metadata("design:type", Function),
|
|
251
|
+
__metadata("design:paramtypes", [Model]),
|
|
252
|
+
__metadata("design:returntype", Promise)
|
|
253
|
+
], Service.prototype, "issueAndSendVerificationCode", null);
|
|
221
254
|
export default new Service();
|
|
222
255
|
//# sourceMappingURL=UserSmsService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSmsService.js","sourceRoot":"","sources":["../../../../Server/Services/UserSmsService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,2BAA2B,EAAE,EAElC,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,SAAS,MAAM,+BAA+B,CAAC;AAEtD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"UserSmsService.js","sourceRoot":"","sources":["../../../../Server/Services/UserSmsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,8 @@ import WhatsAppService from "./WhatsAppService";
|
|
|
16
16
|
import LIMIT_MAX from "../../Types/Database/LimitMax";
|
|
17
17
|
import BadDataException from "../../Types/Exception/BadDataException";
|
|
18
18
|
import ObjectID from "../../Types/ObjectID";
|
|
19
|
-
import
|
|
19
|
+
import TooManyRequestsException from "../../Types/Exception/TooManyRequestsException";
|
|
20
|
+
import ChannelVerification from "../Utils/ChannelVerification";
|
|
20
21
|
import Model from "../../Models/DatabaseModels/UserWhatsApp";
|
|
21
22
|
import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
|
|
22
23
|
import { WhatsAppTemplateIds, WhatsAppTemplateLanguage, } from "../../Types/WhatsApp/WhatsAppTemplates";
|
|
@@ -102,7 +103,7 @@ export class Service extends DatabaseService {
|
|
|
102
103
|
}
|
|
103
104
|
async onCreateSuccess(_onCreate, createdItem) {
|
|
104
105
|
if (!createdItem.isVerified) {
|
|
105
|
-
this.
|
|
106
|
+
this.issueAndSendVerificationCode(createdItem).catch((error) => {
|
|
106
107
|
var _a, _b;
|
|
107
108
|
logger.error(error, {
|
|
108
109
|
projectId: (_a = createdItem.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
|
|
@@ -120,10 +121,10 @@ export class Service extends DatabaseService {
|
|
|
120
121
|
},
|
|
121
122
|
select: {
|
|
122
123
|
phone: true,
|
|
123
|
-
verificationCode: true,
|
|
124
124
|
isVerified: true,
|
|
125
125
|
projectId: true,
|
|
126
126
|
userId: true,
|
|
127
|
+
verificationCodeSentAt: true,
|
|
127
128
|
},
|
|
128
129
|
});
|
|
129
130
|
if (!item) {
|
|
@@ -132,19 +133,45 @@ export class Service extends DatabaseService {
|
|
|
132
133
|
if (item.isVerified) {
|
|
133
134
|
throw new BadDataException("WhatsApp number already verified");
|
|
134
135
|
}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
136
|
+
/*
|
|
137
|
+
* Resend cooldown.
|
|
138
|
+
*
|
|
139
|
+
* Without it, spending the attempt budget on a code and asking for
|
|
140
|
+
* another one is free, which turns the attempt limit into a speed bump
|
|
141
|
+
* rather than a wall — and the resend control doubles as a way to send
|
|
142
|
+
* somebody unsolicited messages as fast as the network allows, at the
|
|
143
|
+
* project's expense.
|
|
144
|
+
*/
|
|
145
|
+
const retryAfterSeconds = ChannelVerification.getResendRetryAfterSeconds({
|
|
146
|
+
lastSentAt: item.verificationCodeSentAt,
|
|
147
|
+
});
|
|
148
|
+
if (retryAfterSeconds > 0) {
|
|
149
|
+
throw new TooManyRequestsException(`Please wait ${retryAfterSeconds} seconds before requesting another verification code.`);
|
|
150
|
+
}
|
|
151
|
+
await this.issueAndSendVerificationCode(item);
|
|
152
|
+
}
|
|
153
|
+
/*
|
|
154
|
+
* Mint a fresh code for this row, store only its digest, and send the
|
|
155
|
+
* plaintext to the channel.
|
|
156
|
+
*
|
|
157
|
+
* The plaintext exists in memory for exactly as long as it takes to hand it
|
|
158
|
+
* to the notification service and is never written anywhere. Everything
|
|
159
|
+
* about why — expiry, the attempt counter, rotation, the resend cooldown —
|
|
160
|
+
* is in Common/Server/Utils/ChannelVerification.ts.
|
|
161
|
+
*
|
|
162
|
+
* This does NOT check whether a send is allowed. Callers decide that:
|
|
163
|
+
* onCreateSuccess because a brand new row has never been sent to, and
|
|
164
|
+
* resendVerificationCode after the cooldown and the channel's own
|
|
165
|
+
* preconditions have passed.
|
|
166
|
+
*/
|
|
167
|
+
async issueAndSendVerificationCode(item) {
|
|
168
|
+
const plainCode = await ChannelVerification.issueCodeOnItem({
|
|
169
|
+
service: this,
|
|
170
|
+
itemId: item.id,
|
|
144
171
|
});
|
|
145
|
-
await this.sendVerificationCode(item);
|
|
172
|
+
await this.sendVerificationCode(item, plainCode);
|
|
146
173
|
}
|
|
147
|
-
async sendVerificationCode(item) {
|
|
174
|
+
async sendVerificationCode(item, code) {
|
|
148
175
|
var _a, _b;
|
|
149
176
|
if (!item.projectId || !item.userId || !item.phone) {
|
|
150
177
|
logger.warn("Cannot send WhatsApp verification code. Missing data.", {
|
|
@@ -155,7 +182,7 @@ export class Service extends DatabaseService {
|
|
|
155
182
|
}
|
|
156
183
|
const templateKey = WhatsAppTemplateIds.VerificationCode;
|
|
157
184
|
const templateVariables = {
|
|
158
|
-
"1":
|
|
185
|
+
"1": code,
|
|
159
186
|
};
|
|
160
187
|
const whatsAppMessage = {
|
|
161
188
|
to: item.phone,
|
|
@@ -204,5 +231,11 @@ __decorate([
|
|
|
204
231
|
__metadata("design:paramtypes", [ObjectID]),
|
|
205
232
|
__metadata("design:returntype", Promise)
|
|
206
233
|
], Service.prototype, "resendVerificationCode", null);
|
|
234
|
+
__decorate([
|
|
235
|
+
CaptureSpan(),
|
|
236
|
+
__metadata("design:type", Function),
|
|
237
|
+
__metadata("design:paramtypes", [Model]),
|
|
238
|
+
__metadata("design:returntype", Promise)
|
|
239
|
+
], Service.prototype, "issueAndSendVerificationCode", null);
|
|
207
240
|
export default new Service();
|
|
208
241
|
//# sourceMappingURL=UserWhatsAppService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserWhatsAppService.js","sourceRoot":"","sources":["../../../../Server/Services/UserWhatsAppService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,2BAA2B,EAAE,EAElC,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"UserWhatsAppService.js","sourceRoot":"","sources":["../../../../Server/Services/UserWhatsAppService.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,27 @@ export default class QueryHelper {
|
|
|
40
40
|
[rid]: `${text}`,
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
|
+
/*
|
|
44
|
+
* Case-insensitive `IN (...)` — the multi-value twin of
|
|
45
|
+
* findWithSameText. Used where a user-typed identifier has to match an
|
|
46
|
+
* ingest-stamped name that may differ only by case (monitor step
|
|
47
|
+
* configs vs. the resource rows discovered from telemetry), and where
|
|
48
|
+
* issuing one findOneBy per identifier would cost a round-trip each.
|
|
49
|
+
*
|
|
50
|
+
* An empty list would compile to `IN ()`, which is a syntax error, so
|
|
51
|
+
* callers must not pass one; they have nothing to look up anyway.
|
|
52
|
+
*/
|
|
53
|
+
static findWithSameTextAnyOf(texts) {
|
|
54
|
+
const rid = Text.generateRandomText(10);
|
|
55
|
+
const normalizedTexts = texts.map((text) => {
|
|
56
|
+
return text.toLowerCase().trim();
|
|
57
|
+
});
|
|
58
|
+
return Raw((alias) => {
|
|
59
|
+
return `(LOWER(${alias}) IN (:...${rid}))`;
|
|
60
|
+
}, {
|
|
61
|
+
[rid]: normalizedTexts,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
43
64
|
static isNull() {
|
|
44
65
|
return Raw((alias) => {
|
|
45
66
|
return `(${alias} IS NULL)`;
|
|
@@ -472,6 +493,12 @@ __decorate([
|
|
|
472
493
|
__metadata("design:paramtypes", [Object]),
|
|
473
494
|
__metadata("design:returntype", Object)
|
|
474
495
|
], QueryHelper, "findWithSameText", null);
|
|
496
|
+
__decorate([
|
|
497
|
+
CaptureSpan(),
|
|
498
|
+
__metadata("design:type", Function),
|
|
499
|
+
__metadata("design:paramtypes", [Array]),
|
|
500
|
+
__metadata("design:returntype", Object)
|
|
501
|
+
], QueryHelper, "findWithSameTextAnyOf", null);
|
|
475
502
|
__decorate([
|
|
476
503
|
CaptureSpan(),
|
|
477
504
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryHelper.js","sourceRoot":"","sources":["../../../../../Server/Types/Database/QueryHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"QueryHelper.js","sourceRoot":"","sources":["../../../../../Server/Types/Database/QueryHelper.ts"],"names":[],"mappings":";;;;;;;;;;AAGA,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAC5D,OAAO,oBAAyC,MAAM,mBAAmB,CAAC;AAE1E,MAAM,CAAC,OAAO,OAAO,WAAW;IAEhB,AAAP,MAAM,CAAC,MAAM,CAClB,QAAgB,EAChB,QAAgB;QAEhB,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,GAAG,OAAO,IAAI,GAAG,CAAC;QAC3C,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,QAAQ;YACf,CAAC,IAAI,CAAC,EAAE,QAAQ;SACjB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,gBAAgB,CAC5B,IAAqB;QAErB,IAAI,QAAQ,GAAY,KAAK,CAAC;QAE9B,IAAI,OAAO,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,GAAI,IAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAC7C,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,QAAQ;gBACb,CAAC,CAAC,UAAU,KAAK,QAAQ,GAAG,GAAG;gBAC/B,CAAC,CAAC,IAAI,KAAK,OAAO,GAAG,GAAG,CAAC;QAC7B,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE;SACjB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IAEW,AAAP,MAAM,CAAC,qBAAqB,CACjC,KAAoB;QAEpB,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,MAAM,eAAe,GAAkB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAU,EAAE;YACxE,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,UAAU,KAAK,aAAa,GAAG,IAAI,CAAC;QAC7C,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,eAAe;SACvB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,MAAM;QAClB,OAAO,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;YAC3B,OAAO,IAAI,KAAK,WAAW,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAGa,AAAP,MAAM,CAAC,OAAO;QACnB,OAAO,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;YAC3B,OAAO,IAAI,KAAK,eAAe,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAGa,AAAP,MAAM,CAAC,aAAa,CACzB,KAAmD;QAEnD,MAAM,GAAG,GAAkB,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAuB,EAAE,CAAC;QAEzC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;gBACjD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACf,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACjD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,CAAC;QAMD,MAAM,cAAc,GAA2B,CAAC,KAAa,EAAU,EAAE;YACvE,IAAI,KAAK,GAAW,GAAG,CAAC;YAExB,KAAK,IAAI,GAAG;iBACT,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;gBACpB,OAAO,GAAG,KAAK,OAAO,IAAI,EAAE,CAAC;YAC/B,CAAC,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhB,KAAK,IAAI,OAAO,KAAK,WAAW,CAAC;YAEjC,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,oBAEI,SAAS,EAEf,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,SAAS,CAAC,KAAwB;QAC9C,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,GAAG,CAAC;QACjC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE;SACxB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,MAAM,CAAC,IAAY;QAC/B,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,UAAU,KAAK,oBAAoB,GAAG,IAAI,CAAC;QACpD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,GAAG;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IAEW,AAAP,MAAM,CAAC,WAAW,CACvB,mBAAkC,EAClC,KAAa;QAEb,MAAM,OAAO,GAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,MAAM,UAAU,GAAW,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC5C,CAAC,CAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAY;gBACjC,CAAC,CAAC,KAAK,CAAC;YAEV,MAAM,YAAY,GAAW,mBAAmB;iBAC7C,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;gBACrB,OAAO,SAAS,UAAU,IAAI,KAAK,oBAAoB,GAAG,GAAG,CAAC;YAChE,CAAC,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhB,OAAO,IAAI,YAAY,GAAG,CAAC;QAC7B,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,IAAI,OAAO,GAAG;SACtB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,WAAW,CAAC,IAAY;QACpC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,SAAS,KAAK,wBAAwB,GAAG,OAAO,KAAK,WAAW,CAAC;QAC1E,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,GAAG;SACnB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,UAAU,CAAC,IAAY;QACnC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,SAAS,KAAK,oBAAoB,GAAG,GAAG,CAAC;QAClD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG;SAClB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,SAAS,KAAK,oBAAoB,GAAG,GAAG,CAAC;QAClD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE;SAClB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,GAAG,CAAC,MAAgC;QAChD,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAwB,EAAE,EAAE;YAC/C,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,cAAc,CAAC,CAAC,gCAAgC;YACzD,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,WAAW,GAAG,IAAI,CAAC;QACrC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,MAAM;SACd,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,GAAG,CACf,MAAyC;QAEzC,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,0BAA0B;IACpD,CAAC;IAED;;;;;OAKG;IAEW,AAAP,MAAM,CAAC,wBAAwB,CAAC,IAKtC;QACC,MAAM,MAAM,GAAkB,IAAI,CAAC,MAAM,CAAC,GAAG,CAC3C,CAAC,KAAwB,EAAE,EAAE;YAC3B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,aAAa,CAAC;YACvB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,MAAM,SAAS,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAW,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,WAAW,GAAW,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,oBAAoB,SAAS,MAAM,QAAQ,WAAW,SAAS,YAAY,SAAS,MAAM,WAAW,aAAa,SAAS,KAAK,CAAC;QACnJ,CAAC,EACD;YACE,CAAC,SAAS,CAAC,EAAE,MAAM;SACpB,CACF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IAEW,AAAP,MAAM,CAAC,yBAAyB,CAAC,IAKvC;QACC,MAAM,MAAM,GAAkB,IAAI,CAAC,MAAM,CAAC,GAAG,CAC3C,CAAC,KAAwB,EAAE,EAAE;YAC3B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,cAAc,CAAC;YACxB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,MAAM,SAAS,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAW,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,WAAW,GAAW,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,gBAAgB,SAAS,MAAM,QAAQ,WAAW,SAAS,YAAY,SAAS,MAAM,WAAW,aAAa,SAAS,KAAK,CAAC;QAC/I,CAAC,EACD;YACE,CAAC,SAAS,CAAC,EAAE,MAAM;SACpB,CACF,CAAC;IACJ,CAAC;IAED;;;OAGG;IAEW,AAAP,MAAM,CAAC,sBAAsB,CAAC,IAGpC;QACC,MAAM,SAAS,GAAW,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;YAC3B,OAAO,IAAI,KAAK,oBAAoB,SAAS,MAAM,QAAQ,WAAW,SAAS,YAAY,SAAS,MAAM,QAAQ,iBAAiB,CAAC;QACtI,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED;;;;OAIG;IAEW,AAAP,MAAM,CAAC,uBAAuB,CAAC,IAGrC;QACC,MAAM,SAAS,GAAW,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;YAC3B,OAAO,IAAI,KAAK,gBAAgB,SAAS,MAAM,QAAQ,WAAW,SAAS,YAAY,SAAS,MAAM,QAAQ,iBAAiB,CAAC;QAClI,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED;;;;;OAKG;IAEW,AAAP,MAAM,CAAC,uBAAuB,CAAC,IAKrC;QACC,MAAM,MAAM,GAAkB,IAAI,CAAC,MAAM,CAAC,GAAG,CAC3C,CAAC,KAAwB,EAAE,EAAE;YAC3B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,cAAc,CAAC;YACxB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,MAAM,SAAS,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAErD,uEAAuE;QACvE,MAAM,SAAS,GAAW,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,WAAW,GAAW,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,gBAAgB,SAAS,MAAM,QAAQ,WAAW,SAAS,YAAY,SAAS,MAAM,WAAW,aAAa,SAAS,eAAe,SAAS,MAAM,QAAQ,4BAA4B,SAAS,MAAM,WAAW,UAAU,QAAQ,IAAI,CAAC;QAC5P,CAAC,EACD;YACE,CAAC,SAAS,CAAC,EAAE,MAAM;YACnB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM;SAC1B,CACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,EAAE,CACf,MAAyC;QAEzC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAiC,EAAE,EAAE;YACxD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,cAAc,CAAC,CAAC,gCAAgC;YACzD,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,YAAY,GAAG,IAAI,CAAC;QACtC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,MAAM;SACd,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,KAAK,CACjB,MAAgC;QAEhC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAwB,EAAE,EAAE;YAC/C,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,aAAa,CAAC,CAAC,+BAA+B;YACvD,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,gBAAgB,GAAG,IAAI,CAAC;QAC1C,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,MAAM;SACd,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,WAAW,CACvB,MAAgC;QAEhC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAwB,EAAE,EAAE;YAC/C,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,GAAG,EAAE;gBACd,OAAO,aAAa,CAAC,CAAC,+BAA+B;YACvD,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QAED,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,gBAAgB,GAAG,QAAQ,KAAK,WAAW,CAAC;QAC9D,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,MAAM;SACd,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,eAAe,CAC3B,MAAmC;QAEnC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAA0B,EAAE,EAAE;YAC/C,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,IAAI,CAAC,EAAG,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAGa,AAAP,MAAM,CAAC,OAAO,CAAC,KAAa;QACjC,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,GAAG,GAAG,CAAC;QAChC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE;SACxB,CACF,CAAC;IACJ,CAAC;IAGa,AAAP,MAAM,CAAC,kBAAkB,CAC9B,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,GAAG,CAAC;QACjC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,wBAAwB,CACpC,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,OAAO,KAAK,WAAW,CAAC;QACrD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,eAAe,CAC3B,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,GAAG,CAAC;QACjC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,cAAc,CAC1B,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,GAAG,OAAO,KAAK,WAAW,CAAC;QACpD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,qBAAqB,CACjC,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,OAAO,KAAK,WAAW,CAAC;QACrD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,WAAW,CACvB,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,GAAG,GAAG,CAAC;QAChC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,iBAAiB,CAC7B,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,GAAG,OAAO,KAAK,WAAW,CAAC;QACrD,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,SAAS,CACrB,UAAa,EACb,QAAW;QAEX,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC;QAC3D,CAAC,EACD;YACE,CAAC,IAAI,CAAC,EAAE,UAAU;YAClB,CAAC,IAAI,CAAC,EAAE,QAAQ;SACjB,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,eAAe,CAC3B,UAAa,EACb,QAAW;QAEX,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,MAAM,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,IAAI,UAAU,KAAK,YAAY,CAAC;QACrF,CAAC,EACD;YACE,CAAC,IAAI,CAAC,EAAE,UAAU;YAClB,CAAC,IAAI,CAAC,EAAE,QAAQ;SACjB,CACwB,CAAC;IAC9B,CAAC;IAGa,AAAP,MAAM,CAAC,YAAY,CACxB,UAAa,EACb,QAAW;QAEX,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,IAAI,OAAO,KAAK,OAAO,IAAI,GAAG,CAAC;QACxD,CAAC,EACD;YACE,CAAC,IAAI,CAAC,EAAE,UAAU;YAClB,CAAC,IAAI,CAAC,EAAE,QAAQ;SACjB,CACwB,CAAC;IAC9B,CAAC;IAED;;;;;;;;;OASG;IAEW,AAAP,MAAM,CAAC,SAAS,CAAC,KAAiB;QACvC,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,SAAS,GAAoB,oBAAoB,CAAC;YACtD,KAAK,EAAE,KAAmB;SAC3B,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;YAC3B;;;eAGG;YAEH,MAAM,eAAe,GAAW,KAAK;iBAClC,KAAK,CAAC,GAAG,CAAC;iBACV,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;gBACpB,OAAO,IAAI,IAAI,GAAG,CAAC;YACrB,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,CAAC;YAEb,OAAO,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1C,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC;IAGa,AAAP,MAAM,CAAC,QAAQ,CACpB,KAAQ;QAER,MAAM,GAAG,GAAW,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,GAAG,CACR,CAAC,KAAa,EAAE,EAAE;YAChB,OAAO,IAAI,KAAK,OAAO,GAAG,GAAG,CAAC;QAChC,CAAC,EACD;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CACwB,CAAC;IAC9B,CAAC;CACF;AAnuBe;IADb,WAAW,EAAE;;;;+BAgBb;AAGa;IADb,WAAW,EAAE;;;;yCAqBb;AAaa;IADb,WAAW,EAAE;;qCAEL,KAAK;;8CAgBb;AAGa;IADb,WAAW,EAAE;;;;+BAKb;AAGa;IADb,WAAW,EAAE;;;;gCAKb;AAGa;IADb,WAAW,EAAE;;;;sCA6Cb;AAGa;IADb,WAAW,EAAE;;;;kCAWb;AAGa;IADb,WAAW,EAAE;;;;+BAYb;AAaa;IADb,WAAW,EAAE;;qCAES,KAAK;;oCAwB3B;AAGa;IADb,WAAW,EAAE;;;;oCAYb;AAGa;IADb,WAAW,EAAE;;;;mCAYb;AAGa;IADb,WAAW,EAAE;;;;iCAYb;AAGa;IADb,WAAW,EAAE;;qCACY,KAAK;;4BAoB9B;AAGa;IADb,WAAW,EAAE;;qCAEJ,KAAK;;4BAGd;AASa;IADb,WAAW,EAAE;;;;iDAiCb;AASa;IADb,WAAW,EAAE;;;;kDAiCb;AAOa;IADb,WAAW,EAAE;;;;+CAWb;AAQa;IADb,WAAW,EAAE;;;;gDAWb;AASa;IADb,WAAW,EAAE;;;;gDAoCb;AA2Ba;IADb,WAAW,EAAE;;qCAEJ,KAAK;;8BAqBd;AAGa;IADb,WAAW,EAAE;;qCAEJ,KAAK;;oCAqBd;AAGa;IADb,WAAW,EAAE;;qCAEJ,KAAK;oCACZ,KAAK;wCAQP;AAGa;IADb,WAAW,EAAE;;;;gCAWb;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;2CAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;iDAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;wCAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;uCAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;8CAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;oCAWT;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;0CAWT;AAGa;IADb,WAAW,EAAE;;yDAEA,CAAC,oBAAD,CAAC,oDACH,CAAC,oBAAD,CAAC;;kCAaZ;AAGa;IADb,WAAW,EAAE;;yDAEA,CAAC,oBAAD,CAAC,oDACH,CAAC,oBAAD,CAAC;;wCAaZ;AAGa;IADb,WAAW,EAAE;;yDAEA,CAAC,oBAAD,CAAC,oDACH,CAAC,oBAAD,CAAC;;qCAaZ;AAaa;IADb,WAAW,EAAE;;;;kCAyBb;AAGa;IADb,WAAW,EAAE;;yDAEL,CAAC,oBAAD,CAAC;;iCAWT"}
|
|
@@ -19,6 +19,43 @@ export const DEFAULT_MAX_MEMORY_USAGE_IN_BYTES = 3221225472;
|
|
|
19
19
|
export const DEFAULT_MAX_BYTES_BEFORE_EXTERNAL_GROUP_BY_IN_BYTES = 1610612736;
|
|
20
20
|
// 1.5 GiB.
|
|
21
21
|
export const DEFAULT_MAX_BYTES_BEFORE_EXTERNAL_SORT_IN_BYTES = 1610612736;
|
|
22
|
+
/*
|
|
23
|
+
* Scan-side memory bound for wide-window aggregations.
|
|
24
|
+
*
|
|
25
|
+
* A GROUP BY over a log window has to visit every matching row, so unlike a
|
|
26
|
+
* paginated list it cannot be made to read less. What it CAN be stopped from
|
|
27
|
+
* doing is holding a huge amount of that data in flight at once: peak memory
|
|
28
|
+
* is roughly (threads x block rows x bytes per row), and a row carrying the
|
|
29
|
+
* fat `attributes` Map(String, String) is expensive. Reading the default
|
|
30
|
+
* 65536 rows per block per thread is what pushes a filtered facet or a
|
|
31
|
+
* projection-fallback histogram past max_memory_usage and into Code 241.
|
|
32
|
+
*
|
|
33
|
+
* These are execution-strategy settings only — ClickHouse returns the same
|
|
34
|
+
* rows either way (asserted in QuerySettingsHelper.test.ts and verified
|
|
35
|
+
* against a real server).
|
|
36
|
+
*
|
|
37
|
+
* Measured on ClickHouse 26.7, 3M rows shaped like LogItemV3, one facet
|
|
38
|
+
* query filtered on an attribute:
|
|
39
|
+
*
|
|
40
|
+
* default 695 MiB peak
|
|
41
|
+
* max_block_size alone 88 MiB peak (and faster)
|
|
42
|
+
* + preferred_block_size_bytes, threads 40 MiB peak
|
|
43
|
+
*
|
|
44
|
+
* NOTE: this bounds SCAN memory, not aggregation state. A facet on a
|
|
45
|
+
* genuinely high-cardinality attribute builds a large hash table regardless;
|
|
46
|
+
* that case is covered by max_bytes_before_external_group_by spilling to
|
|
47
|
+
* disk, which is already applied to every read here.
|
|
48
|
+
*/
|
|
49
|
+
export const AGGREGATION_SCAN_MAX_BLOCK_SIZE = 8192;
|
|
50
|
+
// 1 MiB — caps a block by bytes when rows are unusually wide.
|
|
51
|
+
export const AGGREGATION_SCAN_PREFERRED_BLOCK_SIZE_IN_BYTES = 1048576;
|
|
52
|
+
/*
|
|
53
|
+
* The Logs sidebar fans out one aggregation per facet key concurrently, so
|
|
54
|
+
* per-query thread caps also bound how much of the server a single page load
|
|
55
|
+
* can claim. Latency is barely affected — these queries are already bounded
|
|
56
|
+
* by max_execution_time with 'break'.
|
|
57
|
+
*/
|
|
58
|
+
export const AGGREGATION_SCAN_MAX_THREADS = 4;
|
|
22
59
|
export function getQuerySettings(options) {
|
|
23
60
|
var _a, _b, _c;
|
|
24
61
|
const parts = [];
|
|
@@ -31,6 +68,15 @@ export function getQuerySettings(options) {
|
|
|
31
68
|
parts.push(`max_memory_usage = ${(_a = options === null || options === void 0 ? void 0 : options.maxMemoryUsageInBytes) !== null && _a !== void 0 ? _a : DEFAULT_MAX_MEMORY_USAGE_IN_BYTES}`);
|
|
32
69
|
parts.push(`max_bytes_before_external_group_by = ${(_b = options === null || options === void 0 ? void 0 : options.maxBytesBeforeExternalGroupByInBytes) !== null && _b !== void 0 ? _b : DEFAULT_MAX_BYTES_BEFORE_EXTERNAL_GROUP_BY_IN_BYTES}`);
|
|
33
70
|
parts.push(`max_bytes_before_external_sort = ${(_c = options === null || options === void 0 ? void 0 : options.maxBytesBeforeExternalSortInBytes) !== null && _c !== void 0 ? _c : DEFAULT_MAX_BYTES_BEFORE_EXTERNAL_SORT_IN_BYTES}`);
|
|
71
|
+
/*
|
|
72
|
+
* Emitted before additionalSettings so a call site can still override any
|
|
73
|
+
* one of these explicitly if it has a reason to.
|
|
74
|
+
*/
|
|
75
|
+
if (options === null || options === void 0 ? void 0 : options.boundScanMemory) {
|
|
76
|
+
parts.push(`max_block_size = ${AGGREGATION_SCAN_MAX_BLOCK_SIZE}`);
|
|
77
|
+
parts.push(`preferred_block_size_bytes = ${AGGREGATION_SCAN_PREFERRED_BLOCK_SIZE_IN_BYTES}`);
|
|
78
|
+
parts.push(`max_threads = ${AGGREGATION_SCAN_MAX_THREADS}`);
|
|
79
|
+
}
|
|
34
80
|
if (options === null || options === void 0 ? void 0 : options.additionalSettings) {
|
|
35
81
|
for (const [key, value] of Object.entries(options.additionalSettings)) {
|
|
36
82
|
parts.push(typeof value === "string" ? `${key} = '${value}'` : `${key} = ${value}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuerySettingsHelper.js","sourceRoot":"","sources":["../../../../../Server/Utils/AnalyticsDatabase/QuerySettingsHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,SAAS;AACT,MAAM,CAAC,MAAM,iCAAiC,GAAW,UAAU,CAAC;AAEpE,sEAAsE;AACtE,MAAM,CAAC,MAAM,mDAAmD,GAAW,UAAU,CAAC;AAEtF,WAAW;AACX,MAAM,CAAC,MAAM,+CAA+C,GAAW,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"QuerySettingsHelper.js","sourceRoot":"","sources":["../../../../../Server/Utils/AnalyticsDatabase/QuerySettingsHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,SAAS;AACT,MAAM,CAAC,MAAM,iCAAiC,GAAW,UAAU,CAAC;AAEpE,sEAAsE;AACtE,MAAM,CAAC,MAAM,mDAAmD,GAAW,UAAU,CAAC;AAEtF,WAAW;AACX,MAAM,CAAC,MAAM,+CAA+C,GAAW,UAAU,CAAC;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAW,IAAI,CAAC;AAE5D,8DAA8D;AAC9D,MAAM,CAAC,MAAM,8CAA8C,GAAW,OAAO,CAAC;AAE9E;;;;;GAKG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAW,CAAC,CAAC;AAgCtD,MAAM,UAAU,gBAAgB,CAAC,OAA8B;;IAC7D,MAAM,KAAK,GAAkB,EAAE,CAAC;IAEhC,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,yBAAyB,MAAK,SAAS,EAAE,CAAC;QACrD,KAAK,CAAC,IAAI,CAAC,wBAAwB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,MAAK,SAAS,EAAE,CAAC;QAC/C,KAAK,CAAC,IAAI,CAAC,4BAA4B,OAAO,CAAC,mBAAmB,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,IAAI,CACR,sBACE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,mCAAI,iCACpC,EAAE,CACH,CAAC;IACF,KAAK,CAAC,IAAI,CACR,wCACE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oCAAoC,mCAC7C,mDACF,EAAE,CACH,CAAC;IACF,KAAK,CAAC,IAAI,CACR,oCACE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iCAAiC,mCAC1C,+CACF,EAAE,CACH,CAAC;IAEF;;;OAGG;IACH,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,oBAAoB,+BAA+B,EAAE,CAAC,CAAC;QAClE,KAAK,CAAC,IAAI,CACR,gCAAgC,8CAA8C,EAAE,CACjF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,iBAAiB,4BAA4B,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACtE,KAAK,CAAC,IAAI,CACR,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,KAAK,EAAE,CACxE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAC/B,MAAM,CAAC,gBAAgB,CAAC,OAA8B;QAC3D,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACF"}
|