[PM-9638] Browser V2 Item Details Defects (#10124)

* Item Details Refactored. Created OrgIcon directive, Added screen reader logic, removed excess styling.

apps/browser/src/_locales/en/messages.json

@@ -3850,5 +3850,8 @@
         "example": "3"
       }
     }
+  },
+  "itemLocation": {
+    "message": "Item Location"
   }
 }

apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html

@@ -27,9 +27,10 @@
         <app-vault-icon slot="start" [cipher]="cipher"></app-vault-icon>
         <span data-testid="item-name">{{ cipher.name }}</span>
         <i
-          class="bwi bwi-sm"
           *ngIf="cipher.organizationId"
-          [ngClass]="cipher.orgIcon"
+          appOrgIcon
+          [tierType]="cipher.organization.productTierType"
+          [size]="'small'"
           [appA11yTitle]="orgIconTooltip(cipher)"
         ></i>
         <span slot="secondary">{{ cipher.subTitle }}</span>

apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts

@@ -13,6 +13,7 @@ import {
   SectionHeaderComponent,
   TypographyModule,
 } from "@bitwarden/components";
+import { OrgIconDirective } from "@bitwarden/vault";
 
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
 import { PopupCipherView } from "../../../views/popup-cipher.view";
@@ -33,6 +34,7 @@ import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options
     RouterLink,
     ItemCopyActionsComponent,
     ItemMoreOptionsComponent,
+    OrgIconDirective,
   ],
   selector: "app-vault-list-items-container",
   templateUrl: "vault-list-items-container.component.html",

apps/browser/src/vault/popup/views/popup-cipher.view.ts

@@ -1,5 +1,4 @@
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
@@ -21,21 +20,4 @@ export class PopupCipherView extends CipherView {
     this.collections = collections;
     this.organization = organization;
   }
-
-  /**
-   * Get the bwi icon for the cipher according to the organization type.
-   */
-  get orgIcon(): "bwi-family" | "bwi-business" | null {
-    switch (this.organization?.productTierType) {
-      case ProductTierType.Free:
-      case ProductTierType.Families:
-        return "bwi-family";
-      case ProductTierType.Teams:
-      case ProductTierType.Enterprise:
-      case ProductTierType.TeamsStarter:
-        return "bwi-business";
-      default:
-        return null;
-    }
-  }
 }

libs/vault/src/cipher-view/item-details/item-details-v2.component.html

@@ -3,36 +3,68 @@
     <h2 bitTypography="h6">{{ "itemDetails" | i18n }}</h2>
   </bit-section-header>
   <bit-card>
-    <div class="tw-pb-2 tw-mb-4 tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300">
+    <div>
       <label class="tw-block tw-w-full tw-mb-1 tw-text-xs tw-text-muted tw-select-none">
         {{ "itemName" | i18n }}
       </label>
       <input readonly bitInput type="text" [value]="cipher.name" aria-readonly="true" />
     </div>
 
-    <div *ngIf="cipher.collectionIds || cipher.organizationId || cipher.folderId">
-      <p
-        *ngIf="!cipher.organizationId"
-        [ngClass]="{ 'tw-mb-3': cipher.collectionIds }"
-        bitTypography="body2"
+    <ul
+      [attr.aria-label]="'itemLocation' | i18n"
+      *ngIf="cipher.collectionIds || cipher.organizationId || cipher.folderId"
     >
-        <i class="bwi bwi-user bwi-lg bwi-fw"></i> {{ "ownerYou" | i18n }}
-      </p>
-      <p
+      <li
         *ngIf="cipher.organizationId && organization"
+        class="tw-flex tw-list-none"
         [ngClass]="{ 'tw-mb-3': cipher.collectionIds }"
         bitTypography="body2"
+        [attr.aria-label]="('owner' | i18n) + organization.name"
       >
-        <i class="bwi bwi-business bwi-lg bwi-fw"></i> {{ organization.name }}
-      </p>
-      <ul *ngIf="cipher.collectionIds && collections" [ngClass]="{ 'tw-mb-2': cipher.folderId }">
-        <p *ngFor="let collection of collections" class="tw-mb-1" bitTypography="body2">
-          <i class="bwi bwi-collection bwi-lg bwi-fw"></i> {{ collection.name }}
-        </p>
+        <i
+          class="tw-pt-1"
+          appOrgIcon
+          [tierType]="organization.productTierType"
+          [size]="'large'"
+          [title]="'owner' | i18n"
+        ></i>
+        <span aria-hidden="true" class="tw-pl-1 tw-mb-1">
+          {{ organization.name }}
+        </span>
+      </li>
+      <li
+        class="tw-list-none"
+        *ngIf="cipher.collectionIds && collections"
+        [attr.aria-label]="'collection' | i18n"
+      >
+        <ul>
+          <li
+            *ngFor="let collection of collections; let last = last"
+            class="tw-flex tw-list-none"
+            bitTypography="body2"
+            [ngClass]="{ 'tw-mb-3': last }"
+            [attr.aria-label]="collection.name"
+          >
+            <i
+              class="bwi bwi-collection bwi-lg tw-pt-1"
+              aria-hidden="true"
+              [title]="'collection' | i18n"
+            ></i>
+            <span aria-hidden="true" class="tw-pl-1 tw-mb-1">
+              {{ collection.name }}
+            </span>
+          </li>
+        </ul>
+      </li>
+      <li
+        *ngIf="cipher.folderId && folder"
+        bitTypography="body2"
+        class="tw-flex tw-list-none"
+        [attr.aria-label]="('folder' | i18n) + folder.name"
+      >
+        <i class="bwi bwi-folder bwi-lg tw-pt-1" aria-hidden="true" [title]="'folder' | i18n"></i>
+        <span aria-hidden="true" class="tw-pl-1 tw-mb-1">{{ folder.name }} </span>
+      </li>
     </ul>
-      <p *ngIf="cipher.folderId && folder" bitTypography="body2">
-        <i class="bwi bwi-folder bwi-lg bwi-fw"></i> {{ folder.name }}
-      </p>
-    </div>
   </bit-card>
 </bit-section>

libs/vault/src/cipher-view/item-details/item-details-v2.component.ts

@@ -13,6 +13,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+import { OrgIconDirective } from "../../components/org-icon.directive";
+
 @Component({
   selector: "app-item-details-v2",
   templateUrl: "item-details-v2.component.html",
@@ -24,6 +26,7 @@ import {
     SectionComponent,
     SectionHeaderComponent,
     TypographyModule,
+    OrgIconDirective,
   ],
 })
 export class ItemDetailsV2Component {

libs/vault/src/components/org-icon.directive.ts

@@ -0,0 +1,50 @@
+import { Directive, ElementRef, HostBinding, Input, Renderer2 } from "@angular/core";
+
+import { ProductTierType } from "@bitwarden/common/billing/enums";
+
+export type OrgIconSize = "default" | "small" | "large";
+
+@Directive({
+  standalone: true,
+  selector: "[appOrgIcon]",
+})
+export class OrgIconDirective {
+  @Input({ required: true }) tierType: ProductTierType;
+  @Input() size?: OrgIconSize = "default";
+
+  constructor(
+    private el: ElementRef,
+    private renderer: Renderer2,
+  ) {
+    this.renderer.setAttribute(this.el.nativeElement, "aria-hidden", "true");
+  }
+
+  get iconSize(): "bwi-sm" | "bwi-lg" | "" {
+    switch (this.size) {
+      case "small":
+        return "bwi-sm";
+      case "large":
+        return "bwi-lg";
+      default:
+        return "";
+    }
+  }
+
+  get orgIcon(): string {
+    switch (this.tierType) {
+      case ProductTierType.Free:
+      case ProductTierType.Families:
+        return "bwi-family";
+      case ProductTierType.Teams:
+      case ProductTierType.Enterprise:
+      case ProductTierType.TeamsStarter:
+        return "bwi-business";
+      default:
+        return "";
+    }
+  }
+
+  @HostBinding("class") get classList() {
+    return ["bwi", this.iconSize, this.orgIcon];
+  }
+}

libs/vault/src/index.ts

@@ -1,6 +1,7 @@
 export { PasswordRepromptService } from "./services/password-reprompt.service";
 export { CopyCipherFieldService, CopyAction } from "./services/copy-cipher-field.service";
 export { CopyCipherFieldDirective } from "./components/copy-cipher-field.directive";
+export { OrgIconDirective } from "./components/org-icon.directive";
 
 export * from "./cipher-view";
 export * from "./cipher-form";