From bc18881eda4855373e3ec888bcb1b6565f2667e1 Mon Sep 17 00:00:00 2001 From: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com> Date: Sat, 5 Mar 2022 15:05:49 +0600 Subject: [PATCH] Update comment attachments (#1106) Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com> --- .../src/components/AttachmentRefInput.svelte | 74 ++++++++++++++++--- .../activity/TxCommentCreate.svelte | 9 ++- .../attachment-resources/src/index.ts | 2 + 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte index dc5f14af14..b0580a1571 100644 --- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte +++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte @@ -20,7 +20,7 @@ import attachment from '../plugin' import { setPlatformStatus, unknownError } from '@anticrm/platform' import { createEventDispatcher, onDestroy } from 'svelte' - import { Class, Doc, Ref, Space } from '@anticrm/core' + import { Account, Class, Doc, generateId, Ref, Space } from '@anticrm/core' import { Attachment } from '@anticrm/attachment' import AttachmentPresenter from './AttachmentPresenter.svelte' import { IconClose } from '@anticrm/ui' @@ -29,6 +29,12 @@ export let objectId: Ref export let space: Ref export let _class: Ref> + export let content: string = '' + export let showSend = true + export function submit (): void { + refInput.submit() + } + let refInput: ReferenceInput let inputFile: HTMLInputElement let saved = false @@ -36,28 +42,49 @@ const client = getClient() const query = createQuery() - let attachments: Attachment[] = [] + let attachments: Map, Attachment> = new Map, Attachment>() + let originalAttachments: Set> = new Set>() + let newAttachments: Set> = new Set>() + let removedAttachments: Set = new Set() $: objectId && query.query(attachment.class.Attachment, { attachedTo: objectId - }, (res) => attachments = res) + }, (res) => { + originalAttachments = new Set(res.map((p) => p._id)) + attachments = new Map(res.map((p) => [p._id, p])) + }) async function createAttachment (file: File) { try { const uuid = await uploadFile(file, { space, attachedTo: objectId }) console.log('uploaded file uuid', uuid) - await client.addCollection(attachment.class.Attachment, space, objectId, _class, 'attachments', { + const _id: Ref = generateId() + attachments.set(_id, { + _id, + _class: attachment.class.Attachment, + collection: 'attachments', + modifiedOn: 0, + modifiedBy: '' as Ref, + space, + attachedTo: objectId, + attachedToClass: _class, name: file.name, file: uuid, type: file.type, size: file.size, lastModified: file.lastModified }) + newAttachments.add(_id) + attachments = attachments } catch (err: any) { setPlatformStatus(unknownError(err)) } } + async function saveAttachment (doc: Attachment) { + const res = await client.addCollection(attachment.class.Attachment, space, objectId, _class, 'attachments', doc, doc._id) + } + function fileSelected () { const list = inputFile.files if (list === null || list.length === 0) return @@ -77,21 +104,44 @@ } async function removeAttachment (attachment: Attachment): Promise { - await client.removeCollection(attachment._class, attachment.space, attachment._id, attachment.attachedTo, attachment.attachedToClass, 'attachments') - await deleteFile(attachment.file) + removedAttachments.add(attachment) + attachments.delete(attachment._id) + attachments = attachments + } + + async function deleteAttachment (attachment: Attachment): Promise { + if (originalAttachments.has(attachment._id)) { + await client.removeCollection(attachment._class, attachment.space, attachment._id, attachment.attachedTo, attachment.attachedToClass, 'attachments') + } else { + await deleteFile(attachment.file) + } } onDestroy(() => { if (!saved) { - attachments.map((attachment) => { - removeAttachment(attachment) + newAttachments.forEach(async (p) => { + const attachment = attachments.get(p) + if (attachment !== undefined) { + await deleteAttachment(attachment) + } }) } }) async function onMessage (event: CustomEvent) { saved = true - dispatch('message', { message: event.detail, attachments: attachments.length }) + const promises: Promise[] = [] + newAttachments.forEach((p) => { + const attachment = attachments.get(p) + if (attachment !== undefined) { + promises.push(saveAttachment(attachment)) + } + }) + removedAttachments.forEach((p) => { + promises.push(deleteAttachment(p)) + }) + await Promise.all(promises) + dispatch('message', { message: event.detail, attachments: attachments.size }) } @@ -110,9 +160,9 @@ on:dragleave={() => {}} on:drop|preventDefault|stopPropagation={fileDrop} > - {#if attachments.length} + {#if attachments.size}
- {#each attachments as attachment} + {#each Array.from(attachments.values()) as attachment}
@@ -122,7 +172,7 @@ {/each}
{/if} - 0} on:attach={() => { inputFile.click() }} /> + 0} on:attach={() => { inputFile.click() }} />