From 260580237a79cc69f777e472cf3c0af919e4317a Mon Sep 17 00:00:00 2001 From: Jake Fink Date: Tue, 20 Dec 2022 10:16:45 -0500 Subject: [PATCH] [EC-424] top level vault (#4267) * [EC-424] remove cog menu and header hr * [EC-424] change "Add item" to "New item" * [EC-424] include text for "New item" * [EC-424] add new item dropdown to org vault - add parent collection to dialog params * [EC-14] show Add Item if missing permissions --- .../collection-dialog.component.ts | 3 + .../organizations/vault/vault.component.html | 46 +++-- .../organizations/vault/vault.component.ts | 23 ++- .../src/app/shared/loose-components.module.ts | 3 - .../src/app/vault/bulk-actions.component.html | 50 ------ .../src/app/vault/bulk-actions.component.ts | 162 ------------------ apps/web/src/app/vault/vault.component.html | 12 +- apps/web/src/locales/en/messages.json | 11 ++ 8 files changed, 75 insertions(+), 235 deletions(-) delete mode 100644 apps/web/src/app/vault/bulk-actions.component.html delete mode 100644 apps/web/src/app/vault/bulk-actions.component.ts diff --git a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts index 149ca269f9f..d48b5931cd0 100644 --- a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts @@ -36,6 +36,7 @@ export interface CollectionDialogParams { collectionId?: string; organizationId: string; initialTab?: CollectionDialogTabType; + parentCollectionId?: string; } export enum CollectionDialogResult { @@ -133,6 +134,8 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { }); } else { this.nestOptions = collections; + const parent = collections.find((c) => c.id === this.params.parentCollectionId); + this.formGroup.patchValue({ parent: parent?.name ?? null }); } this.loading = false; diff --git a/apps/web/src/app/organizations/vault/vault.component.html b/apps/web/src/app/organizations/vault/vault.component.html index bc63b5b9187..9445a254f2c 100644 --- a/apps/web/src/app/organizations/vault/vault.component.html +++ b/apps/web/src/app/organizations/vault/vault.component.html @@ -16,7 +16,7 @@
-
+

{{ "vaultItems" | i18n }} @@ -30,20 +30,44 @@

-
- - +
+
+ + +
diff --git a/apps/web/src/app/organizations/vault/vault.component.ts b/apps/web/src/app/organizations/vault/vault.component.ts index dfcd681fcb7..baed8fdcf90 100644 --- a/apps/web/src/app/organizations/vault/vault.component.ts +++ b/apps/web/src/app/organizations/vault/vault.component.ts @@ -8,7 +8,7 @@ import { ViewContainerRef, } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; -import { combineLatest, firstValueFrom, Subject } from "rxjs"; +import { combineLatest, firstValueFrom, lastValueFrom, Subject } from "rxjs"; import { first, switchMap, takeUntil } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; @@ -22,10 +22,15 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { DialogService } from "@bitwarden/components"; import { VaultFilterService } from "../../vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../vault/vault-filter/shared/models/vault-filter.model"; import { EntityEventsComponent } from "../manage/entity-events.component"; +import { + CollectionDialogResult, + openCollectionDialog, +} from "../shared/components/collection-dialog"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; @@ -66,6 +71,7 @@ export class VaultComponent implements OnInit, OnDestroy { private syncService: SyncService, private i18nService: I18nService, private modalService: ModalService, + private dialogService: DialogService, private messagingService: MessagingService, private broadcasterService: BroadcasterService, private ngZone: NgZone, @@ -160,6 +166,21 @@ export class VaultComponent implements OnInit, OnDestroy { this.vaultItemsComponent.search(200); } + async addCollection() { + const dialog = openCollectionDialog(this.dialogService, { + data: { + organizationId: this.organization?.id, + parentCollectionId: this.activeFilter.collectionId, + }, + }); + const result = await lastValueFrom(dialog.closed); + if (result === CollectionDialogResult.Saved || result === CollectionDialogResult.Deleted) { + this.vaultItemsComponent.actionPromise = this.vaultItemsComponent.refresh(); + await this.vaultItemsComponent.actionPromise; + this.vaultItemsComponent.actionPromise = null; + } + } + async editCipherAttachments(cipher: CipherView) { if (this.organization.maxStorageGb == null || this.organization.maxStorageGb === 0) { this.messagingService.send("upgradeOrganization", { organizationId: cipher.organizationId }); diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 0b90ae9fc39..44b26cff891 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -103,7 +103,6 @@ import { ToolsComponent } from "../tools/tools.component"; import { AddEditCustomFieldsComponent } from "../vault/add-edit-custom-fields.component"; import { AddEditComponent } from "../vault/add-edit.component"; import { AttachmentsComponent } from "../vault/attachments.component"; -import { BulkActionsComponent } from "../vault/bulk-actions.component"; import { CollectionsComponent } from "../vault/collections.component"; import { FolderAddEditComponent } from "../vault/folder-add-edit.component"; import { ShareComponent } from "../vault/share.component"; @@ -130,7 +129,6 @@ import { SharedModule } from "./shared.module"; ApiKeyComponent, AttachmentsComponent, BillingSyncKeyComponent, - BulkActionsComponent, ChangeEmailComponent, ChangeKdfComponent, ChangePasswordComponent, @@ -237,7 +235,6 @@ import { SharedModule } from "./shared.module"; AdjustStorageComponent, ApiKeyComponent, AttachmentsComponent, - BulkActionsComponent, ChangeEmailComponent, ChangeKdfComponent, ChangePasswordComponent, diff --git a/apps/web/src/app/vault/bulk-actions.component.html b/apps/web/src/app/vault/bulk-actions.component.html deleted file mode 100644 index 67144fc62e6..00000000000 --- a/apps/web/src/app/vault/bulk-actions.component.html +++ /dev/null @@ -1,50 +0,0 @@ -
- -
- - - - -
- - -
-
diff --git a/apps/web/src/app/vault/bulk-actions.component.ts b/apps/web/src/app/vault/bulk-actions.component.ts deleted file mode 100644 index 4976f014c9c..00000000000 --- a/apps/web/src/app/vault/bulk-actions.component.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { Component, Input } from "@angular/core"; -import { lastValueFrom } from "rxjs"; - -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { DialogService } from "@bitwarden/components"; - -import { - BulkDeleteDialogResult, - openBulkDeleteDialog, -} from "./bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; -import { - BulkMoveDialogResult, - openBulkMoveDialog, -} from "./bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component"; -import { - BulkRestoreDialogResult, - openBulkRestoreDialog, -} from "./bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component"; -import { - BulkShareDialogResult, - openBulkShareDialog, -} from "./bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component"; -import { VaultItemsComponent } from "./vault-items.component"; - -@Component({ - selector: "app-vault-bulk-actions", - templateUrl: "bulk-actions.component.html", -}) -// eslint-disable-next-line rxjs-angular/prefer-takeuntil -export class BulkActionsComponent { - @Input() vaultItemsComponent: VaultItemsComponent; - @Input() deleted: boolean; - @Input() organization: Organization; - - constructor( - private platformUtilsService: PlatformUtilsService, - private i18nService: I18nService, - private dialogService: DialogService, - private passwordRepromptService: PasswordRepromptService - ) {} - - async bulkDelete() { - if (!(await this.promptPassword())) { - return; - } - - const selectedCipherIds = this.vaultItemsComponent.selectedCipherIds; - if (selectedCipherIds.length === 0) { - this.platformUtilsService.showToast( - "error", - this.i18nService.t("errorOccurred"), - this.i18nService.t("nothingSelected") - ); - return; - } - - const dialog = openBulkDeleteDialog(this.dialogService, { - data: { - permanent: this.deleted, - cipherIds: selectedCipherIds, - organization: this.organization, - }, - }); - - const result = await lastValueFrom(dialog.closed); - if (result === BulkDeleteDialogResult.Deleted) { - await this.vaultItemsComponent.refresh(); - } - } - - async bulkRestore() { - if (!(await this.promptPassword())) { - return; - } - - const selectedCipherIds = this.vaultItemsComponent.selectedCipherIds; - if (selectedCipherIds.length === 0) { - this.platformUtilsService.showToast( - "error", - this.i18nService.t("errorOccurred"), - this.i18nService.t("nothingSelected") - ); - return; - } - - const dialog = openBulkRestoreDialog(this.dialogService, { - data: { - cipherIds: selectedCipherIds, - }, - }); - - const result = await lastValueFrom(dialog.closed); - if (result === BulkRestoreDialogResult.Restored) { - this.vaultItemsComponent.refresh(); - } - } - - async bulkShare() { - if (!(await this.promptPassword())) { - return; - } - - const selectedCiphers = this.vaultItemsComponent.selectedCiphers; - if (selectedCiphers.length === 0) { - this.platformUtilsService.showToast( - "error", - this.i18nService.t("errorOccurred"), - this.i18nService.t("nothingSelected") - ); - return; - } - - const dialog = openBulkShareDialog(this.dialogService, { data: { ciphers: selectedCiphers } }); - - const result = await lastValueFrom(dialog.closed); - if (result === BulkShareDialogResult.Shared) { - this.vaultItemsComponent.refresh(); - } - } - - async bulkMove() { - if (!(await this.promptPassword())) { - return; - } - - const selectedCipherIds = this.vaultItemsComponent.selectedCipherIds; - if (selectedCipherIds.length === 0) { - this.platformUtilsService.showToast( - "error", - this.i18nService.t("errorOccurred"), - this.i18nService.t("nothingSelected") - ); - return; - } - - const dialog = openBulkMoveDialog(this.dialogService, { - data: { cipherIds: selectedCipherIds }, - }); - - const result = await lastValueFrom(dialog.closed); - if (result === BulkMoveDialogResult.Moved) { - this.vaultItemsComponent.refresh(); - } - } - - selectAll(select: boolean) { - this.vaultItemsComponent.checkAll(select); - } - - private async promptPassword() { - const selectedCiphers = this.vaultItemsComponent.selectedCiphers; - const notProtected = !selectedCiphers.find( - (cipher) => cipher.reprompt !== CipherRepromptType.None - ); - - return notProtected || (await this.passwordRepromptService.showPasswordPrompt()); - } -} diff --git a/apps/web/src/app/vault/vault.component.html b/apps/web/src/app/vault/vault.component.html index 9ef9b4e9285..2f3b9cbfc00 100644 --- a/apps/web/src/app/vault/vault.component.html +++ b/apps/web/src/app/vault/vault.component.html @@ -17,7 +17,7 @@
-
+

{{ "vaultItems" | i18n }} @@ -32,18 +32,14 @@

- -
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index aede3c26f73..28ef8254706 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -386,6 +386,9 @@ "select": { "message": "Select" }, + "newItem": { + "message": "New item" + }, "addItem": { "message": "Add item" }, @@ -395,6 +398,14 @@ "viewItem": { "message": "View item" }, + "new": + { + "message": "New", + "description": "for adding new items" + }, + "item": { + "message": "Item" + }, "ex": { "message": "ex.", "description": "Short abbreviation for 'example'."