Skip to content

Commit

Permalink
[PM-6606] remove onboarding feature flag (#9178)
Browse files Browse the repository at this point in the history
* remove feature flag value from enum

* remove feature flag from onboarding component

* remove ConfigService mock from spec

* fix format
  • Loading branch information
merissaacosta committed May 24, 2024
1 parent 4e9db90 commit 15ba704
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<div
*ngIf="
isNewAccount && showOnboarding && (showOnboardingAccess$ | async) && onboardingTasks$
| async as onboardingTasks
"
*ngIf="isNewAccount && showOnboarding && onboardingTasks$ | async as onboardingTasks"
class="tw-mb-6"
>
<app-onboarding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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";
Expand All @@ -21,7 +20,6 @@ describe("VaultOnboardingComponent", () => {
let mockApiService: Partial<ApiService>;
let mockPolicyService: MockProxy<PolicyService>;
let mockI18nService: MockProxy<I18nService>;
let mockConfigService: MockProxy<ConfigService>;
let mockVaultOnboardingService: MockProxy<VaultOnboardingServiceAbstraction>;
let mockStateProvider: Partial<StateProvider>;
let setInstallExtLinkSpy: any;
Expand All @@ -34,7 +32,6 @@ describe("VaultOnboardingComponent", () => {
mockApiService = {
getProfile: jest.fn(),
};
mockConfigService = mock<ConfigService>();
mockVaultOnboardingService = mock<VaultOnboardingServiceAbstraction>();
mockStateProvider = {
getActive: jest.fn().mockReturnValue(
Expand All @@ -56,7 +53,6 @@ describe("VaultOnboardingComponent", () => {
{ provide: VaultOnboardingServiceAbstraction, useValue: mockVaultOnboardingService },
{ provide: I18nService, useValue: mockI18nService },
{ provide: ApiService, useValue: mockApiService },
{ provide: ConfigService, useValue: mockConfigService },
{ provide: StateProvider, useValue: mockStateProvider },
],
}).compileComponents();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,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 { VaultOnboardingMessages } from "@bitwarden/common/vault/enums/vault-onboarding.enum";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
Expand All @@ -44,7 +42,6 @@ export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
private destroy$ = new Subject<void>();
isNewAccount: boolean;
private readonly onboardingReleaseDate = new Date("2024-04-02");
showOnboardingAccess$: Observable<boolean>;

protected currentTasks: VaultOnboardingTasks;

Expand All @@ -55,14 +52,10 @@ export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
protected platformUtilsService: PlatformUtilsService,
protected policyService: PolicyService,
private apiService: ApiService,
private configService: ConfigService,
private vaultOnboardingService: VaultOnboardingServiceAbstraction,
) {}

async ngOnInit() {
this.showOnboardingAccess$ = await this.configService.getFeatureFlag$(
FeatureFlag.VaultOnboarding,
);
this.onboardingTasks$ = this.vaultOnboardingService.vaultOnboardingState$;
await this.setOnboardingTasks();
this.setInstallExtLink();
Expand Down
2 changes: 0 additions & 2 deletions libs/common/src/enums/feature-flag.enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export enum FeatureFlag {
BrowserFilelessImport = "browser-fileless-import",
ItemShare = "item-share",
FlexibleCollectionsV1 = "flexible-collections-v-1", // v-1 is intentional
VaultOnboarding = "vault-onboarding",
GeneratorToolsModernization = "generator-tools-modernization",
ShowPaymentMethodWarningBanners = "show-payment-method-warning-banners",
EnableConsolidatedBilling = "enable-consolidated-billing",
Expand All @@ -34,7 +33,6 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.BrowserFilelessImport]: FALSE,
[FeatureFlag.ItemShare]: FALSE,
[FeatureFlag.FlexibleCollectionsV1]: FALSE,
[FeatureFlag.VaultOnboarding]: FALSE,
[FeatureFlag.GeneratorToolsModernization]: FALSE,
[FeatureFlag.ShowPaymentMethodWarningBanners]: FALSE,
[FeatureFlag.EnableConsolidatedBilling]: FALSE,
Expand Down

0 comments on commit 15ba704

Please sign in to comment.