mirror of
https://github.com/bitwarden/clients.git
synced 2026-11-16 07:03:29 +00:00
remove feature flag (#24592)
This commit is contained in:
@@ -7,7 +7,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
|
||||
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
|
||||
import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
|
||||
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
|
||||
import { Utils } from "@bitwarden/common/platform/misc/utils";
|
||||
import { StateProvider } from "@bitwarden/common/platform/state";
|
||||
import {
|
||||
@@ -35,7 +34,6 @@ describe("InviteLinkCalloutService", () => {
|
||||
const userId = Utils.newGuid() as UserId;
|
||||
let accountService: FakeAccountService;
|
||||
let stateProvider: FakeStateProvider;
|
||||
let configService: MockProxy<ConfigService>;
|
||||
let memberDialogManager: MockProxy<MemberDialogManagerService>;
|
||||
let organizationMembersService: MockProxy<OrganizationMembersService>;
|
||||
let organizationMetadataService: MockProxy<OrganizationMetadataServiceAbstraction>;
|
||||
@@ -64,8 +62,6 @@ describe("InviteLinkCalloutService", () => {
|
||||
beforeEach(() => {
|
||||
accountService = mockAccountServiceWith(userId);
|
||||
stateProvider = new FakeStateProvider(accountService);
|
||||
configService = mock<ConfigService>();
|
||||
configService.getFeatureFlag.mockResolvedValue(true);
|
||||
memberDialogManager = mock<MemberDialogManagerService>();
|
||||
memberDialogManager.openInviteDialog.mockResolvedValue(MemberDialogResult.Saved);
|
||||
organizationMembersService = mock<OrganizationMembersService>();
|
||||
@@ -85,7 +81,6 @@ describe("InviteLinkCalloutService", () => {
|
||||
InviteLinkCalloutService,
|
||||
{ provide: AccountService, useValue: accountService },
|
||||
{ provide: StateProvider, useValue: stateProvider },
|
||||
{ provide: ConfigService, useValue: configService },
|
||||
{ provide: MemberDialogManagerService, useValue: memberDialogManager },
|
||||
{ provide: OrganizationMembersService, useValue: organizationMembersService },
|
||||
{ provide: OrganizationMetadataServiceAbstraction, useValue: organizationMetadataService },
|
||||
@@ -145,15 +140,6 @@ describe("InviteLinkCalloutService", () => {
|
||||
expect(dialogService.open).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("showIfEligible() returns early without opening a dialog when the feature flag is disabled", async () => {
|
||||
configService.getFeatureFlag.mockResolvedValue(false);
|
||||
const organization = createOrganization();
|
||||
|
||||
await service.showIfEligible(organization);
|
||||
|
||||
expect(dialogService.open).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("showIfEligible() opens the dialog and calls dismiss() when the user clicks Skip", async () => {
|
||||
const organization = createOrganization();
|
||||
stubDialogClosed("skip");
|
||||
|
||||
@@ -6,8 +6,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
|
||||
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { getUserId } from "@bitwarden/common/auth/services/account.service";
|
||||
import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
|
||||
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
|
||||
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
|
||||
import {
|
||||
INVITE_LINK_CALLOUT_DISK,
|
||||
StateProvider,
|
||||
@@ -36,7 +34,6 @@ export const INVITE_LINK_CALLOUT_DISMISSED_KEY = new UserKeyDefinition<Organizat
|
||||
@Injectable({ providedIn: "root" })
|
||||
export class InviteLinkCalloutService {
|
||||
private accountService = inject(AccountService);
|
||||
private configService = inject(ConfigService);
|
||||
private stateProvider = inject(StateProvider);
|
||||
private memberDialogManager = inject(MemberDialogManagerService);
|
||||
private organizationMembersService = inject(OrganizationMembersService);
|
||||
@@ -90,10 +87,6 @@ export class InviteLinkCalloutService {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(await this.configService.getFeatureFlag(FeatureFlag.InviteLinkNotification))) {
|
||||
return;
|
||||
}
|
||||
|
||||
const dismissed = await firstValueFrom(this.isDismissed$(organization.id));
|
||||
if (dismissed) {
|
||||
return;
|
||||
|
||||
@@ -10,7 +10,7 @@ import { UserId } from "@bitwarden/common/types/guid";
|
||||
import { FeatureFlagsCapability } from "./feature-flags";
|
||||
|
||||
describe("FeatureFlagsCapability", () => {
|
||||
const flag = FeatureFlag.InviteLinkNotification;
|
||||
const flag = FeatureFlag.InviteLinkAutoConfirm;
|
||||
const userId = "11111111-1111-4111-8111-111111111111" as UserId;
|
||||
|
||||
let configService: ReturnType<typeof mock<ConfigService>>;
|
||||
|
||||
@@ -12,7 +12,6 @@ import { ServerConfig } from "../platform/abstractions/config/server-config";
|
||||
export enum FeatureFlag {
|
||||
/* Admin Console Team */
|
||||
CollectionsDecryptListFailures = "pm-43375-collections-decrypt-list-failures",
|
||||
InviteLinkNotification = "pm-39601-invite-link-notification",
|
||||
InviteLinkAutoConfirm = "pm-34429-invite-link-auto-confirm",
|
||||
GroupsComponentRefactor = "pm-43419-groups-table-v2",
|
||||
MembersTableV2 = "pm-37463-members-table-v2",
|
||||
@@ -126,7 +125,6 @@ const FALSE = false as boolean;
|
||||
export const DefaultFeatureFlagValue = {
|
||||
/* Admin Console Team */
|
||||
[FeatureFlag.CollectionsDecryptListFailures]: FALSE,
|
||||
[FeatureFlag.InviteLinkNotification]: FALSE,
|
||||
[FeatureFlag.InviteLinkAutoConfirm]: FALSE,
|
||||
[FeatureFlag.GroupsComponentRefactor]: FALSE,
|
||||
[FeatureFlag.MembersTableV2]: FALSE,
|
||||
|
||||
Reference in New Issue
Block a user