WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-11 04:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix attachments in drafts (#2451)

Browse Source 
Signed-off-by: Denis Maslennikov <denis.maslennikov@gmail.com>
This commit is contained in:
Denis Maslennikov
2022-12-20 11:25:45 +07:00
committed by GitHub
parent 12292dbf46
commit 69a229efef
7 changed files with 143 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/attachment-resources/src/components/AttachmentRefInput.svelte
+57 -19
View File
@@ -13,7 +13,7 @@
// limitations under the License.
-->
<script lang="ts">
import { createQuery, getClient } from '@hcengineering/presentation'
import { createQuery, getClient, draftStore, updateDraftStore } from '@hcengineering/presentation'
import { ReferenceInput } from '@hcengineering/text-editor'
import { deleteFile, uploadFile } from '../utils'
import attachment from '../plugin'
@@ -28,7 +28,8 @@
export let _class: Ref<Class<Doc>>
export let content: string = ''
export let showSend = true
export let shouldUseDraft: boolean = false
export let shouldSaveDraft: boolean = false
export let attachments: Map<Ref<Attachment>, Attachment> = new Map<Ref<Attachment>, Attachment>()
export function submit (): void {
refInput.submit()
}
@@ -41,24 +42,48 @@
const client = getClient()
const query = createQuery()
let attachments: Map<Ref<Attachment>, Attachment> = new Map<Ref<Attachment>, Attachment>()
let draftAttachments: Record<Ref<Attachment>, Attachment> | undefined = undefined
let originalAttachments: Set<Ref<Attachment>> = new Set<Ref<Attachment>>()
const newAttachments: Set<Ref<Attachment>> = new Set<Ref<Attachment>>()
const removedAttachments: Set<Attachment> = new Set<Attachment>()
let refContainer: HTMLElement
$: objectId &&
query.query(
attachment.class.Attachment,
{
attachedTo: objectId
},
(res) => {
originalAttachments = new Set(res.map((p) => p._id))
attachments = new Map(res.map((p) => [p._id, p]))
}
)
$: objectId && updateAttachments(objectId)
async function updateAttachments (objectId: Ref<Doc>) {
draftAttachments = $draftStore[objectId]
if (draftAttachments && shouldSaveDraft) {
attachments.clear()
newAttachments.clear()
Object.entries(draftAttachments).map((file) => {
return attachments.set(file[0] as Ref<Attachment>, file[1])
})
Object.entries(draftAttachments).map((file) => {
return newAttachments.add(file[0] as Ref<Attachment>)
})
originalAttachments.clear()
removedAttachments.clear()
} else {
query.query(
attachment.class.Attachment,
{
attachedTo: objectId
},
(res) => {
originalAttachments = new Set(res.map((p) => p._id))
attachments = new Map(res.map((p) => [p._id, p]))
}
)
}
}
async function saveDraft () {
if (objectId && shouldSaveDraft) {
draftAttachments = Object.fromEntries(attachments)
updateDraftStore(objectId, draftAttachments)
}
}
async function createAttachment (file: File) {
try {
@@ -81,9 +106,7 @@
})
newAttachments.add(_id)
attachments = attachments
if (shouldUseDraft) {
await createAttachments()
}
saveDraft()
} catch (err: any) {
setPlatformStatus(unknownError(err))
}
@@ -115,10 +138,11 @@
async function removeAttachment (attachment: Attachment): Promise<void> {
removedAttachments.add(attachment)
attachments.delete(attachment._id)
if (shouldUseDraft) {
if (shouldSaveDraft) {
await createAttachments()
}
attachments = attachments
saveDraft()
}
async function deleteAttachment (attachment: Attachment): Promise<void> {
@@ -137,7 +161,7 @@
}
onDestroy(() => {
if (!saved) {
if (!saved && !shouldSaveDraft) {
newAttachments.forEach(async (p) => {
const attachment = attachments.get(p)
if (attachment !== undefined) {
@@ -147,6 +171,20 @@
}
})
export function removeDraft (removeFiles: boolean) {
if (objectId) {
updateDraftStore(objectId, undefined)
}
if (removeFiles) {
newAttachments.forEach(async (p) => {
const attachment = attachments.get(p)
if (attachment !== undefined) {
await deleteFile(attachment.file)
}
})
}
}
export function createAttachments (): Promise<void> {
saved = true
const promises: Promise<any>[] = []
plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
+55 -13
View File
@@ -16,7 +16,7 @@
import { Attachment } from '@hcengineering/attachment'
import { Account, Class, Doc, generateId, Ref, Space } from '@hcengineering/core'
import { IntlString, setPlatformStatus, unknownError } from '@hcengineering/platform'
import { createQuery, getClient } from '@hcengineering/presentation'
import { createQuery, getClient, draftStore, updateDraftStore } from '@hcengineering/presentation'
import { StyledTextBox } from '@hcengineering/text-editor'
import { IconSize } from '@hcengineering/ui'
import { createEventDispatcher, onDestroy } from 'svelte'
@@ -37,6 +37,7 @@
export let focusable: boolean = false
export let fakeAttach: 'fake' | 'hidden' | 'normal' = 'normal'
export let refContainer: HTMLElement | undefined = undefined
export let shouldSaveDraft: boolean = false
const dispatch = createEventDispatcher()
@@ -62,6 +63,7 @@
let refInput: StyledTextBox
let inputFile: HTMLInputElement
let draftAttachments: Record<Ref<Attachment>, Attachment> | undefined = undefined
let saved = false
const client = getClient()
@@ -71,17 +73,41 @@
const newAttachments: Set<Ref<Attachment>> = new Set<Ref<Attachment>>()
const removedAttachments: Set<Attachment> = new Set<Attachment>()
$: objectId &&
query.query(
attachment.class.Attachment,
{
attachedTo: objectId
},
(res) => {
originalAttachments = new Set(res.map((p) => p._id))
attachments = new Map(res.map((p) => [p._id, p]))
}
)
$: objectId && updateAttachments(objectId)
async function updateAttachments (objectId: Ref<Doc>) {
draftAttachments = $draftStore[objectId]
if (draftAttachments && shouldSaveDraft) {
attachments.clear()
newAttachments.clear()
Object.entries(draftAttachments).map((file) => {
return attachments.set(file[0] as Ref<Attachment>, file[1])
})
Object.entries(draftAttachments).map((file) => {
return newAttachments.add(file[0] as Ref<Attachment>)
})
originalAttachments.clear()
removedAttachments.clear()
} else {
query.query(
attachment.class.Attachment,
{
attachedTo: objectId
},
(res) => {
originalAttachments = new Set(res.map((p) => p._id))
attachments = new Map(res.map((p) => [p._id, p]))
}
)
}
}
async function saveDraft () {
if (objectId && shouldSaveDraft) {
draftAttachments = Object.fromEntries(attachments)
updateDraftStore(objectId, draftAttachments)
}
}
async function createAttachment (file: File) {
if (space === undefined || objectId === undefined || _class === undefined) return
@@ -105,6 +131,7 @@
})
newAttachments.add(_id)
attachments = attachments
saveDraft()
} catch (err: any) {
setPlatformStatus(unknownError(err))
}
@@ -139,6 +166,7 @@
removedAttachments.add(attachment)
attachments.delete(attachment._id)
attachments = attachments
saveDraft()
}
async function deleteAttachment (attachment: Attachment): Promise<void> {
@@ -157,7 +185,7 @@
}
onDestroy(() => {
if (!saved) {
if (!saved && !shouldSaveDraft) {
newAttachments.forEach(async (p) => {
const attachment = attachments.get(p)
if (attachment !== undefined) {
@@ -167,6 +195,20 @@
}
})
export function removeDraft (removeFiles: boolean) {
if (objectId) {
updateDraftStore(objectId, undefined)
}
if (removeFiles) {
newAttachments.forEach(async (p) => {
const attachment = attachments.get(p)
if (attachment !== undefined) {
await deleteFile(attachment.file)
}
})
}
}
export function createAttachments (): Promise<void> {
saved = true
const promises: Promise<any>[] = []