[PM-13326] Move Collections tab to AC Team (#13529)

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

@@ -20,7 +20,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
-import { GroupApiService, GroupView } from "../../../admin-console/organizations/core";
+import { SharedModule } from "../../../../shared";
+import { GroupApiService, GroupView } from "../../core";
 import {
   AccessItemType,
   AccessItemValue,
@@ -30,8 +31,7 @@ import {
   mapGroupToAccessItemView,
   mapUserToAccessItemView,
   PermissionMode,
-} from "../../../admin-console/organizations/shared/components/access-selector";
+} from "../../shared/components/access-selector";
-import { SharedModule } from "../../../shared";
 
 export interface BulkCollectionsDialogParams {
   organizationId: string;

apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts

@@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { ButtonModule, NoItemsModule, svgIcon } from "@bitwarden/components";
 
-import { SharedModule } from "../../shared";
+import { SharedModule } from "../../../shared";
-import { CollectionDialogTabType } from "../components/collection-dialog";
+import { CollectionDialogTabType } from "../../../vault/components/collection-dialog";
 
 const icon = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="10 -10 120 140" fill="none">
   <rect class="tw-stroke-secondary-600" width="134" height="86" x="3" y="31.485" stroke-width="6" rx="11"/>

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

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../../shared/shared.module";
+import { SharedModule } from "../../../../shared/shared.module";
-import { PipesModule } from "../../individual-vault/pipes/pipes.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 
 import { CollectionNameBadgeComponent } from "./collection-name.badge.component";
 

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

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../../shared/shared.module";
+import { SharedModule } from "../../../../shared/shared.module";
-import { PipesModule } from "../../individual-vault/pipes/pipes.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 
 import { GroupNameBadgeComponent } from "./group-name-badge.component";
 

apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts

@@ -5,7 +5,7 @@ import { Component, Input, OnChanges } from "@angular/core";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { GroupView } from "../../../admin-console/organizations/core";
+import { GroupView } from "../../core";
 
 @Component({
   selector: "app-group-badge",

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

@@ -12,18 +12,19 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { DialogService, ToastService } from "@bitwarden/components";
 
-import { VaultFilterComponent as BaseVaultFilterComponent } from "../../individual-vault/vault-filter/components/vault-filter.component"; //../../vault/vault-filter/components/vault-filter.component";
+import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/individual-vault/vault-filter/components/vault-filter.component";
-import { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service";
+import { VaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
 import {
   VaultFilterList,
   VaultFilterSection,
   VaultFilterType,
-} from "../../individual-vault/vault-filter/shared/models/vault-filter-section.type";
+} from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter-section.type";
-import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type";
+import { CollectionFilter } from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter.type";
 
 @Component({
   selector: "app-organization-vault-filter",
-  templateUrl: "../../individual-vault/vault-filter/components/vault-filter.component.html",
+  templateUrl:
+    "../../../../vault/individual-vault/vault-filter/components/vault-filter.component.html",
 })
 export class VaultFilterComponent
   extends BaseVaultFilterComponent

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

@@ -2,8 +2,8 @@ import { NgModule } from "@angular/core";
 
 import { SearchModule } from "@bitwarden/components";
 
-import { VaultFilterService as VaultFilterServiceAbstraction } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service";
+import { VaultFilterService as VaultFilterServiceAbstraction } from "../../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
-import { VaultFilterSharedModule } from "../../individual-vault/vault-filter/shared/vault-filter-shared.module";
+import { VaultFilterSharedModule } from "../../../../vault/individual-vault/vault-filter/shared/vault-filter-shared.module";
 
 import { VaultFilterComponent } from "./vault-filter.component";
 import { VaultFilterService } from "./vault-filter.service";

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

@@ -11,8 +11,8 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
-import { VaultFilterService as BaseVaultFilterService } from "../../individual-vault/vault-filter/services/vault-filter.service";
+import { VaultFilterService as BaseVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/vault-filter.service";
-import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type";
+import { CollectionFilter } from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter.type";
 
 @Injectable()
 export class VaultFilterService extends BaseVaultFilterService implements OnDestroy {

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

@@ -1,7 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+// FIXME: rename output bindings and then remove this line
+/* eslint-disable @angular-eslint/no-output-on-prefix */
 import { CommonModule } from "@angular/common";
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
@@ -13,7 +15,6 @@ import {
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
@@ -25,13 +26,13 @@ import {
   SimpleDialogOptions,
 } from "@bitwarden/components";
 
-import { HeaderModule } from "../../../layouts/header/header.module";
+import { HeaderModule } from "../../../../layouts/header/header.module";
-import { SharedModule } from "../../../shared";
+import { SharedModule } from "../../../../shared";
-import { CollectionDialogTabType } from "../../components/collection-dialog";
+import { CollectionDialogTabType } from "../../../../vault/components/collection-dialog";
 import {
   All,
   RoutedVaultFilterModel,
-} from "../../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
+} from "../../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 
 @Component({
   standalone: true,
@@ -47,7 +48,7 @@ import {
     JslibModule,
   ],
 })
-export class VaultHeaderComponent implements OnInit {
+export class VaultHeaderComponent {
   protected All = All;
   protected Unassigned = Unassigned;
 
@@ -97,11 +98,8 @@ export class VaultHeaderComponent implements OnInit {
     private dialogService: DialogService,
     private collectionAdminService: CollectionAdminService,
     private router: Router,
-    private configService: ConfigService,
   ) {}
 
-  async ngOnInit() {}
-
   get title() {
     const headerType = this.i18nService.t("collections").toLowerCase();
 

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

@@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 
-import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
+import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
 
 import { VaultComponent } from "./vault.component";
 const routes: Routes = [

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

@@ -76,55 +76,55 @@ import {
   PasswordRepromptService,
 } from "@bitwarden/vault";
 
-import { GroupApiService, GroupView } from "../../admin-console/organizations/core";
-import { openEntityEventsDialog } from "../../admin-console/organizations/manage/entity-events.component";
 import {
   ResellerWarning,
   ResellerWarningService,
-} from "../../billing/services/reseller-warning.service";
+} from "../../../billing/services/reseller-warning.service";
-import { TrialFlowService } from "../../billing/services/trial-flow.service";
+import { TrialFlowService } from "../../../billing/services/trial-flow.service";
-import { FreeTrial } from "../../billing/types/free-trial";
+import { FreeTrial } from "../../../billing/types/free-trial";
-import { SharedModule } from "../../shared";
+import { SharedModule } from "../../../shared";
-import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
+import { AssignCollectionsWebComponent } from "../../../vault/components/assign-collections";
-import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model";
-import { AssignCollectionsWebComponent } from "../components/assign-collections";
 import {
   CollectionDialogAction,
   CollectionDialogTabType,
   openCollectionDialog,
-} from "../components/collection-dialog";
+} from "../../../vault/components/collection-dialog";
 import {
   VaultItemDialogComponent,
   VaultItemDialogMode,
   VaultItemDialogResult,
-} from "../components/vault-item-dialog/vault-item-dialog.component";
+} from "../../../vault/components/vault-item-dialog/vault-item-dialog.component";
-import { VaultItemEvent } from "../components/vault-items/vault-item-event";
+import { VaultItemEvent } from "../../../vault/components/vault-items/vault-item-event";
-import { VaultItemsModule } from "../components/vault-items/vault-items.module";
+import { VaultItemsModule } from "../../../vault/components/vault-items/vault-items.module";
 import {
   AttachmentDialogResult,
   AttachmentsV2Component,
-} from "../individual-vault/attachments-v2.component";
+} from "../../../vault/individual-vault/attachments-v2.component";
 import {
   BulkDeleteDialogResult,
   openBulkDeleteDialog,
-} from "../individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component";
+} from "../../../vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component";
-import { RoutedVaultFilterBridgeService } from "../individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
+import { VaultFilterService } from "../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
-import { RoutedVaultFilterService } from "../individual-vault/vault-filter/services/routed-vault-filter.service";
+import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
-import { createFilterFunction } from "../individual-vault/vault-filter/shared/models/filter-function";
+import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
+import { createFilterFunction } from "../../../vault/individual-vault/vault-filter/shared/models/filter-function";
 import {
   All,
   RoutedVaultFilterModel,
-} from "../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
+} from "../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
-import { VaultHeaderComponent } from "../org-vault/vault-header/vault-header.component";
+import { VaultFilter } from "../../../vault/individual-vault/vault-filter/shared/models/vault-filter.model";
-import { getNestedCollectionTree } from "../utils/collection-utils";
+import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
+import { getNestedCollectionTree } from "../../../vault/utils/collection-utils";
+import { GroupApiService, GroupView } from "../core";
+import { openEntityEventsDialog } from "../manage/entity-events.component";
 
 import {
   BulkCollectionsDialogComponent,
   BulkCollectionsDialogResult,
 } from "./bulk-collections-dialog";
 import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component";
-import { AdminConsoleCipherFormConfigService } from "./services/admin-console-cipher-form-config.service";
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
+import { VaultHeaderComponent } from "./vault-header/vault-header.component";
 
 const BroadcasterSubscriptionId = "OrgVaultComponent";
 const SearchTextDebounceInterval = 200;

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

@@ -1,10 +1,10 @@
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule } from "../../shared/loose-components.module";
+import { LooseComponentsModule } from "../../../shared/loose-components.module";
-import { SharedModule } from "../../shared/shared.module";
+import { SharedModule } from "../../../shared/shared.module";
-import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module";
+import { CollectionDialogModule } from "../../../vault/components/collection-dialog";
-import { CollectionDialogModule } from "../components/collection-dialog";
+import { OrganizationBadgeModule } from "../../../vault/individual-vault/organization-badge/organization-badge.module";
-import { ViewComponent } from "../individual-vault/view.component";
+import { ViewComponent } from "../../../vault/individual-vault/view.component";
 
 import { CollectionBadgeModule } from "./collection-badge/collection-badge.module";
 import { GroupBadgeModule } from "./group-badge/group-badge.module";

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

@@ -14,14 +14,14 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
-import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
-import { organizationRedirectGuard } from "../../admin-console/organizations/guards/org-redirect.guard";
-import { OrganizationLayoutComponent } from "../../admin-console/organizations/layouts/organization-layout.component";
 import { deepLinkGuard } from "../../auth/guards/deep-link.guard";
-import { VaultModule } from "../../vault/org-vault/vault.module";
 
+import { VaultModule } from "./collections/vault.module";
 import { isEnterpriseOrgGuard } from "./guards/is-enterprise-org.guard";
+import { organizationPermissionsGuard } from "./guards/org-permissions.guard";
+import { organizationRedirectGuard } from "./guards/org-redirect.guard";
 import { AdminConsoleIntegrationsComponent } from "./integrations/integrations.component";
+import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { GroupsComponent } from "./manage/groups.component";
 
 const routes: Routes = [

apps/web/src/app/vault/components/vault-items/vault-items.module.ts

@@ -5,11 +5,11 @@ import { RouterModule } from "@angular/router";
 
 import { TableModule } from "@bitwarden/components";
 
+import { CollectionBadgeModule } from "../../../admin-console/organizations/collections/collection-badge/collection-badge.module";
+import { GroupBadgeModule } from "../../../admin-console/organizations/collections/group-badge/group-badge.module";
 import { SharedModule } from "../../../shared/shared.module";
 import { OrganizationBadgeModule } from "../../individual-vault/organization-badge/organization-badge.module";
 import { PipesModule } from "../../individual-vault/pipes/pipes.module";
-import { CollectionBadgeModule } from "../../org-vault/collection-badge/collection-badge.module";
-import { GroupBadgeModule } from "../../org-vault/group-badge/group-badge.module";
 
 import { VaultCipherRowComponent } from "./vault-cipher-row.component";
 import { VaultCollectionRowComponent } from "./vault-collection-row.component";

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

@@ -1,9 +1,9 @@
 import { NgModule } from "@angular/core";
 
+import { CollectionBadgeModule } from "../../admin-console/organizations/collections/collection-badge/collection-badge.module";
+import { GroupBadgeModule } from "../../admin-console/organizations/collections/group-badge/group-badge.module";
 import { LooseComponentsModule, SharedModule } from "../../shared";
 import { CollectionDialogModule } from "../components/collection-dialog";
-import { CollectionBadgeModule } from "../org-vault/collection-badge/collection-badge.module";
-import { GroupBadgeModule } from "../org-vault/group-badge/group-badge.module";
 
 import { BulkDialogsModule } from "./bulk-action-dialogs/bulk-dialogs.module";
 import { OrganizationBadgeModule } from "./organization-badge/organization-badge.module";