refactor back to hasArchiveFlagEnabled$ - more straight forward to the underlying logic

Author: nick-livefront

apps/desktop/src/vault/app/vault/item-footer.component.ts

@@ -225,7 +225,7 @@ export class ItemFooterComponent implements OnInit, OnChanges {
         switchMap((id) =>
           combineLatest([
             this.cipherArchiveService.userCanArchive$(id),
-            this.cipherArchiveService.showArchiveFeatures$(),
+            this.cipherArchiveService.hasArchiveFlagEnabled$,
           ]),
         ),
       ),

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

@@ -58,7 +58,7 @@ describe("VaultItemsComponent", () => {
         {
           provide: CipherArchiveService,
           useValue: {
-            showArchiveFeatures$: jest.fn().mockReturnValue(of(true)),
+            hasArchiveFlagEnabled$: of(true),
           },
         },
       ],

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

@@ -146,7 +146,7 @@ export class VaultItemsComponent<C extends CipherViewLike> {
   protected disableMenu$: Observable<boolean>;
   private restrictedTypes: RestrictedCipherType[] = [];
 
-  protected archiveFeatureEnabled$ = this.cipherArchiveService.showArchiveFeatures$();
+  protected archiveFeatureEnabled$ = this.cipherArchiveService.hasArchiveFlagEnabled$;
 
   constructor(
     protected cipherAuthorizationService: CipherAuthorizationService,

apps/web/src/app/vault/components/vault-items/vault-items.stories.ts

@@ -147,7 +147,7 @@ export default {
         {
           provide: CipherArchiveService,
           useValue: {
-            showArchiveFeatures$: () => new BehaviorSubject(true).asObservable(),
+            hasArchiveFlagEnabled$: of(true),
           },
         },
       ],

apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts

@@ -258,7 +258,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     const [userId, showArchive] = await firstValueFrom(
       combineLatest([
         this.accountService.activeAccount$.pipe(getUserId),
-        this.cipherArchiveService.showArchiveFeatures$(),
+        this.cipherArchiveService.hasArchiveFlagEnabled$,
       ]),
     );
 

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

@@ -446,7 +446,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       allowedCiphers$,
       filter$,
       this.currentSearchText$,
-      this.cipherArchiveService.showArchiveFeatures$(),
+      this.cipherArchiveService.hasArchiveFlagEnabled$,
     ]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
       concatMap(async ([ciphers, filter, searchText, showArchiveVault]) => {

libs/common/src/vault/abstractions/cipher-archive.service.ts

@@ -4,9 +4,9 @@ import { CipherId, UserId } from "@bitwarden/common/types/guid";
 import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 
 export abstract class CipherArchiveService {
+  abstract hasArchiveFlagEnabled$: Observable<boolean>;
   abstract archivedCiphers$(userId: UserId): Observable<CipherViewLike[]>;
   abstract userCanArchive$(userId: UserId): Observable<boolean>;
-  abstract showArchiveFeatures$(): Observable<boolean>;
   abstract userHasPremium$(userId: UserId): Observable<boolean>;
   abstract archiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void>;
   abstract unarchiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void>;

libs/common/src/vault/services/default-cipher-archive.service.spec.ts

@@ -109,11 +109,11 @@ describe("DefaultCipherArchiveService", () => {
     });
   });
 
-  describe("showArchiveFeatures$", () => {
+  describe("hasArchiveFlagEnabled$", () => {
     it("returns true when feature flag is enabled", async () => {
       mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
 
-      const result = await firstValueFrom(service.showArchiveFeatures$());
+      const result = await firstValueFrom(service.hasArchiveFlagEnabled$);
 
       expect(result).toBe(true);
       expect(mockConfigService.getFeatureFlag$).toHaveBeenCalledWith(
@@ -124,7 +124,7 @@ describe("DefaultCipherArchiveService", () => {
     it("returns false when feature flag is disabled", async () => {
       mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
 
-      const result = await firstValueFrom(service.showArchiveFeatures$());
+      const result = await firstValueFrom(service.hasArchiveFlagEnabled$);
 
       expect(result).toBe(false);
     });

libs/common/src/vault/services/default-cipher-archive.service.ts

@@ -58,11 +58,9 @@ export class DefaultCipherArchiveService implements CipherArchiveService {
   }
 
   /** Returns true when the archive features should be shown. */
-  showArchiveFeatures$(): Observable<boolean> {
-    return this.configService
-      .getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive)
-      .pipe(shareReplay({ refCount: true, bufferSize: 1 }));
-  }
+  hasArchiveFlagEnabled$: Observable<boolean> = this.configService
+    .getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive)
+    .pipe(shareReplay({ refCount: true, bufferSize: 1 }));
 
   /** Returns true when the user has premium from any means. */
   userHasPremium$(userId: UserId): Observable<boolean> {