Revert "DEVPROD-7660: Add link to image page in task metadata" (#379)

evergreen-ci · Sep 12, 2024 · 9abb8f1 · 9abb8f1
1 parent 22fe953
commit 9abb8f1
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 159 deletions.
diff --git a/apps/spruce/cypress/integration/image/navigation.ts b/apps/spruce/cypress/integration/image/navigation.ts
@@ -22,15 +22,4 @@ describe("/image/imageId/random redirect route", () => {
         });
     });
   });
-
-  it("navigates to the image page from the task page", () => {
-    cy.visit(
-      "/task/evergreen_ubuntu1604_test_annotations_b_5e4ff3abe3c3317e352062e4_20_02_21_15_13_48",
-    );
-    cy.dataCy("task-image-link")
-      .should("have.attr", "href")
-      .and("eq", "/image/ubuntu1604/build-information");
-    cy.dataCy("task-image-link").click();
-    cy.location("pathname").should("eq", "/image/ubuntu1604/build-information");
-  });
 });
diff --git a/apps/spruce/src/gql/generated/types.ts b/apps/spruce/src/gql/generated/types.ts
@@ -8841,7 +8841,6 @@ export type TaskQuery = {
     generatedBy?: string | null;
     generatedByName?: string | null;
     hostId?: string | null;
-    imageId: string;
     ingestTime?: Date | null;
     isPerfPluginEnabled: boolean;
     latestExecution: number;

diff --git a/apps/spruce/src/gql/mocks/taskData.ts b/apps/spruce/src/gql/mocks/taskData.ts
@@ -58,7 +58,6 @@ export const taskQuery: TaskQueryType = {
     canUnschedule: false,
     dependsOn: [],
     displayName: "e2e_test",
-    imageId: "ubuntu1604",
     distroId: "ubuntu1604-small",
     estimatedStart: 1000,
     pod: null,

diff --git a/apps/spruce/src/gql/queries/task.graphql b/apps/spruce/src/gql/queries/task.graphql
@@ -84,7 +84,6 @@ query Task($taskId: String!, $execution: Int) {
     generatedBy
     generatedByName
     hostId
-    imageId
     ingestTime
     isPerfPluginEnabled
     latestExecution

diff --git a/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_ContainerizedTask.storyshot b/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_ContainerizedTask.storyshot
@@ -139,7 +139,6 @@
           class="css-qqg5h5-Divider eb6szep0"
         />
       </div>
-
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
       >

diff --git a/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_Default.storyshot b/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_Default.storyshot
@@ -139,26 +139,17 @@
           class="css-qqg5h5-Divider eb6szep0"
         />
       </div>
-
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
+        data-cy="task-metadata-ami"
       >
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          ID:
+          AMI:
         </b>
 
-        <a
-          class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-host-link"
-          href="/host/i-0e0e62799806e037d"
-          target="_self"
-        >
-          <span>
-            i-0e0e62799806e037d
-          </span>
-        </a>
+        ami-0c83bb0a9f48c15bf
       </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
@@ -185,31 +176,20 @@
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          Image:
+          ID:
         </b>
 
         <a
           class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-image-link"
-          href="/image/ubuntu1604/build-information"
+          data-cy="task-host-link"
+          href="/host/i-0e0e62799806e037d"
+          target="_self"
         >
           <span>
-            ubuntu1604
+            i-0e0e62799806e037d
           </span>
         </a>
       </p>
-      <p
-        class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
-        data-cy="task-metadata-ami"
-      >
-        <b
-          class="css-1xk67r-MetadataLabel e1ul56zb0"
-        >
-          AMI:
-        </b>
-
-        ami-0c83bb0a9f48c15bf
-      </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
       >

diff --git a/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_OOMTracker.storyshot b/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_OOMTracker.storyshot
@@ -135,26 +135,17 @@
           class="css-qqg5h5-Divider eb6szep0"
         />
       </div>
-
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
+        data-cy="task-metadata-ami"
       >
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          ID:
+          AMI:
         </b>
 
-        <a
-          class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-host-link"
-          href="/host/i-0e0e62799806e037d"
-          target="_self"
-        >
-          <span>
-            i-0e0e62799806e037d
-          </span>
-        </a>
+        ami-0c83bb0a9f48c15bf
       </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
@@ -181,31 +172,20 @@
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          Image:
+          ID:
         </b>
 
         <a
           class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-image-link"
-          href="/image/ubuntu1604/build-information"
+          data-cy="task-host-link"
+          href="/host/i-0e0e62799806e037d"
+          target="_self"
         >
           <span>
-            ubuntu1604
+            i-0e0e62799806e037d
           </span>
         </a>
       </p>
-      <p
-        class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
-        data-cy="task-metadata-ami"
-      >
-        <b
-          class="css-1xk67r-MetadataLabel e1ul56zb0"
-        >
-          AMI:
-        </b>
-
-        ami-0c83bb0a9f48c15bf
-      </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
       >

diff --git a/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_WithAbortMessage.storyshot b/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_WithAbortMessage.storyshot
@@ -139,26 +139,17 @@
           class="css-qqg5h5-Divider eb6szep0"
         />
       </div>
-
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
+        data-cy="task-metadata-ami"
       >
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          ID:
+          AMI:
         </b>
 
-        <a
-          class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-host-link"
-          href="/host/i-0e0e62799806e037d"
-          target="_self"
-        >
-          <span>
-            i-0e0e62799806e037d
-          </span>
-        </a>
+        ami-0c83bb0a9f48c15bf
       </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
@@ -185,31 +176,20 @@
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          Image:
+          ID:
         </b>
 
         <a
           class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-image-link"
-          href="/image/ubuntu1604/build-information"
+          data-cy="task-host-link"
+          href="/host/i-0e0e62799806e037d"
+          target="_self"
         >
           <span>
-            ubuntu1604
+            i-0e0e62799806e037d
           </span>
         </a>
       </p>
-      <p
-        class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
-        data-cy="task-metadata-ami"
-      >
-        <b
-          class="css-1xk67r-MetadataLabel e1ul56zb0"
-        >
-          AMI:
-        </b>
-
-        ami-0c83bb0a9f48c15bf
-      </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
       >

diff --git a/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_WithDependencies.storyshot b/apps/spruce/src/pages/task/metadata/__snapshots__/Metadata_WithDependencies.storyshot
@@ -139,26 +139,17 @@
           class="css-qqg5h5-Divider eb6szep0"
         />
       </div>
-
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
+        data-cy="task-metadata-ami"
       >
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          ID:
+          AMI:
         </b>
 
-        <a
-          class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-host-link"
-          href="/host/i-0e0e62799806e037d"
-          target="_self"
-        >
-          <span>
-            i-0e0e62799806e037d
-          </span>
-        </a>
+        ami-0c83bb0a9f48c15bf
       </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
@@ -185,31 +176,20 @@
         <b
           class="css-1xk67r-MetadataLabel e1ul56zb0"
         >
-          Image:
+          ID:
         </b>
 
         <a
           class="lg-ui-0001 css-1gw3cuq-StyledLink leafygreen-ui-16e7rxl"
-          data-cy="task-image-link"
-          href="/image/ubuntu1604/build-information"
+          data-cy="task-host-link"
+          href="/host/i-0e0e62799806e037d"
+          target="_self"
         >
           <span>
-            ubuntu1604
+            i-0e0e62799806e037d
           </span>
         </a>
       </p>
-      <p
-        class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
-        data-cy="task-metadata-ami"
-      >
-        <b
-          class="css-1xk67r-MetadataLabel e1ul56zb0"
-        >
-          AMI:
-        </b>
-
-        ami-0c83bb0a9f48c15bf
-      </p>
       <p
         class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
       >
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,6 @@ @@
               class="css-qqg5h5-Divider eb6szep0"
             />
           </div>
           <p
             class="css-1spnncu-Item-wordBreakCss e1ul56zb1 leafygreen-ui-1tb6tuo"
           >
@@ Expand Down @@