[PM-11162] Assign To Collections Permission Update

apps/web/src/app/vault/org-vault/vault.component.html

@@ -107,7 +107,7 @@
           *ngIf="
             filter.type !== 'trash' &&
             filter.collectionId !== Unassigned &&
-            selectedCollection?.node?.canEditItems(organization)
+            selectedCollection?.node?.canEditItems(organization, false)
           "
         >
           <i aria-hidden="true" class="bwi bwi-plus"></i> {{ "newItem" | i18n }}

libs/admin-console/src/common/collections/models/collection.view.ts

@@ -40,19 +40,17 @@
   }
 
   // Applying excludeHidePassword false will remove collections with Can Edit Except Password Permissions
-  canEditItems(org: Organization, excludeHidePassword = true): boolean {
+  canEditItems(org: Organization, editPassword = true): boolean {
     if (org != null && org.id !== this.organizationId) {
       throw new Error(
         "Id of the organization provided does not match the org id of the collection.",
       );
     }
 
     return (
       org?.canEditAllCiphers ||
       this.manage ||
-      (this.assigned &&
-        !this.readOnly &&
-        (excludeHidePassword ? true : this.hidePasswords === false))
+      (this.assigned && !this.readOnly && (!editPassword || !this.hidePasswords))
     );
   }
 

libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts

@@ -460,27 +460,6 @@ describe("ItemDetailsSectionComponent", () => {
         createMockCollection("col1", "Collection 1", "org1", true, false) as CollectionView,
         createMockCollection("col2", "Collection 2", "org1", true, false) as CollectionView,
         createMockCollection("col3", "Collection 3", "org1", false, false) as CollectionView,
-        // {
-        //   id: "col1",
-        //   name: "Collection 1",
-        //   organizationId: "org1",
-        //   readOnly: true,
-        //   canEditItems: (_org) => false,
-        // } as CollectionView,
-        // {
-        //   id: "col2",
-        //   name: "Collection 2",
-        //   organizationId: "org1",
-        //   readOnly: true,
-        //   canEditItems: (_org) => false,
-        // } as CollectionView,
-        // {
-        //   id: "col3",
-        //   name: "Collection 3",
-        //   organizationId: "org1",
-        //   readOnly: false,
-        //   canEditItems: (_org) => false,
-        // } as CollectionView,
       ];
 
       fixture.detectChanges();

libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts

@@ -286,7 +286,7 @@ export class ItemDetailsSectionComponent implements OnInit {
         // - When viewing as an admin, all collections should be shown, even readonly. When non-admin, filter out readonly collections
         return (
           c.organizationId === orgId &&
-          (this.partialEdit || c.canEditItems(organization, false) || this.config.admin)
+          (this.partialEdit || c.canEditItems(organization) || this.config.admin)
         );
       })
       .map((c) => ({

libs/vault/src/components/assign-collections.component.ts

@@ -287,13 +287,13 @@
       return;
     }
 
     const org = await this.organizationService.get(this.selectedOrgId);
 
     this.availableCollections = this.params.availableCollections
       .filter((collection) => {
-        return collection.canEditItems(org, false);
+        return collection.canEditItems(org);
       })
       .map((c) => ({
         icon: "bwi-collection",
         id: c.id,
         labelName: c.name,