@oneuptime/common 9.3.6 → 9.3.8

package/Models/DatabaseModels/{ServiceCatalogDependency.ts → ServiceDependency.ts}

@@ -20,9 +20,9 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import ServiceCatalog from "./ServiceCatalog";
+import Service from "./Service";
 
-@CanAccessIfCanReadOn("serviceCatalogId")
+@CanAccessIfCanReadOn("serviceId")
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableBillingAccessControl({
@@ -36,26 +36,26 @@ import ServiceCatalog from "./ServiceCatalog";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatlogDependency,
+    Permission.CreateServiceDependency,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ProjectMember,
-    Permission.ReadServiceCatlogDependency,
+    Permission.ReadServiceDependency,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.DeleteServiceCatlogDependency,
+    Permission.DeleteServiceDependency,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.EditServiceCatlogDependency,
+    Permission.EditServiceDependency,
   ],
 })
 @EnableWorkflow({
@@ -64,33 +64,33 @@ import ServiceCatalog from "./ServiceCatalog";
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog-dependency"))
+@CrudApiEndpoint(new Route("/service-dependency"))
 @SlugifyColumn("name", "slug")
 @TableMetadata({
-  tableName: "ServiceCatlogDependency",
+  tableName: "ServiceDependency",
   singularName: "Service Dependency",
   pluralName: "Service Dependencies",
   icon: IconProp.SquareStack,
   tableDescription:
-    "Service Catalog is a collection of services that you have in your organization. It can be a collection of services that you are monitoring or services that you are providing to your customers. It can be anything that you want to keep track of.",
+    "Service is a collection of services that you have in your organization. It can be a collection of services that you are monitoring or services that you are providing to your customers. It can be anything that you want to keep track of.",
 })
 @Entity({
-  name: "ServiceCatlogDependency",
+  name: "ServiceDependency",
 })
-export default class ServiceCatlogDependency extends BaseModel {
+export default class ServiceDependency extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -121,14 +121,14 @@ export default class ServiceCatlogDependency extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -153,29 +153,28 @@ export default class ServiceCatlogDependency extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "serviceCatalogId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: ServiceCatalog,
-    title: "Service Catalog",
-    description:
-      "Relation to Service Catalog Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @ManyToOne(
     () => {
-      return ServiceCatalog;
+      return Service;
     },
     {
       eager: false,
@@ -184,22 +183,22 @@ export default class ServiceCatlogDependency extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "serviceCatalogId" })
-  public serviceCatalog?: ServiceCatalog = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -208,9 +207,8 @@ export default class ServiceCatlogDependency extends BaseModel {
     type: TableColumnType.ObjectID,
     required: true,
     canReadOnRelationQuery: true,
-    title: "Service Catalog ID",
-    description:
-      "ID of your OneUptime Service Catalog in which this object belongs",
+    title: "Service ID",
+    description: "ID of your OneUptime Service in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @Column({
@@ -218,36 +216,35 @@ export default class ServiceCatlogDependency extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceCatalogId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "dependencyServiceCatalogId",
+    manyToOneRelationColumn: "dependencyServiceId",
     type: TableColumnType.Entity,
-    modelType: ServiceCatalog,
-    title: "Service Catalog",
-    description:
-      "Relation to Service Catalog Resource in which this object belongs",
+    modelType: Service,
+    title: "Dependency Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "a7b8c9d0-e1f2-3456-ab78-cd90ef123456",
   })
   @ManyToOne(
     () => {
-      return ServiceCatalog;
+      return Service;
     },
     {
       eager: false,
@@ -256,22 +253,22 @@ export default class ServiceCatlogDependency extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "dependencyServiceCatalogId" })
-  public dependencyServiceCatalog?: ServiceCatalog = undefined;
+  @JoinColumn({ name: "dependencyServiceId" })
+  public dependencyService?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -280,9 +277,8 @@ export default class ServiceCatlogDependency extends BaseModel {
     type: TableColumnType.ObjectID,
     required: true,
     canReadOnRelationQuery: true,
-    title: "Dependency Service Catalog ID",
-    description:
-      "ID of your OneUptime Service Catalog in which this object belongs",
+    title: "Dependency Service ID",
+    description: "ID of your OneUptime Service in which this object belongs",
     example: "a7b8c9d0-e1f2-3456-ab78-cd90ef123456",
   })
   @Column({
@@ -290,21 +286,21 @@ export default class ServiceCatlogDependency extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public dependencyServiceCatalogId?: ObjectID = undefined;
+  public dependencyServiceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -336,14 +332,14 @@ export default class ServiceCatlogDependency extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatlogDependency,
+      Permission.CreateServiceDependency,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -368,7 +364,7 @@ export default class ServiceCatlogDependency extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })
@@ -403,7 +399,7 @@ export default class ServiceCatlogDependency extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatlogDependency,
+      Permission.ReadServiceDependency,
     ],
     update: [],
   })

package/Models/DatabaseModels/{ServiceCatalogMonitor.ts → ServiceMonitor.ts}

@@ -20,10 +20,10 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import ServiceCatalog from "./ServiceCatalog";
+import Service from "./Service";
 import Monitor from "./Monitor";
 
-@CanAccessIfCanReadOn("serviceCatalogId")
+@CanAccessIfCanReadOn("serviceId")
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableBillingAccessControl({
@@ -37,26 +37,26 @@ import Monitor from "./Monitor";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatalogMonitor,
+    Permission.CreateServiceMonitor,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ProjectMember,
-    Permission.ReadServiceCatalogMonitor,
+    Permission.ReadServiceMonitor,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.DeleteServiceCatalogMonitor,
+    Permission.DeleteServiceMonitor,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.EditServiceCatalogMonitor,
+    Permission.EditServiceMonitor,
   ],
 })
 @EnableWorkflow({
@@ -65,32 +65,32 @@ import Monitor from "./Monitor";
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog-monitor"))
+@CrudApiEndpoint(new Route("/service-monitor"))
 @SlugifyColumn("name", "slug")
 @TableMetadata({
-  tableName: "ServiceCatalogMonitor",
-  singularName: "Service Catalog Monitor",
-  pluralName: "Service Catalog Monitors",
+  tableName: "ServiceMonitor",
+  singularName: "Service Monitor",
+  pluralName: "Service Monitors",
   icon: IconProp.SquareStack,
-  tableDescription: "List of monitor - service catalog relationship.",
+  tableDescription: "List of monitor - service relationship.",
 })
 @Entity({
-  name: "ServiceCatalogMonitor",
+  name: "ServiceMonitor",
 })
-export default class ServiceCatalogMonitor extends BaseModel {
+export default class ServiceMonitor extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -121,14 +121,14 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -153,29 +153,28 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "serviceCatalogId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: ServiceCatalog,
-    title: "Service Catalog",
-    description:
-      "Relation to Service Catalog Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @ManyToOne(
     () => {
-      return ServiceCatalog;
+      return Service;
     },
     {
       eager: false,
@@ -184,22 +183,22 @@ export default class ServiceCatalogMonitor extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "serviceCatalogId" })
-  public serviceCatalog?: ServiceCatalog = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -208,9 +207,8 @@ export default class ServiceCatalogMonitor extends BaseModel {
     type: TableColumnType.ObjectID,
     required: true,
     canReadOnRelationQuery: true,
-    title: "Service Catalog ID",
-    description:
-      "ID of your OneUptime Service Catalog in which this object belongs",
+    title: "Service ID",
+    description: "ID of your OneUptime Service in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @Column({
@@ -218,21 +216,21 @@ export default class ServiceCatalogMonitor extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceCatalogId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -263,14 +261,14 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -295,14 +293,14 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -334,14 +332,14 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogMonitor,
+      Permission.CreateServiceMonitor,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -366,7 +364,7 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })
@@ -401,7 +399,7 @@ export default class ServiceCatalogMonitor extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogMonitor,
+      Permission.ReadServiceMonitor,
     ],
     update: [],
   })