mirror of
https://github.com/bitwarden/browser
synced 2025-12-23 11:43:46 +00:00
[AC-2522] Remove collection enhancements opt-in (#9283)
* Remove FlexibleCollectionsMigration feature flag and code * Remove api method
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user