bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-badge.module.ts
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 {}

5
apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
View File

@@ -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[];

1
apps/web/src/app/admin-console/organizations/collections/collection-badge/index.ts Normal file
View File

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

2
apps/web/src/app/admin-console/organizations/collections/index.ts Normal file
View File

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

1
apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts → apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts
View File

@@ -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[]) {

1
apps/web/src/app/admin-console/organizations/collections/pipes/index.ts Normal file
View File

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

0
apps/web/src/app/vault/utils/collection-utils.spec.ts → apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.spec.ts
View File

0
apps/web/src/app/vault/utils/collection-utils.ts → apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts
View File

1
apps/web/src/app/admin-console/organizations/collections/utils/index.ts Normal file
View File

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

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

@@ -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";

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

@@ -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,

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

@@ -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,
],

5
apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts
View File

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

2
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -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,

4
apps/web/src/app/vault/individual-vault/vault.module.ts
View File

@@ -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,