refactor: update breadcrumb and fix tests

Author: anandtiwary

projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.test.ts

@@ -84,28 +84,16 @@ describe('Api detail breadcrumb resolver', () => {
       runFakeRxjs(({ expectObservable }) => {
         expectObservable(breadcrumb$).toBe('(abc|)', {
           a: {
-            [entityIdKey]: 'test-id',
-            [entityTypeKey]: ObservabilityEntityType.Api,
+            [entityIdKey]: 'test-service-id',
+            [entityTypeKey]: ObservabilityEntityType.Service,
             label: 'test service',
             icon: ObservabilityIconType.Service,
-            url: ['services', 'service', 'test-service-id'],
-            name: 'test api',
-            parentId: 'test-service-id',
-            parentName: 'test service',
-            serviceName: 'test service',
-            serviceId: 'test-service-id'
+            url: ['services', 'service', 'test-service-id']
           },
           b: {
-            [entityIdKey]: 'test-id',
-            [entityTypeKey]: ObservabilityEntityType.Api,
             label: 'Endpoints',
             icon: ObservabilityIconType.Api,
-            url: ['services', 'service', 'test-service-id', 'endpoints'],
-            name: 'test api',
-            parentId: 'test-service-id',
-            parentName: 'test service',
-            serviceName: 'test service',
-            serviceId: 'test-service-id'
+            url: ['services', 'service', 'test-service-id', 'endpoints']
           },
           c: {
             [entityIdKey]: 'test-id',

projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.ts

@@ -1,12 +1,13 @@
 import { Inject, Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
-import { NavigationService, TimeRangeService } from '@hypertrace/common';
+import { Breadcrumb, NavigationService, TimeRangeService } from '@hypertrace/common';
 import { BreadcrumbsService } from '@hypertrace/components';
 import { GraphQlRequestService } from '@hypertrace/graphql-client';
+import { entityIdKey } from '@hypertrace/observability';
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { EntityMetadata, EntityMetadataMap, ENTITY_METADATA } from '../../../shared/constants/entity-metadata';
-import { Entity, ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity';
+import { Entity, entityTypeKey, ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity';
 import {
   EntityBreadcrumb,
   EntityBreadcrumbResolver
@@ -29,7 +30,7 @@ export class ApiDetailBreadcrumbResolver<T extends EntityBreadcrumb> extends Ent
     this.apiEntityMetadata = this.entityMetadataMap.get(ObservabilityEntityType.Api);
   }
 
-  public async resolve(activatedRouteSnapshot: ActivatedRouteSnapshot): Promise<Observable<EntityBreadcrumb>> {
+  public async resolve(activatedRouteSnapshot: ActivatedRouteSnapshot): Promise<Observable<Breadcrumb>> {
     const id = activatedRouteSnapshot.paramMap.get('id') as string;
     const parentEntityMetadata = this.resolveParentType();
 
@@ -56,17 +57,20 @@ export class ApiDetailBreadcrumbResolver<T extends EntityBreadcrumb> extends Ent
     };
   }
 
-  protected getParentBreadcrumbs(api: EntityBreadcrumb, parentEntityMetadata?: EntityMetadata): EntityBreadcrumb[] {
+  protected getParentBreadcrumbs(
+    api: EntityBreadcrumb,
+    parentEntityMetadata?: EntityMetadata
+  ): (EntityBreadcrumb | Breadcrumb)[] {
     return parentEntityMetadata !== undefined
       ? [
           {
-            ...api,
+            [entityIdKey]: api.parentId as string,
+            [entityTypeKey]: parentEntityMetadata.entityType,
             label: api.parentName as string,
             icon: parentEntityMetadata?.icon,
             url: parentEntityMetadata?.detailPath(api.parentId as string)
           },
           {
-            ...api,
             label: 'Endpoints',
             icon: this.apiEntityMetadata?.icon,
             url: parentEntityMetadata?.apisListPath?.(api.parentId as string)

projects/observability/src/shared/services/entity-breadcrumb/entity-breadcrumb.resolver.ts

@@ -12,7 +12,7 @@ import { Specification } from './../../graphql/model/schema/specifier/specificat
 import { ENTITY_GQL_REQUEST } from './../../graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service';
 
 export abstract class EntityBreadcrumbResolver<T extends EntityBreadcrumb = EntityBreadcrumb>
-  implements Resolve<Observable<EntityBreadcrumb>> {
+  implements Resolve<Observable<Breadcrumb>> {
   private readonly specificationBuilder: SpecificationBuilder = new SpecificationBuilder();
 
   public constructor(
@@ -21,7 +21,7 @@ export abstract class EntityBreadcrumbResolver<T extends EntityBreadcrumb = Enti
     protected readonly iconLookupService: EntityIconLookupService
   ) {}
 
-  public abstract resolve(route: ActivatedRouteSnapshot): Promise<Observable<EntityBreadcrumb>>;
+  public abstract resolve(route: ActivatedRouteSnapshot): Promise<Observable<Breadcrumb>>;
 
   protected abstract getAttributeKeys(): string[];