@oneuptime/common 9.3.6 → 9.3.8

package/Server/Services/{ServiceCatalogCodeRepositoryService.ts → ServiceCodeRepositoryService.ts}

@@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogCodeRepository";
+import Model from "../../Models/DatabaseModels/ServiceCodeRepository";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -15,23 +15,23 @@ export class Service extends DatabaseService<Model> {
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
-    if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-      throw new BadDataException("serviceCatalog is required");
+    if (!createBy.data.serviceId && !createBy.data.service) {
+      throw new BadDataException("service is required");
     }
 
     if (!createBy.data.codeRepository && !createBy.data.codeRepositoryId) {
       throw new BadDataException("codeRepository is required");
     }
 
-    const serviceCatalogId: string | ObjectID | undefined =
-      createBy.data.serviceCatalogId || createBy.data.serviceCatalog?._id;
+    const serviceId: string | ObjectID | undefined =
+      createBy.data.serviceId || createBy.data.service?._id;
     const codeRepositoryId: string | ObjectID | undefined =
       createBy.data.codeRepositoryId || createBy.data.codeRepository?._id;
 
-    // check if this code repository is already added to the service catalog for this service.
+    // check if this code repository is already added to the service for this service.
     const existingCodeRepository: Model | null = await this.findOneBy({
       query: {
-        serviceCatalogId: serviceCatalogId as ObjectID,
+        serviceId: serviceId as ObjectID,
         codeRepositoryId: codeRepositoryId as ObjectID,
       },
       props: {

package/Server/Services/ServiceDependencyService.ts

@@ -0,0 +1,48 @@
+import BadDataException from "../../Types/Exception/BadDataException";
+import CreateBy from "../Types/Database/CreateBy";
+import { OnCreate } from "../Types/Database/Hooks";
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/ServiceDependency";
+import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+  }
+
+  @CaptureSpan()
+  protected override async onBeforeCreate(
+    createBy: CreateBy<Model>,
+  ): Promise<OnCreate<Model>> {
+    // select a random color.
+
+    if (!createBy.data.serviceId && !createBy.data.service) {
+      throw new BadDataException("service is required");
+    }
+
+    if (
+      !createBy.data.dependencyServiceId &&
+      !createBy.data.dependencyService
+    ) {
+      throw new BadDataException("dependencyService is required");
+    }
+
+    // serviceId and dependencyServiceId should not be the same
+    const serviceId: string | ObjectID | undefined =
+      createBy.data.serviceId || createBy.data.service?._id;
+    const dependencyServiceId: string | ObjectID | undefined =
+      createBy.data.dependencyServiceId || createBy.data.dependencyService?._id;
+
+    if (serviceId?.toString() === dependencyServiceId?.toString()) {
+      throw new BadDataException("Service cannot depend on itself.");
+    }
+
+    return {
+      carryForward: null,
+      createBy: createBy,
+    };
+  }
+}
+
+export default new Service();

package/Server/Services/{ServiceCatalogMonitorService.ts → ServiceMonitorService.ts}

@@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogMonitor";
+import Model from "../../Models/DatabaseModels/ServiceMonitor";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -17,25 +17,25 @@ export class Service extends DatabaseService<Model> {
   ): Promise<OnCreate<Model>> {
     // select a random color.
 
-    if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-      throw new BadDataException("serviceCatalog is required");
+    if (!createBy.data.serviceId && !createBy.data.service) {
+      throw new BadDataException("service is required");
     }
 
     if (!createBy.data.monitor && !createBy.data.monitorId) {
       throw new BadDataException("monitor is required");
     }
 
-    // serviceCatalogId and dependencyServiceCatalogId should not be the same
-    const serviceCatalogId: string | ObjectID | undefined =
-      createBy.data.serviceCatalogId || createBy.data.serviceCatalog?._id;
+    // serviceId and dependencyServiceId should not be the same
+    const serviceId: string | ObjectID | undefined =
+      createBy.data.serviceId || createBy.data.service?._id;
     const monitorId: string | ObjectID | undefined =
       createBy.data.monitorId || createBy.data.monitor?._id;
 
-    // check if this monitor is already added to the service catalog for this service.
+    // check if this monitor is already added to the service for this service.
 
     const existingMonitor: Model | null = await this.findOneBy({
       query: {
-        serviceCatalogId: serviceCatalogId as ObjectID,
+        serviceId: serviceId as ObjectID,
         monitorId: monitorId as ObjectID,
       },
       props: {

package/Server/Services/{ServiceCatalogOwnerTeamService.ts → ServiceOwnerTeamService.ts}

@@ -1,5 +1,5 @@
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerTeam";
+import Model from "../../Models/DatabaseModels/ServiceOwnerTeam";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {

package/Server/Services/{ServiceCatalogOwnerUserService.ts → ServiceOwnerUserService.ts}

@@ -1,5 +1,5 @@
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerUser";
+import Model from "../../Models/DatabaseModels/ServiceOwnerUser";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {

package/Server/Services/{ServiceCatalogService.ts → ServiceService.ts}

@@ -3,7 +3,7 @@ import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
-import Model from "../../Models/DatabaseModels/ServiceCatalog";
+import Model from "../../Models/DatabaseModels/Service";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {

package/Server/Services/{ServiceCatalogTelemetryServiceService.ts → ServiceTelemetryServiceService.ts}

@@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogTelemetryService";
+import Model from "../../Models/DatabaseModels/ServiceTelemetryService";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -17,25 +17,25 @@ export class Service extends DatabaseService<Model> {
   ): Promise<OnCreate<Model>> {
     // select a random color.
 
-    if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-      throw new BadDataException("serviceCatalog is required");
+    if (!createBy.data.serviceId && !createBy.data.service) {
+      throw new BadDataException("service is required");
     }
 
     if (!createBy.data.telemetryService && !createBy.data.telemetryServiceId) {
       throw new BadDataException("telemetryService is required");
     }
 
-    // serviceCatalogId and dependencyServiceCatalogId should not be the same
-    const serviceCatalogId: string | ObjectID | undefined =
-      createBy.data.serviceCatalogId || createBy.data.serviceCatalog?._id;
+    // serviceId and dependencyServiceId should not be the same
+    const serviceId: string | ObjectID | undefined =
+      createBy.data.serviceId || createBy.data.service?._id;
     const telemetryServiceId: string | ObjectID | undefined =
       createBy.data.telemetryServiceId || createBy.data.telemetryService?._id;
 
-    // check if this telemetryService is already added to the service catalog for this service.
+    // check if this telemetryService is already added to the service for this service.
 
     const existingtelemetryService: Model | null = await this.findOneBy({
       query: {
-        serviceCatalogId: serviceCatalogId as ObjectID,
+        serviceId: serviceId as ObjectID,
         telemetryServiceId: telemetryServiceId as ObjectID,
       },
       props: {

package/Types/Icon/IconProp.ts

@@ -143,6 +143,7 @@ enum IconProp {
   Brain = "Brain",
   FlowDiagram = "FlowDiagram",
   GitHub = "GitHub",
+  Bug = "Bug",
 }
 
 export default IconProp;

package/Types/Permission.ts

@@ -244,15 +244,15 @@ enum Permission {
   EditStatusPageOwnerUser = "EditStatusPageOwnerUser",
   ReadStatusPageOwnerUser = "ReadStatusPageOwnerUser",
 
-  CreateServiceCatalogOwnerTeam = "CreateServiceCatalogOwnerTeam",
-  DeleteServiceCatalogOwnerTeam = "DeleteServiceCatalogOwnerTeam",
-  EditServiceCatalogOwnerTeam = "EditServiceCatalogOwnerTeam",
-  ReadServiceCatalogOwnerTeam = "ReadServiceCatalogOwnerTeam",
+  CreateServiceOwnerTeam = "CreateServiceOwnerTeam",
+  DeleteServiceOwnerTeam = "DeleteServiceOwnerTeam",
+  EditServiceOwnerTeam = "EditServiceOwnerTeam",
+  ReadServiceOwnerTeam = "ReadServiceOwnerTeam",
 
-  CreateServiceCatalogOwnerUser = "CreateServiceCatalogOwner",
-  DeleteServiceCatalogOwnerUser = "DeleteServiceCatalogOwnerUser",
-  EditServiceCatalogOwnerUser = "EditServiceCatalogOwnerUser",
-  ReadServiceCatalogOwnerUser = "ReadServiceCatalogOwnerUser",
+  CreateServiceOwnerUser = "CreateServiceOwnerUser",
+  DeleteServiceOwnerUser = "DeleteServiceOwnerUser",
+  EditServiceOwnerUser = "EditServiceOwnerUser",
+  ReadServiceOwnerUser = "ReadServiceOwnerUser",
 
   CreateMonitorOwnerTeam = "CreateMonitorOwnerTeam",
   DeleteMonitorOwnerTeam = "DeleteMonitorOwnerTeam",
@@ -620,30 +620,30 @@ enum Permission {
   DeleteAlertSeverity = "DeleteAlertSeverity",
   ReadAlertSeverity = "ReadAlertSeverity",
 
-  CreateServiceCatalog = "CreateServiceCatalog",
-  DeleteServiceCatalog = "DeleteServiceCatalog",
-  EditServiceCatalog = "EditServiceCatalog",
-  ReadServiceCatalog = "ReadServiceCatalog",
+  CreateService = "CreateService",
+  DeleteService = "DeleteService",
+  EditService = "EditService",
+  ReadService = "ReadService",
 
-  CreateServiceCatlogDependency = "CreateServiceCatlogDependency",
-  DeleteServiceCatlogDependency = "DeleteServiceCatlogDependency",
-  EditServiceCatlogDependency = "EditServiceCatlogDependency",
-  ReadServiceCatlogDependency = "ReadServiceCatlogDependency",
+  CreateServiceDependency = "CreateServiceDependency",
+  DeleteServiceDependency = "DeleteServiceDependency",
+  EditServiceDependency = "EditServiceDependency",
+  ReadServiceDependency = "ReadServiceDependency",
 
-  CreateServiceCatalogMonitor = "CreateServiceCatalogMonitor",
-  DeleteServiceCatalogMonitor = "DeleteServiceCatalogMonitor",
-  EditServiceCatalogMonitor = "EditServiceCatalogMonitor",
-  ReadServiceCatalogMonitor = "ReadServiceCatalogMonitor",
+  CreateServiceMonitor = "CreateServiceMonitor",
+  DeleteServiceMonitor = "DeleteServiceMonitor",
+  EditServiceMonitor = "EditServiceMonitor",
+  ReadServiceMonitor = "ReadServiceMonitor",
 
-  CreateServiceCatalogTelemetryService = "CreateServiceCatalogTelemetryService",
-  DeleteServiceCatalogTelemetryService = "DeleteServiceCatalogTelemetryService",
-  EditServiceCatalogTelemetryService = "EditServiceCatalogTelemetryService",
-  ReadServiceCatalogTelemetryService = "ReadServiceCatalogTelemetryService",
+  CreateServiceTelemetryService = "CreateServiceTelemetryService",
+  DeleteServiceTelemetryService = "DeleteServiceTelemetryService",
+  EditServiceTelemetryService = "EditServiceTelemetryService",
+  ReadServiceTelemetryService = "ReadServiceTelemetryService",
 
-  CreateServiceCatalogCodeRepository = "CreateServiceCatalogCodeRepository",
-  DeleteServiceCatalogCodeRepository = "DeleteServiceCatalogCodeRepository",
-  EditServiceCatalogCodeRepository = "EditServiceCatalogCodeRepository",
-  ReadServiceCatalogCodeRepository = "ReadServiceCatalogCodeRepository",
+  CreateServiceCodeRepository = "CreateServiceCodeRepository",
+  DeleteServiceCodeRepository = "DeleteServiceCodeRepository",
+  EditServiceCodeRepository = "EditServiceCodeRepository",
+  ReadServiceCodeRepository = "ReadServiceCodeRepository",
 
   // Code Repository
   CreateCodeRepository = "CreateCodeRepository",
@@ -3483,165 +3483,162 @@ export class PermissionHelper {
       },
 
       {
-        permission: Permission.CreateServiceCatalog,
-        title: "Create Service Catalog",
-        description: "This permission can create Service Catalog this project.",
+        permission: Permission.CreateService,
+        title: "Create Service",
+        description: "This permission can create Service in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: true,
       },
       {
-        permission: Permission.DeleteServiceCatalog,
-        title: "Delete Service Catalog",
-        description:
-          "This permission can delete Service Catalog of this project.",
+        permission: Permission.DeleteService,
+        title: "Delete Service",
+        description: "This permission can delete Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: true,
       },
       {
-        permission: Permission.EditServiceCatalog,
-        title: "Edit Service Catalog",
-        description:
-          "This permission can edit Service Catalog of this project.",
+        permission: Permission.EditService,
+        title: "Edit Service",
+        description: "This permission can edit Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: true,
       },
       {
-        permission: Permission.ReadServiceCatalog,
-        title: "Read Service Catalog",
-        description:
-          "This permission can read Service Catalog of this project.",
+        permission: Permission.ReadService,
+        title: "Read Service",
+        description: "This permission can read Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: true,
       },
 
       {
-        permission: Permission.CreateServiceCatlogDependency,
-        title: "Create Service Catalog Dependency",
+        permission: Permission.CreateServiceDependency,
+        title: "Create Service Dependency",
         description:
-          "This permission can create Service Catalog Dependencies this project.",
+          "This permission can create Service Dependencies in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatlogDependency,
-        title: "Delete Service Catalog Dependency",
+        permission: Permission.DeleteServiceDependency,
+        title: "Delete Service Dependency",
         description:
-          "This permission can delete Service Catalog Dependencies of this project.",
+          "This permission can delete Service Dependencies of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatlogDependency,
-        title: "Edit Service Catalog Dependency",
+        permission: Permission.EditServiceDependency,
+        title: "Edit Service Dependency",
         description:
-          "This permission can edit Service Catalog Dependencies of this project.",
+          "This permission can edit Service Dependencies of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatlogDependency,
-        title: "Read Service Catalog Dependency",
+        permission: Permission.ReadServiceDependency,
+        title: "Read Service Dependency",
         description:
-          "This permission can read Service Catalog Dependencies of this project.",
+          "This permission can read Service Dependencies of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
 
       {
-        permission: Permission.CreateServiceCatalogMonitor,
-        title: "Create Service Catalog Monitor",
+        permission: Permission.CreateServiceMonitor,
+        title: "Create Service Monitor",
         description:
-          "This permission can create Service Catalog Monitor this project.",
+          "This permission can create Service Monitor in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatalogMonitor,
-        title: "Delete Service Catalog Monitor",
+        permission: Permission.DeleteServiceMonitor,
+        title: "Delete Service Monitor",
         description:
-          "This permission can delete Service Catalog Monitor of this project.",
+          "This permission can delete Service Monitor of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatalogMonitor,
-        title: "Edit Service Catalog Monitor",
+        permission: Permission.EditServiceMonitor,
+        title: "Edit Service Monitor",
         description:
-          "This permission can edit Service Catalog Monitor of this project.",
+          "This permission can edit Service Monitor of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatalogMonitor,
-        title: "Read Service Catalog Monitor",
+        permission: Permission.ReadServiceMonitor,
+        title: "Read Service Monitor",
         description:
-          "This permission can read Service Catalog Monitor of this project.",
+          "This permission can read Service Monitor of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
 
       {
-        permission: Permission.CreateServiceCatalogTelemetryService,
-        title: "Create Service Catalog Telemetry Service",
+        permission: Permission.CreateServiceTelemetryService,
+        title: "Create Service Telemetry Service",
         description:
-          "This permission can create Service Catalog Telemetry Service this project.",
+          "This permission can create Service Telemetry Service in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatalogTelemetryService,
-        title: "Delete Service Catalog Telemetry Service",
+        permission: Permission.DeleteServiceTelemetryService,
+        title: "Delete Service Telemetry Service",
         description:
-          "This permission can delete Service Catalog Telemetry Service of this project.",
+          "This permission can delete Service Telemetry Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatalogTelemetryService,
-        title: "Edit Service Catalog Telemetry Service",
+        permission: Permission.EditServiceTelemetryService,
+        title: "Edit Service Telemetry Service",
         description:
-          "This permission can edit Service Catalog Telemetry Service of this project.",
+          "This permission can edit Service Telemetry Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatalogTelemetryService,
-        title: "Read Service Catalog Telemetry Service",
+        permission: Permission.ReadServiceTelemetryService,
+        title: "Read Service Telemetry Service",
         description:
-          "This permission can read Service Catalog Telemetry Service of this project.",
+          "This permission can read Service Telemetry Service of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
 
       {
-        permission: Permission.CreateServiceCatalogCodeRepository,
-        title: "Create Service Catalog Code Repository",
+        permission: Permission.CreateServiceCodeRepository,
+        title: "Create Service Code Repository",
         description:
-          "This permission can create Service Catalog Code Repository in this project.",
+          "This permission can create Service Code Repository in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatalogCodeRepository,
-        title: "Delete Service Catalog Code Repository",
+        permission: Permission.DeleteServiceCodeRepository,
+        title: "Delete Service Code Repository",
         description:
-          "This permission can delete Service Catalog Code Repository of this project.",
+          "This permission can delete Service Code Repository of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatalogCodeRepository,
-        title: "Edit Service Catalog Code Repository",
+        permission: Permission.EditServiceCodeRepository,
+        title: "Edit Service Code Repository",
         description:
-          "This permission can edit Service Catalog Code Repository of this project.",
+          "This permission can edit Service Code Repository of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatalogCodeRepository,
-        title: "Read Service Catalog Code Repository",
+        permission: Permission.ReadServiceCodeRepository,
+        title: "Read Service Code Repository",
         description:
-          "This permission can read Service Catalog Code Repository of this project.",
+          "This permission can read Service Code Repository of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
@@ -4209,67 +4206,67 @@ export class PermissionHelper {
       },
 
       {
-        permission: Permission.CreateServiceCatalogOwnerTeam,
-        title: "Create Service Catalog Team Owner",
+        permission: Permission.CreateServiceOwnerTeam,
+        title: "Create Service Team Owner",
         description:
-          "This permission can create Service Catalog Team Owner this project.",
+          "This permission can create Service Team Owner in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatalogOwnerTeam,
-        title: "Delete Service Catalog Team Owner",
+        permission: Permission.DeleteServiceOwnerTeam,
+        title: "Delete Service Team Owner",
         description:
-          "This permission can delete Service Catalog Team Owner of this project.",
+          "This permission can delete Service Team Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatalogOwnerTeam,
-        title: "Edit Service Catalog Team Owner",
+        permission: Permission.EditServiceOwnerTeam,
+        title: "Edit Service Team Owner",
         description:
-          "This permission can edit Service Catalog Team Owner of this project.",
+          "This permission can edit Service Team Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatalogOwnerTeam,
-        title: "Read Service Catalog Team Owner",
+        permission: Permission.ReadServiceOwnerTeam,
+        title: "Read Service Team Owner",
         description:
-          "This permission can read Service Catalog Team Owner of this project.",
+          "This permission can read Service Team Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
 
       {
-        permission: Permission.CreateServiceCatalogOwnerUser,
-        title: "Create Service Catalog User Owner",
+        permission: Permission.CreateServiceOwnerUser,
+        title: "Create Service User Owner",
         description:
-          "This permission can create Service Catalog User Owner this project.",
+          "This permission can create Service User Owner in this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.DeleteServiceCatalogOwnerUser,
-        title: "Delete Service Catalog User Owner",
+        permission: Permission.DeleteServiceOwnerUser,
+        title: "Delete Service User Owner",
         description:
-          "This permission can delete Service Catalog User Owner of this project.",
+          "This permission can delete Service User Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.EditServiceCatalogOwnerUser,
-        title: "Edit Service Catalog User Owner",
+        permission: Permission.EditServiceOwnerUser,
+        title: "Edit Service User Owner",
         description:
-          "This permission can edit Service Catalog User Owner of this project.",
+          "This permission can edit Service User Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
       {
-        permission: Permission.ReadServiceCatalogOwnerUser,
-        title: "Read Service Catalog User Owner",
+        permission: Permission.ReadServiceOwnerUser,
+        title: "Read Service User Owner",
         description:
-          "This permission can read Service Catalog User Owner of this project.",
+          "This permission can read Service User Owner of this project.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },

package/UI/Components/Icon/Icon.tsx

@@ -1319,6 +1319,17 @@ const Icon: FunctionComponent<ComponentProps> = ({
         />
       </>,
     );
+  } else if (icon === IconProp.Bug) {
+    // Bug icon for exceptions - matching home page
+    return getSvgWrapper(
+      <>
+        <ellipse cx="12" cy="14" rx="5" ry="6" />
+        <path
+          strokeLinecap="round"
+          d="M9 8.5C9 6.5 10.5 5 12 5s3 1.5 3 3.5M4 11l3 1m10-1 3 1M4 17l3-1m10 1 3-1M12 8v12M9 14h6"
+        />
+      </>,
+    );
   }
 
   return <></>;