[PM-13811] Remove conditional code for extension refresh on web

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

@@ -22,7 +22,7 @@
       [routerLink]="[]"
       [queryParams]="{ itemId: cipher.id, action: clickAction }"
       queryParamsHandling="merge"
-      [replaceUrl]="extensionRefreshEnabled"
+      [replaceUrl]="true"
       title="{{ 'editItemWithName' | i18n: cipher.name }}"
       type="button"
       appStopProp

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

@@ -1,12 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
-import { firstValueFrom } from "rxjs";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
 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 { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -25,11 +22,6 @@
 export class VaultCipherRowComponent implements OnInit {
   protected RowHeightClass = RowHeightClass;
 
-  /**
-   * Flag to determine if the extension refresh feature flag is enabled.
-   */
-  protected extensionRefreshEnabled = false;
-
   @Input() disabled: boolean;
   @Input() cipher: CipherView;
   @Input() showOwner: boolean;
@@ -60,19 +52,12 @@
   ];
   protected organization?: Organization;
 
-  constructor(
-    private configService: ConfigService,
-    private i18nService: I18nService,
-  ) {}
+  constructor(private i18nService: I18nService) {}
 
   /**
    * Lifecycle hook for component initialization.
-   * Checks if the extension refresh feature flag is enabled to provide to template.
    */
   async ngOnInit(): Promise<void> {
-    this.extensionRefreshEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.ExtensionRefresh),
-    );
     if (this.cipher.organizationId != null) {
       this.organization = this.organizations.find((o) => o.id === this.cipher.organizationId);
     }
@@ -82,7 +67,7 @@
     if (this.cipher.decryptionFailure) {
       return "showFailedToDecrypt";
     }
-    return this.extensionRefreshEnabled ? "view" : null;
+    return "view";
   }
 
   protected get showTotpCopyButton() {

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

@@ -143,11 +143,7 @@
       }, 1000);
     }
 
-    const extensionRefreshEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.ExtensionRefresh),
-    );
-
-    this.cardIsExpired = extensionRefreshEnabled && isCardExpired(this.cipher.card);
+    this.cardIsExpired = isCardExpired(this.cipher.card);
   }
 
   ngOnDestroy() {

apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html

@@ -69,88 +69,48 @@
 
   <div *ngIf="filter.type !== 'trash'" class="tw-shrink-0">
     <div appListDropdown>
-      <ng-container [ngSwitch]="extensionRefreshEnabled">
-        <ng-container *ngSwitchCase="true">
-          <button
-            bitButton
-            buttonType="primary"
-            type="button"
-            [bitMenuTriggerFor]="addOptions"
-            id="newItemDropdown"
-            appA11yTitle="{{ 'new' | i18n }}"
-          >
-            <i class="bwi bwi-plus-f" aria-hidden="true"></i>
-            {{ "new" | i18n }}<i class="bwi tw-ml-2" aria-hidden="true"></i>
-          </button>
-          <bit-menu #addOptions aria-labelledby="newItemDropdown">
-            <button type="button" bitMenuItem (click)="addCipher(CipherType.Login)">
-              <i class="bwi bwi-globe" slot="start" aria-hidden="true"></i>
-              {{ "typeLogin" | i18n }}
-            </button>
-            <button type="button" bitMenuItem (click)="addCipher(CipherType.Card)">
-              <i class="bwi bwi-credit-card" slot="start" aria-hidden="true"></i>
-              {{ "typeCard" | i18n }}
-            </button>
-            <button type="button" bitMenuItem (click)="addCipher(CipherType.Identity)">
-              <i class="bwi bwi-id-card" slot="start" aria-hidden="true"></i>
-              {{ "typeIdentity" | i18n }}
-            </button>
-            <button type="button" bitMenuItem (click)="addCipher(CipherType.SecureNote)">
-              <i class="bwi bwi-sticky-note" slot="start" aria-hidden="true"></i>
-              {{ "note" | i18n }}
-            </button>
-            <button type="button" bitMenuItem (click)="addCipher(CipherType.SshKey)">
-              <i class="bwi bwi-key" slot="start" aria-hidden="true"></i>
-              {{ "typeSshKey" | i18n }}
-            </button>
-            <bit-menu-divider />
-            <button type="button" bitMenuItem (click)="addFolder()">
-              <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
-              {{ "folder" | i18n }}
-            </button>
-            <button
-              *ngIf="canCreateCollections"
-              type="button"
-              bitMenuItem
-              (click)="addCollection()"
-            >
-              <i class="bwi bwi-fw bwi-collection" aria-hidden="true"></i>
-              {{ "collection" | i18n }}
-            </button>
-          </bit-menu>
-        </ng-container>
-        <ng-container *ngSwitchCase="false">
-          <button
-            bitButton
-            buttonType="primary"
-            type="button"
-            [bitMenuTriggerFor]="addOptions"
-            id="newItemDropdown"
-            appA11yTitle="{{ 'new' | i18n }}"
-          >
-            {{ "new" | i18n }}<i class="bwi bwi-angle-down tw-ml-2" aria-hidden="true"></i>
-          </button>
-          <bit-menu #addOptions aria-labelledby="newItemDropdown">
-            <button type="button" bitMenuItem (click)="addCipher()">
-              <i class="bwi bwi-fw bwi-globe" aria-hidden="true"></i>
-              {{ "item" | i18n }}
-            </button>
-            <button type="button" bitMenuItem (click)="addFolder()">
-              <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
-              {{ "folder" | i18n }}
-            </button>
-            <button
-              *ngIf="canCreateCollections"
-              type="button"
-              bitMenuItem
-              (click)="addCollection()"
-            >
-              <i class="bwi bwi-fw bwi-collection" aria-hidden="true"></i>
-              {{ "collection" | i18n }}
-            </button>
-          </bit-menu>
-        </ng-container>
-      </ng-container>
+      <button
+        bitButton
+        buttonType="primary"
+        type="button"
+        [bitMenuTriggerFor]="addOptions"
+        id="newItemDropdown"
+        appA11yTitle="{{ 'new' | i18n }}"
+      >
+        <i class="bwi bwi-plus-f" aria-hidden="true"></i>
+        {{ "new" | i18n }}<i class="bwi tw-ml-2" aria-hidden="true"></i>
+      </button>
+      <bit-menu #addOptions aria-labelledby="newItemDropdown">
+        <button type="button" bitMenuItem (click)="addCipher(CipherType.Login)">
+          <i class="bwi bwi-globe" slot="start" aria-hidden="true"></i>
+          {{ "typeLogin" | i18n }}
+        </button>
+        <button type="button" bitMenuItem (click)="addCipher(CipherType.Card)">
+          <i class="bwi bwi-credit-card" slot="start" aria-hidden="true"></i>
+          {{ "typeCard" | i18n }}
+        </button>
+        <button type="button" bitMenuItem (click)="addCipher(CipherType.Identity)">
+          <i class="bwi bwi-id-card" slot="start" aria-hidden="true"></i>
+          {{ "typeIdentity" | i18n }}
+        </button>
+        <button type="button" bitMenuItem (click)="addCipher(CipherType.SecureNote)">
+          <i class="bwi bwi-sticky-note" slot="start" aria-hidden="true"></i>
+          {{ "note" | i18n }}
+        </button>
+        <button type="button" bitMenuItem (click)="addCipher(CipherType.SshKey)">
+          <i class="bwi bwi-key" slot="start" aria-hidden="true"></i>
+          {{ "typeSshKey" | i18n }}
+        </button>
+        <bit-menu-divider />
+        <button type="button" bitMenuItem (click)="addFolder()">
+          <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
+          {{ "folder" | i18n }}
+        </button>
+        <button *ngIf="canCreateCollections" type="button" bitMenuItem (click)="addCollection()">
+          <i class="bwi bwi-fw bwi-collection" aria-hidden="true"></i>
+          {{ "collection" | i18n }}
+        </button>
+      </bit-menu>
     </div>
   </div>
 </app-header>

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

@@ -9,13 +9,10 @@
   OnInit,
   Output,
 } from "@angular/core";
-import { firstValueFrom } from "rxjs";
 
 import { Unassigned, CollectionView } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 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 { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
@@ -50,7 +47,6 @@
   protected All = All;
   protected CollectionDialogTabType = CollectionDialogTabType;
   protected CipherType = CipherType;
-  protected extensionRefreshEnabled: boolean;
 
   /**
    * Boolean to determine the loading state of the header.
@@ -85,16 +81,9 @@
   /** Emits an event when the delete collection button is clicked in the header */
   @Output() onDeleteCollection = new EventEmitter<void>();
 
-  constructor(
-    private i18nService: I18nService,
-    private configService: ConfigService,
-  ) {}
+  constructor(private i18nService: I18nService) {}
 
-  async ngOnInit() {
-    this.extensionRefreshEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.ExtensionRefresh),
-    );
-  }
+  async ngOnInit() {}
 
   /**
    * The id of the organization that is currently being filtered on.

apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.html

@@ -22,12 +22,7 @@
       <p class="tw-pl-1">
         {{ "onboardingImportDataDetailsPartOne" | i18n }}
         <button type="button" bitLink (click)="emitToAddCipher()">
-          {{
-            (extensionRefreshEnabled
-              ? "onboardingImportDataDetailsLoginLink"
-              : "onboardingImportDataDetailsLink"
-            ) | i18n
-          }}
+          {{ "onboardingImportDataDetailsLoginLink" | i18n }}
         </button>
         <span>
           {{ "onboardingImportDataDetailsPartTwoNoOrgs" | i18n }}

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

@@ -7,7 +7,6 @@ import { Subject, of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -28,7 +27,6 @@ describe("VaultOnboardingComponent", () => {
   let mockStateProvider: Partial<StateProvider>;
   let setInstallExtLinkSpy: any;
   let individualVaultPolicyCheckSpy: any;
-  let mockConfigService: MockProxy<ConfigService>;
 
   beforeEach(() => {
     mockPolicyService = mock<PolicyService>();
@@ -47,7 +45,6 @@ describe("VaultOnboardingComponent", () => {
         }),
       ),
     };
-    mockConfigService = mock<ConfigService>();
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     TestBed.configureTestingModule({
@@ -60,7 +57,6 @@ describe("VaultOnboardingComponent", () => {
         { provide: I18nService, useValue: mockI18nService },
         { provide: ApiService, useValue: mockApiService },
         { provide: StateProvider, useValue: mockStateProvider },
-        { provide: ConfigService, useValue: mockConfigService },
       ],
     }).compileComponents();
     fixture = TestBed.createComponent(VaultOnboardingComponent);

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

@@ -18,8 +18,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { VaultOnboardingMessages } from "@bitwarden/common/vault/enums/vault-onboarding.enum";
@@ -58,14 +56,12 @@ export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
 
   protected onboardingTasks$: Observable<VaultOnboardingTasks>;
   protected showOnboarding = false;
-  protected extensionRefreshEnabled = false;
 
   constructor(
     protected platformUtilsService: PlatformUtilsService,
     protected policyService: PolicyService,
     private apiService: ApiService,
     private vaultOnboardingService: VaultOnboardingServiceAbstraction,
-    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -74,9 +70,6 @@ export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
     this.setInstallExtLink();
     this.individualVaultPolicyCheck();
     this.checkForBrowserExtension();
-    this.extensionRefreshEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.ExtensionRefresh,
-    );
   }
 
   async ngOnChanges(changes: SimpleChanges) {