remove feature flag (#16640)

apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.html

@@ -1,121 +0,0 @@
-@if (organization) {
-  <app-organization-free-trial-warning
-    [organization]="organization"
-    (clicked)="navigateToPaymentMethod()"
-  >
-  </app-organization-free-trial-warning>
-  <app-organization-reseller-renewal-warning [organization]="organization">
-  </app-organization-reseller-renewal-warning>
-}
-
-<app-org-vault-header
-  [filter]="filter"
-  [loading]="refreshing"
-  [organization]="organization"
-  [collection]="selectedCollection"
-  [searchText]="currentSearchText$ | async"
-  (onAddCipher)="addCipher($event)"
-  (onAddCollection)="addCollection()"
-  (onEditCollection)="editCollection(selectedCollection.node, $event.tab, $event.readonly)"
-  (onDeleteCollection)="deleteCollection(selectedCollection.node)"
-  (searchTextChanged)="filterSearchText($event)"
-></app-org-vault-header>
-
-<div class="tw-flex tw-flex-row">
-  <div class="tw-w-1/4 tw-mr-5" *ngIf="!hideVaultFilters">
-    <app-organization-vault-filter
-      [organization]="organization"
-      [activeFilter]="activeFilter"
-      [searchText]="currentSearchText$ | async"
-      (searchTextChanged)="filterSearchText($event)"
-    ></app-organization-vault-filter>
-  </div>
-  <div [class]="hideVaultFilters ? 'tw-w-full' : 'tw-w-3/4'">
-    <bit-toggle-group
-      *ngIf="showAddAccessToggle && activeFilter.selectedCollectionNode"
-      [selected]="addAccessStatus$ | async"
-      (selectedChange)="addAccessToggle($event)"
-      [attr.aria-label]="'addAccessFilter' | i18n"
-    >
-      <bit-toggle [value]="0">
-        {{ "all" | i18n }}
-      </bit-toggle>
-
-      <bit-toggle [value]="1">
-        {{ "addAccess" | i18n }}
-      </bit-toggle>
-    </bit-toggle-group>
-    <bit-callout type="warning" *ngIf="activeFilter.isDeleted">
-      {{ trashCleanupWarning }}
-    </bit-callout>
-    <app-vault-items
-      #vaultItems
-      [ciphers]="ciphers"
-      [collections]="collections"
-      [allCollections]="allCollections"
-      [allOrganizations]="organization ? [organization] : []"
-      [allGroups]="allGroups"
-      [disabled]="loading"
-      [showOwner]="false"
-      [showPermissionsColumn]="true"
-      [showCollections]="filter.type !== undefined"
-      [showGroups]="
-        organization?.useGroups &&
-        ((filter.type === undefined && filter.collectionId === undefined) ||
-          filter.collectionId !== undefined)
-      "
-      [showPremiumFeatures]="organization?.useTotp"
-      [showBulkMove]="false"
-      [showBulkTrashOptions]="filter.type === 'trash'"
-      [useEvents]="organization?.canAccessEventLogs"
-      [showAdminActions]="true"
-      (onEvent)="onVaultItemsEvent($event)"
-      [showBulkEditCollectionAccess]="true"
-      [showBulkAddToCollections]="true"
-      [viewingOrgVault]="true"
-      [addAccessStatus]="addAccessStatus$ | async"
-      [addAccessToggle]="showAddAccessToggle"
-      [activeCollection]="selectedCollection?.node"
-    >
-    </app-vault-items>
-    <ng-container *ngIf="!performingInitialLoad && isEmpty">
-      <bit-no-items *ngIf="!showCollectionAccessRestricted">
-        <span slot="title" class="tw-mt-4 tw-block">{{ "noItemsInList" | i18n }}</span>
-        <button
-          slot="button"
-          bitButton
-          (click)="addCipher()"
-          buttonType="primary"
-          type="button"
-          *ngIf="
-            filter.type !== 'trash' &&
-            filter.collectionId !== Unassigned &&
-            selectedCollection?.node?.canEditItems(organization)
-          "
-        >
-          <i aria-hidden="true" class="bwi bwi-plus"></i> {{ "newItem" | i18n }}
-        </button>
-      </bit-no-items>
-      <collection-access-restricted
-        *ngIf="showCollectionAccessRestricted"
-        [canEditCollection]="selectedCollection?.node?.canEdit(organization)"
-        [canViewCollectionInfo]="selectedCollection?.node?.canViewCollectionInfo(organization)"
-        (viewCollectionClicked)="
-          editCollection(selectedCollection.node, $event.tab, $event.readonly)
-        "
-      >
-      </collection-access-restricted>
-    </ng-container>
-    <div
-      class="tw-mt-6 tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-start"
-      *ngIf="performingInitialLoad"
-    >
-      <i
-        class="bwi bwi-spinner bwi-spin tw-text-muted"
-        title="{{ 'loading' | i18n }}"
-        aria-hidden="true"
-      ></i>
-      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-    </div>
-  </div>
-</div>

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

@@ -1,26 +1,19 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
 import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
 
-import { VaultComponent } from "./deprecated_vault.component";
+import { VaultComponent } from "./vault.component";
-import { vNextVaultComponent } from "./vault.component";
 
 const routes: Routes = [
-  ...featureFlaggedRoute({
+  {
-    defaultComponent: VaultComponent,
-    flaggedComponent: vNextVaultComponent,
-    featureFlag: FeatureFlag.CollectionVaultRefactor,
-    routeOptions: {
     data: { titleId: "vaults" },
     path: "",
     canActivate: [organizationPermissionsGuard(canAccessVaultTab)],
+    component: VaultComponent,
   },
-  }),
 ];
 
 @NgModule({

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

@@ -162,7 +162,7 @@ enum AddAccessStatusType {
     { provide: CipherFormConfigService, useClass: AdminConsoleCipherFormConfigService },
   ],
 })
-export class vNextVaultComponent implements OnInit, OnDestroy {
+export class VaultComponent implements OnInit, OnDestroy {
   protected Unassigned = Unassigned;
 
   trashCleanupWarning: string = this.i18nService.t(

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

@@ -6,10 +6,9 @@ import { ViewComponent } from "../../../vault/individual-vault/view.component";
 import { CollectionDialogComponent } from "../shared/components/collection-dialog";
 
 import { CollectionNameBadgeComponent } from "./collection-badge";
-import { VaultComponent } from "./deprecated_vault.component";
 import { GroupBadgeModule } from "./group-badge/group-badge.module";
 import { VaultRoutingModule } from "./vault-routing.module";
-import { vNextVaultComponent } from "./vault.component";
+import { VaultComponent } from "./vault.component";
 
 @NgModule({
   imports: [
@@ -20,7 +19,6 @@ import { vNextVaultComponent } from "./vault.component";
     OrganizationBadgeModule,
     CollectionDialogComponent,
     VaultComponent,
-    vNextVaultComponent,
     ViewComponent,
   ],
 })

libs/common/src/enums/feature-flag.enum.ts

@@ -12,7 +12,6 @@ import { ServerConfig } from "../platform/abstractions/config/server-config";
 export enum FeatureFlag {
   /* Admin Console Team */
   CreateDefaultLocation = "pm-19467-create-default-location",
-  CollectionVaultRefactor = "pm-25030-resolve-ts-upgrade-errors",
 
   /* Auth */
   PM22110_DisableAlternateLoginMethods = "pm-22110-disable-alternate-login-methods",
@@ -74,7 +73,6 @@ const FALSE = false as boolean;
 export const DefaultFeatureFlagValue = {
   /* Admin Console Team */
   [FeatureFlag.CreateDefaultLocation]: FALSE,
-  [FeatureFlag.CollectionVaultRefactor]: FALSE,
 
   /* Autofill */
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,