diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts index e5d10d19db0..15ba10a0d59 100644 --- a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts @@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ButtonModule, NoItemsModule, svgIcon } from "@bitwarden/components"; import { SharedModule } from "../../../shared"; -import { CollectionDialogTabType } from "../../../vault/components/collection-dialog"; +import { CollectionDialogTabType } from "../shared/components/collection-dialog"; const icon = svgIcon` diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts index 22a7e4b432b..7efb79ebdb6 100644 --- a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts @@ -28,11 +28,11 @@ import { import { HeaderModule } from "../../../../layouts/header/header.module"; import { SharedModule } from "../../../../shared"; -import { CollectionDialogTabType } from "../../../../vault/components/collection-dialog"; import { All, RoutedVaultFilterModel, } from "../../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model"; +import { CollectionDialogTabType } from "../../shared/components/collection-dialog"; @Component({ standalone: true, 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 2ace66f2364..7fb170c3806 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 @@ -84,11 +84,6 @@ 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 "../../../vault/components/collection-dialog"; import { VaultItemDialogComponent, VaultItemDialogMode, @@ -117,6 +112,11 @@ import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/se import { getNestedCollectionTree } from "../../../vault/utils/collection-utils"; import { GroupApiService, GroupView } from "../core"; import { openEntityEventsDialog } from "../manage/entity-events.component"; +import { + CollectionDialogAction, + CollectionDialogTabType, + openCollectionDialog, +} from "../shared/components/collection-dialog"; import { BulkCollectionsDialogComponent, 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 8a2f3fbc2f0..3f2eccdd514 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 @@ -2,9 +2,9 @@ import { NgModule } from "@angular/core"; 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 { CollectionDialogComponent } from "../shared/components/collection-dialog"; import { CollectionBadgeModule } from "./collection-badge/collection-badge.module"; import { GroupBadgeModule } from "./group-badge/group-badge.module"; @@ -19,7 +19,7 @@ import { VaultComponent } from "./vault.component"; GroupBadgeModule, CollectionBadgeModule, OrganizationBadgeModule, - CollectionDialogModule, + CollectionDialogComponent, VaultComponent, ViewComponent, ], diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts similarity index 96% rename from apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts index a035202516a..2dd1c1bc5b8 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts @@ -35,10 +35,11 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { BitValidators, DialogService, ToastService } from "@bitwarden/components"; +import { SelectModule, BitValidators, DialogService, ToastService } from "@bitwarden/components"; -import { GroupApiService, GroupView } from "../../../admin-console/organizations/core"; -import { PermissionMode } from "../../../admin-console/organizations/shared/components/access-selector/access-selector.component"; +import { SharedModule } from "../../../../../shared"; +import { GroupApiService, GroupView } from "../../../core"; +import { PermissionMode } from "../access-selector/access-selector.component"; import { AccessItemType, AccessItemValue, @@ -46,7 +47,8 @@ import { CollectionPermission, convertToPermission, convertToSelectionView, -} from "../../../admin-console/organizations/shared/components/access-selector/access-selector.models"; +} from "../access-selector/access-selector.models"; +import { AccessSelectorModule } from "../access-selector/access-selector.module"; export enum CollectionDialogTabType { Info = 0, @@ -80,6 +82,8 @@ export enum CollectionDialogAction { @Component({ templateUrl: "collection-dialog.component.html", + standalone: true, + imports: [SharedModule, AccessSelectorModule, SelectModule], }) export class CollectionDialogComponent implements OnInit, OnDestroy { private destroy$ = new Subject(); @@ -289,7 +293,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { if (this.tabIndex === CollectionDialogTabType.Access && !accessTabError) { this.toastService.showToast({ variant: "error", - title: null, message: this.i18nService.t( "fieldOnTabRequiresAttention", this.i18nService.t("collectionInfo"), @@ -298,7 +301,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { } else if (this.tabIndex === CollectionDialogTabType.Info && accessTabError) { this.toastService.showToast({ variant: "error", - title: null, message: this.i18nService.t("fieldOnTabRequiresAttention", this.i18nService.t("access")), }); } @@ -327,7 +329,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { this.toastService.showToast({ variant: "success", - title: null, message: this.i18nService.t( this.editMode ? "editedCollectionId" : "createdCollectionId", collectionView.name, @@ -357,7 +358,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { this.toastService.showToast({ variant: "success", - title: null, message: this.i18nService.t("deletedCollectionId", this.collection?.name), }); @@ -493,10 +493,7 @@ function mapUserToAccessItemView( */ export function openCollectionDialog( dialogService: DialogService, - config: DialogConfig, + config: DialogConfig>, ) { - return dialogService.open( - CollectionDialogComponent, - config, - ); + return dialogService.open(CollectionDialogComponent, config); } diff --git a/apps/web/src/app/vault/components/collection-dialog/index.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/index.ts similarity index 51% rename from apps/web/src/app/vault/components/collection-dialog/index.ts rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/index.ts index 4d4c463eb6c..d7365f5f2b1 100644 --- a/apps/web/src/app/vault/components/collection-dialog/index.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/index.ts @@ -1,2 +1 @@ export * from "./collection-dialog.component"; -export * from "./collection-dialog.module"; diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.module.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.module.ts deleted file mode 100644 index a8f284fb485..00000000000 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from "@angular/core"; - -import { SelectModule } from "@bitwarden/components"; - -import { AccessSelectorModule } from "../../../admin-console/organizations/shared/components/access-selector/access-selector.module"; -import { SharedModule } from "../../../shared"; - -import { CollectionDialogComponent } from "./collection-dialog.component"; -@NgModule({ - imports: [SharedModule, AccessSelectorModule, SelectModule], - declarations: [CollectionDialogComponent], - exports: [CollectionDialogComponent], -}) -export class CollectionDialogModule {} diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts index 63af397e726..000feeaf337 100644 --- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts @@ -18,9 +18,9 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { BreadcrumbsModule, MenuModule } from "@bitwarden/components"; +import { CollectionDialogTabType } from "../../../admin-console/organizations/shared/components/collection-dialog"; import { HeaderModule } from "../../../layouts/header/header.module"; import { SharedModule } from "../../../shared"; -import { CollectionDialogTabType } from "../../components/collection-dialog"; import { PipesModule } from "../pipes/pipes.module"; import { All, 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 674af0cfa32..9983567a4d1 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -75,15 +75,15 @@ import { PasswordRepromptService, } from "@bitwarden/vault"; -import { TrialFlowService } from "../../billing/services/trial-flow.service"; -import { FreeTrial } from "../../billing/types/free-trial"; -import { SharedModule } from "../../shared/shared.module"; -import { AssignCollectionsWebComponent } from "../components/assign-collections"; import { CollectionDialogAction, CollectionDialogTabType, openCollectionDialog, -} from "../components/collection-dialog"; +} from "../../admin-console/organizations/shared/components/collection-dialog"; +import { TrialFlowService } from "../../billing/services/trial-flow.service"; +import { FreeTrial } from "../../billing/types/free-trial"; +import { SharedModule } from "../../shared/shared.module"; +import { AssignCollectionsWebComponent } from "../components/assign-collections"; import { VaultItemDialogComponent, VaultItemDialogMode, 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 d400d44bf0d..6b3674fa540 100644 --- a/apps/web/src/app/vault/individual-vault/vault.module.ts +++ b/apps/web/src/app/vault/individual-vault/vault.module.ts @@ -2,8 +2,8 @@ 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 { CollectionDialogComponent } from "../../admin-console/organizations/shared/components/collection-dialog"; import { LooseComponentsModule, SharedModule } from "../../shared"; -import { CollectionDialogModule } from "../components/collection-dialog"; import { BulkDialogsModule } from "./bulk-action-dialogs/bulk-dialogs.module"; import { OrganizationBadgeModule } from "./organization-badge/organization-badge.module"; @@ -22,7 +22,7 @@ import { ViewComponent } from "./view.component"; SharedModule, LooseComponentsModule, BulkDialogsModule, - CollectionDialogModule, + CollectionDialogComponent, VaultComponent, ViewComponent, ],