Merge branch 'main' of https://github.com/bitwarden/clients into PM-2164-Migrate-api-key-dialog

apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html

@@ -48,7 +48,7 @@
   ></app-group-badge>
 </td>
 <td bitCell [ngClass]="RowHeightClass" *ngIf="showPermissionsColumn">
-  <p class="tw-mb-0 tw-text-muted">
+  <p class="tw-mb-0 tw-text-muted" [title]="permissionTooltip">
     {{ permissionText }}
   </p>
 </td>

apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts

@@ -6,6 +6,7 @@ import { CollectionView } from "@bitwarden/common/vault/models/view/collection.v
 
 import { GroupView } from "../../../admin-console/organizations/core";
 import { CollectionAdminView } from "../../core/views/collection-admin.view";
+import { Unassigned } from "../../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 
 import {
   convertToPermission,
@@ -52,8 +53,8 @@ export class VaultCollectionRowComponent {
   }
 
   get permissionText() {
-    if (!(this.collection as CollectionAdminView).assigned) {
-      return "-";
+    if (this.collection.id != Unassigned && !(this.collection as CollectionAdminView).assigned) {
+      return this.i18nService.t("noAccess");
     } else {
       const permissionList = getPermissionList(this.organization?.flexibleCollections);
       return this.i18nService.t(
@@ -62,6 +63,13 @@ export class VaultCollectionRowComponent {
     }
   }
 
+  get permissionTooltip() {
+    if (this.collection.id == Unassigned) {
+      return this.i18nService.t("collectionAdminConsoleManaged");
+    }
+    return "";
+  }
+
   protected edit() {
     this.onEvent.next({ type: "editCollection", item: this.collection });
   }

apps/web/src/locales/en/messages.json

@@ -7979,5 +7979,11 @@
   },
   "createdNewClient": {
     "message": "Successfully created new client"
+   },
+  "noAccess": {
+    "message": "No access"
+  },
+  "collectionAdminConsoleManaged": {
+    "message": "This collection is only accessible from the admin console"
   }
 }