From 61e8ad213528af832bad55a2ecb5d018a69ef2a4 Mon Sep 17 00:00:00 2001
From: Jake Bassett <jake@traceable.ai>
Date: Wed, 24 Mar 2021 16:31:56 -0700
Subject: [PATCH 1/2] feat: request includeInactive for all entity id queries

---
 .../query/entity/entity-graphql-query-handler.service.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
index f719ca399..8763c9ec1 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
@@ -8,7 +8,7 @@ import {
 } from '@hypertrace/graphql-client';
 import { Observable } from 'rxjs';
 import { map, throwIfEmpty } from 'rxjs/operators';
-import { Entity, EntityType, ObservabilityEntityType } from '../../../../../model/schema/entity';
+import { Entity, EntityType } from '../../../../../model/schema/entity';
 import { GraphQlEntityFilter } from '../../../../../model/schema/filter/entity/graphql-entity-filter';
 import { EntitiesGraphqlQueryBuilderService } from '../entities-graphql-query-builder.service';
 import {
@@ -57,8 +57,8 @@ export class EntityGraphQlQueryHandlerService implements GraphQlQueryHandler<Gra
       timeRange: request.timeRange,
       properties: request.properties,
       filters: [new GraphQlEntityFilter(request.id, request.entityType)],
-      // If querying for a single API, then always want to includeInactive
-      includeInactive: request.entityType === ObservabilityEntityType.Api
+      // If querying for a single API by ID, then always want to includeInactive
+      includeInactive: true
     };
   }
 }

From bf5b9b71f4359ef365fa07f85bcae8c0d20bbb93 Mon Sep 17 00:00:00 2001
From: Jake Bassett <jake@traceable.ai>
Date: Thu, 25 Mar 2021 10:33:27 -0700
Subject: [PATCH 2/2] feat: includeInactive is configurable defaulting to true

---
 .../query/entity/entity-graphql-query-handler.service.ts     | 5 +++--
 .../interactions-graphql-query-handler.service.ts            | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
index 8763c9ec1..f540b11c9 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
@@ -57,8 +57,8 @@ export class EntityGraphQlQueryHandlerService implements GraphQlQueryHandler<Gra
       timeRange: request.timeRange,
       properties: request.properties,
       filters: [new GraphQlEntityFilter(request.id, request.entityType)],
-      // If querying for a single API by ID, then always want to includeInactive
-      includeInactive: true
+      // If querying for a single API by ID, then usually want to includeInactive
+      includeInactive: request.includeInactive !== false
     };
   }
 }
@@ -71,4 +71,5 @@ export interface GraphQlEntityRequest {
   id: string;
   properties: Specification[];
   timeRange: GraphQlTimeRange;
+  includeInactive?: boolean;
 }
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
index 1ad11d686..dc0a46d20 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
@@ -68,7 +68,8 @@ export class InteractionsGraphQlQueryHandlerService
       id: request.entityId,
       entityType: request.entityType,
       properties: [],
-      timeRange: request.timeRange
+      timeRange: request.timeRange,
+      includeInactive: false
     };
   }