mirror of
https://github.com/bitwarden/browser
synced 2026-02-13 23:13:36 +00:00
[PM-22434] Remove CreateDefaultLocation feature flag references and definition (#18057)
* chore: remove ff from vault-popup-list-filters.service, refs PM-22434 * chore: remove ff from confirm.command, refs PM-22434 * chore: remove ff from bulk-confirm-dialog.component, refs PM-22434 * chore: remove ff from member-actions.service and clean up leftover imports, refs PM-22434 * chore: remove ff from policy-edit-dialog.component, refs PM-22434 * chore: remove ff from organization-data-ownership.component, refs PM-22434 * chore: remove ff from vnext-organization-data-ownership.component, refs PM-22434 * chore: remove ff from vault-filter.service, refs PM-22434 * chore: remove ff from vault-filter.service (libs), refs PM-22434 * chore: remove ff from export.component, refs PM-22434 * chore: update observeMyItemsExclusionCriteria method documentation comments, refs PM-22434 * chore: remove ff from item-details-section.component, refs PM-22434 * chore: remove ff definition, refs PM-22434 * fix: remove configService from superclasses, refs PM-22434 * chore: update injection for VaultPopupListFilters service instantiation, refs PM-22434 * chore: update ConfirmCommand instantiation, refs PM-22434 * chore: update import order in member-actions.service, refs PM-22434 * fix: constructor argument update to amend merge conflict, refs PM-22434 * chore: remove unnecessary feature flag related tests for confirm user, refs PM-22434 * fix: remove unused services from member-actions.service.spec, refs PM-22434
This commit is contained in:
@@ -14,8 +14,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
|
||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { getUserId } from "@bitwarden/common/auth/services/account.service";
|
||||
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
|
||||
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { SingleUserState, StateProvider } from "@bitwarden/common/platform/state";
|
||||
import { UserId } from "@bitwarden/common/types/guid";
|
||||
@@ -45,7 +43,6 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
|
||||
protected policyService: PolicyService,
|
||||
protected stateProvider: StateProvider,
|
||||
protected accountService: AccountService,
|
||||
protected configService: ConfigService,
|
||||
protected i18nService: I18nService,
|
||||
) {}
|
||||
|
||||
@@ -116,18 +113,13 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
|
||||
),
|
||||
);
|
||||
const orgs = await this.buildOrganizations();
|
||||
const defaulCollectionsFlagEnabled = await this.configService.getFeatureFlag(
|
||||
FeatureFlag.CreateDefaultLocation,
|
||||
);
|
||||
|
||||
let collections =
|
||||
organizationId == null
|
||||
? storedCollections
|
||||
: storedCollections.filter((c) => c.organizationId === organizationId);
|
||||
|
||||
if (defaulCollectionsFlagEnabled) {
|
||||
collections = sortDefaultCollections(collections, orgs, this.i18nService.collator);
|
||||
}
|
||||
collections = sortDefaultCollections(collections, orgs, this.i18nService.collator);
|
||||
|
||||
const nestedCollections = await this.collectionService.getAllNested(collections);
|
||||
return new DynamicTreeNode<CollectionView>({
|
||||
|
||||
Reference in New Issue
Block a user