Removed feature flag for OptimizeNestedTraverseTypescript and vnext methods related to it. (#15314)

apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts

@@ -37,31 +37,6 @@ export function getNestedCollectionTree(
   return nodes;
 }
 
-export function getNestedCollectionTree_vNext(
-  collections: (CollectionView | CollectionAdminView)[],
-): TreeNode<CollectionView | CollectionAdminView>[] {
-  if (!collections) {
-    return [];
-  }
-
-  // Collections need to be cloned because ServiceUtils.nestedTraverse actively
-  // modifies the names of collections.
-  // These changes risk affecting collections store in StateService.
-  const clonedCollections = collections
-    .sort((a, b) => a.name.localeCompare(b.name))
-    .map(cloneCollection);
-
-  const nodes: TreeNode<CollectionView | CollectionAdminView>[] = [];
-  clonedCollections.forEach((collection) => {
-    const parts =
-      collection.name != null
-        ? collection.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter)
-        : [];
-    ServiceUtils.nestedTraverse_vNext(nodes, 0, parts, collection, null, NestingDelimiter);
-  });
-  return nodes;
-}
-
 export function getFlatCollectionTree(
   nodes: TreeNode<CollectionAdminView>[],
 ): CollectionAdminView[];

apps/web/src/app/admin-console/organizations/collections/vault.component.ts

@@ -125,11 +125,7 @@ import {
   BulkCollectionsDialogResult,
 } from "./bulk-collections-dialog";
 import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component";
-import {
-  getNestedCollectionTree,
-  getFlatCollectionTree,
-  getNestedCollectionTree_vNext,
-} from "./utils";
+import { getNestedCollectionTree, getFlatCollectionTree } from "./utils";
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
 import { VaultHeaderComponent } from "./vault-header/vault-header.component";
 
@@ -423,16 +419,9 @@ export class VaultComponent implements OnInit, OnDestroy {
       }),
     );
 
-    const nestedCollections$ = combineLatest([
-      allCollections$,
-      this.configService.getFeatureFlag$(FeatureFlag.OptimizeNestedTraverseTypescript),
-    ]).pipe(
-      map(
-        ([collections, shouldOptimize]) =>
-          (shouldOptimize
-            ? getNestedCollectionTree_vNext(collections)
-            : getNestedCollectionTree(collections)) as TreeNode<CollectionAdminView>[],
-      ),
+    const nestedCollections$ = allCollections$.pipe(
+      map((collections) => getNestedCollectionTree(collections)),
+      shareReplay({ refCount: true, bufferSize: 1 }),
     );
 
     const collections$ = combineLatest([

apps/web/src/app/vault/individual-vault/vault.component.ts

@@ -48,7 +48,6 @@ import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -85,7 +84,6 @@ import {
 import {
   getNestedCollectionTree,
   getFlatCollectionTree,
-  getNestedCollectionTree_vNext,
 } from "../../admin-console/organizations/collections";
 import {
   CollectionDialogAction,
@@ -331,15 +329,8 @@ export class VaultComponent implements OnInit, OnDestroy {
 
     const filter$ = this.routedVaultFilterService.filter$;
     const allCollections$ = this.collectionService.decryptedCollections$;
-    const nestedCollections$ = combineLatest([
-      allCollections$,
-      this.configService.getFeatureFlag$(FeatureFlag.OptimizeNestedTraverseTypescript),
-    ]).pipe(
-      map(([collections, shouldOptimize]) =>
-        shouldOptimize
-          ? getNestedCollectionTree_vNext(collections)
-          : getNestedCollectionTree(collections),
-      ),
+    const nestedCollections$ = allCollections$.pipe(
+      map((collections) => getNestedCollectionTree(collections)),
     );
 
     this.searchText$