1 files changed, 20 insertions, 31 deletions

diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
index 23d8e97dd79..4f89d217623 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
@@ -12,7 +12,6 @@ import {
   REMOVE_REPOSITORY_LABEL,
   ROW_SCHEDULED_FOR_DELETION,
   IMAGE_DELETE_SCHEDULED_STATUS,
-  IMAGE_FAILED_DELETED_STATUS,
   IMAGE_MIGRATING_STATE,
   COPY_IMAGE_PATH_TITLE,
   IMAGE_FULL_PATH_LABEL,
@@ -79,9 +78,6 @@ export default {
     migrating() {
       return this.item.migrationState === IMAGE_MIGRATING_STATE;
     },
-    failedDelete() {
-      return this.item.status === IMAGE_FAILED_DELETED_STATUS;
-    },
     tagsCountText() {
       return n__(
         'ContainerRegistry|%{count} Tag',
@@ -99,9 +95,6 @@ export default {
       }
       return projectPath;
     },
-    routerLinkEvent() {
-      return this.deleting ? '' : 'click';
-    },
     deleteButtonTooltipTitle() {
       return this.migrating
         ? LIST_DELETE_BUTTON_DISABLED_FOR_MIGRATION
@@ -121,15 +114,7 @@ export default {
 </script>
 
 <template>
-  <list-item
-    v-gl-tooltip="{
-      placement: 'left',
-      disabled: !deleting,
-      title: $options.i18n.ROW_SCHEDULED_FOR_DELETION,
-    }"
-    v-bind="$attrs"
-    :disabled="deleting"
-  >
+  <list-item v-bind="$attrs">
     <template #left-primary>
       <gl-button
         v-if="!showFullPath"
@@ -143,12 +128,13 @@ export default {
         :aria-label="$options.i18n.IMAGE_FULL_PATH_LABEL"
         @click="hideButton"
       />
+      <span v-if="deleting" class="gl-text-gray-500">{{ imageName }}</span>
       <router-link
+        v-else
         ref="imageName"
         class="gl-text-body gl-font-weight-bold"
         data-testid="details-link"
         data-qa-selector="registry_image_content"
-        :event="routerLinkEvent"
         :to="{ name: 'details', params: { id } }"
       >
         {{ imageName }}
@@ -163,21 +149,24 @@ export default {
     </template>
     <template #left-secondary>
       <template v-if="!metadataLoading">
-        <span class="gl-display-flex gl-align-items-center" data-testid="tags-count">
-          <gl-icon name="tag" class="gl-mr-2" />
-          <gl-sprintf :message="tagsCountText">
-            <template #count>
-              {{ item.tagsCount }}
-            </template>
-          </gl-sprintf>
-        </span>
+        <span v-if="deleting">{{ $options.i18n.ROW_SCHEDULED_FOR_DELETION }}</span>
+        <template v-else>
+          <span class="gl-display-flex gl-align-items-center" data-testid="tags-count">
+            <gl-icon name="tag" class="gl-mr-2" />
+            <gl-sprintf :message="tagsCountText">
+              <template #count>
+                {{ item.tagsCount }}
+              </template>
+            </gl-sprintf>
+          </span>
 
-        <cleanup-status
-          v-if="item.expirationPolicyCleanupStatus"
-          class="ml-2"
-          :status="item.expirationPolicyCleanupStatus"
-          :expiration-policy="expirationPolicy"
-        />
+          <cleanup-status
+            v-if="item.expirationPolicyCleanupStatus"
+            class="gl-ml-2"
+            :status="item.expirationPolicyCleanupStatus"
+            :expiration-policy="expirationPolicy"
+          />
+        </template>
       </template>
 
       <div v-else class="gl-w-full">