From 5d4f490614a52f6fed9e40db2b0f795cfab7664b Mon Sep 17 00:00:00 2001 From: duchm Date: Thu, 19 Oct 2023 17:05:53 +0700 Subject: [PATCH] fix: not clear params between move to collection actions --- src/renderer/components/folder/MoveFolder.vue | 11 ++++++----- src/renderer/jslib | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/renderer/components/folder/MoveFolder.vue b/src/renderer/components/folder/MoveFolder.vue index e5cb8082..19aa014a 100644 --- a/src/renderer/components/folder/MoveFolder.vue +++ b/src/renderer/components/folder/MoveFolder.vue @@ -84,8 +84,7 @@ export default { ids: [], folderId: '', collections: [], - organizations: [], - ciphers: [] + organizations: [] } }, @@ -110,13 +109,14 @@ export default { this.loading = true const collection = this.collections.find(c => c.id === this.folderId) const personalKey = await this.$cryptoService.getEncKey() - const promises = [] + let promises = [] + const ciphers = [] // Get decrypted ciphers list this.ids.forEach(async id => { const encCipher = await this.$cipherService.get(id) const decCipher = await encCipher.decrypt() - this.ciphers.push({ ...decCipher, id }) + ciphers.push({ ...decCipher, id }) promises.push(this.removeFromCollection(decCipher, personalKey)) }) @@ -132,7 +132,8 @@ export default { const orgKey = await this.$cryptoService.getOrgKey( collection.organizationId ) - this.ciphers.forEach(cipher => { + promises = [] + ciphers.forEach(cipher => { promises.push(this.addToCollection(cipher, orgKey, collection)) }) await Promise.all(promises) diff --git a/src/renderer/jslib b/src/renderer/jslib index a841d075..8f4bcf06 160000 --- a/src/renderer/jslib +++ b/src/renderer/jslib @@ -1 +1 @@ -Subproject commit a841d07520cb174cd58dd8df9f69cf4de8b3b788 +Subproject commit 8f4bcf065513b82d1b6dbcee23471aa324edd69c