From f2fcf5ce2ec947382d1f22bbfafecf93dd35f72b Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 24 May 2024 09:00:40 +1000 Subject: [PATCH] [AC-2522] Remove collection enhancements opt-in (#9283) * Remove FlexibleCollectionsMigration feature flag and code * Remove api method --- .../settings/account.component.html | 23 ---------------- .../settings/account.component.ts | 26 +------------------ apps/web/src/locales/en/messages.json | 13 ---------- .../organization-api.service.abstraction.ts | 1 - .../organization/organization-api.service.ts | 11 -------- libs/common/src/enums/feature-flag.enum.ts | 2 -- 6 files changed, 1 insertion(+), 75 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html index d8cd5fddfe..ae27df1ce9 100644 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.html +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html @@ -50,29 +50,6 @@ {{ "rotateApiKey" | i18n }} -
-

- {{ "collectionManagement" | i18n }} -

-

- {{ "collectionEnhancementsDesc" | i18n }} - - {{ "collectionEnhancementsLearnMore" | i18n }} - -

- -
; - protected flexibleCollectionsMigrationEnabled$ = this.configService.getFeatureFlag$( - FeatureFlag.FlexibleCollectionsMigration, - ); - flexibleCollectionsV1Enabled$ = this.configService.getFeatureFlag$( FeatureFlag.FlexibleCollectionsV1, ); @@ -172,26 +168,6 @@ export class AccountComponent { this.platformUtilsService.showToast("success", null, this.i18nService.t("organizationUpdated")); }; - async showConfirmCollectionEnhancementsDialog() { - const collectionEnhancementsDialogOptions: SimpleDialogOptions = { - title: this.i18nService.t("confirmCollectionEnhancementsDialogTitle"), - content: this.i18nService.t("confirmCollectionEnhancementsDialogContent"), - type: "warning", - acceptButtonText: this.i18nService.t("continue"), - acceptAction: async () => { - await this.organizationApiService.enableCollectionEnhancements(this.organizationId); - - this.platformUtilsService.showToast( - "success", - null, - this.i18nService.t("updatedCollectionManagement"), - ); - }, - }; - - await this.dialogService.openSimpleDialog(collectionEnhancementsDialogOptions); - } - submitCollectionManagement = async () => { // Early exit if self-hosted if (this.selfHosted) { diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 124081b5f4..c4dbb33ac4 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -7683,13 +7683,6 @@ "message": "add a payment method", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'" }, - "collectionEnhancementsDesc": { - "message": "Add new settings and permissions for additional flexibility. Replace the Manager role with the \"can manage\" permission, and introduce options to allow users to create collections as well as restrict administrative access to collections.", - "description": "This describes new features and improvements for user roles and collections" - }, - "collectionEnhancementsLearnMore": { - "message": "Learn more about collection management" - }, "organizationInformation": { "message": "Organization information" }, @@ -7702,12 +7695,6 @@ "smFreeTrialConfirmationEmail": { "message": "We've sent a confirmation email to your email at " }, - "confirmCollectionEnhancementsDialogTitle": { - "message": "This action is irreversible" - }, - "confirmCollectionEnhancementsDialogContent": { - "message": "Turning on this feature will deprecate the manager role and replace it with a Can manage permission. This will take a few moments. Do not make any organization changes until it is complete. Are you sure you want to proceed?" - }, "sorryToSeeYouGo": { "message": "Sorry to see you go! Help improve Bitwarden by sharing why you're canceling.", "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation." diff --git a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts index 3aca2fb3f6..28b108fa4c 100644 --- a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts @@ -82,5 +82,4 @@ export class OrganizationApiServiceAbstraction { id: string, request: OrganizationCollectionManagementUpdateRequest, ) => Promise; - enableCollectionEnhancements: (id: string) => Promise; } diff --git a/libs/common/src/admin-console/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts index 91d5e47547..13d8eb7bff 100644 --- a/libs/common/src/admin-console/services/organization/organization-api.service.ts +++ b/libs/common/src/admin-console/services/organization/organization-api.service.ts @@ -352,15 +352,4 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction await this.syncService.fullSync(true); return data; } - - async enableCollectionEnhancements(id: string): Promise { - await this.apiService.send( - "POST", - "/organizations/" + id + "/enable-collection-enhancements", - null, - true, - false, - ); - await this.syncService.fullSync(true); - } } diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index dd400da7bb..6b3cb6057c 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -9,7 +9,6 @@ export enum FeatureFlag { FlexibleCollectionsV1 = "flexible-collections-v-1", // v-1 is intentional VaultOnboarding = "vault-onboarding", GeneratorToolsModernization = "generator-tools-modernization", - FlexibleCollectionsMigration = "flexible-collections-migration", ShowPaymentMethodWarningBanners = "show-payment-method-warning-banners", EnableConsolidatedBilling = "enable-consolidated-billing", AC1795_UpdatedSubscriptionStatusSection = "AC-1795_updated-subscription-status-section", @@ -37,7 +36,6 @@ export const DefaultFeatureFlagValue = { [FeatureFlag.FlexibleCollectionsV1]: FALSE, [FeatureFlag.VaultOnboarding]: FALSE, [FeatureFlag.GeneratorToolsModernization]: FALSE, - [FeatureFlag.FlexibleCollectionsMigration]: FALSE, [FeatureFlag.ShowPaymentMethodWarningBanners]: FALSE, [FeatureFlag.EnableConsolidatedBilling]: FALSE, [FeatureFlag.AC1795_UpdatedSubscriptionStatusSection]: FALSE,