diff --git a/apps/cli/src/vault/models/collection.response.ts b/apps/cli/src/admin-console/models/response/collection.response.ts similarity index 84% rename from apps/cli/src/vault/models/collection.response.ts rename to apps/cli/src/admin-console/models/response/collection.response.ts index 5136e85774f..a0d1ce1047d 100644 --- a/apps/cli/src/vault/models/collection.response.ts +++ b/apps/cli/src/admin-console/models/response/collection.response.ts @@ -1,7 +1,7 @@ import { CollectionView } from "@bitwarden/admin-console/common"; import { CollectionWithIdExport } from "@bitwarden/common/models/export/collection-with-id.export"; -import { BaseResponse } from "../../models/response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class CollectionResponse extends CollectionWithIdExport implements BaseResponse { object: string; diff --git a/apps/cli/src/admin-console/models/response/organization-collection.response.ts b/apps/cli/src/admin-console/models/response/organization-collection.response.ts index 3d93502af88..a0d62b4c7b6 100644 --- a/apps/cli/src/admin-console/models/response/organization-collection.response.ts +++ b/apps/cli/src/admin-console/models/response/organization-collection.response.ts @@ -1,8 +1,9 @@ import { CollectionView } from "@bitwarden/admin-console/common"; -import { CollectionResponse } from "../../../vault/models/collection.response"; import { SelectionReadOnly } from "../selection-read-only"; +import { CollectionResponse } from "./collection.response"; + export class OrganizationCollectionResponse extends CollectionResponse { groups: SelectionReadOnly[]; users: SelectionReadOnly[]; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 28c06505f8a..1bdbd051585 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -37,6 +37,7 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { KeyService } from "@bitwarden/key-management"; import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request"; +import { CollectionResponse } from "../admin-console/models/response/collection.response"; import { OrganizationCollectionResponse } from "../admin-console/models/response/organization-collection.response"; import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { SelectionReadOnly } from "../admin-console/models/selection-read-only"; @@ -46,7 +47,6 @@ import { TemplateResponse } from "../models/response/template.response"; import { SendResponse } from "../tools/send/models/send.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; -import { CollectionResponse } from "../vault/models/collection.response"; import { FolderResponse } from "../vault/models/folder.response"; import { DownloadCommand } from "./download.command"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 5d512d81bf5..018e742baad 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -21,13 +21,13 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { CollectionResponse } from "../admin-console/models/response/collection.response"; import { OrganizationUserResponse } from "../admin-console/models/response/organization-user.response"; import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { Response } from "../models/response"; import { ListResponse } from "../models/response/list.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; -import { CollectionResponse } from "../vault/models/collection.response"; import { FolderResponse } from "../vault/models/folder.response"; export class ListCommand { diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts deleted file mode 100644 index 56919ef79fb..00000000000 --- a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from "@angular/core"; - -import { SharedModule } from "../../../../shared/shared.module"; -import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module"; - -import { CollectionNameBadgeComponent } from "./collection-name.badge.component"; - -@NgModule({ - imports: [SharedModule, PipesModule], - declarations: [CollectionNameBadgeComponent], - exports: [CollectionNameBadgeComponent], -}) -export class CollectionBadgeModule {} diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts index 3235797b882..d8ace8acc56 100644 --- a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts @@ -4,9 +4,14 @@ import { Component, Input } from "@angular/core"; import { CollectionView } from "@bitwarden/admin-console/common"; +import { SharedModule } from "../../../../shared/shared.module"; +import { GetCollectionNameFromIdPipe } from "../pipes"; + @Component({ selector: "app-collection-badge", templateUrl: "collection-name-badge.component.html", + standalone: true, + imports: [SharedModule, GetCollectionNameFromIdPipe], }) export class CollectionNameBadgeComponent { @Input() collectionIds: string[]; diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-badge/index.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/index.ts new file mode 100644 index 00000000000..2cc8f8eb9b6 --- /dev/null +++ b/apps/web/src/app/admin-console/organizations/collections/collection-badge/index.ts @@ -0,0 +1 @@ +export * from "./collection-name.badge.component"; diff --git a/apps/web/src/app/admin-console/organizations/collections/index.ts b/apps/web/src/app/admin-console/organizations/collections/index.ts new file mode 100644 index 00000000000..57f936ab590 --- /dev/null +++ b/apps/web/src/app/admin-console/organizations/collections/index.ts @@ -0,0 +1,2 @@ +export * from "./utils"; +export * from "./collection-badge"; diff --git a/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts b/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts similarity index 94% rename from apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts rename to apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts index b52719304b8..8833ddfa382 100644 --- a/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts +++ b/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts @@ -5,6 +5,7 @@ import { CollectionView } from "@bitwarden/admin-console/common"; @Pipe({ name: "collectionNameFromId", pure: true, + standalone: true, }) export class GetCollectionNameFromIdPipe implements PipeTransform { transform(value: string, collections: CollectionView[]) { diff --git a/apps/web/src/app/admin-console/organizations/collections/pipes/index.ts b/apps/web/src/app/admin-console/organizations/collections/pipes/index.ts new file mode 100644 index 00000000000..63b1a86cae5 --- /dev/null +++ b/apps/web/src/app/admin-console/organizations/collections/pipes/index.ts @@ -0,0 +1 @@ +export * from "./get-collection-name.pipe"; diff --git a/apps/web/src/app/vault/utils/collection-utils.spec.ts b/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.spec.ts similarity index 100% rename from apps/web/src/app/vault/utils/collection-utils.spec.ts rename to apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.spec.ts diff --git a/apps/web/src/app/vault/utils/collection-utils.ts b/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts similarity index 100% rename from apps/web/src/app/vault/utils/collection-utils.ts rename to apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts diff --git a/apps/web/src/app/admin-console/organizations/collections/utils/index.ts b/apps/web/src/app/admin-console/organizations/collections/utils/index.ts new file mode 100644 index 00000000000..67ff730806d --- /dev/null +++ b/apps/web/src/app/admin-console/organizations/collections/utils/index.ts @@ -0,0 +1 @@ +export * from "./collection-utils"; diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts index e59ce941719..ec92597dc7b 100644 --- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts @@ -111,7 +111,6 @@ import { } 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 { @@ -125,6 +124,7 @@ import { BulkCollectionsDialogResult, } from "./bulk-collections-dialog"; import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component"; +import { getNestedCollectionTree } from "./utils"; import { VaultFilterModule } from "./vault-filter/vault-filter.module"; import { VaultHeaderComponent } from "./vault-header/vault-header.component"; diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault.module.ts index 3f2eccdd514..037a27cd781 100644 --- a/apps/web/src/app/admin-console/organizations/collections/vault.module.ts +++ b/apps/web/src/app/admin-console/organizations/collections/vault.module.ts @@ -6,7 +6,7 @@ import { OrganizationBadgeModule } from "../../../vault/individual-vault/organiz import { ViewComponent } from "../../../vault/individual-vault/view.component"; import { CollectionDialogComponent } from "../shared/components/collection-dialog"; -import { CollectionBadgeModule } from "./collection-badge/collection-badge.module"; +import { CollectionNameBadgeComponent } from "./collection-badge"; import { GroupBadgeModule } from "./group-badge/group-badge.module"; import { VaultRoutingModule } from "./vault-routing.module"; import { VaultComponent } from "./vault.component"; @@ -17,7 +17,7 @@ import { VaultComponent } from "./vault.component"; SharedModule, LooseComponentsModule, GroupBadgeModule, - CollectionBadgeModule, + CollectionNameBadgeComponent, OrganizationBadgeModule, CollectionDialogComponent, VaultComponent, 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 5a0a98a84b2..e54a9c1141f 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,7 +5,7 @@ import { RouterModule } from "@angular/router"; import { TableModule } from "@bitwarden/components"; -import { CollectionBadgeModule } from "../../../admin-console/organizations/collections/collection-badge/collection-badge.module"; +import { CollectionNameBadgeComponent } from "../../../admin-console/organizations/collections"; 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"; @@ -23,7 +23,7 @@ import { VaultItemsComponent } from "./vault-items.component"; SharedModule, TableModule, OrganizationBadgeModule, - CollectionBadgeModule, + CollectionNameBadgeComponent, GroupBadgeModule, PipesModule, ], diff --git a/apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts b/apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts index c33136b8262..16b95717718 100644 --- a/apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts +++ b/apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts @@ -1,11 +1,10 @@ import { NgModule } from "@angular/core"; -import { GetCollectionNameFromIdPipe } from "./get-collection-name.pipe"; import { GetGroupNameFromIdPipe } from "./get-group-name.pipe"; import { GetOrgNameFromIdPipe } from "./get-organization-name.pipe"; @NgModule({ - declarations: [GetOrgNameFromIdPipe, GetCollectionNameFromIdPipe, GetGroupNameFromIdPipe], - exports: [GetOrgNameFromIdPipe, GetCollectionNameFromIdPipe, GetGroupNameFromIdPipe], + declarations: [GetOrgNameFromIdPipe, GetGroupNameFromIdPipe], + exports: [GetOrgNameFromIdPipe, GetGroupNameFromIdPipe], }) export class PipesModule {} diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index b74af0b1b9c..d4441c73719 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -76,6 +76,7 @@ import { PasswordRepromptService, } from "@bitwarden/vault"; +import { getNestedCollectionTree } from "../../admin-console/organizations/collections"; import { CollectionDialogAction, CollectionDialogTabType, @@ -94,7 +95,6 @@ import { import { VaultItem } from "../components/vault-items/vault-item"; import { VaultItemEvent } from "../components/vault-items/vault-item-event"; import { VaultItemsModule } from "../components/vault-items/vault-items.module"; -import { getNestedCollectionTree } from "../utils/collection-utils"; import { AttachmentDialogCloseResult, 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 6b3674fa540..57d3df30df7 100644 --- a/apps/web/src/app/vault/individual-vault/vault.module.ts +++ b/apps/web/src/app/vault/individual-vault/vault.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { CollectionBadgeModule } from "../../admin-console/organizations/collections/collection-badge/collection-badge.module"; +import { CollectionNameBadgeComponent } from "../../admin-console/organizations/collections"; import { GroupBadgeModule } from "../../admin-console/organizations/collections/group-badge/group-badge.module"; import { CollectionDialogComponent } from "../../admin-console/organizations/shared/components/collection-dialog"; import { LooseComponentsModule, SharedModule } from "../../shared"; @@ -17,7 +17,7 @@ import { ViewComponent } from "./view.component"; VaultRoutingModule, OrganizationBadgeModule, GroupBadgeModule, - CollectionBadgeModule, + CollectionNameBadgeComponent, PipesModule, SharedModule, LooseComponentsModule, diff --git a/libs/common/src/models/request/collection-bulk-delete.request.ts b/libs/common/src/admin-console/models/request/collection-bulk-delete.request.ts similarity index 100% rename from libs/common/src/models/request/collection-bulk-delete.request.ts rename to libs/common/src/admin-console/models/request/collection-bulk-delete.request.ts diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index b6a466943de..bb1b89df34f 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -12,6 +12,7 @@ import { LogoutReason } from "@bitwarden/auth/common"; import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service"; import { OrganizationConnectionType } from "../admin-console/enums"; +import { CollectionBulkDeleteRequest } from "../admin-console/models/request/collection-bulk-delete.request"; import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request"; import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request"; import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request"; @@ -101,7 +102,6 @@ import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/mode import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request"; import { VaultTimeoutSettingsService } from "../key-management/vault-timeout"; import { VaultTimeoutAction } from "../key-management/vault-timeout/enums/vault-timeout-action.enum"; -import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; import { EventRequest } from "../models/request/event.request"; import { KdfRequest } from "../models/request/kdf.request";