From 56c8c2ccc8b09c368c8bc66338553d40dff32470 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:18:42 +1100 Subject: [PATCH] [PM-13326] Move Collections tab to AC Team (#13529) --- .../bulk-collections-dialog.component.html | 0 .../bulk-collections-dialog.component.ts | 6 +-- .../bulk-collections-dialog/index.ts | 0 .../collection-access-restricted.component.ts | 4 +- .../collection-badge.module.ts | 4 +- .../collection-name-badge.component.html | 0 .../collection-name.badge.component.ts | 0 .../group-badge/group-badge.module.ts | 4 +- .../group-name-badge.component.html | 0 .../group-badge/group-name-badge.component.ts | 2 +- .../vault-filter/vault-filter.component.ts | 11 ++--- .../vault-filter/vault-filter.module.ts | 4 +- .../vault-filter/vault-filter.service.ts | 4 +- .../vault-header/vault-header.component.html | 0 .../vault-header/vault-header.component.ts | 18 ++++---- .../collections}/vault-routing.module.ts | 2 +- .../collections}/vault.component.html | 0 .../collections}/vault.component.ts | 44 +++++++++---------- .../collections}/vault.module.ts | 10 ++--- .../organization-routing.module.ts | 8 ++-- .../vault-items/vault-items.module.ts | 4 +- .../vault/individual-vault/vault.module.ts | 4 +- 22 files changed, 64 insertions(+), 65 deletions(-) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/bulk-collections-dialog/bulk-collections-dialog.component.html (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/bulk-collections-dialog/bulk-collections-dialog.component.ts (95%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/bulk-collections-dialog/index.ts (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/collection-access-restricted.component.ts (96%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/collection-badge/collection-badge.module.ts (67%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/collection-badge/collection-name-badge.component.html (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/collection-badge/collection-name.badge.component.ts (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/group-badge/group-badge.module.ts (65%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/group-badge/group-name-badge.component.html (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/group-badge/group-name-badge.component.ts (92%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-filter/vault-filter.component.ts (89%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-filter/vault-filter.module.ts (72%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-filter/vault-filter.service.ts (91%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-header/vault-header.component.html (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-header/vault-header.component.ts (92%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault-routing.module.ts (84%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault.component.html (100%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault.component.ts (95%) rename apps/web/src/app/{vault/org-vault => admin-console/organizations/collections}/vault.module.ts (57%) diff --git a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.html b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.html rename to apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.html diff --git a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts similarity index 95% rename from apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts rename to apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts index 4058c1151fb..dc08b32ce36 100644 --- a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts +++ b/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"; -import { SharedModule } from "../../../shared"; +} from "../../shared/components/access-selector"; export interface BulkCollectionsDialogParams { organizationId: string; diff --git a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/index.ts b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/index.ts similarity index 100% rename from apps/web/src/app/vault/org-vault/bulk-collections-dialog/index.ts rename to apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/index.ts diff --git a/apps/web/src/app/vault/org-vault/collection-access-restricted.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts similarity index 96% rename from apps/web/src/app/vault/org-vault/collection-access-restricted.component.ts rename to apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts index 1e4280626fe..e5d10d19db0 100644 --- a/apps/web/src/app/vault/org-vault/collection-access-restricted.component.ts +++ b/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 { CollectionDialogTabType } from "../components/collection-dialog"; +import { SharedModule } from "../../../shared"; +import { CollectionDialogTabType } from "../../../vault/components/collection-dialog"; const icon = svgIcon` diff --git a/apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts similarity index 67% rename from apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts rename to apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts index 44c27e57c8d..56919ef79fb 100644 --- a/apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts +++ b/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 { PipesModule } from "../../individual-vault/pipes/pipes.module"; +import { SharedModule } from "../../../../shared/shared.module"; +import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module"; import { CollectionNameBadgeComponent } from "./collection-name.badge.component"; diff --git a/apps/web/src/app/vault/org-vault/collection-badge/collection-name-badge.component.html b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name-badge.component.html similarity index 100% rename from apps/web/src/app/vault/org-vault/collection-badge/collection-name-badge.component.html rename to apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name-badge.component.html diff --git a/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts similarity index 100% rename from apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts rename to apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts diff --git a/apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-badge.module.ts similarity index 65% rename from apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts rename to apps/web/src/app/admin-console/organizations/collections/group-badge/group-badge.module.ts index 26ce689ed86..a209631bb23 100644 --- a/apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts +++ b/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 { PipesModule } from "../../individual-vault/pipes/pipes.module"; +import { SharedModule } from "../../../../shared/shared.module"; +import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module"; import { GroupNameBadgeComponent } from "./group-name-badge.component"; diff --git a/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.html b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html similarity index 100% rename from apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.html rename to apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html diff --git a/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts similarity index 92% rename from apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts rename to apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts index 4ed145a732f..8e5f261bc26 100644 --- a/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts +++ b/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", diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts similarity index 89% rename from apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts rename to apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts index 7e08af7c7f7..73973e7ffde 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts +++ b/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 { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/individual-vault/vault-filter/components/vault-filter.component"; +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"; -import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; +} from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter-section.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 diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.module.ts similarity index 72% rename from apps/web/src/app/vault/org-vault/vault-filter/vault-filter.module.ts rename to apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.module.ts index 13a69796441..a0dba839b22 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.module.ts +++ b/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 { VaultFilterSharedModule } from "../../individual-vault/vault-filter/shared/vault-filter-shared.module"; +import { VaultFilterService as VaultFilterServiceAbstraction } from "../../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; +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"; diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts similarity index 91% rename from apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts rename to apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts index e2d713649f5..f4b6f41fab6 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts +++ b/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 { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; +import { VaultFilterService as BaseVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/vault-filter.service"; +import { CollectionFilter } from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter.type"; @Injectable() export class VaultFilterService extends BaseVaultFilterService implements OnDestroy { diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html similarity index 100% rename from apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html rename to apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts similarity index 92% rename from apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts rename to apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts index e3c99231a86..22a7e4b432b 100644 --- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts +++ b/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 { SharedModule } from "../../../shared"; -import { CollectionDialogTabType } from "../../components/collection-dialog"; +import { HeaderModule } from "../../../../layouts/header/header.module"; +import { SharedModule } from "../../../../shared"; +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(); diff --git a/apps/web/src/app/vault/org-vault/vault-routing.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts similarity index 84% rename from apps/web/src/app/vault/org-vault/vault-routing.module.ts rename to apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts index 4c2ed048bd1..960ddf4397f 100644 --- a/apps/web/src/app/vault/org-vault/vault-routing.module.ts +++ b/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 = [ diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/admin-console/organizations/collections/vault.component.html similarity index 100% rename from apps/web/src/app/vault/org-vault/vault.component.html rename to apps/web/src/app/admin-console/organizations/collections/vault.component.html diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts similarity index 95% rename from apps/web/src/app/vault/org-vault/vault.component.ts rename to apps/web/src/app/admin-console/organizations/collections/vault.component.ts index f14a8fcf5ee..a02cc599a18 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/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"; -import { TrialFlowService } from "../../billing/services/trial-flow.service"; -import { FreeTrial } from "../../billing/types/free-trial"; -import { SharedModule } from "../../shared"; -import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; -import { AssignCollectionsWebComponent } from "../components/assign-collections"; +} from "../../../billing/services/reseller-warning.service"; +import { TrialFlowService } from "../../../billing/services/trial-flow.service"; +import { FreeTrial } from "../../../billing/types/free-trial"; +import { SharedModule } from "../../../shared"; +import { AssignCollectionsWebComponent } from "../../../vault/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"; -import { VaultItemEvent } from "../components/vault-items/vault-item-event"; -import { VaultItemsModule } from "../components/vault-items/vault-items.module"; +} from "../../../vault/components/vault-item-dialog/vault-item-dialog.component"; +import { VaultItemEvent } from "../../../vault/components/vault-items/vault-item-event"; +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"; -import { RoutedVaultFilterBridgeService } from "../individual-vault/vault-filter/services/routed-vault-filter-bridge.service"; -import { RoutedVaultFilterService } from "../individual-vault/vault-filter/services/routed-vault-filter.service"; -import { createFilterFunction } from "../individual-vault/vault-filter/shared/models/filter-function"; +} from "../../../vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; +import { VaultFilterService } from "../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service"; +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"; -import { VaultHeaderComponent } from "../org-vault/vault-header/vault-header.component"; -import { getNestedCollectionTree } from "../utils/collection-utils"; +} from "../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model"; +import { VaultFilter } from "../../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; +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; diff --git a/apps/web/src/app/vault/org-vault/vault.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault.module.ts similarity index 57% rename from apps/web/src/app/vault/org-vault/vault.module.ts rename to apps/web/src/app/admin-console/organizations/collections/vault.module.ts index db8d2256f52..8a2f3fbc2f0 100644 --- a/apps/web/src/app/vault/org-vault/vault.module.ts +++ b/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 { SharedModule } from "../../shared/shared.module"; -import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module"; -import { CollectionDialogModule } from "../components/collection-dialog"; -import { ViewComponent } from "../individual-vault/view.component"; +import { LooseComponentsModule } from "../../../shared/loose-components.module"; +import { SharedModule } from "../../../shared/shared.module"; +import { CollectionDialogModule } from "../../../vault/components/collection-dialog"; +import { OrganizationBadgeModule } from "../../../vault/individual-vault/organization-badge/organization-badge.module"; +import { ViewComponent } from "../../../vault/individual-vault/view.component"; import { CollectionBadgeModule } from "./collection-badge/collection-badge.module"; import { GroupBadgeModule } from "./group-badge/group-badge.module"; diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts index 71be67af810..e5c68b73546 100644 --- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts +++ b/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 = [ diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts b/apps/web/src/app/vault/components/vault-items/vault-items.module.ts index ac0d0fb1947..5a0a98a84b2 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts +++ b/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"; diff --git a/apps/web/src/app/vault/individual-vault/vault.module.ts b/apps/web/src/app/vault/individual-vault/vault.module.ts index 712b86a9803..d400d44bf0d 100644 --- a/apps/web/src/app/vault/individual-vault/vault.module.ts +++ b/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";