@oneuptime/common 12.0.10 → 12.0.12
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/NetworkDevice.ts +44 -0
- package/Models/DatabaseModels/NetworkDeviceLink.ts +116 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787400000000-AddDeviceRoleAndDeclaredLinkParent.ts +52 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +2 -0
- package/Server/Services/NetworkDeviceLinkService.ts +338 -2
- package/Server/Types/Billing/MeteredPlan/AllMeteredPlans.ts +19 -5
- package/Server/Types/Database/JSONColumnQuery.ts +42 -4
- package/Server/Types/Workflow/Components/Conditions/IfElse.ts +9 -0
- package/Server/Types/Workflow/Components/JavaScript.ts +9 -0
- package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts +12 -0
- package/Server/Utils/Telemetry/InventoryEntityRegistry.ts +186 -38
- package/Server/Utils/VM/VMRunner.ts +693 -874
- package/Tests/App/Dashboard/AdminNotificationRulesPage.test.tsx +420 -112
- package/Tests/App/Dashboard/PayAsYouGoConsentGate.test.tsx +543 -0
- package/Tests/App/Dashboard/PayAsYouGoFreePlan.test.ts +125 -0
- package/Tests/App/Dashboard/PayAsYouGoNotices.test.tsx +612 -0
- package/Tests/App/Dashboard/SloWidgetChartRendering.test.tsx +536 -0
- package/Tests/Models/AnalyticsModels/CommonModel.test.ts +312 -0
- package/Tests/Server/Infrastructure/Postgres/DeviceRoleAndDeclaredLinkParentMigration.test.ts +250 -0
- package/Tests/Server/Infrastructure/Postgres/EpisodeMemberNotifyIndexesMigration.test.ts +46 -18
- package/Tests/Server/Services/NetworkDeviceLinkParentValidation.test.ts +1043 -0
- package/Tests/Server/Types/Billing/PayAsYouGoMeteredPricing.test.ts +125 -0
- package/Tests/Server/Types/Database/JSONColumnQuery.test.ts +508 -0
- package/Tests/Server/Types/Workflow/Components/CustomCodeScriptError.test.ts +121 -0
- package/Tests/Server/Utils/Monitor/MonitorCriteriaEvaluatorJavascriptExpression.test.ts +92 -0
- package/Tests/Server/Utils/Telemetry/InventoryEntityRegistry.test.ts +668 -0
- package/Tests/Server/Utils/VM/VMRunnerIsolation.test.ts +385 -0
- package/Tests/Server/Utils/VM/VMRunnerSsrf.test.ts +3 -0
- package/Tests/Types/Billing/PayAsYouGoPricing.test.ts +64 -0
- package/Tests/Types/CustomField/CustomFieldTypeCorrespondence.test.ts +107 -0
- package/Tests/Types/Monitor/MonitorType.test.ts +62 -0
- package/Tests/UI/Components/Charts/ChartXAxisDataKey.test.tsx +256 -0
- package/Tests/UI/Components/Charts/DataPointUtil.test.ts +323 -0
- package/Tests/UI/Components/ModelTable/CustomFieldColumns.test.tsx +349 -1
- package/Tests/Utils/Monitor/NetworkDeviceRoleUtil.test.ts +502 -0
- package/Tests/Utils/Monitor/NetworkTopologyDeclaredHierarchy.test.ts +759 -0
- package/Tests/Utils/Schema/BaseSchema.test.ts +651 -0
- package/Types/Billing/PayAsYouGoPricing.ts +47 -0
- package/Types/CustomField/CustomFieldType.ts +28 -0
- package/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse.ts +14 -2
- package/Types/Monitor/MonitorType.ts +11 -0
- package/Types/Monitor/SnmpMonitor/NetworkTopology.ts +13 -0
- package/UI/Components/Charts/Area/AreaChart.tsx +4 -2
- package/UI/Components/Charts/Bar/BarChart.tsx +4 -2
- package/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.ts +13 -0
- package/UI/Components/Charts/Line/LineChart.tsx +4 -2
- package/UI/Components/Charts/Types/XAxis/XAxis.ts +6 -0
- package/UI/Components/Charts/Utils/DataPoint.ts +15 -12
- package/UI/Components/ModelTable/CustomFieldColumns.tsx +55 -0
- package/Utils/Monitor/NetworkDeviceRoleUtil.ts +45 -0
- package/Utils/Monitor/NetworkTopologyUtil.ts +42 -2
- package/build/dist/Models/DatabaseModels/NetworkDevice.js +45 -0
- package/build/dist/Models/DatabaseModels/NetworkDevice.js.map +1 -1
- package/build/dist/Models/DatabaseModels/NetworkDeviceLink.js +115 -0
- package/build/dist/Models/DatabaseModels/NetworkDeviceLink.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787400000000-AddDeviceRoleAndDeclaredLinkParent.js +33 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787400000000-AddDeviceRoleAndDeclaredLinkParent.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +2 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Services/NetworkDeviceLinkService.js +253 -1
- package/build/dist/Server/Services/NetworkDeviceLinkService.js.map +1 -1
- package/build/dist/Server/Types/Billing/MeteredPlan/AllMeteredPlans.js +12 -5
- package/build/dist/Server/Types/Billing/MeteredPlan/AllMeteredPlans.js.map +1 -1
- package/build/dist/Server/Types/Database/JSONColumnQuery.js +40 -4
- package/build/dist/Server/Types/Database/JSONColumnQuery.js.map +1 -1
- package/build/dist/Server/Types/Workflow/Components/Conditions/IfElse.js +8 -0
- package/build/dist/Server/Types/Workflow/Components/Conditions/IfElse.js.map +1 -1
- package/build/dist/Server/Types/Workflow/Components/JavaScript.js +8 -0
- package/build/dist/Server/Types/Workflow/Components/JavaScript.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js +12 -1
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js.map +1 -1
- package/build/dist/Server/Utils/Telemetry/InventoryEntityRegistry.js +128 -35
- package/build/dist/Server/Utils/Telemetry/InventoryEntityRegistry.js.map +1 -1
- package/build/dist/Server/Utils/VM/VMRunner.js +402 -525
- package/build/dist/Server/Utils/VM/VMRunner.js.map +1 -1
- package/build/dist/Types/Billing/PayAsYouGoPricing.js +41 -0
- package/build/dist/Types/Billing/PayAsYouGoPricing.js.map +1 -0
- package/build/dist/Types/CustomField/CustomFieldType.js +26 -0
- package/build/dist/Types/CustomField/CustomFieldType.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorType.js +10 -0
- package/build/dist/Types/Monitor/MonitorType.js.map +1 -1
- package/build/dist/UI/Components/Charts/Area/AreaChart.js +2 -1
- package/build/dist/UI/Components/Charts/Area/AreaChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/Bar/BarChart.js +2 -1
- package/build/dist/UI/Components/Charts/Bar/BarChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.js +12 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.js.map +1 -1
- package/build/dist/UI/Components/Charts/Line/LineChart.js +2 -1
- package/build/dist/UI/Components/Charts/Line/LineChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/Utils/DataPoint.js +17 -10
- package/build/dist/UI/Components/Charts/Utils/DataPoint.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js +42 -0
- package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js.map +1 -1
- package/build/dist/Utils/Monitor/NetworkDeviceRoleUtil.js +37 -0
- package/build/dist/Utils/Monitor/NetworkDeviceRoleUtil.js.map +1 -1
- package/build/dist/Utils/Monitor/NetworkTopologyUtil.js +25 -3
- package/build/dist/Utils/Monitor/NetworkTopologyUtil.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B;;;;;;;;;OASG;IACK,MAAM,CAAC,0BAA0B,CAAC,IAIzC;;QACC,MAAM,OAAO,GACX,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAG,SAAS,CAAC,CAAA,KAAK,QAAQ;YAC1C,CAAC,CAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAY;YACpC,CAAC,CAAC,EAAE,CAAC;QAET,IAAI,MAAM,GAAW,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,SAAS,GAAY,MAAA,IAAI,CAAC,MAAM,0CAAG,KAAK,CAAC,CAAC;YAChD,MAAM,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9D,CAAC;QAED,IAAI,QAAQ,GAAW,MAAM,CAAC;QAE9B,MAAM,gBAAgB,GAAW,eAAe,CAAC;QAEjD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACxE,CAAC;YACD,QAAQ,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAMpC;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC/B,MAAM,OAAO,GAAW,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;QAEhD,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,eAAe,GAAqB,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAW,GAAG,CAAC;QAChC,MAAM,gBAAgB,GAAW,IAAI,CAAC;QACtC,MAAM,aAAa,GAAW,OAAS,CAAC;QACxC,MAAM,+BAA+B,GAAW,KAAM,CAAC;QACvD,IAAI,QAAQ,GAAW,CAAC,CAAC;QAEzB,MAAM,mBAAmB,GACvB,IAAI,GAAG,EAAwC,CAAC;QAClD,MAAM,uBAAuB,GAC3B,IAAI,GAAG,EAAmB,CAAC;QAC7B,IAAI,uBAAuB,GAAY,IAAI,CAAC;QAK5C,MAAM,sBAAsB,GAAuC,IAAI,GAAG,EAGvE,CAAC;QACJ,IAAI,oBAAoB,GAAW,CAAC,CAAC;QAKrC,MAAM,sBAAsB,GAAuC,IAAI,GAAG,EAGvE,CAAC;QACJ,IAAI,oBAAoB,GAAW,CAAC,CAAC;QAErC,MAAM,mBAAmB,GAA8B,CACrD,KAAc,EACP,EAAE;YACT,IAAI,OAAO,GAAW,uBAAuB,CAAC;YAE9C,IAAI,CAAC;gBACH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,OAAO,GAAG,KAAK,CAAC;gBAClB,CAAC;qBAAM,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9C,MAAM,gBAAgB,GAAa,KAA+B,CAChE,SAAS,CACV,CAAC;oBAEF,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;wBACzC,OAAO,GAAG,gBAAgB,CAAC;oBAC7B,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,WAAM,CAAC;gBACP,yEAAyE;YAC3E,CAAC;YAED,IAAI,gBAAgB,GAAW,EAAE,CAAC;YAElC,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;gBAChC,MAAM,aAAa,GAAW,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAEtD,IACE,aAAa,KAAK,CAAC;oBACnB,aAAa,KAAK,EAAE;oBACpB,aAAa,KAAK,EAAE;oBACpB,CAAC,aAAa,IAAI,EAAE,IAAI,aAAa,KAAK,GAAG,CAAC,EAC9C,CAAC;oBACD,gBAAgB,IAAI,SAAS,CAAC;gBAChC,CAAC;gBAED,IAAI,gBAAgB,CAAC,MAAM,IAAI,+BAA+B,EAAE,CAAC;oBAC/D,MAAM;gBACR,CAAC;YACH,CAAC;YAED,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,+BAA+B,CAAC,CAAC;YAEzE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,uBAAuB,CAAC;YACpC,CAAC;YAED;;;eAGG;YACH,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;QAEnE,IAAI,CAAC;YACH,MAAM,OAAO,GAAgB,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,MAAM,IAAI,GAA2C,OAAO,CAAC,MAAM,CAAC;YAEpE,uBAAuB;YACvB,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAE3C;;;;eAIG;YACH,MAAM,IAAI,CAAC,GAAG,CACZ,4BAA4B,EAC5B,IAAI,GAAG,CAAC,QAAQ,CACd,CAAC,OAAe,EAAE,EAAE;gBAClB,IAAI,WAAW,CAAC,MAAM,IAAI,gBAAgB,EAAE,CAAC;oBAC3C,OAAO;gBACT,CAAC;gBAED,MAAM,YAAY,GAAW,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAEhE,IAAI,QAAQ,GAAG,YAAY,GAAG,aAAa,EAAE,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBAED,QAAQ,IAAI,YAAY,CAAC;gBACzB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CACF,CAAC;YAEF,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqClB,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,GAAG,CACZ,+BAA+B,EAC/B,IAAI,GAAG,CAAC,QAAQ,CACd,CAAC,IAAY,EAAE,KAAa,EAAE,cAAuB,EAAE,EAAE;gBACvD,IAAI,eAAe,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;oBAC1C,OAAO;gBACT,CAAC;gBACD,MAAM,QAAQ,GAAW,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACpB,OAAO;gBACT,CAAC;gBACD,MAAM,MAAM,GAAmB;oBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC;oBACpC,KAAK,EAAE,QAAQ;iBAChB,CAAC;gBACF,IAAI,cAAc,EAAE,CAAC;oBACnB,IAAI,CAAC;wBACH,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAe,CAAC;oBAC/D,CAAC;oBAAC,WAAM,CAAC;wBACP,sBAAsB;oBACxB,CAAC;gBACH,CAAC;gBACD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/B,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CACF,CAAC;YAEF,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;OAoBlB,CAAC,CAAC;YAEH,gCAAgC;YAChC,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE;gBAC1D,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;OAUlB,CAAC,CAAC;YAEH;;;;eAIG;YACH,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;OAiBlB,CAAC,CAAC;YAEH;;;;;;;eAOG;YACH,MAAM,mBAAmB,GAMF,KAAK,EAC1B,MAAmB,EACnB,MAAc,EACd,GAAW,EACX,IAAa,EACb,IAAa,EACI,EAAE;gBACnB,MAAM,eAAe,GAAa,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC3D,MAAM,OAAO,GAAY,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAE1D;;;mBAGG;gBACH,MAAM,IAAI,GACR,OAAO,IAAI,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEjE,MAAM,SAAS,GAAuB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC5D,IAAI,MAAM,GAA2B,SAAS;oBAC5C,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAgB;oBACvC,CAAC,CAAC,SAAS,CAAC;gBAEd,6DAA6D;gBAC7D,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,gBAAgB,GAA2B,MAAM,CACrD,YAAY,CACa,CAAC;oBAE5B,IACE,gBAAgB;wBAChB,gBAAgB,CAAC,aAAa,CAAC,KAAK,iBAAiB,EACrD,CAAC;wBACD,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CACpC,gBAAgB,CAAC,SAAS,CAAuB,CACzB,CAAC;oBAC7B,CAAC;oBAED,MAAM,eAAe,GAA2B,MAAM,CACpD,WAAW,CACc,CAAC;oBAE5B,IACE,eAAe;wBACf,eAAe,CAAC,aAAa,CAAC,KAAK,gBAAgB,EACnD,CAAC;wBACD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAClC,eAAe,CAAC,SAAS,CAAsB,CACvB,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBAED;;;mBAGG;gBACH,MAAM,cAAc,GAAkD,CACpE,OAAgB,EACS,EAAE;oBAC3B,MAAM,KAAK,GAA4B,EAAE,CAAC;oBAC1C,IAAI,OAAO,EAAE,CAAC;wBACZ,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAC5B,OAAkC,CACnC,EAAE,CAAC;4BACF,KAAK,CAAC,IAAI,CAAC,GAAI,OAAmC,CAAC,IAAI,CAAC,CAAC;wBAC3D,CAAC;oBACH,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC;gBAEF;;;;;;;;;;;;;;mBAcG;gBACH,MAAM,YAAY,GAAW,QAAQ,CAAC,0BAA0B,CAAC;oBAC/D,MAAM;oBACN,GAAG;oBACH,MAAM;iBACP,CAAC,CAAC;gBAEH,MAAM,cAAc,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC;gBAE/D;;;;;;;;;mBASG;gBACH,MAAM,UAAU,GAAe,MAAM,IAAI,EAAE,CAAC;gBAC5C,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;gBAChC,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC;gBAC/B,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC7B,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBAC/B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,EAAE;oBAC1C,KAAK,EAAE,MAAM;oBACb,UAAU,EAAE,IAAI;oBAChB,YAAY,EAAE,IAAI;iBACnB,CAAC,CAAC;gBACH,MAAM,GAAG,UAAU,CAAC;gBAEpB,IAAI,CAAC;oBACH,IAAI,QAAuB,CAAC;oBAE5B,QAAQ,MAAM,EAAE,CAAC;wBACf,KAAK,KAAK;4BACR,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BACxC,MAAM;wBACR,KAAK,MAAM;4BACT,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BACzC,MAAM;wBACR,KAAK,SAAS;4BACZ,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BAC5C,MAAM;wBACR,KAAK,MAAM;4BACT,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BAC/C,MAAM;wBACR,KAAK,KAAK;4BACR,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BAC9C,MAAM;wBACR,KAAK,OAAO;4BACV,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;4BAChD,MAAM;wBACR,KAAK,QAAQ;4BACX,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BAC3C,MAAM;wBACR,KAAK,SAAS;4BACZ,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAC5B,MAA6C,CAC9C,CAAC;4BACF,MAAM;wBACR;4BACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;oBAC1D,CAAC;oBAED;;;;;uBAKG;oBACH,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;wBACzC,IAAI,EAAE,QAAQ,CAAC,IAAI;qBACpB,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAY,EAAE,CAAC;oBACtB;;;;uBAIG;oBACH,MAAM,QAAQ,GAIV,GAIH,CAAC;oBAEF,IAAI,QAAQ,CAAC,YAAY,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBAC/C,OAAO,IAAI,CAAC,SAAS,CAAC;4BACpB,cAAc,EAAE,IAAI;4BACpB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,gBAAgB;4BAC7C,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;4BAChC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU;4BACxC,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;4BAClD,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;yBAC7B,CAAC,CAAC;oBACL,CAAC;oBAED,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;YAEF,MAAM,kBAAkB,GAEpB,IAAI,GAAG,CAAC,QAAQ,CAClB,CAAC,MAAc,EAAE,GAAW,EAAE,IAAa,EAAE,IAAa,EAAU,EAAE;gBACpE,MAAM,WAAW,GAAW,MAAM,CAAC,EAAE,oBAAoB,CAAC,CAAC;gBAE3D,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,IAAI,sBAAsB,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;oBACvC,sBAAsB,CAAC,GAAG,CAAC,WAAW,EAAE;wBACtC,MAAM,EAAE,UAAU;wBAClB,YAAY,EAAE,gCAAgC;qBAC/C,CAAC,CAAC;oBACH,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,sBAAsB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC/D,MAAM,eAAe,GAAoB,IAAI,eAAe,EAAE,CAAC;gBAC/D,uBAAuB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC7C,KAAK,mBAAmB,CACtB,eAAe,CAAC,MAAM,EACtB,MAAM,EACN,GAAG,EACH,IAAI,EACJ,IAAI,CACL;qBACE,IAAI,CACH,CAAC,KAAa,EAAE,EAAE;oBAChB,IAAI,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC5C,sBAAsB,CAAC,GAAG,CAAC,WAAW,EAAE;4BACtC,MAAM,EAAE,WAAW;4BACnB,KAAK;yBACN,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,EACD,CAAC,KAAc,EAAE,EAAE;oBACjB,IAAI,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC5C,sBAAsB,CAAC,GAAG,CAAC,WAAW,EAAE;4BACtC,MAAM,EAAE,UAAU;4BAClB,YAAY,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,OAAO;yBACjD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CACF;qBACA,OAAO,CAAC,GAAG,EAAE;oBACZ,uBAAuB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEL,OAAO,WAAW,CAAC;YACrB,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YAEF,MAAM,iBAAiB,GACrB,IAAI,GAAG,CAAC,QAAQ,CACd,CAAC,WAAmB,EAAU,EAAE;gBAC9B,MAAM,SAAS,GACb,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,UAAU;wBAClB,YAAY,EAAE,oCAAoC;qBACnD,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACnC,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC;gBAED,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YAEJ,MAAM,IAAI,CAAC,GAAG,CAAC,mCAAmC,EAAE,kBAAkB,CAAC,CAAC;YACxE,MAAM,IAAI,CAAC,GAAG,CAAC,kCAAkC,EAAE,iBAAiB,CAAC,CAAC;YAEtE,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmKlB,CAAC,CAAC;YAEH,sEAAsE;YACtE,MAAM,cAAc,GAEhB,IAAI,GAAG,CAAC,QAAQ,CAClB,CAAC,EAAU,EAAE,GAAG,IAAc,EAAU,EAAE;gBACxC,QAAQ,EAAE,EAAE,CAAC;oBACX,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;wBAC9C,OAAO,MAAM;6BACV,UAAU,CAAC,SAAU,CAAC;6BACtB,MAAM,CAAC,SAAU,CAAC;6BAClB,MAAM,CAAE,QAAwC,IAAI,KAAK,CAAC,CAAC;oBAChE,CAAC;oBACD,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;wBACnD,OAAO,MAAM;6BACV,UAAU,CAAC,SAAU,EAAE,GAAI,CAAC;6BAC5B,MAAM,CAAC,SAAU,CAAC;6BAClB,MAAM,CAAE,QAAwC,IAAI,KAAK,CAAC,CAAC;oBAChE,CAAC;oBACD,KAAK,aAAa,CAAC,CAAC,CAAC;wBACnB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;wBACpB,OAAO,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAC7D,CAAC;oBACD,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;oBAC7B,CAAC;oBACD,KAAK,WAAW,CAAC,CAAC,CAAC;wBACjB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;wBACxB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAI,CAAC,EAAE,QAAQ,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC;oBAClE,CAAC;oBACD;wBACE,MAAM,IAAI,KAAK,CAAC,iCAAiC,EAAE,EAAE,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;YAEF,MAAM,IAAI,CAAC,GAAG,CAAC,+BAA+B,EAAE,cAAc,CAAC,CAAC;YAEhE,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkClB,CAAC,CAAC;YAEH,mEAAmE;YACnE,MAAM,kBAAkB,GACtB,IAAI,GAAG,CAAC,QAAQ,CACd,CAAC,EAAU,EAAU,EAAE;gBACrB,MAAM,WAAW,GAAW,MAAM,CAAC,EAAE,oBAAoB,CAAC,CAAC;gBAE3D,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,MAAM,YAAY,GAAW,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,MAAM,YAAY,GAAW,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;oBACxD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAC9C,CAAC,CAAC,CAAC,CAAC;gBACN,MAAM,aAAa,GACjB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;oBACrB,MAAM,SAAS,GACb,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAE1C,IAAI,SAAS,EAAE,CAAC;wBACd,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;oBAC3B,CAAC;oBACD,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC5C,CAAC,EAAE,YAAY,CAAC,CAAC;gBAEnB,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBACvC,sBAAsB,CAAC,GAAG,CAAC,WAAW,EAAE;oBACtC,OAAO,EAAE,KAAK;iBACf,CAAC,CAAC;gBAEH,OAAO,WAAW,CAAC;YACrB,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YAEJ,MAAM,iBAAiB,GACrB,IAAI,GAAG,CAAC,QAAQ,CACd,CAAC,WAAmB,EAAW,EAAE;gBAC/B,MAAM,SAAS,GACb,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAE1C,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;oBACpC,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBAC3C,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YAEJ,MAAM,IAAI,CAAC,GAAG,CAAC,mCAAmC,EAAE,kBAAkB,CAAC,CAAC;YACxE,MAAM,IAAI,CAAC,GAAG,CAAC,kCAAkC,EAAE,iBAAiB,CAAC,CAAC;YAEtE,MAAM,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8DlB,CAAC,CAAC;YAEH;;;;;eAKG;YACH,MAAM,WAAW,GAAW;;YAEtB,IAAI;;;;WAIL,CAAC;YAEN,IAAI,MAAe,CAAC;YACpB,IAAI,WAA8B,CAAC;YAEnC,IAAI,CAAC;gBACH,2DAA2D;gBAC3D,MAAM,aAAa,GAAqB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE;oBAChE,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,OAAO;iBACjB,CAAC,CAAC;gBAEH,MAAM,cAAc,GAAmB,IAAI,OAAO,CAChD,CACE,QAAgC,EAChC,MAA+B,EAC/B,EAAE;oBACF,MAAM,aAAa,GACjB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;wBACrB,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAC1C,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;oBAClD,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,yCAAyC;oBAE/D,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBACzC,CAAC,CACF,CAAC;gBAEF,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;YAC/D,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YAED,yDAAyD;YACzD,IAAI,WAAoB,CAAC;YAEzB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,IAAI,CAAC;oBACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnC,CAAC;gBAAC,WAAM,CAAC;oBACP,WAAW,GAAG,MAAM,CAAC;gBACvB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,MAAM,CAAC;YACvB,CAAC;YAED,OAAO;gBACL,WAAW;gBACX,WAAW;gBACX,eAAe;gBACf,WAAW;aACZ,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,uBAAuB,GAAG,KAAK,CAAC;YAEhC,KAAK,MAAM,aAAa,IAAI,mBAAmB,EAAE,CAAC;gBAChD,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;YACD,KAAK,MAAM,eAAe,IAAI,uBAAuB,EAAE,CAAC;gBACtD,eAAe,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC;YACD,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAC5B,uBAAuB,CAAC,KAAK,EAAE,CAAC;YAChC,sBAAsB,CAAC,KAAK,EAAE,CAAC;YAC/B,sBAAsB,CAAC,KAAK,EAAE,CAAC;YAE/B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxB,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAz9BqB;IADnB,WAAW,EAAE;;;;sCAy9Bb"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* The public pay-as-you-go rates, as advertised on
|
|
3
|
+
* https://oneuptime.com/pricing.
|
|
4
|
+
*
|
|
5
|
+
* These live in Types (and not next to the metered plans, which are
|
|
6
|
+
* server-only) because two very different places need the same numbers: the
|
|
7
|
+
* server meters and bills against them, and the dashboard has to tell a Free
|
|
8
|
+
* plan user what they are about to be charged before they commit to it. A
|
|
9
|
+
* price quoted in the product that disagrees with the price on the invoice is
|
|
10
|
+
* worse than quoting no price at all, so there is exactly one copy.
|
|
11
|
+
*/
|
|
12
|
+
// Telemetry ingest - logs, traces, metrics and profiles.
|
|
13
|
+
export const TELEMETRY_PRICE_IN_USD_PER_GB = 0.1;
|
|
14
|
+
/*
|
|
15
|
+
* Session replay recordings travel on the same ingestion key as the rest of
|
|
16
|
+
* telemetry but are priced well above it, on purpose - see
|
|
17
|
+
* SessionReplayDataIngestMeteredPlan. Anything that quotes "what this key
|
|
18
|
+
* costs" has to say both numbers, or it is quoting a rate 20x below what a
|
|
19
|
+
* replay-heavy project will actually be invoiced.
|
|
20
|
+
*/
|
|
21
|
+
export const SESSION_REPLAY_PRICE_IN_USD_PER_GB = 2;
|
|
22
|
+
// The retention the per-GB telemetry prices above are quoted for.
|
|
23
|
+
export const TELEMETRY_PRICE_RETENTION_IN_DAYS = 15;
|
|
24
|
+
/*
|
|
25
|
+
* Active monitoring. Every monitor except a Manual one is an active monitor -
|
|
26
|
+
* see MonitorTypeHelper.isBilledAsActiveMonitor.
|
|
27
|
+
*/
|
|
28
|
+
export const ACTIVE_MONITOR_PRICE_IN_USD_PER_MONTH = 1;
|
|
29
|
+
export const PRICING_PAGE_URL = "https://oneuptime.com/pricing";
|
|
30
|
+
/**
|
|
31
|
+
* Money as the pricing page writes it: `$1` rather than `$1.00`, but `$0.10`
|
|
32
|
+
* rather than `$0.1`. In-app copy that quotes a rate should read exactly like
|
|
33
|
+
* the page the user will check it against.
|
|
34
|
+
*/
|
|
35
|
+
export function formatPriceInUSD(amountInUSD) {
|
|
36
|
+
if (Number.isInteger(amountInUSD)) {
|
|
37
|
+
return `$${amountInUSD}`;
|
|
38
|
+
}
|
|
39
|
+
return `$${amountInUSD.toFixed(2)}`;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=PayAsYouGoPricing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PayAsYouGoPricing.js","sourceRoot":"","sources":["../../../../Types/Billing/PayAsYouGoPricing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,yDAAyD;AACzD,MAAM,CAAC,MAAM,6BAA6B,GAAW,GAAG,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAW,CAAC,CAAC;AAE5D,kEAAkE;AAClE,MAAM,CAAC,MAAM,iCAAiC,GAAW,EAAE,CAAC;AAE5D;;;GAGG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAW,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAW,+BAA+B,CAAC;AAExE;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,WAAmB;IAClD,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AACtC,CAAC"}
|
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* The member VALUES are load-bearing beyond this enum.
|
|
3
|
+
*
|
|
4
|
+
* CustomFieldsDetail passes a definition's `customFieldType` straight through
|
|
5
|
+
* as the `fieldType` of a Detail field and of a form field, so every member
|
|
6
|
+
* here has to name a member of BOTH `FieldType` (Detail) and
|
|
7
|
+
* `FormFieldSchemaType` (Forms) by value. `Boolean` is the standing example:
|
|
8
|
+
* it reaches the form as FormFieldSchemaType.Toggle, which is spelled
|
|
9
|
+
* `Toggle = "Boolean"` for exactly this reason.
|
|
10
|
+
*
|
|
11
|
+
* Adding a member without that correspondence compiles fine and then renders
|
|
12
|
+
* an empty cell and an input the user cannot type into.
|
|
13
|
+
*/
|
|
1
14
|
var CustomFieldType;
|
|
2
15
|
(function (CustomFieldType) {
|
|
3
16
|
CustomFieldType["Text"] = "Text";
|
|
@@ -5,6 +18,19 @@ var CustomFieldType;
|
|
|
5
18
|
CustomFieldType["Boolean"] = "Boolean";
|
|
6
19
|
CustomFieldType["Dropdown"] = "Dropdown";
|
|
7
20
|
CustomFieldType["MultiSelectDropdown"] = "MultiSelectDropdown";
|
|
21
|
+
/**
|
|
22
|
+
* A calendar date with no time of day — purchase date, warranty expiry,
|
|
23
|
+
* end-of-life. Stored in the `customFields` jsonb bag as an ISO-8601 string,
|
|
24
|
+
* which is what makes it comparable: ISO-8601 sorts identically as text and
|
|
25
|
+
* as an instant, so the range filters work over a jsonb key without a cast
|
|
26
|
+
* (see JSONColumnQuery.compareText).
|
|
27
|
+
*/
|
|
28
|
+
CustomFieldType["Date"] = "Date";
|
|
29
|
+
/**
|
|
30
|
+
* As `Date`, but the time of day is part of the answer — last audited at,
|
|
31
|
+
* decommissioned at.
|
|
32
|
+
*/
|
|
33
|
+
CustomFieldType["DateTime"] = "DateTime";
|
|
8
34
|
})(CustomFieldType || (CustomFieldType = {}));
|
|
9
35
|
export default CustomFieldType;
|
|
10
36
|
//# sourceMappingURL=CustomFieldType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomFieldType.js","sourceRoot":"","sources":["../../../../Types/CustomField/CustomFieldType.ts"],"names":[],"mappings":"AAAA,IAAK,
|
|
1
|
+
{"version":3,"file":"CustomFieldType.js","sourceRoot":"","sources":["../../../../Types/CustomField/CustomFieldType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,IAAK,eAqBJ;AArBD,WAAK,eAAe;IAClB,gCAAa,CAAA;IACb,oCAAiB,CAAA;IACjB,sCAAmB,CAAA;IACnB,wCAAqB,CAAA;IACrB,8DAA2C,CAAA;IAE3C;;;;;;OAMG;IACH,gCAAa,CAAA;IAEb;;;OAGG;IACH,wCAAqB,CAAA;AACvB,CAAC,EArBI,eAAe,KAAf,eAAe,QAqBnB;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -143,6 +143,16 @@ export class MonitorTypeHelper {
|
|
|
143
143
|
static isManualMonitor(monitorType) {
|
|
144
144
|
return monitorType === MonitorType.Manual;
|
|
145
145
|
}
|
|
146
|
+
/*
|
|
147
|
+
* Whether a monitor of this type adds to the project's Active Monitoring
|
|
148
|
+
* bill. Mirrors what the server actually meters -
|
|
149
|
+
* ActiveMonitoringMeteredPlan counts every monitor whose type is not
|
|
150
|
+
* Manual - so the dashboard can warn a Free plan user about a charge using
|
|
151
|
+
* the same rule that produces it. Manual monitors are free and unlimited.
|
|
152
|
+
*/
|
|
153
|
+
static isBilledAsActiveMonitor(monitorType) {
|
|
154
|
+
return !this.isManualMonitor(monitorType);
|
|
155
|
+
}
|
|
146
156
|
static getAllMonitorTypeProps() {
|
|
147
157
|
const monitorTypeProps = [
|
|
148
158
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MonitorType.js","sourceRoot":"","sources":["../../../../Types/Monitor/MonitorType.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MonitorType.js","sourceRoot":"","sources":["../../../../Types/Monitor/MonitorType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AreaChart } from "../ChartLibrary/AreaChart/AreaChart";
|
|
2
2
|
import React, { useEffect, useMemo, } from "react";
|
|
3
3
|
import ChartCurve from "../Types/ChartCurve";
|
|
4
|
+
import { CHART_DATA_POINT_X_AXIS_KEY, } from "../ChartLibrary/Types/ChartDataPoint";
|
|
4
5
|
import DataPointUtil from "../Utils/DataPoint";
|
|
5
6
|
import TimeAnnotationUtil from "../Utils/TimeAnnotation";
|
|
6
7
|
import XAxisUtil from "../Utils/XAxis";
|
|
@@ -93,7 +94,7 @@ const AreaChartElement = (props) => {
|
|
|
93
94
|
const minValueProp = typeof yAxisMinOption === "number" ? { minValue: yAxisMinOption } : {};
|
|
94
95
|
const maxValueProp = typeof yAxisMaxOption === "number" ? { maxValue: yAxisMaxOption } : {};
|
|
95
96
|
return (React.createElement("div", { className: "relative flex flex-1", style: props.heightInPx ? { height: `${props.heightInPx}px` } : undefined },
|
|
96
|
-
React.createElement(AreaChart, Object.assign({ data: records, tickGap: 30, index:
|
|
97
|
+
React.createElement(AreaChart, Object.assign({ data: records, tickGap: 30, index: CHART_DATA_POINT_X_AXIS_KEY, categories: categories, colors: props.colors && props.colors.length > 0
|
|
97
98
|
? props.colors
|
|
98
99
|
: AreaChartPalette, valueFormatter: props.yAxis.options.formatter || undefined, showTooltip: true, showLegend: props.showLegend !== false, connectNulls: true, curve: props.curve || ChartCurve.MONOTONE, syncid: props.sync ? props.syncid : undefined, yAxisWidth: 64, autoMinValue: autoMinValue }, minValueProp, maxValueProp, { onValueChange: () => { }, referenceLines: props.referenceLines, formattedTimeReferenceLines: formattedTimeReferenceLines.length > 0
|
|
99
100
|
? formattedTimeReferenceLines
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AreaChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Area/AreaChart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAKhE,OAAO,KAAK,EAAE,EAGZ,SAAS,EACT,OAAO,GACR,MAAM,OAAO,CAAC;AAIf,OAAO,UAAU,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AreaChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Area/AreaChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BarChart } from "../ChartLibrary/BarChart/BarChart";
|
|
2
2
|
import React, { useEffect, useMemo, } from "react";
|
|
3
|
+
import { CHART_DATA_POINT_X_AXIS_KEY, } from "../ChartLibrary/Types/ChartDataPoint";
|
|
3
4
|
import DataPointUtil from "../Utils/DataPoint";
|
|
4
5
|
import TimeAnnotationUtil from "../Utils/TimeAnnotation";
|
|
5
6
|
import NoDataMessage from "../ChartGroup/NoDataMessage";
|
|
@@ -52,7 +53,7 @@ const BarChartElement = (props) => {
|
|
|
52
53
|
return series.data.length === 0;
|
|
53
54
|
});
|
|
54
55
|
return (React.createElement("div", { className: "relative flex flex-1", style: props.heightInPx ? { height: `${props.heightInPx}px` } : undefined },
|
|
55
|
-
React.createElement(BarChart, { data: records, tickGap: 30, index:
|
|
56
|
+
React.createElement(BarChart, { data: records, tickGap: 30, index: CHART_DATA_POINT_X_AXIS_KEY, categories: categories, colors: props.colors && props.colors.length > 0
|
|
56
57
|
? props.colors
|
|
57
58
|
: BarChartPalette, valueFormatter: props.yAxis.options.formatter || undefined, showTooltip: true, showLegend: props.showLegend !== false, yAxisWidth: 64, syncid: props.sync ? props.syncid : undefined, onValueChange: () => { }, referenceLines: props.referenceLines, formattedTimeReferenceLines: formattedTimeReferenceLines.length > 0
|
|
58
59
|
? formattedTimeReferenceLines
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BarChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Bar/BarChart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAK7D,OAAO,KAAK,EAAE,EAGZ,SAAS,EACT,OAAO,GACR,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BarChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Bar/BarChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,16 @@
|
|
|
4
4
|
* is never rendered as a series (only `categories` keys are drawn).
|
|
5
5
|
*/
|
|
6
6
|
export const CHART_DATA_POINT_DATE_KEY = "__date";
|
|
7
|
+
/**
|
|
8
|
+
* Per-row field carrying the FORMATTED x-axis label.
|
|
9
|
+
*
|
|
10
|
+
* This is the recharts `XAxis` dataKey — the Line / Bar / Area wrappers all
|
|
11
|
+
* pass it down as their `index` prop. `DataPointUtil` must therefore write
|
|
12
|
+
* the label under exactly this key: a row keyed anything else leaves every
|
|
13
|
+
* point with an undefined category, and recharts then draws no line, bar or
|
|
14
|
+
* area at all (the axes and grid still render, so the chart looks alive but
|
|
15
|
+
* empty). Keeping the single constant on both sides is what stops that from
|
|
16
|
+
* being an invisible coupling between two distant files.
|
|
17
|
+
*/
|
|
18
|
+
export const CHART_DATA_POINT_X_AXIS_KEY = "Time";
|
|
7
19
|
//# sourceMappingURL=ChartDataPoint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartDataPoint.js","sourceRoot":"","sources":["../../../../../../../UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAW,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"ChartDataPoint.js","sourceRoot":"","sources":["../../../../../../../UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAW,QAAQ,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAW,MAAM,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { LineChart } from "../ChartLibrary/LineChart/LineChart";
|
|
2
2
|
import React, { useEffect, useMemo, } from "react";
|
|
3
|
+
import { CHART_DATA_POINT_X_AXIS_KEY, } from "../ChartLibrary/Types/ChartDataPoint";
|
|
3
4
|
import DataPointUtil from "../Utils/DataPoint";
|
|
4
5
|
import TimeAnnotationUtil from "../Utils/TimeAnnotation";
|
|
5
6
|
import XAxisUtil from "../Utils/XAxis";
|
|
@@ -82,7 +83,7 @@ const LineChartElement = (props) => {
|
|
|
82
83
|
const minValueProp = typeof yAxisMinOption === "number" ? { minValue: yAxisMinOption } : {};
|
|
83
84
|
const maxValueProp = typeof yAxisMaxOption === "number" ? { maxValue: yAxisMaxOption } : {};
|
|
84
85
|
return (React.createElement("div", { className: "relative flex flex-1", style: props.heightInPx ? { height: `${props.heightInPx}px` } : undefined },
|
|
85
|
-
React.createElement(LineChart, Object.assign({ data: records, tickGap: 30, index:
|
|
86
|
+
React.createElement(LineChart, Object.assign({ data: records, tickGap: 30, index: CHART_DATA_POINT_X_AXIS_KEY, categories: categories, colors: props.colors && props.colors.length > 0
|
|
86
87
|
? props.colors
|
|
87
88
|
: LineChartPalette, valueFormatter: props.yAxis.options.formatter || undefined, showTooltip: true, showLegend: props.showLegend !== false, connectNulls: true, curve: props.curve, syncid: props.sync ? props.syncid : undefined, yAxisWidth: 64, autoMinValue: autoMinValue }, minValueProp, maxValueProp, { onValueChange: () => { }, referenceLines: props.referenceLines, formattedTimeReferenceLines: formattedTimeReferenceLines.length > 0
|
|
88
89
|
? formattedTimeReferenceLines
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Line/LineChart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAKhE,OAAO,KAAK,EAAE,EAGZ,SAAS,EACT,OAAO,GACR,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Line/LineChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,20 +7,19 @@
|
|
|
7
7
|
* }
|
|
8
8
|
*/
|
|
9
9
|
import BadDataException from "../../../../Types/Exception/BadDataException";
|
|
10
|
-
import { CHART_DATA_POINT_DATE_KEY, } from "../ChartLibrary/Types/ChartDataPoint";
|
|
10
|
+
import { CHART_DATA_POINT_DATE_KEY, CHART_DATA_POINT_X_AXIS_KEY, } from "../ChartLibrary/Types/ChartDataPoint";
|
|
11
11
|
import { XAxisAggregateType } from "../Types/XAxis/XAxis";
|
|
12
12
|
import XAxisUtil from "./XAxis";
|
|
13
13
|
export default class DataPointUtil {
|
|
14
14
|
static getChartDataPoints(data) {
|
|
15
|
-
const {
|
|
16
|
-
const arrayOfData = this.initializeArrayOfData(intervals,
|
|
17
|
-
this.processSeriesData(data.seriesPoints, arrayOfData,
|
|
15
|
+
const { intervals, formatter } = this.initializeXAxisData(data.xAxis);
|
|
16
|
+
const arrayOfData = this.initializeArrayOfData(intervals, formatter);
|
|
17
|
+
this.processSeriesData(data.seriesPoints, arrayOfData, formatter, data.xAxis.options.aggregateType);
|
|
18
18
|
return arrayOfData;
|
|
19
19
|
}
|
|
20
20
|
static initializeXAxisData(xAxis) {
|
|
21
21
|
const xAxisMax = xAxis.options.max;
|
|
22
22
|
const xAxisMin = xAxis.options.min;
|
|
23
|
-
const xAxisLegend = xAxis.legend;
|
|
24
23
|
const intervals = XAxisUtil.getPrecisionIntervals({
|
|
25
24
|
xAxisMax,
|
|
26
25
|
xAxisMin,
|
|
@@ -29,13 +28,21 @@ export default class DataPointUtil {
|
|
|
29
28
|
xAxisMax,
|
|
30
29
|
xAxisMin,
|
|
31
30
|
});
|
|
32
|
-
return { xAxisMax, xAxisMin,
|
|
31
|
+
return { xAxisMax, xAxisMin, intervals, formatter };
|
|
33
32
|
}
|
|
34
|
-
static initializeArrayOfData(intervals,
|
|
33
|
+
static initializeArrayOfData(intervals, formatter) {
|
|
35
34
|
const arrayOfData = [];
|
|
36
35
|
for (const interval of intervals) {
|
|
37
36
|
const dataPoint = {};
|
|
38
|
-
|
|
37
|
+
/*
|
|
38
|
+
* Always the canonical key, NEVER `xAxis.legend`. The wrappers hand
|
|
39
|
+
* recharts this exact key as the XAxis dataKey, so keying rows off a
|
|
40
|
+
* caller-supplied string meant one caller passing anything else
|
|
41
|
+
* (the SLO dashboard widget passed "") produced rows recharts could
|
|
42
|
+
* not read — every point landed on an undefined category and the
|
|
43
|
+
* line silently vanished while the axes still drew.
|
|
44
|
+
*/
|
|
45
|
+
dataPoint[CHART_DATA_POINT_X_AXIS_KEY] = formatter(interval);
|
|
39
46
|
/*
|
|
40
47
|
* The formatted label is not round-trippable back to a Date, so
|
|
41
48
|
* keep the raw bucket start on the row — charts use it to recover
|
|
@@ -46,7 +53,7 @@ export default class DataPointUtil {
|
|
|
46
53
|
}
|
|
47
54
|
return arrayOfData;
|
|
48
55
|
}
|
|
49
|
-
static processSeriesData(seriesPoints, arrayOfData,
|
|
56
|
+
static processSeriesData(seriesPoints, arrayOfData, formatter, aggregateType) {
|
|
50
57
|
/*
|
|
51
58
|
* Accumulate per (series, bucket). The previous implementation kept
|
|
52
59
|
* one SeriesData accumulator per series and reused it across every
|
|
@@ -68,7 +75,7 @@ export default class DataPointUtil {
|
|
|
68
75
|
const value = dataPoint.y;
|
|
69
76
|
const formattedDate = formatter(date);
|
|
70
77
|
const target = arrayOfData.find((chartDataPoint) => {
|
|
71
|
-
return chartDataPoint[
|
|
78
|
+
return (chartDataPoint[CHART_DATA_POINT_X_AXIS_KEY] === formattedDate);
|
|
72
79
|
});
|
|
73
80
|
if (!target) {
|
|
74
81
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataPoint.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Utils/DataPoint.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAC5E,OAAuB,EACrB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"DataPoint.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Utils/DataPoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import FieldType from "../Types/FieldType";
|
|
2
2
|
import DropdownValueBadge from "../Dropdown/DropdownValueBadge";
|
|
3
3
|
import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
|
|
4
|
+
import OneUptimeDate from "../../../Types/Date";
|
|
4
5
|
import { parseCustomFieldDropdownOptions, } from "../../../Types/CustomField/CustomFieldDropdownOption";
|
|
5
6
|
import React from "react";
|
|
6
7
|
export const CustomFieldsColumnKey = "customFields";
|
|
@@ -78,6 +79,47 @@ export const renderCustomFieldValue = (data) => {
|
|
|
78
79
|
? "inline-flex items-center px-2 py-1 rounded-md bg-green-50 text-green-700 text-xs font-medium ring-1 ring-inset ring-green-600/20"
|
|
79
80
|
: "inline-flex items-center px-2 py-1 rounded-md bg-gray-50 text-gray-600 text-xs font-medium ring-1 ring-inset ring-gray-500/10" }, isTrue ? "Yes" : "No"));
|
|
80
81
|
}
|
|
82
|
+
if (definition.customFieldType === CustomFieldType.Date ||
|
|
83
|
+
definition.customFieldType === CustomFieldType.DateTime) {
|
|
84
|
+
/*
|
|
85
|
+
* Stored as ISO-8601 (the shared date Input normalises every entry through
|
|
86
|
+
* OneUptimeDate.toString()), which is unreadable in a cell, so it is shown
|
|
87
|
+
* in the viewer's own timezone — the same rendering Detail gives a date
|
|
88
|
+
* field, so the list and the item page agree.
|
|
89
|
+
*/
|
|
90
|
+
const isDateOnly = definition.customFieldType === CustomFieldType.Date;
|
|
91
|
+
const raw = String(value);
|
|
92
|
+
/*
|
|
93
|
+
* Validity is decided here rather than by inspecting what the formatter
|
|
94
|
+
* returned, because the formatter never reports failure: OneUptimeDate
|
|
95
|
+
* .fromString swallows moment's parse error and falls back to `new
|
|
96
|
+
* Date(str)`, so junk becomes an Invalid Date and moment renders it as the
|
|
97
|
+
* literal, truthy string "Invalid date" (and "Invalid date UTC" for the
|
|
98
|
+
* DateTime variant). A `formatted || raw` fallback therefore never fires.
|
|
99
|
+
*
|
|
100
|
+
* Showing the raw text instead matters because the value is not
|
|
101
|
+
* necessarily one this UI wrote — a project can PUT anything into the
|
|
102
|
+
* `customFields` bag over the API, and may well have been storing dates as
|
|
103
|
+
* free text before this field became a date. "Invalid date" hides which
|
|
104
|
+
* value is wrong; the value itself is the thing that lets someone fix it.
|
|
105
|
+
*/
|
|
106
|
+
let parsed = null;
|
|
107
|
+
try {
|
|
108
|
+
parsed = OneUptimeDate.fromString(raw);
|
|
109
|
+
}
|
|
110
|
+
catch (_b) {
|
|
111
|
+
parsed = null;
|
|
112
|
+
}
|
|
113
|
+
if (!parsed || isNaN(parsed.getTime())) {
|
|
114
|
+
return React.createElement("span", null, raw);
|
|
115
|
+
}
|
|
116
|
+
try {
|
|
117
|
+
return (React.createElement("span", null, OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(parsed, isDateOnly)));
|
|
118
|
+
}
|
|
119
|
+
catch (_c) {
|
|
120
|
+
return React.createElement("span", null, raw);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
81
123
|
if (definition.customFieldType === CustomFieldType.MultiSelectDropdown) {
|
|
82
124
|
/*
|
|
83
125
|
* Tolerant on the way out: an older single-select value that was later
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/CustomFieldColumns.tsx"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAGhE,OAAO,eAAe,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"CustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/CustomFieldColumns.tsx"],"names":[],"mappings":"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"}
|
|
@@ -383,4 +383,41 @@ export function labelForDeviceRole(role) {
|
|
|
383
383
|
}
|
|
384
384
|
return DEVICE_ROLE_LABELS[role] || DEVICE_ROLE_LABELS.unknown;
|
|
385
385
|
}
|
|
386
|
+
/**
|
|
387
|
+
* Read an operator's stored role override off a NetworkDevice row.
|
|
388
|
+
*
|
|
389
|
+
* The classifier above is evidence-driven, and its evidence is SNMP: a
|
|
390
|
+
* device nothing walks — a ping-only device imported by discovery, say —
|
|
391
|
+
* offers it a hostname and nothing else, so it comes back "unknown" and
|
|
392
|
+
* stays there forever. `NetworkDevice.deviceRole` is the operator saying
|
|
393
|
+
* what the box actually is, and it is the only statement about a role that
|
|
394
|
+
* is not an inference, so it outranks everything the classifier can find.
|
|
395
|
+
*
|
|
396
|
+
* Undefined means "no override" — NOT "unknown". The two are different
|
|
397
|
+
* answers and the difference decides whether the classifier gets to run at
|
|
398
|
+
* all, which is why an unrecognised or empty column reads as undefined
|
|
399
|
+
* rather than falling back to a role. "unknown" is itself refused as an
|
|
400
|
+
* override for the same reason: storing it would silently disable the
|
|
401
|
+
* classifier on a device the operator was only declining to classify.
|
|
402
|
+
*/
|
|
403
|
+
export function parseDeviceRoleOverride(value) {
|
|
404
|
+
const normalized = (value || "").trim().toLowerCase();
|
|
405
|
+
if (!normalized) {
|
|
406
|
+
return undefined;
|
|
407
|
+
}
|
|
408
|
+
return DEVICE_ROLES_IN_LEGEND_ORDER.find((role) => {
|
|
409
|
+
return role.toLowerCase() === normalized;
|
|
410
|
+
});
|
|
411
|
+
}
|
|
412
|
+
/**
|
|
413
|
+
* The role to draw a managed device with: the operator's override when
|
|
414
|
+
* there is one, otherwise whatever the evidence supports.
|
|
415
|
+
*
|
|
416
|
+
* One function so the topology builder, the forms and the tests cannot
|
|
417
|
+
* drift about which of the two wins.
|
|
418
|
+
*/
|
|
419
|
+
export function resolveDeviceRole(roleOverride, signals) {
|
|
420
|
+
var _a;
|
|
421
|
+
return (_a = parseDeviceRoleOverride(roleOverride)) !== null && _a !== void 0 ? _a : classifyDeviceRole(signals);
|
|
422
|
+
}
|
|
386
423
|
//# sourceMappingURL=NetworkDeviceRoleUtil.js.map
|