mirror of
https://github.com/bitwarden/browser.git
synced 2024-12-21 16:18:28 +01:00
[AC-2522] Remove collection enhancements opt-in (#9283)
* Remove FlexibleCollectionsMigration feature flag and code * Remove api method
This commit is contained in:
Thomas Rittson
GitHub
parent
08a6f91411
commit
f2fcf5ce2e
@ -50,29 +50,6 @@
|
||||
{{ "rotateApiKey" | i18n }}
|
||||
</button>
|
||||
</ng-container>
|
||||
<form
|
||||
*ngIf="
|
||||
org && !loading && !org.flexibleCollections && (flexibleCollectionsMigrationEnabled$ | async)
|
||||
"
|
||||
>
|
||||
<h1 bitTypography="h1" class="tw-mt-16 tw-pb-2.5">
|
||||
{{ "collectionManagement" | i18n }}
|
||||
</h1>
|
||||
<p>
|
||||
{{ "collectionEnhancementsDesc" | i18n }}
|
||||
<a href="https://bitwarden.com/help/collection-management" target="_blank" rel="noreferrer">
|
||||
{{ "collectionEnhancementsLearnMore" | i18n }}
|
||||
</a>
|
||||
</p>
|
||||
<button
|
||||
type="button"
|
||||
bitButton
|
||||
buttonType="primary"
|
||||
(click)="showConfirmCollectionEnhancementsDialog()"
|
||||
>
|
||||
{{ "enable" | i18n }}
|
||||
</button>
|
||||
</form>
|
||||
<form
|
||||
*ngIf="org && !loading && org.flexibleCollections"
|
||||
[bitSubmit]="submitCollectionManagement"
|
||||
|
||||
@ -16,7 +16,7 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||
import { Utils } from "@bitwarden/common/platform/misc/utils";
|
||||
import { DialogService, SimpleDialogOptions } from "@bitwarden/components";
|
||||
import { DialogService } from "@bitwarden/components";
|
||||
|
||||
import { ApiKeyComponent } from "../../../auth/settings/security/api-key.component";
|
||||
import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.component";
|
||||
@ -40,10 +40,6 @@ export class AccountComponent {
|
||||
org: OrganizationResponse;
|
||||
taxFormPromise: Promise<unknown>;
|
||||
|
||||
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) {
|
||||
|
||||
@ -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."
|
||||
|
||||
@ -82,5 +82,4 @@ export class OrganizationApiServiceAbstraction {
|
||||
id: string,
|
||||
request: OrganizationCollectionManagementUpdateRequest,
|
||||
) => Promise<OrganizationResponse>;
|
||||
enableCollectionEnhancements: (id: string) => Promise<void>;
|
||||
}
|
||||
|
||||
@ -352,15 +352,4 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction
|
||||
await this.syncService.fullSync(true);
|
||||
return data;
|
||||
}
|
||||
|
||||
async enableCollectionEnhancements(id: string): Promise<void> {
|
||||
await this.apiService.send(
|
||||
"POST",
|
||||
"/organizations/" + id + "/enable-collection-enhancements",
|
||||
null,
|
||||
true,
|
||||
false,
|
||||
);
|
||||
await this.syncService.fullSync(true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user