@oneuptime/common 12.0.14 → 12.0.15
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/GlobalOidc.ts +20 -0
- package/Models/DatabaseModels/GlobalSso.ts +20 -0
- package/Models/DatabaseModels/MarketingConversion.ts +19 -9
- package/Models/DatabaseModels/NetworkDeviceLinkRule.ts +46 -0
- package/Models/DatabaseModels/StatusPage.ts +7 -4
- package/Server/API/StatusPageAPI.ts +29 -4
- package/Server/EnvironmentConfig.ts +7 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.ts +19 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.ts +40 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +4 -0
- package/Server/Middleware/SlackAuthorization.ts +43 -6
- package/Server/Middleware/UserAuthorization.ts +236 -26
- package/Server/Middleware/WhatsAppAuthorization.ts +43 -3
- package/Server/Services/GlobalOidcProjectService.ts +126 -1
- package/Server/Services/GlobalOidcService.ts +132 -0
- package/Server/Services/GlobalSsoProjectService.ts +126 -1
- package/Server/Services/GlobalSsoService.ts +132 -0
- package/Server/Services/UserEmailService.ts +4 -4
- package/Server/Utils/CronTab.ts +73 -0
- package/Server/Utils/GlobalSsoAuthorization.ts +175 -0
- package/Server/Utils/Marketing/ConversionUploadProvider.ts +35 -5
- package/Server/Utils/Marketing/Providers/GoogleAds.ts +1 -1
- package/Server/Utils/Marketing/Providers/LinkedIn.ts +1 -1
- package/Server/Utils/Marketing/Providers/Meta.ts +1 -1
- package/Server/Utils/Marketing/Providers/MicrosoftAds.ts +1 -1
- package/Server/Utils/Marketing/Providers/Reddit.ts +1 -1
- package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +48 -33
- package/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts +35 -30
- package/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.ts +33 -28
- package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts +475 -47
- package/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.ts +35 -30
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +34 -28
- package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +33 -28
- package/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +69 -40
- package/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts +35 -29
- package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts +8 -0
- package/Server/Utils/Monitor/MonitorResource.ts +161 -21
- package/Server/Utils/StatusPageContentSecurityPolicy.ts +56 -0
- package/Server/Utils/StatusPageCustomizationAccess.ts +117 -0
- package/Tests/Server/API/StatusPageCustomizationOrigin.test.ts +348 -0
- package/Tests/Server/Infrastructure/Postgres/FixTotpOtpUrlAlgorithmMigration.test.ts +9 -59
- package/Tests/Server/Infrastructure/Postgres/SchemaMigrationsOrdering.test.ts +227 -0
- package/Tests/Server/Middleware/SlackAuthorization.test.ts +149 -0
- package/Tests/Server/Middleware/UserAuthorization.test.ts +27 -13
- package/Tests/Server/Middleware/UserAuthorizationGlobalSsoGovernance.test.ts +1455 -0
- package/Tests/Server/Middleware/UserAuthorizationSSOProvider.test.ts +91 -2
- package/Tests/Server/Middleware/WhatsAppAuthorization.test.ts +233 -0
- package/Tests/Server/Services/DiscoveryScanClaimHookFreeSafety.test.ts +21 -8
- package/Tests/Server/Services/GlobalSsoProviderAuthorization.test.ts +1242 -0
- package/Tests/Server/Services/MonitorResourceProbeAgreementHydration.test.ts +459 -0
- package/Tests/Server/Services/MonitorResourceProbeAgreementReuse.test.ts +10 -0
- package/Tests/Server/Types/AnalyticsDatabase/AggregateUtilBucketTimestamp.test.ts +416 -0
- package/Tests/Server/Types/Database/QueryHelperManyToManyAndEmptyValues.test.ts +551 -0
- package/Tests/Server/Types/Database/SelectUtil.test.ts +348 -0
- package/Tests/Server/Utils/CronTab.test.ts +116 -0
- package/Tests/Server/Utils/GlobalSSOToken.test.ts +581 -0
- package/Tests/Server/Utils/GlobalSsoAuthorization.test.ts +1401 -0
- package/Tests/Server/Utils/Marketing/AdUploadableConversionTypes.test.ts +254 -0
- package/Tests/Server/Utils/Marketing/ConversionUploadProvider.test.ts +1 -1
- package/Tests/Server/Utils/Monitor/Criteria/APIRequestCriteriaEvaluateOverTime.test.ts +508 -0
- package/Tests/Server/Utils/Monitor/Criteria/APIRequestCriteriaPortTimings.test.ts +30 -9
- package/Tests/Server/Utils/Monitor/Criteria/EvaluateOverTime.test.ts +987 -0
- package/Tests/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.test.ts +916 -0
- package/Tests/Server/Utils/Monitor/Criteria/ProfileMonitorCriteria.test.ts +382 -0
- package/Tests/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.test.ts +1219 -0
- package/Tests/Server/Utils/Monitor/MonitorResourceIngestedStepSelection.test.ts +86 -0
- package/Tests/Server/Utils/StatusPageContentSecurityPolicy.test.ts +136 -0
- package/Tests/Server/Utils/StatusPageCustomizationAccess.test.ts +223 -0
- package/Tests/Types/Monitor/MonitorStepConfigHelpers.test.ts +165 -0
- package/Tests/Types/NetworkDevice/NetworkDeviceLinkRuleScope.test.ts +215 -0
- package/Tests/UI/Components/Forms/FormSubmitAnalytics.test.tsx +206 -0
- package/Tests/UI/Utils/AIChatExport/ConversationMarkdown.test.ts +774 -0
- package/Tests/UI/Utils/AIChatExport/MarkdownBlocks.test.ts +791 -0
- package/Tests/UI/Utils/AIChatExport/MarkdownSafety.test.ts +544 -0
- package/Tests/Utils/Analytics.test.ts +187 -0
- package/Tests/Utils/Monitor/MonitorMetricType.test.ts +80 -0
- package/Tests/Utils/Monitor/NetworkDeviceLinkRuleUtil.test.ts +1291 -0
- package/Tests/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.test.ts +214 -0
- package/Types/Marketing/MarketingConversion.ts +12 -0
- package/Types/Monitor/CriteriaFilter.ts +9 -0
- package/Types/NetworkDevice/NetworkDeviceLinkRuleScope.ts +51 -0
- package/UI/Components/FormModal/BasicFormModal.tsx +12 -0
- package/UI/Components/Forms/BasicForm.tsx +13 -1
- package/UI/Components/Forms/BasicModelForm.tsx +2 -1
- package/UI/Components/Forms/ModelForm.tsx +10 -1
- package/UI/Components/Forms/Utils/FormAnalyticsName.ts +39 -0
- package/UI/Components/ModelFormModal/ModelFormModal.tsx +6 -1
- package/Utils/Analytics.ts +55 -2
- package/Utils/Monitor/MonitorMetricType.ts +40 -0
- package/Utils/Monitor/NetworkDeviceLinkRuleUtil.ts +587 -37
- package/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.ts +115 -0
- package/build/dist/Models/DatabaseModels/GlobalOidc.js +21 -0
- package/build/dist/Models/DatabaseModels/GlobalOidc.js.map +1 -1
- package/build/dist/Models/DatabaseModels/GlobalSso.js +21 -0
- package/build/dist/Models/DatabaseModels/GlobalSso.js.map +1 -1
- package/build/dist/Models/DatabaseModels/MarketingConversion.js +20 -10
- package/build/dist/Models/DatabaseModels/MarketingConversion.js.map +1 -1
- package/build/dist/Models/DatabaseModels/NetworkDeviceLinkRule.js +47 -0
- package/build/dist/Models/DatabaseModels/NetworkDeviceLinkRule.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPage.js +4 -4
- package/build/dist/Models/DatabaseModels/StatusPage.js.map +1 -1
- package/build/dist/Server/API/StatusPageAPI.js +25 -4
- package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
- package/build/dist/Server/EnvironmentConfig.js +6 -0
- package/build/dist/Server/EnvironmentConfig.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.js +29 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +4 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Middleware/SlackAuthorization.js +28 -4
- package/build/dist/Server/Middleware/SlackAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/UserAuthorization.js +197 -22
- package/build/dist/Server/Middleware/UserAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js +32 -2
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js.map +1 -1
- package/build/dist/Server/Services/GlobalOidcProjectService.js +105 -0
- package/build/dist/Server/Services/GlobalOidcProjectService.js.map +1 -1
- package/build/dist/Server/Services/GlobalOidcService.js +127 -0
- package/build/dist/Server/Services/GlobalOidcService.js.map +1 -1
- package/build/dist/Server/Services/GlobalSsoProjectService.js +105 -0
- package/build/dist/Server/Services/GlobalSsoProjectService.js.map +1 -1
- package/build/dist/Server/Services/GlobalSsoService.js +127 -0
- package/build/dist/Server/Services/GlobalSsoService.js.map +1 -1
- package/build/dist/Server/Services/UserEmailService.js +4 -4
- package/build/dist/Server/Utils/CronTab.js +66 -0
- package/build/dist/Server/Utils/CronTab.js.map +1 -1
- package/build/dist/Server/Utils/GlobalSsoAuthorization.js +112 -0
- package/build/dist/Server/Utils/GlobalSsoAuthorization.js.map +1 -0
- package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js +17 -1
- package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Meta.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Meta.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Reddit.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Reddit.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +37 -35
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js +20 -22
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js +370 -42
- package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js +64 -52
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js +25 -29
- package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js +8 -0
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResource.js +123 -23
- package/build/dist/Server/Utils/Monitor/MonitorResource.js.map +1 -1
- package/build/dist/Server/Utils/StatusPageContentSecurityPolicy.js +39 -0
- package/build/dist/Server/Utils/StatusPageContentSecurityPolicy.js.map +1 -0
- package/build/dist/Server/Utils/StatusPageCustomizationAccess.js +85 -0
- package/build/dist/Server/Utils/StatusPageCustomizationAccess.js.map +1 -0
- package/build/dist/Types/Marketing/MarketingConversion.js +10 -0
- package/build/dist/Types/Marketing/MarketingConversion.js.map +1 -1
- package/build/dist/Types/Monitor/CriteriaFilter.js +1 -0
- package/build/dist/Types/Monitor/CriteriaFilter.js.map +1 -1
- package/build/dist/Types/NetworkDevice/NetworkDeviceLinkRuleScope.js +46 -0
- package/build/dist/Types/NetworkDevice/NetworkDeviceLinkRuleScope.js.map +1 -0
- package/build/dist/UI/Components/FormModal/BasicFormModal.js +2 -1
- package/build/dist/UI/Components/FormModal/BasicFormModal.js.map +1 -1
- package/build/dist/UI/Components/Forms/BasicForm.js +10 -1
- package/build/dist/UI/Components/Forms/BasicForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/BasicModelForm.js +2 -1
- package/build/dist/UI/Components/Forms/BasicModelForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/ModelForm.js +4 -1
- package/build/dist/UI/Components/Forms/ModelForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/Utils/FormAnalyticsName.js +33 -0
- package/build/dist/UI/Components/Forms/Utils/FormAnalyticsName.js.map +1 -0
- package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js +2 -1
- package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js.map +1 -1
- package/build/dist/Utils/Analytics.js +50 -2
- package/build/dist/Utils/Analytics.js.map +1 -1
- package/build/dist/Utils/Monitor/MonitorMetricType.js +37 -0
- package/build/dist/Utils/Monitor/MonitorMetricType.js.map +1 -1
- package/build/dist/Utils/Monitor/NetworkDeviceLinkRuleUtil.js +318 -37
- package/build/dist/Utils/Monitor/NetworkDeviceLinkRuleUtil.js.map +1 -1
- package/build/dist/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.js +87 -0
- package/build/dist/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import OneUptimeDate from "../../Types/Date";
|
|
2
|
+
import ColumnLength from "../../Types/Database/ColumnLength";
|
|
3
|
+
|
|
4
|
+
/*
|
|
5
|
+
* Why a network discovery scan is still sitting in "Pending".
|
|
6
|
+
*
|
|
7
|
+
* A scan leaves "Pending" in exactly one place: the probe asks
|
|
8
|
+
* /probe/discovery-scan/list and the server claims a row for it
|
|
9
|
+
* (App/FeatureSet/Telemetry/API/ProbeIngest/DiscoveryScan.ts). Nothing on the
|
|
10
|
+
* server can make that happen — if the probe never asks, the row simply never
|
|
11
|
+
* moves.
|
|
12
|
+
*
|
|
13
|
+
* Until this existed, that outcome was completely silent. The scans list
|
|
14
|
+
* showed "Pending" and an em-dash in Responded Hosts, forever, with no
|
|
15
|
+
* timestamp, no probe state and no message anywhere in the product; the only
|
|
16
|
+
* evidence lived in the probe container's log, if the operator had it. That is
|
|
17
|
+
* what OneUptime issue #3287 reported: four scans submitted over an hour, all
|
|
18
|
+
* "Pending", nothing to act on.
|
|
19
|
+
*
|
|
20
|
+
* So this module writes the sentence the operator was missing. It is pure and
|
|
21
|
+
* lives in Common so the wording can be unit-tested without a database, the
|
|
22
|
+
* same way ScanTargetUtil's messages are.
|
|
23
|
+
*
|
|
24
|
+
* It deliberately does NOT fail the scan. A scan nobody has claimed is still
|
|
25
|
+
* perfectly runnable the moment the probe comes back, and a recurring one
|
|
26
|
+
* would tangle with the re-queue pass; what was missing was information, not a
|
|
27
|
+
* state change.
|
|
28
|
+
*/
|
|
29
|
+
|
|
30
|
+
/*
|
|
31
|
+
* How long a scan may sit unclaimed before the job says anything.
|
|
32
|
+
*
|
|
33
|
+
* The probe polls every minute, so this is fifteen consecutive failed polls —
|
|
34
|
+
* long enough that a restarting probe, a redeploy or a brief network blip
|
|
35
|
+
* never produces a message, short enough to be useful while the operator is
|
|
36
|
+
* still looking at the page they just submitted from.
|
|
37
|
+
*
|
|
38
|
+
* It is NOT the whole guard against false positives: a scan queued behind
|
|
39
|
+
* another scan on the same probe is legitimately Pending for as long as that
|
|
40
|
+
* sweep takes (the claim endpoint hands out one at a time), so the caller
|
|
41
|
+
* excludes probes that currently have a scan In Progress. This threshold only
|
|
42
|
+
* decides how long an IDLE probe gets before its silence is worth reporting.
|
|
43
|
+
*/
|
|
44
|
+
export const UNCLAIMED_PENDING_MINUTES: number = 15;
|
|
45
|
+
|
|
46
|
+
export interface UnclaimedScanProbeState {
|
|
47
|
+
// The probe the scan was assigned to, as the operator named it.
|
|
48
|
+
probeName?: string | undefined;
|
|
49
|
+
/*
|
|
50
|
+
* The probe's own connection state, as maintained every minute by
|
|
51
|
+
* Workers/Jobs/Probe/UpdateConnectionStatus.ts. This is the half of the
|
|
52
|
+
* diagnosis the operator cannot work out for themselves.
|
|
53
|
+
*/
|
|
54
|
+
isProbeConnected: boolean;
|
|
55
|
+
// When the probe last authenticated a request. Null if it never has.
|
|
56
|
+
lastAliveAt?: Date | null | undefined;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/*
|
|
60
|
+
* The two cases below are genuinely different problems with different fixes,
|
|
61
|
+
* and telling them apart is the entire point of this message: a probe that is
|
|
62
|
+
* not connected is an infrastructure problem the operator can see and fix,
|
|
63
|
+
* whereas a probe that IS connected and still is not claiming scans means the
|
|
64
|
+
* probe is running but its discovery job is not — an old image, a wedged
|
|
65
|
+
* sweep, or a probe that cannot reach the probe-ingest route specifically.
|
|
66
|
+
*/
|
|
67
|
+
export function buildUnclaimedScanDiagnosis(
|
|
68
|
+
probeState: UnclaimedScanProbeState,
|
|
69
|
+
): string {
|
|
70
|
+
const probeLabel: string = probeState.probeName
|
|
71
|
+
? `Probe "${truncateProbeName(probeState.probeName)}"`
|
|
72
|
+
: "The assigned probe";
|
|
73
|
+
|
|
74
|
+
if (!probeState.isProbeConnected) {
|
|
75
|
+
const lastSeen: string = probeState.lastAliveAt
|
|
76
|
+
? `It was last seen ${OneUptimeDate.fromNow(probeState.lastAliveAt)}.`
|
|
77
|
+
: "It has never connected.";
|
|
78
|
+
|
|
79
|
+
return (
|
|
80
|
+
`Not started yet: ${probeLabel} is not connected to OneUptime, so it has not picked this scan up. ` +
|
|
81
|
+
`${lastSeen} The scan will run on its own as soon as the probe reconnects.`
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
return (
|
|
86
|
+
`Not started yet: ${probeLabel} is connected but has not picked this scan up for over ` +
|
|
87
|
+
`${UNCLAIMED_PENDING_MINUTES} minutes. Check that the probe is running a version that supports ` +
|
|
88
|
+
`network discovery, and that it can reach the probe-ingest endpoint. The scan will run on its own ` +
|
|
89
|
+
`once the probe starts claiming scans again.`
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/*
|
|
94
|
+
* statusMessage is a varchar(500) and this job writes through the full
|
|
95
|
+
* update pipeline, which does NOT clamp — an over-long value would throw and
|
|
96
|
+
* the diagnosis would be lost rather than truncated. The only unbounded part
|
|
97
|
+
* of the sentence is the probe's name (itself a ShortText column, so at most
|
|
98
|
+
* 100 characters), and it is cut here so the arithmetic holds for every
|
|
99
|
+
* possible name. See the test that asserts the worst case still fits.
|
|
100
|
+
*/
|
|
101
|
+
const MAX_PROBE_NAME_LENGTH: number = 60;
|
|
102
|
+
|
|
103
|
+
function truncateProbeName(name: string): string {
|
|
104
|
+
if (name.length <= MAX_PROBE_NAME_LENGTH) {
|
|
105
|
+
return name;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return name.substring(0, MAX_PROBE_NAME_LENGTH) + "…";
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/*
|
|
112
|
+
* Exported so the job and its tests agree on the ceiling they are checking
|
|
113
|
+
* against, rather than both hard-coding 500.
|
|
114
|
+
*/
|
|
115
|
+
export const MAX_SCAN_STATUS_MESSAGE_LENGTH: number = ColumnLength.LongText;
|
|
@@ -41,6 +41,7 @@ let GlobalOIDC = class GlobalOIDC extends BaseModel {
|
|
|
41
41
|
this.emailClaimName = undefined;
|
|
42
42
|
this.nameClaimName = undefined;
|
|
43
43
|
this.disableSignUpWithSso = undefined;
|
|
44
|
+
this.restrictToAttachedProjects = undefined;
|
|
44
45
|
this.isEnabled = undefined;
|
|
45
46
|
this.createdByUser = undefined;
|
|
46
47
|
this.createdByUserId = undefined;
|
|
@@ -244,6 +245,26 @@ __decorate([
|
|
|
244
245
|
}),
|
|
245
246
|
__metadata("design:type", Boolean)
|
|
246
247
|
], GlobalOIDC.prototype, "disableSignUpWithSso", void 0);
|
|
248
|
+
__decorate([
|
|
249
|
+
ColumnAccessControl({
|
|
250
|
+
create: [],
|
|
251
|
+
read: [],
|
|
252
|
+
update: [],
|
|
253
|
+
}),
|
|
254
|
+
TableColumn({
|
|
255
|
+
isDefaultValueColumn: true,
|
|
256
|
+
type: TableColumnType.Boolean,
|
|
257
|
+
title: "Restrict to Attached Projects",
|
|
258
|
+
description: "When enabled, a login through this provider only satisfies SSO enforcement for the projects attached below. Leave this off (the default) and the provider satisfies SSO enforcement for every project the user is a member of, which is how attachments have always behaved - they are the provisioning allow-list, not an access boundary. Turning this on narrows access for people already signed in.",
|
|
259
|
+
defaultValue: false,
|
|
260
|
+
example: true,
|
|
261
|
+
}),
|
|
262
|
+
Column({
|
|
263
|
+
type: ColumnType.Boolean,
|
|
264
|
+
default: false,
|
|
265
|
+
}),
|
|
266
|
+
__metadata("design:type", Boolean)
|
|
267
|
+
], GlobalOIDC.prototype, "restrictToAttachedProjects", void 0);
|
|
247
268
|
__decorate([
|
|
248
269
|
ColumnAccessControl({
|
|
249
270
|
create: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalOidc.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/GlobalOidc.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,yBAAyB,MAAM,8DAA8D,CAAC;AACrG,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEhE;;;;GAIG;AAsBY,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,SAAS;IAAlC;;QAkBN,SAAI,GAAY,SAAS,CAAC;QAiB1B,gBAAW,GAAY,SAAS,CAAC;QAoBjC,iBAAY,GAAS,SAAS,CAAC;QAmB/B,cAAS,GAAY,SAAS,CAAC;QAmB/B,aAAQ,GAAY,SAAS,CAAC;QAmB9B,iBAAY,GAAY,SAAS,CAAC;QAoBlC,WAAM,GAAY,SAAS,CAAC;QAoB5B,mBAAc,GAAY,SAAS,CAAC;QAoBpC,kBAAa,GAAY,SAAS,CAAC;QAoBnC,yBAAoB,GAAa,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"GlobalOidc.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/GlobalOidc.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ let GlobalSSO = class GlobalSSO extends BaseModel {
|
|
|
44
44
|
this.issuerURL = undefined;
|
|
45
45
|
this.publicCertificate = undefined;
|
|
46
46
|
this.disableSignUpWithSso = undefined;
|
|
47
|
+
this.restrictToAttachedProjects = undefined;
|
|
47
48
|
this.isEnabled = undefined;
|
|
48
49
|
this.createdByUser = undefined;
|
|
49
50
|
this.createdByUserId = undefined;
|
|
@@ -206,6 +207,26 @@ __decorate([
|
|
|
206
207
|
}),
|
|
207
208
|
__metadata("design:type", Boolean)
|
|
208
209
|
], GlobalSSO.prototype, "disableSignUpWithSso", void 0);
|
|
210
|
+
__decorate([
|
|
211
|
+
ColumnAccessControl({
|
|
212
|
+
create: [],
|
|
213
|
+
read: [],
|
|
214
|
+
update: [],
|
|
215
|
+
}),
|
|
216
|
+
TableColumn({
|
|
217
|
+
isDefaultValueColumn: true,
|
|
218
|
+
type: TableColumnType.Boolean,
|
|
219
|
+
title: "Restrict to Attached Projects",
|
|
220
|
+
description: "When enabled, a login through this provider only satisfies SSO enforcement for the projects attached below. Leave this off (the default) and the provider satisfies SSO enforcement for every project the user is a member of, which is how attachments have always behaved - they are the provisioning allow-list, not an access boundary. Turning this on narrows access for people already signed in.",
|
|
221
|
+
defaultValue: false,
|
|
222
|
+
example: true,
|
|
223
|
+
}),
|
|
224
|
+
Column({
|
|
225
|
+
type: ColumnType.Boolean,
|
|
226
|
+
default: false,
|
|
227
|
+
}),
|
|
228
|
+
__metadata("design:type", Boolean)
|
|
229
|
+
], GlobalSSO.prototype, "restrictToAttachedProjects", void 0);
|
|
209
230
|
__decorate([
|
|
210
231
|
ColumnAccessControl({
|
|
211
232
|
create: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalSso.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/GlobalSso.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,yBAAyB,MAAM,8DAA8D,CAAC;AACrG,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,YAAY,MAAM,8BAA8B,CAAC;AACxD,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEhE;;;;;;;GAOG;AAsBY,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,SAAS;IAAjC;;QAkBN,SAAI,GAAY,SAAS,CAAC;QAiB1B,gBAAW,GAAY,SAAS,CAAC;QAmBjC,oBAAe,GAAqB,SAAS,CAAC;QAmB9C,iBAAY,GAAkB,SAAS,CAAC;QAmBxC,cAAS,GAAS,SAAS,CAAC;QAkB5B,cAAS,GAAY,SAAS,CAAC;QAkB/B,sBAAiB,GAAY,SAAS,CAAC;QAoBvC,yBAAoB,GAAa,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"GlobalSso.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/GlobalSso.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,11 +21,13 @@ import IconProp from "../../Types/Icon/IconProp";
|
|
|
21
21
|
import ObjectID from "../../Types/ObjectID";
|
|
22
22
|
import { Column, Entity, Index } from "typeorm";
|
|
23
23
|
/*
|
|
24
|
-
* Internal table (no API access) recording
|
|
25
|
-
* signups and paid subscriptions
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
24
|
+
* Internal table (no API access) recording server-confirmed conversions —
|
|
25
|
+
* signups, booked meetings and paid subscriptions, along with any ad click IDs
|
|
26
|
+
* the converting visitor carried — and the status of uploading the
|
|
27
|
+
* ad-uploadable ones to ad platforms (Google Ads offline click conversions,
|
|
28
|
+
* Meta Conversions API). Browser analytics never write this table: rows are
|
|
29
|
+
* written by the signup/subscription flows and the Cal.com webhook, and read
|
|
30
|
+
* by the MarketingConversions worker job.
|
|
29
31
|
*/
|
|
30
32
|
let MarketingConversion = class MarketingConversion extends BaseModel {
|
|
31
33
|
constructor() {
|
|
@@ -50,7 +52,7 @@ __decorate([
|
|
|
50
52
|
type: TableColumnType.ShortText,
|
|
51
53
|
required: true,
|
|
52
54
|
title: "Conversion Type",
|
|
53
|
-
description: "SignUp or PaidSubscription.",
|
|
55
|
+
description: "SignUp, MeetingBooked or PaidSubscription.",
|
|
54
56
|
}),
|
|
55
57
|
Column({
|
|
56
58
|
type: ColumnType.ShortText,
|
|
@@ -70,7 +72,7 @@ __decorate([
|
|
|
70
72
|
type: TableColumnType.ObjectID,
|
|
71
73
|
required: false,
|
|
72
74
|
title: "User ID",
|
|
73
|
-
description: "User this conversion belongs to (SignUp conversions).",
|
|
75
|
+
description: "User this conversion belongs to (SignUp conversions). Null when the conversion has no OneUptime user yet, as with a booked meeting.",
|
|
74
76
|
}),
|
|
75
77
|
Column({
|
|
76
78
|
type: ColumnType.ObjectID,
|
|
@@ -164,7 +166,7 @@ __decorate([
|
|
|
164
166
|
type: TableColumnType.Number,
|
|
165
167
|
required: false,
|
|
166
168
|
title: "Conversion Value (USD Cents)",
|
|
167
|
-
description: "Conversion value in USD cents (monthly recurring revenue for paid subscriptions). Null when unknown (custom pricing) or not applicable (signups).",
|
|
169
|
+
description: "Conversion value in USD cents (monthly recurring revenue for paid subscriptions). Null when unknown (custom pricing) or not applicable (signups, booked meetings).",
|
|
168
170
|
}),
|
|
169
171
|
Column({
|
|
170
172
|
type: ColumnType.Number,
|
|
@@ -203,11 +205,19 @@ MarketingConversion = __decorate([
|
|
|
203
205
|
singularName: "Marketing Conversion",
|
|
204
206
|
pluralName: "Marketing Conversions",
|
|
205
207
|
icon: IconProp.ChartBar,
|
|
206
|
-
tableDescription: "
|
|
208
|
+
tableDescription: "Server-confirmed conversions (signups, meetings booked, paid subscriptions) and their upload status to ad platforms for offline conversion tracking.",
|
|
207
209
|
}),
|
|
208
210
|
Entity({
|
|
209
211
|
name: "MarketingConversion",
|
|
210
|
-
})
|
|
212
|
+
})
|
|
213
|
+
/*
|
|
214
|
+
* One conversion of each type per user/project. Postgres treats NULLs as
|
|
215
|
+
* distinct, so these indexes only constrain rows that actually carry a user or
|
|
216
|
+
* project id — conversion types with neither (a booked meeting from an
|
|
217
|
+
* anonymous visitor) are de-duplicated by their deterministic primary key
|
|
218
|
+
* instead.
|
|
219
|
+
*/
|
|
220
|
+
,
|
|
211
221
|
Index("uq_marketing_conversion_type_user", ["conversionType", "userId"], {
|
|
212
222
|
unique: true,
|
|
213
223
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarketingConversion.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/MarketingConversion.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAEjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhD
|
|
1
|
+
{"version":3,"file":"MarketingConversion.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/MarketingConversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
import Label from "./Label";
|
|
11
11
|
import Project from "./Project";
|
|
12
12
|
import User from "./User";
|
|
13
|
+
import NetworkDeviceLinkRuleScope from "../../Types/NetworkDevice/NetworkDeviceLinkRuleScope";
|
|
13
14
|
import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
|
|
14
15
|
import Route from "../../Types/API/Route";
|
|
15
16
|
import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
|
|
@@ -43,6 +44,15 @@ import { Column, Entity, JoinColumn, JoinTable, ManyToMany, ManyToOne, } from "t
|
|
|
43
44
|
* cabling. Both cases are reported rather than silently producing an empty
|
|
44
45
|
* map — see NetworkDeviceLinkRuleUtil.
|
|
45
46
|
*
|
|
47
|
+
* "Exactly one" needs a universe, and `scope` names it. By default the
|
|
48
|
+
* question is asked across the whole project, which is what every rule
|
|
49
|
+
* written before that column existed means. Setting it to Site asks the same
|
|
50
|
+
* question once per site instead, so one rule draws the same router-to-switch
|
|
51
|
+
* star in every building rather than reporting fourteen candidate routers and
|
|
52
|
+
* drawing nothing anywhere. A site-scoped rule looks only inside each device's
|
|
53
|
+
* OWN site — it never reaches up to a parent site — and skips devices that
|
|
54
|
+
* have no site at all, reporting how many it walked past.
|
|
55
|
+
*
|
|
46
56
|
* Rules are evaluated when the topology is built, not materialised into
|
|
47
57
|
* NetworkDeviceLink rows: relabelling a device then shows up on the next
|
|
48
58
|
* refresh, and there is nothing to garbage-collect when a rule is deleted.
|
|
@@ -57,6 +67,7 @@ let NetworkDeviceLinkRule = class NetworkDeviceLinkRule extends BaseModel {
|
|
|
57
67
|
this.isEnabled = undefined;
|
|
58
68
|
this.childDeviceLabels = undefined;
|
|
59
69
|
this.parentDeviceLabels = undefined;
|
|
70
|
+
this.scope = undefined;
|
|
60
71
|
this.createdByUser = undefined;
|
|
61
72
|
this.createdByUserId = undefined;
|
|
62
73
|
this.deletedByUser = undefined;
|
|
@@ -315,6 +326,42 @@ __decorate([
|
|
|
315
326
|
}),
|
|
316
327
|
__metadata("design:type", Array)
|
|
317
328
|
], NetworkDeviceLinkRule.prototype, "parentDeviceLabels", void 0);
|
|
329
|
+
__decorate([
|
|
330
|
+
ColumnAccessControl({
|
|
331
|
+
create: [
|
|
332
|
+
Permission.ProjectOwner,
|
|
333
|
+
Permission.ProjectAdmin,
|
|
334
|
+
Permission.CreateNetworkDeviceLinkRule,
|
|
335
|
+
],
|
|
336
|
+
read: [
|
|
337
|
+
Permission.ProjectOwner,
|
|
338
|
+
Permission.ProjectAdmin,
|
|
339
|
+
Permission.ProjectMember,
|
|
340
|
+
Permission.Viewer,
|
|
341
|
+
Permission.ReadNetworkDeviceLinkRule,
|
|
342
|
+
],
|
|
343
|
+
update: [
|
|
344
|
+
Permission.ProjectOwner,
|
|
345
|
+
Permission.ProjectAdmin,
|
|
346
|
+
Permission.EditNetworkDeviceLinkRule,
|
|
347
|
+
],
|
|
348
|
+
}),
|
|
349
|
+
TableColumn({
|
|
350
|
+
required: false,
|
|
351
|
+
type: TableColumnType.ShortText,
|
|
352
|
+
canReadOnRelationQuery: true,
|
|
353
|
+
title: "Parent Scope",
|
|
354
|
+
description: "How wide the 'exactly one parent device' question is asked. Project (the default) looks for one parent across the whole project. Site asks once per site, so the same rule can draw an uplink in every building. Rules created before this existed are Project.",
|
|
355
|
+
example: "Project",
|
|
356
|
+
}),
|
|
357
|
+
Column({
|
|
358
|
+
nullable: true,
|
|
359
|
+
type: ColumnType.ShortText,
|
|
360
|
+
length: ColumnLength.ShortText,
|
|
361
|
+
default: NetworkDeviceLinkRuleScope.Project,
|
|
362
|
+
}),
|
|
363
|
+
__metadata("design:type", String)
|
|
364
|
+
], NetworkDeviceLinkRule.prototype, "scope", void 0);
|
|
318
365
|
__decorate([
|
|
319
366
|
ColumnAccessControl({
|
|
320
367
|
create: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkDeviceLinkRule.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/NetworkDeviceLinkRule.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,mBAAmB,MAAM,0CAA0C,CAAC;AAC3E,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,GACV,MAAM,SAAS,CAAC;AAEjB
|
|
1
|
+
{"version":3,"file":"NetworkDeviceLinkRule.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/NetworkDeviceLinkRule.ts"],"names":[],"mappings":"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"}
|
|
@@ -948,7 +948,7 @@ __decorate([
|
|
|
948
948
|
required: false,
|
|
949
949
|
type: TableColumnType.HTML,
|
|
950
950
|
title: "Header HTML",
|
|
951
|
-
description: "Status Page Custom HTML Header",
|
|
951
|
+
description: "Status Page Custom HTML Header. Served only from a verified custom domain.",
|
|
952
952
|
}),
|
|
953
953
|
Column({
|
|
954
954
|
nullable: true,
|
|
@@ -994,7 +994,7 @@ __decorate([
|
|
|
994
994
|
required: false,
|
|
995
995
|
type: TableColumnType.HTML,
|
|
996
996
|
title: "Footer HTML",
|
|
997
|
-
description: "Status Page Custom HTML Footer",
|
|
997
|
+
description: "Status Page Custom HTML Footer. Served only from a verified custom domain.",
|
|
998
998
|
}),
|
|
999
999
|
Column({
|
|
1000
1000
|
nullable: true,
|
|
@@ -1040,7 +1040,7 @@ __decorate([
|
|
|
1040
1040
|
required: false,
|
|
1041
1041
|
type: TableColumnType.CSS,
|
|
1042
1042
|
title: "CSS",
|
|
1043
|
-
description: "Status Page Custom CSS
|
|
1043
|
+
description: "Status Page Custom CSS. Served only from a verified custom domain.",
|
|
1044
1044
|
}),
|
|
1045
1045
|
Column({
|
|
1046
1046
|
nullable: true,
|
|
@@ -1086,7 +1086,7 @@ __decorate([
|
|
|
1086
1086
|
required: false,
|
|
1087
1087
|
type: TableColumnType.JavaScript,
|
|
1088
1088
|
title: "JavaScript",
|
|
1089
|
-
description: "Status Page Custom JavaScript. This runs when the status page is loaded.",
|
|
1089
|
+
description: "Status Page Custom JavaScript. This runs when the status page is loaded from a verified custom domain.",
|
|
1090
1090
|
}),
|
|
1091
1091
|
Column({
|
|
1092
1092
|
nullable: true,
|