diff --git a/libs/vault/src/services/vault-batch-bar.service.spec.ts b/libs/vault/src/services/vault-batch-bar.service.spec.ts index 3bfe3b01487..19bddfaf5d7 100644 --- a/libs/vault/src/services/vault-batch-bar.service.spec.ts +++ b/libs/vault/src/services/vault-batch-bar.service.spec.ts @@ -348,6 +348,15 @@ describe("VaultBatchBarService", () => { expect(service.canArchive()).toBe(true); }); + + it("returns false when in org vault (admin console)", () => { + userCanArchiveSubject.next(true); + service.setConfig(makeConfig({ isOrgVault: true })); + + service.selection.select(makeCipherItem({ organizationId: orgId })); + + expect(service.canArchive()).toBe(false); + }); }); describe("canUnarchive", () => { @@ -380,6 +389,14 @@ describe("VaultBatchBarService", () => { expect(service.canUnarchive()).toBe(true); }); + + it("returns false when in org vault (admin console)", () => { + service.setConfig(makeConfig({ isOrgVault: true })); + + service.selection.select(makeCipherItem({ archivedDate: new Date(), organizationId: orgId })); + + expect(service.canUnarchive()).toBe(false); + }); }); describe("canRestore", () => { diff --git a/libs/vault/src/services/vault-batch-bar.service.ts b/libs/vault/src/services/vault-batch-bar.service.ts index 3e60cb2c39b..b091a0e2c52 100644 --- a/libs/vault/src/services/vault-batch-bar.service.ts +++ b/libs/vault/src/services/vault-batch-bar.service.ts @@ -198,7 +198,13 @@ export class VaultBatchBarService { readonly canArchive = computed(() => { const selected = this.selected(); const hasCollections = selected.some((i) => i.collection); - if (selected.length === 0 || !this.userCanArchive() || hasCollections || this.inTrash()) { + if ( + selected.length === 0 || + !this.userCanArchive() || + hasCollections || + this.inTrash() || + this.config().isOrgVault + ) { return false; } return !selected.find((item) => item.cipher && item.cipher.archivedDate); @@ -207,7 +213,7 @@ export class VaultBatchBarService { /** True when all selected ciphers can be unarchived. */ readonly canUnarchive = computed(() => { const selected = this.selected(); - if (selected.length === 0 || this.inTrash()) { + if (selected.length === 0 || this.inTrash() || this.config().isOrgVault) { return false; } return !selected.find((i) => !i.cipher?.archivedDate);