[8.x] Revert "[ECO][Inventory v2] Ad hoc data view: Add get enti…

…ties definition endpoint using sources (#203424) (#204012) (#204025) # Backport This will backport the following commits from `main` to `8.x`: - [Revert "[ECO][Inventory v2] Ad hoc data view: Add get entities definition endpoint using sources (#203424) (#204012)](#204012)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: jennypavlova <[email protected]> Co-authored-by: Irene Blanco <[email protected]>
elastic · Dec 17, 2024 · 4e7bca8 · 4e7bca8
1 parent 7559d03
commit 4e7bca8
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 89 deletions.
diff --git a/x-pack/plugins/observability_solution/inventory/public/components/entity_actions/index.tsx b/x-pack/plugins/observability_solution/inventory/public/components/entity_actions/index.tsx
@@ -24,18 +24,17 @@ export const EntityActions = ({ entity, setShowActions }: Props) => {
     ? `inventoryEntityActionsButton-${entity.entityDisplayName}`
     : 'inventoryEntityActionsButton';
 
-  const { getDiscoverEntitiesRedirectUrl, isEntityDefinitionIndexPatternsLoading } =
-    useDiscoverRedirect(entity);
+  const { getDiscoverEntitiesRedirectUrl, isEntityDefinitionLoading } = useDiscoverRedirect(entity);
   const discoverUrl = getDiscoverEntitiesRedirectUrl();
 
   const actions: React.ReactElement[] = [];
 
-  if (!discoverUrl && !isEntityDefinitionIndexPatternsLoading) {
+  if (!discoverUrl && !isEntityDefinitionLoading) {
     setShowActions(false);
     return null;
   }
 
-  if (!isEntityDefinitionIndexPatternsLoading) {
+  if (!isEntityDefinitionLoading) {
     actions.push(
       <EuiContextMenuItem
         data-test-subj="inventoryEntityActionExploreInDiscover"
@@ -66,7 +65,7 @@ export const EntityActions = ({ entity, setShowActions }: Props) => {
           iconType="boxesHorizontal"
           color="text"
           onClick={togglePopover}
-          isLoading={isEntityDefinitionIndexPatternsLoading}
+          isLoading={isEntityDefinitionLoading}
         />
       }
       closePopover={closePopover}

diff --git a/x-pack/plugins/observability_solution/inventory/public/hooks/use_discover_redirect.ts b/x-pack/plugins/observability_solution/inventory/public/hooks/use_discover_redirect.ts
@@ -7,22 +7,23 @@
 import { useCallback, useMemo } from 'react';
 import type { InventoryEntity } from '../../common/entities';
 import { useAdHocDataView } from './use_adhoc_data_view';
-import { useFetchEntityDefinitionIndexPattern } from './use_fetch_entity_definition_index_patterns';
+import { useFetchEntityDefinition } from './use_fetch_entity_definition';
 import { useKibana } from './use_kibana';
 
 export const useDiscoverRedirect = (entity: InventoryEntity) => {
   const {
     services: { share, application, entityManager },
   } = useKibana();
-  const { entityDefinitionIndexPatterns, isEntityDefinitionIndexPatternsLoading } =
-    useFetchEntityDefinitionIndexPattern(entity.entityType);
+  const { entityDefinitions, isEntityDefinitionLoading } = useFetchEntityDefinition(
+    entity.entityDefinitionId
+  );
 
   const title = useMemo(
     () =>
-      !isEntityDefinitionIndexPatternsLoading && (entityDefinitionIndexPatterns ?? []).length > 0
-        ? entityDefinitionIndexPatterns[0].join()
+      !isEntityDefinitionLoading && entityDefinitions && entityDefinitions?.length > 0
+        ? entityDefinitions[0]?.indexPatterns?.join(',')
         : '',
-    [entityDefinitionIndexPatterns, isEntityDefinitionIndexPatternsLoading]
+    [entityDefinitions, isEntityDefinitionLoading]
   );
 
   const { dataView } = useAdHocDataView(title);
@@ -53,5 +54,5 @@ export const useDiscoverRedirect = (entity: InventoryEntity) => {
     entityManager.entityClient,
   ]);
 
-  return { getDiscoverEntitiesRedirectUrl, isEntityDefinitionIndexPatternsLoading };
+  return { getDiscoverEntitiesRedirectUrl, isEntityDefinitionLoading };
 };
diff --git a/x-pack/plugins/observability_solution/inventory/public/hooks/use_fetch_entity_definition.ts b/x-pack/plugins/observability_solution/inventory/public/hooks/use_fetch_entity_definition.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useAbortableAsync } from '@kbn/observability-utils-browser/hooks/use_abortable_async';
+import { useKibana } from './use_kibana';
+
+export const useFetchEntityDefinition = (id: string) => {
+  const {
+    services: { entityManager },
+  } = useKibana();
+
+  const { value, loading } = useAbortableAsync(
+    ({ signal }) => {
+      return entityManager.entityClient.getEntityDefinition(id);
+    },
+    [entityManager.entityClient, id]
+  );
+
+  return {
+    entityDefinitions: value?.definitions,
+    isEntityDefinitionLoading: loading,
+  };
+};
diff --git a/...servability_solution/inventory/public/hooks/use_fetch_entity_definition_index_patterns.ts b/...servability_solution/inventory/public/hooks/use_fetch_entity_definition_index_patterns.ts
diff --git a/...bservability_solution/inventory/server/routes/entity_definition/get_entity_definitions.ts b/...bservability_solution/inventory/server/routes/entity_definition/get_entity_definitions.ts
diff --git a/...s/observability_solution/inventory/server/routes/get_global_inventory_route_repository.ts b/...s/observability_solution/inventory/server/routes/get_global_inventory_route_repository.ts
@@ -6,13 +6,11 @@
  */
 
 import { entitiesRoutes } from './entities/route';
-import { entityDefinitionsRoutes } from './entity_definition/get_entity_definitions';
 import { hasDataRoutes } from './has_data/route';
 
 export function getGlobalInventoryServerRouteRepository() {
   return {
     ...entitiesRoutes,
-    ...entityDefinitionsRoutes,
     ...hasDataRoutes,
   };
 }