Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

feat: new app drop with preview (re-use NodeResourceInline component)

Smaug6739e4e449fac016
diff --git a/frontend/app/components/AppDrop.vue b/frontend/app/components/AppDrop.vue
index e4bbe640..aa4e06a8 100644
--- a/frontend/app/components/AppDrop.vue
+++ b/frontend/app/components/AppDrop.vue
@@ -12,18 +12,8 @@
<div v-if="selectedFiles.length" class="files">
<div class="list">
- <div v-for="(file, index) in selectedFiles" :key="index" class="item">
- <div class="icon">
- <Icon :name="resolveFileIcon(file.type)" />
- </div>
- <div class="details">
- <span class="name">{{ file.name }}</span>
- <span class="meta">{{ readableFileSize(file.size) }} β€’ {{ resolveFileType(file.type) }}</span>
- </div>
- <button class="remove" @click.stop="removeFile(index)">
- <Icon name="close" size="16px" />
- <p class="hint-tooltip">{{ t('cdn.appdrop.removeFile') }}</p>
- </button>
+ <div v-for="(file, index) in selectedFiles" :key="file.name + '-' + file.size + '-' + file.lastModified" class="item">
+ <NodeResourceInline :file="file" :remove-file="() => removeFile(index)" class="file-card" />
</div>
</div>
<footer>
@@ -53,7 +43,7 @@
</div>
</template>
<script setup lang="ts">
-import { readableFileSize, resolveFileIcon, resolveFileType } from '~/helpers/resources';
+import { readableFileSize } from '~/helpers/resources';
const props = withDefaults(
defineProps<{
@@ -79,43 +69,58 @@ const emit = defineEmits<{
const triggerFileSelect = () => fileInput.value!.click();
-const handleFileSelect = (event: Event) => {
- const files = (event.target as HTMLInputElement | null)?.files;
+const addFiles = (files?: FileList | File[] | null) => {
if (!files) return;
-
+ const fileArray = Array.from(files);
if (props.multiple) {
- const fileArray = Array.from(files).slice(0, props.maxFiles);
- selectedFiles.value = fileArray;
- emit('select', fileArray);
+ const newFiles = fileArray.slice(0, props.maxFiles - selectedFiles.value.length);
+ for (const file of newFiles) {
+ if (file && !selectedFiles.value.some(f => f.name === file.name && f.size === file.size && f.lastModified === file.lastModified)) {
+ selectedFiles.value.push(file);
+ }
+ }
+ emit('select', selectedFiles.value);
} else {
- selectedFiles.value = files[0] ? [files[0]] : [];
- emit('select', files[0] || null);
+ const file = fileArray[0];
+ if (!file) return;
+ selectedFiles.value = [file];
+ emit('select', file);
}
};
+const handleFileSelect = (event: Event) => {
+ const files = (event.target as HTMLInputElement | null)?.files;
+ addFiles(files);
+};
+
const handleFileDrop = (event: DragEvent) => {
if (event.dataTransfer?.files && event.dataTransfer.files.length > 0) {
const files = event.dataTransfer.files;
- if (props.multiple) {
- const fileArray = Array.from(files).slice(0, props.maxFiles);
- selectedFiles.value = fileArray;
- emit('select', fileArray);
- } else {
- const file = files[0];
- if (file) {
- selectedFiles.value = [file];
- emit('select', file);
- }
- }
+ addFiles(files);
isDragOver.value = false;
}
};
+const handlePaste = (event: ClipboardEvent) => {
+ const items = event.clipboardData?.items;
+ if (!items) return;
+
+ const pastedFiles: File[] = [];
+ for (const item of items) {
+ const file = item.getAsFile();
+ if (!file) continue;
+ pastedFiles.push(file);
+ if (!props.multiple) break;
+ }
+ addFiles(pastedFiles);
+};
+
const dragEnter = () => (isDragOver.value = true);
const dragLeave = () => (isDragOver.value = false);
const removeFile = (index: number) => {
selectedFiles.value.splice(index, 1);
+ if (fileInput.value) fileInput.value.value = '';
if (props.multiple) {
emit('select', selectedFiles.value.length ? selectedFiles.value : null);
} else {
@@ -128,37 +133,6 @@ const reset = () => {
if (fileInput.value) fileInput.value.value = '';
};
-const handlePaste = (event: ClipboardEvent) => {
- const items = event.clipboardData?.items;
- if (!items) return;
-
- const pastedFiles: File[] = [];
- for (let i = 0; i < items.length; i++) {
- const item = items[i];
- if (item?.type.startsWith('image/')) {
- const file = item.getAsFile();
- if (file) {
- pastedFiles.push(file);
- if (!props.multiple) break;
- }
- }
- }
-
- if (pastedFiles.length) {
- if (props.multiple) {
- const limitedFiles = pastedFiles.slice(0, props.maxFiles);
- selectedFiles.value = limitedFiles;
- emit('select', limitedFiles);
- } else {
- const file = pastedFiles[0];
- if (file) {
- selectedFiles.value = [file];
- emit('select', file);
- }
- }
- }
-};
-
defineExpose({ reset });
</script>
@@ -225,7 +199,7 @@ defineExpose({ reset });
.list {
display: flex;
- max-height: 200px;
+ max-height: 300px;
flex-direction: column;
gap: 6px;
overflow-y: auto;
@@ -304,16 +278,11 @@ defineExpose({ reset });
cursor: pointer;
flex-shrink: 0;
justify-content: center;
- position: relative;
&:hover {
color: var(--red);
background: var(--surface-transparent);
opacity: 1;
- .hint-tooltip {
- opacity: 1;
- visibility: visible;
- }
}
}
diff --git a/frontend/app/components/Node/Resource/Inline.vue b/frontend/app/components/Node/Resource/Inline.vue
index 6569c09a..58a70ff6 100644
--- a/frontend/app/components/Node/Resource/Inline.vue
+++ b/frontend/app/components/Node/Resource/Inline.vue
@@ -1,10 +1,10 @@
<template>
<div class="file-card">
- <img v-if="file.preview" :src="file.preview" :alt="file.name" class="file-preview" />
- <Icon v-else :name="resolveFileIcon(file.file.type)" display="lg" />
+ <img v-if="preview" :src="preview" :alt="file.name" class="file-preview" />
+ <Icon v-else :name="resolveFileIcon(file.type)" display="lg" />
<div class="file-info">
<span class="file-name">{{ file.name }}</span>
- <span class="file-size">{{ readableFileSize(file.file.size) }}</span>
+ <span class="file-size">{{ readableFileSize(file.size) }}</span>
</div>
<button class="file-remove" @click="removeFile">
<Icon name="close" />
@@ -15,16 +15,24 @@
<script setup lang="ts">
import { readableFileSize, resolveFileIcon } from '~/helpers/resources';
-interface SharedFile {
- name: string;
- preview?: string;
- file: File;
-}
-defineProps<{
- file: SharedFile;
+const props = defineProps<{
+ file: File;
removeFile: () => void;
}>();
+
+const preview = ref<string | null>(null);
+
+onMounted(async () => {
+ if (props.file.type.startsWith('image/')) {
+ preview.value = URL.createObjectURL(props.file);
+ }
+});
+
+onBeforeUnmount(() => {
+ if (preview.value) URL.revokeObjectURL(preview.value);
+});
+
</script>
<style scoped lang="scss">
@@ -32,9 +40,11 @@ defineProps<{
display: flex;
align-items: center;
gap: 0.75rem;
- padding: 0.75rem;
+ padding: 0.5rem 0.75rem;
border-radius: var(--radius-md);
border: 1px solid var(--border);
+ background-color: var(--surface-base);
+ width: 100%;
.file-preview {
width: 48px;
@@ -43,16 +53,6 @@ defineProps<{
object-fit: cover;
}
- .file-icon {
- width: 48px;
- height: 48px;
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: var(--radius-sm);
- color: var(--text-muted);
- }
-
.file-info {
flex: 1;
min-width: 0;
diff --git a/frontend/app/pages/dashboard/share-target.vue b/frontend/app/pages/dashboard/share-target.vue
index b04653fe..af39b1f8 100644
--- a/frontend/app/pages/dashboard/share-target.vue
+++ b/frontend/app/pages/dashboard/share-target.vue
@@ -63,7 +63,7 @@
<script lang="ts" setup>
import type { Node } from '~/stores';
-definePageMeta({ breadcrumb: {i18n: 'common.actions.share'} });
+definePageMeta({ breadcrumb: { i18n: 'common.actions.share' } });
const nodesStore = useNodesStore();
const resourcesStore = useResourcesStore();
@@ -72,12 +72,13 @@ const { t } = useI18nT();
const notifications = useNotifications();
const router = useRouter();
const nodesTree = useNodesTree();
+const route = useRoute();
const loading = ref(true);
const sharedTitle = ref('');
const sharedText = ref('');
const sharedUrl = ref('');
-const sharedFiles = ref<{ name: string; file: File; preview?: string }[]>([]);
+const sharedFiles = ref<File[]>([]);
const parentId = ref<string | undefined>(undefined);
const processing = ref(false);
@@ -105,13 +106,7 @@ async function retrieveSharedData() {
sharedText.value = formData.get('text')?.toString() || '';
sharedUrl.value = formData.get('url')?.toString() || '';
- const files = formData.getAll('files') as File[];
- for (const file of files) {
- if (file && file.size > 0) {
- const preview = file.type.startsWith('image/') ? URL.createObjectURL(file) : undefined;
- sharedFiles.value.push({ file, name: file.name, preview });
- }
- }
+ sharedFiles.value = formData.getAll('files') as File[];
// Clean up cache after reading
await cache.delete('/share-target-data');
@@ -120,15 +115,12 @@ async function retrieveSharedData() {
}
// Fallback: URL query params (GET share, or simple text share)
- const route = useRoute();
if (!sharedTitle.value && route.query.title) sharedTitle.value = route.query.title as string;
if (!sharedText.value && route.query.text) sharedText.value = route.query.text as string;
if (!sharedUrl.value && route.query.url) sharedUrl.value = route.query.url as string;
}
function removeFile(index: number) {
- const file = sharedFiles.value[index];
- if (file?.preview) URL.revokeObjectURL(file.preview);
sharedFiles.value.splice(index, 1);
}
@@ -168,8 +160,8 @@ async function createNote() {
// Append text file contents to the note
for (const sharedFile of sharedFiles.value) {
- if (sharedFile.file.type.startsWith('text/') || sharedFile.name.endsWith('.md') || sharedFile.name.endsWith('.txt')) {
- const text = await readTextFile(sharedFile.file);
+ if (sharedFile.type.startsWith('text/') || sharedFile.name.endsWith('.md') || sharedFile.name.endsWith('.txt')) {
+ const text = await readTextFile(sharedFile);
content += `\n\n---\n\n## ${sharedFile.name}\n\n${text}`;
}
}
@@ -186,12 +178,12 @@ async function createNote() {
notifications.add({ title: 'Document created from shared content', type: 'success' });
// Upload non-text files as resources linked to this note
- const nonTextFiles = sharedFiles.value.filter(f => !f.file.type.startsWith('text/') && !f.name.endsWith('.md') && !f.name.endsWith('.txt'));
+ const nonTextFiles = sharedFiles.value.filter(f => !f.type.startsWith('text/') && !f.name.endsWith('.md') && !f.name.endsWith('.txt'));
for (const sharedFile of nonTextFiles) {
try {
const formData = new FormData();
- formData.append('file', sharedFile.file);
+ formData.append('file', sharedFile);
formData.append('parent_id', created.id);
await resourcesStore.post(formData);
} catch (e) {
@@ -200,7 +192,6 @@ async function createNote() {
}
}
- cleanupPreviews();
router.push(`/dashboard/docs/edit/${created.id}`);
} catch (e) {
notifications.add({ message: String(e), title: 'Error creating document', type: 'error' });
@@ -217,13 +208,13 @@ async function uploadFiles() {
let uploadedCount = 0;
for (const sharedFile of sharedFiles.value) {
const formData = new FormData();
- formData.append('file', sharedFile.file);
+ formData.append('file', sharedFile);
if (parentId.value) formData.append('parent_id', parentId.value);
await resourcesStore.post(formData);
uploadedCount++;
}
- notifications.add({ title: `${uploadedCount} file(s) uploaded successfully`, type: 'success' });
+ notifications.add({ type: 'success', title: `${uploadedCount} file(s) uploaded successfully` });
cleanupPreviews();
router.push('/dashboard/cdn');
} catch (e) {
@@ -232,16 +223,6 @@ async function uploadFiles() {
processing.value = false;
}
}
-
-function cleanupPreviews() {
- sharedFiles.value.forEach(f => {
- if (f.preview) URL.revokeObjectURL(f.preview);
- });
-}
-
-onBeforeUnmount(() => {
- cleanupPreviews();
-});
</script>
<style scoped lang="scss">