[8.17] [APM] Fix inventory plugin link (elastic#201122) (elastic#201874)

# Backport This will backport the following commits from `main` to `8.17`: - [[APM] Fix inventory plugin link (elastic#201122)](elastic#201122)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Cauê Marcondes <[email protected]>
kibanamachine · Nov 26, 2024 · a692b88 · a692b88
1 parent e3cdc2e
commit a692b88
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 29 deletions.
diff --git a/.../observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts b/.../observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts
@@ -23,10 +23,12 @@ const serviceInventoryHref = url.format({
 
 const mainApiRequestsToIntercept = [
   {
+    method: 'GET',
     endpoint: '/internal/apm/services?*',
     aliasName: 'servicesRequest',
   },
   {
+    method: 'POST',
     endpoint: '/internal/apm/services/detailed_statistics?*',
     aliasName: 'detailedStatisticsRequest',
   },
@@ -51,8 +53,13 @@ describe.skip('Service inventory', () => {
 
   describe('When navigating to the service inventory', () => {
     beforeEach(() => {
+      mainApiRequestsToIntercept.forEach(({ aliasName, endpoint, method }) =>
+        cy.intercept(method, endpoint).as(aliasName)
+      );
       cy.loginAsViewerUser();
-      cy.visitKibana(serviceInventoryHref);
+      cy.visitKibana(serviceInventoryHref, {
+        localStorageOptions: [['apm.dismissedEntitiesInventoryCallout', 'false']],
+      });
     });
 
     it('has no detectable a11y violations on load', () => {
@@ -80,9 +87,8 @@ describe.skip('Service inventory', () => {
 
   describe('Calls APIs', () => {
     beforeEach(() => {
-      cy.intercept('GET', '/internal/apm/services?*').as('servicesRequest');
-      cy.intercept('POST', '/internal/apm/services/detailed_statistics?*').as(
-        'detailedStatisticsRequest'
+      mainApiRequestsToIntercept.forEach(({ aliasName, endpoint, method }) =>
+        cy.intercept(method, endpoint).as(aliasName)
       );
 
       cy.loginAsViewerUser();

diff --git a/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/commands.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/commands.ts
@@ -55,26 +55,32 @@ Cypress.Commands.add('loginAsApmReadPrivilegesWithWriteSettingsUser', () => {
 Cypress.Commands.add(
   'loginAs',
   ({ username, password }: { username: string; password: string }) => {
-    // cy.session(username, () => {
-    const kibanaUrl = Cypress.env('KIBANA_URL');
-    cy.log(`Logging in as ${username} on ${kibanaUrl}`);
-    cy.visit('/');
-    cy.request({
-      log: true,
-      method: 'POST',
-      url: `${kibanaUrl}/internal/security/login`,
-      body: {
-        providerType: 'basic',
-        providerName: 'basic',
-        currentURL: `${kibanaUrl}/login`,
-        params: { username, password },
-      },
-      headers: {
-        'kbn-xsrf': 'e2e_test',
+    cy.session(
+      username,
+      () => {
+        const kibanaUrl = Cypress.env('KIBANA_URL');
+        cy.log(`Logging in as ${username} on ${kibanaUrl}`);
+        cy.visit('/');
+        cy.request({
+          log: true,
+          method: 'POST',
+          url: `${kibanaUrl}/internal/security/login`,
+          body: {
+            providerType: 'basic',
+            providerName: 'basic',
+            currentURL: `${kibanaUrl}/login`,
+            params: { username, password },
+          },
+          headers: {
+            'kbn-xsrf': 'e2e_test',
+          },
+        });
+        cy.visit('/');
       },
-      // });
-    });
-    cy.visit('/');
+      {
+        cacheAcrossSpecs: true,
+      }
+    );
   }
 );
 
@@ -87,8 +93,14 @@ Cypress.Commands.add('changeTimeRange', (value: string) => {
   cy.contains(value).click();
 });
 
-Cypress.Commands.add('visitKibana', (url: string) => {
-  cy.visit(url);
+Cypress.Commands.add('visitKibana', (url, options) => {
+  cy.visit(url, {
+    onBeforeLoad(win) {
+      if (options?.localStorageOptions && options.localStorageOptions.length > 0) {
+        options.localStorageOptions.forEach(([key, value]) => win.localStorage.setItem(key, value));
+      }
+    },
+  });
   cy.getByTestSubj('kbnLoadingMessage').should('exist');
   cy.getByTestSubj('kbnLoadingMessage').should('not.exist', {
     timeout: 50000,

diff --git a/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/types.d.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/types.d.ts
@@ -19,7 +19,7 @@ declare namespace Cypress {
       password: string;
     }): Cypress.Chainable<Cypress.Response<any>>;
     changeTimeRange(value: string): void;
-    visitKibana(url: string): void;
+    visitKibana(url: string, options?: { localStorageOptions?: Array<[string, string]> }): void;
     selectAbsoluteTimeRange(start: string, end: string): void;
     expectAPIsToHaveBeenCalledWith(params: { apisIntercepted: string[]; value: string }): void;
     updateAdvancedSettings(settings: Record<string, unknown>): void;

diff --git a/x-pack/plugins/observability_solution/inventory/public/hooks/use_inventory_router.ts b/x-pack/plugins/observability_solution/inventory/public/hooks/use_inventory_router.ts
@@ -47,7 +47,7 @@ export function useInventoryRouter(): StatefulInventoryRouter {
         navigateToApp('inventory', { path: next, replace: true });
       },
       link: (path, ...args) => {
-        return http.basePath.prepend('/app/observability/inventory' + link(path, ...args));
+        return http.basePath.prepend('/app/inventory' + link(path, ...args));
       },
     }),
     [navigateToApp, http.basePath]

diff --git a/...olution/observability_shared/common/locators/entity_inventory/entity_inventory_locator.ts b/...olution/observability_shared/common/locators/entity_inventory/entity_inventory_locator.ts
@@ -16,8 +16,8 @@ export class EntitiesInventoryLocatorDefinition implements LocatorDefinition<Ser
 
   public readonly getLocation = async () => {
     return {
-      app: 'observability',
-      path: `/inventory`,
+      app: 'inventory',
+      path: `/`,
       state: {},
     };
   };