1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00

[PM-13323] Move remaining collection code to AC Team (#13731)

This commit is contained in:
Thomas Rittson
2025-03-14 07:18:47 +10:00
committed by GitHub
parent 45df8ff825
commit 0c507f54f6
21 changed files with 27 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
import { CollectionView } from "@bitwarden/admin-console/common"; import { CollectionView } from "@bitwarden/admin-console/common";
import { CollectionWithIdExport } from "@bitwarden/common/models/export/collection-with-id.export"; 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 { export class CollectionResponse extends CollectionWithIdExport implements BaseResponse {
object: string; object: string;

View File

@@ -1,8 +1,9 @@
import { CollectionView } from "@bitwarden/admin-console/common"; import { CollectionView } from "@bitwarden/admin-console/common";
import { CollectionResponse } from "../../../vault/models/collection.response";
import { SelectionReadOnly } from "../selection-read-only"; import { SelectionReadOnly } from "../selection-read-only";
import { CollectionResponse } from "./collection.response";
export class OrganizationCollectionResponse extends CollectionResponse { export class OrganizationCollectionResponse extends CollectionResponse {
groups: SelectionReadOnly[]; groups: SelectionReadOnly[];
users: SelectionReadOnly[]; users: SelectionReadOnly[];

View File

@@ -37,6 +37,7 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
import { KeyService } from "@bitwarden/key-management"; import { KeyService } from "@bitwarden/key-management";
import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request"; 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 { OrganizationCollectionResponse } from "../admin-console/models/response/organization-collection.response";
import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { OrganizationResponse } from "../admin-console/models/response/organization.response";
import { SelectionReadOnly } from "../admin-console/models/selection-read-only"; 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 { SendResponse } from "../tools/send/models/send.response";
import { CliUtils } from "../utils"; import { CliUtils } from "../utils";
import { CipherResponse } from "../vault/models/cipher.response"; import { CipherResponse } from "../vault/models/cipher.response";
import { CollectionResponse } from "../vault/models/collection.response";
import { FolderResponse } from "../vault/models/folder.response"; import { FolderResponse } from "../vault/models/folder.response";
import { DownloadCommand } from "./download.command"; import { DownloadCommand } from "./download.command";

View File

@@ -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 { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; 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 { OrganizationUserResponse } from "../admin-console/models/response/organization-user.response";
import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { OrganizationResponse } from "../admin-console/models/response/organization.response";
import { Response } from "../models/response"; import { Response } from "../models/response";
import { ListResponse } from "../models/response/list.response"; import { ListResponse } from "../models/response/list.response";
import { CliUtils } from "../utils"; import { CliUtils } from "../utils";
import { CipherResponse } from "../vault/models/cipher.response"; import { CipherResponse } from "../vault/models/cipher.response";
import { CollectionResponse } from "../vault/models/collection.response";
import { FolderResponse } from "../vault/models/folder.response"; import { FolderResponse } from "../vault/models/folder.response";
export class ListCommand { export class ListCommand {

View File

@@ -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 {}

View File

@@ -4,9 +4,14 @@ import { Component, Input } from "@angular/core";
import { CollectionView } from "@bitwarden/admin-console/common"; import { CollectionView } from "@bitwarden/admin-console/common";
import { SharedModule } from "../../../../shared/shared.module";
import { GetCollectionNameFromIdPipe } from "../pipes";
@Component({ @Component({
selector: "app-collection-badge", selector: "app-collection-badge",
templateUrl: "collection-name-badge.component.html", templateUrl: "collection-name-badge.component.html",
standalone: true,
imports: [SharedModule, GetCollectionNameFromIdPipe],
}) })
export class CollectionNameBadgeComponent { export class CollectionNameBadgeComponent {
@Input() collectionIds: string[]; @Input() collectionIds: string[];

View File

@@ -0,0 +1 @@
export * from "./collection-name.badge.component";

View File

@@ -0,0 +1,2 @@
export * from "./utils";
export * from "./collection-badge";

View File

@@ -5,6 +5,7 @@ import { CollectionView } from "@bitwarden/admin-console/common";
@Pipe({ @Pipe({
name: "collectionNameFromId", name: "collectionNameFromId",
pure: true, pure: true,
standalone: true,
}) })
export class GetCollectionNameFromIdPipe implements PipeTransform { export class GetCollectionNameFromIdPipe implements PipeTransform {
transform(value: string, collections: CollectionView[]) { transform(value: string, collections: CollectionView[]) {

View File

@@ -0,0 +1 @@
export * from "./get-collection-name.pipe";

View File

@@ -0,0 +1 @@
export * from "./collection-utils";

View File

@@ -111,7 +111,6 @@ import {
} from "../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model"; } 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 { 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 { 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 { GroupApiService, GroupView } from "../core";
import { openEntityEventsDialog } from "../manage/entity-events.component"; import { openEntityEventsDialog } from "../manage/entity-events.component";
import { import {
@@ -125,6 +124,7 @@ import {
BulkCollectionsDialogResult, BulkCollectionsDialogResult,
} from "./bulk-collections-dialog"; } from "./bulk-collections-dialog";
import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component"; import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component";
import { getNestedCollectionTree } from "./utils";
import { VaultFilterModule } from "./vault-filter/vault-filter.module"; import { VaultFilterModule } from "./vault-filter/vault-filter.module";
import { VaultHeaderComponent } from "./vault-header/vault-header.component"; import { VaultHeaderComponent } from "./vault-header/vault-header.component";

View File

@@ -6,7 +6,7 @@ import { OrganizationBadgeModule } from "../../../vault/individual-vault/organiz
import { ViewComponent } from "../../../vault/individual-vault/view.component"; import { ViewComponent } from "../../../vault/individual-vault/view.component";
import { CollectionDialogComponent } from "../shared/components/collection-dialog"; 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 { GroupBadgeModule } from "./group-badge/group-badge.module";
import { VaultRoutingModule } from "./vault-routing.module"; import { VaultRoutingModule } from "./vault-routing.module";
import { VaultComponent } from "./vault.component"; import { VaultComponent } from "./vault.component";
@@ -17,7 +17,7 @@ import { VaultComponent } from "./vault.component";
SharedModule, SharedModule,
LooseComponentsModule, LooseComponentsModule,
GroupBadgeModule, GroupBadgeModule,
CollectionBadgeModule, CollectionNameBadgeComponent,
OrganizationBadgeModule, OrganizationBadgeModule,
CollectionDialogComponent, CollectionDialogComponent,
VaultComponent, VaultComponent,

View File

@@ -5,7 +5,7 @@ import { RouterModule } from "@angular/router";
import { TableModule } from "@bitwarden/components"; 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 { GroupBadgeModule } from "../../../admin-console/organizations/collections/group-badge/group-badge.module";
import { SharedModule } from "../../../shared/shared.module"; import { SharedModule } from "../../../shared/shared.module";
import { OrganizationBadgeModule } from "../../individual-vault/organization-badge/organization-badge.module"; import { OrganizationBadgeModule } from "../../individual-vault/organization-badge/organization-badge.module";
@@ -23,7 +23,7 @@ import { VaultItemsComponent } from "./vault-items.component";
SharedModule, SharedModule,
TableModule, TableModule,
OrganizationBadgeModule, OrganizationBadgeModule,
CollectionBadgeModule, CollectionNameBadgeComponent,
GroupBadgeModule, GroupBadgeModule,
PipesModule, PipesModule,
], ],

View File

@@ -1,11 +1,10 @@
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { GetCollectionNameFromIdPipe } from "./get-collection-name.pipe";
import { GetGroupNameFromIdPipe } from "./get-group-name.pipe"; import { GetGroupNameFromIdPipe } from "./get-group-name.pipe";
import { GetOrgNameFromIdPipe } from "./get-organization-name.pipe"; import { GetOrgNameFromIdPipe } from "./get-organization-name.pipe";
@NgModule({ @NgModule({
declarations: [GetOrgNameFromIdPipe, GetCollectionNameFromIdPipe, GetGroupNameFromIdPipe], declarations: [GetOrgNameFromIdPipe, GetGroupNameFromIdPipe],
exports: [GetOrgNameFromIdPipe, GetCollectionNameFromIdPipe, GetGroupNameFromIdPipe], exports: [GetOrgNameFromIdPipe, GetGroupNameFromIdPipe],
}) })
export class PipesModule {} export class PipesModule {}

View File

@@ -76,6 +76,7 @@ import {
PasswordRepromptService, PasswordRepromptService,
} from "@bitwarden/vault"; } from "@bitwarden/vault";
import { getNestedCollectionTree } from "../../admin-console/organizations/collections";
import { import {
CollectionDialogAction, CollectionDialogAction,
CollectionDialogTabType, CollectionDialogTabType,
@@ -94,7 +95,6 @@ import {
import { VaultItem } from "../components/vault-items/vault-item"; import { VaultItem } from "../components/vault-items/vault-item";
import { VaultItemEvent } from "../components/vault-items/vault-item-event"; import { VaultItemEvent } from "../components/vault-items/vault-item-event";
import { VaultItemsModule } from "../components/vault-items/vault-items.module"; import { VaultItemsModule } from "../components/vault-items/vault-items.module";
import { getNestedCollectionTree } from "../utils/collection-utils";
import { import {
AttachmentDialogCloseResult, AttachmentDialogCloseResult,

View File

@@ -1,6 +1,6 @@
import { NgModule } from "@angular/core"; 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 { GroupBadgeModule } from "../../admin-console/organizations/collections/group-badge/group-badge.module";
import { CollectionDialogComponent } from "../../admin-console/organizations/shared/components/collection-dialog"; import { CollectionDialogComponent } from "../../admin-console/organizations/shared/components/collection-dialog";
import { LooseComponentsModule, SharedModule } from "../../shared"; import { LooseComponentsModule, SharedModule } from "../../shared";
@@ -17,7 +17,7 @@ import { ViewComponent } from "./view.component";
VaultRoutingModule, VaultRoutingModule,
OrganizationBadgeModule, OrganizationBadgeModule,
GroupBadgeModule, GroupBadgeModule,
CollectionBadgeModule, CollectionNameBadgeComponent,
PipesModule, PipesModule,
SharedModule, SharedModule,
LooseComponentsModule, LooseComponentsModule,

View File

@@ -12,6 +12,7 @@ import { LogoutReason } from "@bitwarden/auth/common";
import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service"; import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service";
import { OrganizationConnectionType } from "../admin-console/enums"; 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 { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request";
import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request"; import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request";
import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.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 { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request";
import { VaultTimeoutSettingsService } from "../key-management/vault-timeout"; import { VaultTimeoutSettingsService } from "../key-management/vault-timeout";
import { VaultTimeoutAction } from "../key-management/vault-timeout/enums/vault-timeout-action.enum"; 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 { DeleteRecoverRequest } from "../models/request/delete-recover.request";
import { EventRequest } from "../models/request/event.request"; import { EventRequest } from "../models/request/event.request";
import { KdfRequest } from "../models/request/kdf.request"; import { KdfRequest } from "../models/request/kdf.request";