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

[PM-14289] - vault cipher form - set default owner as organization from collection when possible (#12682)

Browse Source 
* set default org by referencing collecction

* get organizationId from collection

* always get organizationId from collection when possible
This commit is contained in:
Jordan Aasen
2025-01-08 10:36:38 -08:00
committed by GitHub
parent 4d576f0533
commit 38c1cdfb62
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -779,16 +779,26 @@ export class VaultComponent implements OnInit, OnDestroy {
null, null,
cipherType, cipherType,
); );
cipherFormConfig.initialValues = { const collectionId =
organizationId: this.activeFilter.collectionId !== "AllCollections" && this.activeFilter.collectionId != null
? this.activeFilter.collectionId
: null;
let organizationId =
this.activeFilter.organizationId !== "MyVault" && this.activeFilter.organizationId != null this.activeFilter.organizationId !== "MyVault" && this.activeFilter.organizationId != null
? (this.activeFilter.organizationId as OrganizationId) ? this.activeFilter.organizationId
: null, : null;
collectionIds: // Attempt to get the organization ID from the collection if present
this.activeFilter.collectionId !== "AllCollections" && if (collectionId) {
this.activeFilter.collectionId != null const organizationIdFromCollection = (
? [this.activeFilter.collectionId as CollectionId] await firstValueFrom(this.vaultFilterService.filteredCollections$)
: [], ).find((c) => c.id === this.activeFilter.collectionId)?.organizationId;
if (organizationIdFromCollection) {
organizationId = organizationIdFromCollection;
}
}
cipherFormConfig.initialValues = {
organizationId: organizationId as OrganizationId,
collectionIds: [collectionId as CollectionId],
folderId: this.activeFilter.folderId, folderId: this.activeFilter.folderId,
}; };