[AC-2555] Cipher collections dialog merge fixes (#9036)

* [AC-2555] Fix missing feature flags in CollectionsComponent

* [AC-2555] Do not filter collections when opening the cipher collections dialog in the org vault

apps/browser/src/vault/popup/components/vault/collections.component.ts

@@ -5,6 +5,7 @@ import { first } from "rxjs/operators";
 
 import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -26,6 +27,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     private route: ActivatedRoute,
     private location: Location,
     logService: LogService,
+    configService: ConfigService,
   ) {
     super(
       collectionService,
@@ -34,6 +36,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
       cipherService,
       organizationService,
       logService,
+      configService,
     );
   }
 

apps/desktop/src/vault/app/vault/collections.component.ts

@@ -2,6 +2,7 @@ import { Component } from "@angular/core";
 
 import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -20,6 +21,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     platformUtilsService: PlatformUtilsService,
     organizationService: OrganizationService,
     logService: LogService,
+    configService: ConfigService,
   ) {
     super(
       collectionService,
@@ -28,6 +30,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
       cipherService,
       organizationService,
       logService,
+      configService,
     );
   }
 }

apps/web/src/app/vault/individual-vault/collections.component.ts

@@ -1,8 +1,9 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { Component, OnDestroy, Inject } from "@angular/core";
+import { Component, Inject, OnDestroy } from "@angular/core";
 
 import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -23,6 +24,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
     cipherService: CipherService,
     organizationSerivce: OrganizationService,
     logService: LogService,
+    configService: ConfigService,
     protected dialogRef: DialogRef,
     @Inject(DIALOG_DATA) params: CollectionsDialogParams,
   ) {
@@ -33,6 +35,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
       cipherService,
       organizationSerivce,
       logService,
+      configService,
     );
     this.cipherId = params?.cipherId;
   }

apps/web/src/app/vault/org-vault/collections.component.ts

@@ -4,6 +4,7 @@ import { Component, Inject } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -35,6 +36,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     organizationService: OrganizationService,
     private apiService: ApiService,
     logService: LogService,
+    configService: ConfigService,
     protected dialogRef: DialogRef,
     @Inject(DIALOG_DATA) params: OrgVaultCollectionsDialogParams,
   ) {
@@ -45,6 +47,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
       cipherService,
       organizationService,
       logService,
+      configService,
       dialogRef,
       params,
     );

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

@@ -802,33 +802,14 @@ export class VaultComponent implements OnInit, OnDestroy {
     const dialog = openOrgVaultCollectionsDialog(this.dialogService, {
       data: {
         collectionIds: cipher.collectionIds,
-        collections: collections.filter((c) => !c.readOnly && c.id != Unassigned),
+        collections: collections,
         organization: this.organization,
         cipherId: cipher.id,
       },
     });
-    /**
-     
-     const [modal] = await this.modalService.openViewRef(
-     CollectionsComponent,
-     this.collectionsModalRef,
-     (comp) => {
-     comp.flexibleCollectionsV1Enabled = this.flexibleCollectionsV1Enabled;
-     comp.collectionIds = cipher.collectionIds;
-     comp.collections = collections;
-     comp.organization = this.organization;
-     comp.cipherId = cipher.id;
-     comp.onSavedCollections.pipe(takeUntil(this.destroy$)).subscribe(() => {
-     modal.close();
-     this.refresh();
-     });
-     },
-     );
-     
-     */
 
     if ((await lastValueFrom(dialog.closed)) == CollectionsDialogResult.Saved) {
-      await this.refresh();
+      this.refresh();
     }
   }
 

libs/angular/src/admin-console/components/collections.component.ts

@@ -2,6 +2,8 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -33,9 +35,13 @@ export class CollectionsComponent implements OnInit {
     protected cipherService: CipherService,
     protected organizationService: OrganizationService,
     private logService: LogService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
+    this.flexibleCollectionsV1Enabled = await this.configService.getFeatureFlag(
+      FeatureFlag.FlexibleCollectionsV1,
+    );
     await this.load();
   }