feat: pagination
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
@@ -0,0 +1,79 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, nextTick, onMounted, onBeforeUnmount, watch } from 'vue'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
hasMore: boolean
|
||||||
|
loading: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
intersect: []
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const sentinelEl = ref<HTMLElement | null>(null)
|
||||||
|
let observer: IntersectionObserver | null = null
|
||||||
|
let observerGeneration = 0
|
||||||
|
|
||||||
|
function destroyObserver() {
|
||||||
|
if (observer) {
|
||||||
|
observer.disconnect()
|
||||||
|
observer = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createObserver() {
|
||||||
|
const generation = ++observerGeneration
|
||||||
|
destroyObserver()
|
||||||
|
|
||||||
|
// The sentinel is conditionally rendered from `hasMore`. Wait until Vue has
|
||||||
|
// committed that DOM update before reading the template ref.
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
if (generation !== observerGeneration || !sentinelEl.value || !props.hasMore) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// root: null (viewport) still resolves correctly through clipping/scrolling
|
||||||
|
// ancestors (including Vuetify's internal v-virtual-scroll container), per the
|
||||||
|
// IntersectionObserver spec — no need to locate that container explicitly.
|
||||||
|
observer = new IntersectionObserver((entries) => {
|
||||||
|
if (entries.some((entry) => entry.isIntersecting) && props.hasMore && !props.loading) {
|
||||||
|
emit('intersect')
|
||||||
|
}
|
||||||
|
}, { root: null, rootMargin: '200px' })
|
||||||
|
|
||||||
|
observer.observe(sentinelEl.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
void createObserver()
|
||||||
|
})
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
observerGeneration++
|
||||||
|
destroyObserver()
|
||||||
|
})
|
||||||
|
watch(
|
||||||
|
[() => props.hasMore, () => props.loading],
|
||||||
|
() => {
|
||||||
|
void createObserver()
|
||||||
|
},
|
||||||
|
{ flush: 'post' },
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div v-if="hasMore" ref="sentinelEl" class="files-load-more-sentinel">
|
||||||
|
<v-progress-circular v-if="loading" indeterminate size="20" width="2" color="primary" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.files-load-more-sentinel {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 48px;
|
||||||
|
padding: 12px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -6,11 +6,11 @@ import { formatSize, formatDate } from '@/utils/fileHelpers'
|
|||||||
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
||||||
import FilePreview from '@/components/FilePreview.vue'
|
import FilePreview from '@/components/FilePreview.vue'
|
||||||
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
||||||
|
import FilesLoadMoreSentinel from '@/components/FilesLoadMoreSentinel.vue'
|
||||||
|
|
||||||
type ItemWithType = {
|
type ItemWithType =
|
||||||
item: CollectionObject | EntityObject
|
| { item: CollectionObject | EntityObject; type: 'collection' | 'entity' }
|
||||||
type: 'collection' | 'entity'
|
| { item: null; type: 'sentinel' }
|
||||||
}
|
|
||||||
|
|
||||||
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
||||||
|
|
||||||
@@ -18,6 +18,8 @@ const props = defineProps<{
|
|||||||
collections: CollectionObject[]
|
collections: CollectionObject[]
|
||||||
entities: EntityObject[]
|
entities: EntityObject[]
|
||||||
selectedIds: Set<string>
|
selectedIds: Set<string>
|
||||||
|
hasMore?: boolean
|
||||||
|
isLoadingMore?: boolean
|
||||||
previewSource?: PreviewSource
|
previewSource?: PreviewSource
|
||||||
thumbnailSource?: PreviewSource
|
thumbnailSource?: PreviewSource
|
||||||
}>()
|
}>()
|
||||||
@@ -30,17 +32,25 @@ const emit = defineEmits<{
|
|||||||
'delete': [item: CollectionObject | EntityObject]
|
'delete': [item: CollectionObject | EntityObject]
|
||||||
'download': [item: CollectionObject | EntityObject]
|
'download': [item: CollectionObject | EntityObject]
|
||||||
'show-details': [item: CollectionObject | EntityObject]
|
'show-details': [item: CollectionObject | EntityObject]
|
||||||
|
'load-more': []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
// Combine collections and entities into a single list for virtual scrolling
|
// Combine collections and entities into a single list for virtual scrolling; a
|
||||||
|
// trailing sentinel row (rendered only once virtual-scroll actually mounts it)
|
||||||
|
// drives the infinite-scroll "load more" trigger.
|
||||||
const allItems = computed<ItemWithType[]>(() => [
|
const allItems = computed<ItemWithType[]>(() => [
|
||||||
...props.collections.map(c => ({ item: c, type: 'collection' as const })),
|
...props.collections.map(c => ({ item: c, type: 'collection' as const })),
|
||||||
...props.entities.map(e => ({ item: e, type: 'entity' as const }))
|
...props.entities.map(e => ({ item: e, type: 'entity' as const })),
|
||||||
|
...(props.hasMore ? [{ item: null, type: 'sentinel' as const }] : []),
|
||||||
])
|
])
|
||||||
|
|
||||||
function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObject; type: 'collection' } {
|
function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObject; type: 'collection' } {
|
||||||
return wrapped.type === 'collection'
|
return wrapped.type === 'collection'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isSentinel(wrapped: ItemWithType): wrapped is { item: null; type: 'sentinel' } {
|
||||||
|
return wrapped.type === 'sentinel'
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -60,9 +70,17 @@ function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObjec
|
|||||||
class="files-details-body"
|
class="files-details-body"
|
||||||
>
|
>
|
||||||
<template #default="{ item: wrapped }">
|
<template #default="{ item: wrapped }">
|
||||||
|
<!-- Load-more sentinel -->
|
||||||
|
<FilesLoadMoreSentinel
|
||||||
|
v-if="isSentinel(wrapped)"
|
||||||
|
:has-more="!!hasMore"
|
||||||
|
:loading="!!isLoadingMore"
|
||||||
|
@intersect="emit('load-more')"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Folder row -->
|
<!-- Folder row -->
|
||||||
<div
|
<div
|
||||||
v-if="isCollection(wrapped)"
|
v-else-if="isCollection(wrapped)"
|
||||||
class="files-details-row"
|
class="files-details-row"
|
||||||
:class="{ 'files-details-row--selected': selectedIds.has(String(wrapped.item.identifier)) }"
|
:class="{ 'files-details-row--selected': selectedIds.has(String(wrapped.item.identifier)) }"
|
||||||
@click="emit('item-click', wrapped.item, $event)"
|
@click="emit('item-click', wrapped.item, $event)"
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { formatSize } from '@/utils/fileHelpers'
|
|||||||
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
||||||
import FilePreview from '@/components/FilePreview.vue'
|
import FilePreview from '@/components/FilePreview.vue'
|
||||||
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
||||||
|
import FilesLoadMoreSentinel from '@/components/FilesLoadMoreSentinel.vue'
|
||||||
|
|
||||||
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
||||||
|
|
||||||
@@ -12,6 +13,8 @@ const props = defineProps<{
|
|||||||
collections: CollectionObject[]
|
collections: CollectionObject[]
|
||||||
entities: EntityObject[]
|
entities: EntityObject[]
|
||||||
selectedIds: Set<string>
|
selectedIds: Set<string>
|
||||||
|
hasMore?: boolean
|
||||||
|
isLoadingMore?: boolean
|
||||||
previewSource?: PreviewSource
|
previewSource?: PreviewSource
|
||||||
thumbnailSource?: PreviewSource
|
thumbnailSource?: PreviewSource
|
||||||
}>()
|
}>()
|
||||||
@@ -24,6 +27,7 @@ const emit = defineEmits<{
|
|||||||
'delete': [item: CollectionObject | EntityObject]
|
'delete': [item: CollectionObject | EntityObject]
|
||||||
'download': [item: CollectionObject | EntityObject]
|
'download': [item: CollectionObject | EntityObject]
|
||||||
'show-details': [item: CollectionObject | EntityObject]
|
'show-details': [item: CollectionObject | EntityObject]
|
||||||
|
'load-more': []
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -90,6 +94,12 @@ const emit = defineEmits<{
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<FilesLoadMoreSentinel
|
||||||
|
:has-more="!!hasMore"
|
||||||
|
:loading="!!isLoadingMore"
|
||||||
|
@intersect="emit('load-more')"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ import { formatSize } from '@/utils/fileHelpers'
|
|||||||
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
import FileActionsMenu from '@/components/FileActionsMenu.vue'
|
||||||
import FilePreview from '@/components/FilePreview.vue'
|
import FilePreview from '@/components/FilePreview.vue'
|
||||||
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
import FilePreviewPopover from '@/components/viewer/FilePreviewPopover.vue'
|
||||||
|
import FilesLoadMoreSentinel from '@/components/FilesLoadMoreSentinel.vue'
|
||||||
|
|
||||||
type ItemWithType = {
|
type ItemWithType =
|
||||||
item: CollectionObject | EntityObject
|
| { item: CollectionObject | EntityObject; type: 'collection' | 'entity' }
|
||||||
type: 'collection' | 'entity'
|
| { item: null; type: 'sentinel' }
|
||||||
}
|
|
||||||
|
|
||||||
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
type PreviewSource = (item: { id: string; meta?: Record<string, unknown> }) => string | Blob | Promise<string | Blob>
|
||||||
|
|
||||||
@@ -18,6 +18,8 @@ const props = defineProps<{
|
|||||||
collections: CollectionObject[]
|
collections: CollectionObject[]
|
||||||
entities: EntityObject[]
|
entities: EntityObject[]
|
||||||
selectedIds: Set<string>
|
selectedIds: Set<string>
|
||||||
|
hasMore?: boolean
|
||||||
|
isLoadingMore?: boolean
|
||||||
previewSource?: PreviewSource
|
previewSource?: PreviewSource
|
||||||
thumbnailSource?: PreviewSource
|
thumbnailSource?: PreviewSource
|
||||||
}>()
|
}>()
|
||||||
@@ -30,17 +32,25 @@ const emit = defineEmits<{
|
|||||||
'delete': [item: CollectionObject | EntityObject]
|
'delete': [item: CollectionObject | EntityObject]
|
||||||
'download': [item: CollectionObject | EntityObject]
|
'download': [item: CollectionObject | EntityObject]
|
||||||
'show-details': [item: CollectionObject | EntityObject]
|
'show-details': [item: CollectionObject | EntityObject]
|
||||||
|
'load-more': []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
// Combine collections and entities into a single list for virtual scrolling
|
// Combine collections and entities into a single list for virtual scrolling; a
|
||||||
|
// trailing sentinel row (rendered only once virtual-scroll actually mounts it)
|
||||||
|
// drives the infinite-scroll "load more" trigger.
|
||||||
const allItems = computed<ItemWithType[]>(() => [
|
const allItems = computed<ItemWithType[]>(() => [
|
||||||
...props.collections.map(c => ({ item: c, type: 'collection' as const })),
|
...props.collections.map(c => ({ item: c, type: 'collection' as const })),
|
||||||
...props.entities.map(e => ({ item: e, type: 'entity' as const }))
|
...props.entities.map(e => ({ item: e, type: 'entity' as const })),
|
||||||
|
...(props.hasMore ? [{ item: null, type: 'sentinel' as const }] : []),
|
||||||
])
|
])
|
||||||
|
|
||||||
function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObject; type: 'collection' } {
|
function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObject; type: 'collection' } {
|
||||||
return wrapped.type === 'collection'
|
return wrapped.type === 'collection'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isSentinel(wrapped: ItemWithType): wrapped is { item: null; type: 'sentinel' } {
|
||||||
|
return wrapped.type === 'sentinel'
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -50,9 +60,17 @@ function isCollection(wrapped: ItemWithType): wrapped is { item: CollectionObjec
|
|||||||
class="files-list-virtual pa-2"
|
class="files-list-virtual pa-2"
|
||||||
>
|
>
|
||||||
<template #default="{ item: wrapped }">
|
<template #default="{ item: wrapped }">
|
||||||
|
<!-- Load-more sentinel -->
|
||||||
|
<FilesLoadMoreSentinel
|
||||||
|
v-if="isSentinel(wrapped)"
|
||||||
|
:has-more="!!hasMore"
|
||||||
|
:loading="!!isLoadingMore"
|
||||||
|
@intersect="emit('load-more')"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Folder -->
|
<!-- Folder -->
|
||||||
<v-list-item
|
<v-list-item
|
||||||
v-if="isCollection(wrapped)"
|
v-else-if="isCollection(wrapped)"
|
||||||
:active="selectedIds.has(String(wrapped.item.identifier))"
|
:active="selectedIds.has(String(wrapped.item.identifier))"
|
||||||
@click="($event: MouseEvent | KeyboardEvent) => emit('item-click', wrapped.item, $event)"
|
@click="($event: MouseEvent | KeyboardEvent) => emit('item-click', wrapped.item, $event)"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -293,9 +293,7 @@ export function useFileUpload(options: UseFileUploadOptions) {
|
|||||||
try {
|
try {
|
||||||
// Create the folder
|
// Create the folder
|
||||||
const collection = await nodesStore.createCollection(
|
const collection = await nodesStore.createCollection(
|
||||||
currentProviderId(),
|
`${currentProviderId()}:${currentServiceId()}:${parentId || ROOT_ID}`,
|
||||||
currentServiceId(),
|
|
||||||
parentId,
|
|
||||||
{ label: folderName, owner: '' }
|
{ label: folderName, owner: '' }
|
||||||
)
|
)
|
||||||
folderIdMap.set(folderPath, String(collection.identifier))
|
folderIdMap.set(folderPath, String(collection.identifier))
|
||||||
@@ -342,9 +340,7 @@ export function useFileUpload(options: UseFileUploadOptions) {
|
|||||||
|
|
||||||
// Create the entity
|
// Create the entity
|
||||||
const entity = await nodesStore.createEntity(
|
const entity = await nodesStore.createEntity(
|
||||||
currentProviderId(),
|
`${currentProviderId()}:${currentServiceId()}:${targetCollection || ROOT_ID}`,
|
||||||
currentServiceId(),
|
|
||||||
targetCollection || ROOT_ID,
|
|
||||||
{
|
{
|
||||||
'@type': 'documents.properties',
|
'@type': 'documents.properties',
|
||||||
urid: null,
|
urid: null,
|
||||||
@@ -360,10 +356,7 @@ export function useFileUpload(options: UseFileUploadOptions) {
|
|||||||
|
|
||||||
// Write the content
|
// Write the content
|
||||||
await nodesStore.writeEntity(
|
await nodesStore.writeEntity(
|
||||||
currentProviderId(),
|
`${entity.provider}:${entity.service}:${entity.collection || ROOT_ID}:${entity.identifier}`,
|
||||||
currentServiceId(),
|
|
||||||
targetCollection || ROOT_ID,
|
|
||||||
String(entity.identifier),
|
|
||||||
content
|
content
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+58
-79
@@ -1,9 +1,10 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed, onMounted, watch, nextTick, defineAsyncComponent } from 'vue'
|
import { ref, computed, onMounted, onUnmounted, watch, nextTick, defineAsyncComponent } from 'vue'
|
||||||
import { useDisplay } from 'vuetify'
|
import { useDisplay } from 'vuetify'
|
||||||
import { useModuleStore, useIntegrationStore, usePreviewStore } from '@KTXC'
|
import { useModuleStore, useIntegrationStore, usePreviewStore } from '@KTXC'
|
||||||
import { useDocumentManager, useDocumentSelection, useFileUpload, useFileEditor } from '@/composables'
|
import { useDocumentManager, useDocumentSelection, useFileUpload, useFileEditor } from '@/composables'
|
||||||
import type { ViewMode, SortField, SortOrder, BreadcrumbItem } from '@/types'
|
import type { ViewMode, SortField, SortOrder, BreadcrumbItem } from '@/types'
|
||||||
|
import type { ListFilter, ListSort } from '@DocumentsManager/types'
|
||||||
import { CollectionObject } from '@DocumentsManager/models/collection'
|
import { CollectionObject } from '@DocumentsManager/models/collection'
|
||||||
import { EntityObject } from '@DocumentsManager/models/entity'
|
import { EntityObject } from '@DocumentsManager/models/entity'
|
||||||
import { ServiceObject } from '@DocumentsManager/models/service'
|
import { ServiceObject } from '@DocumentsManager/models/service'
|
||||||
@@ -118,7 +119,7 @@ const mediaViewerDialog = computed(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const viewerItems = computed<ViewerItem[]>(() =>
|
const viewerItems = computed<ViewerItem[]>(() =>
|
||||||
sortedItems.value.entities.map(entityToViewerItem),
|
documentManager.currentEntities.value.map(entityToViewerItem),
|
||||||
)
|
)
|
||||||
|
|
||||||
function entityToViewerItem(entity: EntityObject): ViewerItem {
|
function entityToViewerItem(entity: EntityObject): ViewerItem {
|
||||||
@@ -294,77 +295,46 @@ const breadcrumbs = computed<BreadcrumbItem[]>(() => {
|
|||||||
return items
|
return items
|
||||||
})
|
})
|
||||||
|
|
||||||
const sortedItems = computed(() => {
|
|
||||||
const collections = [...documentManager.currentCollections.value]
|
|
||||||
const entities = [...documentManager.currentEntities.value]
|
|
||||||
|
|
||||||
// Sort collections
|
|
||||||
collections.sort((a, b) => {
|
|
||||||
const aVal = sortField.value === 'label'
|
|
||||||
? (a.properties.label || nodeId(a))
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (a.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (a.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const bVal = sortField.value === 'label'
|
|
||||||
? (b.properties.label || nodeId(b))
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (b.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (b.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const cmp = String(aVal).localeCompare(String(bVal))
|
|
||||||
return sortOrder.value === 'asc' ? cmp : -cmp
|
|
||||||
})
|
|
||||||
|
|
||||||
// Sort entities
|
|
||||||
entities.sort((a, b) => {
|
|
||||||
const aVal = sortField.value === 'label'
|
|
||||||
? (a.properties.label || nodeId(a))
|
|
||||||
: sortField.value === 'mime'
|
|
||||||
? (a.properties.mime || '')
|
|
||||||
: sortField.value === 'size'
|
|
||||||
? a.properties.size
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (a.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (a.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const bVal = sortField.value === 'label'
|
|
||||||
? (b.properties.label || nodeId(b))
|
|
||||||
: sortField.value === 'mime'
|
|
||||||
? (b.properties.mime || '')
|
|
||||||
: sortField.value === 'size'
|
|
||||||
? b.properties.size
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (b.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (b.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const cmp = String(aVal).localeCompare(String(bVal))
|
|
||||||
return sortOrder.value === 'asc' ? cmp : -cmp
|
|
||||||
})
|
|
||||||
|
|
||||||
// Filter by search
|
|
||||||
const filterFn = (item: CollectionObject | EntityObject) => {
|
|
||||||
if (!searchQuery.value) return true
|
|
||||||
const label = item instanceof EntityObject
|
|
||||||
? (item.properties.label || nodeId(item))
|
|
||||||
: (item.properties.label || nodeId(item))
|
|
||||||
return label.toLowerCase().includes(searchQuery.value.toLowerCase())
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
collections: collections.filter(filterFn),
|
|
||||||
entities: entities.filter(filterFn),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const hasItems = computed(() =>
|
const hasItems = computed(() =>
|
||||||
sortedItems.value.collections.length > 0 || sortedItems.value.entities.length > 0
|
documentManager.currentCollections.value.length > 0 || documentManager.currentEntities.value.length > 0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Search/sort are server-driven: build the current filter/sort and reset-load
|
||||||
|
// the current location whenever either changes.
|
||||||
|
function buildFilter(): ListFilter | undefined {
|
||||||
|
return searchQuery.value ? { label: searchQuery.value } : undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildSort(): ListSort {
|
||||||
|
return { [sortField.value]: sortOrder.value === 'asc' }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function reload() {
|
||||||
|
await documentManager.resetAndLoad(buildFilter(), buildSort())
|
||||||
|
}
|
||||||
|
|
||||||
|
let searchDebounceTimer: ReturnType<typeof setTimeout> | null = null
|
||||||
|
|
||||||
|
watch(searchQuery, () => {
|
||||||
|
if (searchDebounceTimer !== null) {
|
||||||
|
clearTimeout(searchDebounceTimer)
|
||||||
|
}
|
||||||
|
searchDebounceTimer = setTimeout(() => {
|
||||||
|
searchDebounceTimer = null
|
||||||
|
reload()
|
||||||
|
}, 300)
|
||||||
|
})
|
||||||
|
|
||||||
|
watch([sortField, sortOrder], () => {
|
||||||
|
reload()
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (searchDebounceTimer !== null) {
|
||||||
|
clearTimeout(searchDebounceTimer)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
const hasSelection = computed(() => selection.hasSelection.value)
|
const hasSelection = computed(() => selection.hasSelection.value)
|
||||||
|
|
||||||
const selectedIds = computed(() => selection.selectedIds.value)
|
const selectedIds = computed(() => selection.selectedIds.value)
|
||||||
@@ -695,7 +665,7 @@ async function readEntriesRecursively(
|
|||||||
async function handleUploadAll() {
|
async function handleUploadAll() {
|
||||||
try {
|
try {
|
||||||
await upload.uploadAll()
|
await upload.uploadAll()
|
||||||
await documentManager.refresh()
|
await reload()
|
||||||
notify('Uploads completed', 'success')
|
notify('Uploads completed', 'success')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to upload files:', error)
|
console.error('Failed to upload files:', error)
|
||||||
@@ -712,7 +682,7 @@ function handleUploadDialogClose() {
|
|||||||
// Refresh
|
// Refresh
|
||||||
async function handleRefresh() {
|
async function handleRefresh() {
|
||||||
try {
|
try {
|
||||||
await documentManager.refresh()
|
await reload()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to refresh files:', error)
|
console.error('Failed to refresh files:', error)
|
||||||
notify(getErrorMessage(error, 'Failed to refresh files'), 'error')
|
notify(getErrorMessage(error, 'Failed to refresh files'), 'error')
|
||||||
@@ -725,7 +695,7 @@ onMounted(async () => {
|
|||||||
await documentManager.initialize()
|
await documentManager.initialize()
|
||||||
await servicesStore.list()
|
await servicesStore.list()
|
||||||
syncActiveService(availableServices.value)
|
syncActiveService(availableServices.value)
|
||||||
await documentManager.refresh()
|
await reload()
|
||||||
console.log('[Files] - Initialized with:', {
|
console.log('[Files] - Initialized with:', {
|
||||||
provider: activeProviderId.value,
|
provider: activeProviderId.value,
|
||||||
service: activeServiceId.value,
|
service: activeServiceId.value,
|
||||||
@@ -818,9 +788,11 @@ onMounted(async () => {
|
|||||||
<!-- Grid View -->
|
<!-- Grid View -->
|
||||||
<FilesGridView
|
<FilesGridView
|
||||||
v-else-if="viewMode === 'grid'"
|
v-else-if="viewMode === 'grid'"
|
||||||
:collections="sortedItems.collections"
|
:collections="documentManager.currentCollections.value"
|
||||||
:entities="sortedItems.entities"
|
:entities="documentManager.currentEntities.value"
|
||||||
:selected-ids="selectedIds"
|
:selected-ids="selectedIds"
|
||||||
|
:has-more="documentManager.hasMore.value"
|
||||||
|
:is-loading-more="documentManager.isLoadingMore.value"
|
||||||
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
||||||
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
||||||
@item-click="handleItemClick"
|
@item-click="handleItemClick"
|
||||||
@@ -830,14 +802,17 @@ onMounted(async () => {
|
|||||||
@delete="handleDeleteItem"
|
@delete="handleDeleteItem"
|
||||||
@download="handleDownloadItem"
|
@download="handleDownloadItem"
|
||||||
@show-details="handleShowDetails"
|
@show-details="handleShowDetails"
|
||||||
|
@load-more="documentManager.loadMore"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- List View -->
|
<!-- List View -->
|
||||||
<FilesListView
|
<FilesListView
|
||||||
v-else-if="viewMode === 'list'"
|
v-else-if="viewMode === 'list'"
|
||||||
:collections="sortedItems.collections"
|
:collections="documentManager.currentCollections.value"
|
||||||
:entities="sortedItems.entities"
|
:entities="documentManager.currentEntities.value"
|
||||||
:selected-ids="selectedIds"
|
:selected-ids="selectedIds"
|
||||||
|
:has-more="documentManager.hasMore.value"
|
||||||
|
:is-loading-more="documentManager.isLoadingMore.value"
|
||||||
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
||||||
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
||||||
@item-click="handleItemClick"
|
@item-click="handleItemClick"
|
||||||
@@ -847,14 +822,17 @@ onMounted(async () => {
|
|||||||
@delete="handleDeleteItem"
|
@delete="handleDeleteItem"
|
||||||
@download="handleDownloadItem"
|
@download="handleDownloadItem"
|
||||||
@show-details="handleShowDetails"
|
@show-details="handleShowDetails"
|
||||||
|
@load-more="documentManager.loadMore"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- Details View -->
|
<!-- Details View -->
|
||||||
<FilesDetailsView
|
<FilesDetailsView
|
||||||
v-else-if="viewMode === 'details'"
|
v-else-if="viewMode === 'details'"
|
||||||
:collections="sortedItems.collections"
|
:collections="documentManager.currentCollections.value"
|
||||||
:entities="sortedItems.entities"
|
:entities="documentManager.currentEntities.value"
|
||||||
:selected-ids="selectedIds"
|
:selected-ids="selectedIds"
|
||||||
|
:has-more="documentManager.hasMore.value"
|
||||||
|
:is-loading-more="documentManager.isLoadingMore.value"
|
||||||
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
:preview-source="previewsAvailable ? resolvePreviewSource : undefined"
|
||||||
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
:thumbnail-source="previewsAvailable ? resolveThumbnailSource : undefined"
|
||||||
@item-click="handleItemClick"
|
@item-click="handleItemClick"
|
||||||
@@ -864,6 +842,7 @@ onMounted(async () => {
|
|||||||
@delete="handleDeleteItem"
|
@delete="handleDeleteItem"
|
||||||
@download="handleDownloadItem"
|
@download="handleDownloadItem"
|
||||||
@show-details="handleShowDetails"
|
@show-details="handleShowDetails"
|
||||||
|
@load-more="documentManager.loadMore"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,222 +0,0 @@
|
|||||||
import { computed, ref } from 'vue'
|
|
||||||
import { defineStore } from 'pinia'
|
|
||||||
import { useProvidersStore, useServicesStore, useNodesStore, ROOT_ID } from '@DocumentsManager/stores'
|
|
||||||
import { CollectionObject } from '@DocumentsManager/models/collection'
|
|
||||||
import { EntityObject } from '@DocumentsManager/models/entity'
|
|
||||||
import type { SortField, SortOrder, ViewMode, BreadcrumbItem } from '@/types'
|
|
||||||
|
|
||||||
type NodeRecord = CollectionObject | EntityObject
|
|
||||||
|
|
||||||
export const useDocumentsStore = defineStore('documentsStore', () => {
|
|
||||||
const providersStore = useProvidersStore()
|
|
||||||
const servicesStore = useServicesStore()
|
|
||||||
const nodesStore = useNodesStore()
|
|
||||||
|
|
||||||
const activeProviderId = ref('default')
|
|
||||||
const activeServiceId = ref<string | number>('personal')
|
|
||||||
const currentLocation = ref<string>(ROOT_ID)
|
|
||||||
|
|
||||||
const viewMode = ref<ViewMode>('grid')
|
|
||||||
const sortField = ref<SortField>('label')
|
|
||||||
const sortOrder = ref<SortOrder>('asc')
|
|
||||||
const searchQuery = ref('')
|
|
||||||
const sidebarVisible = ref(true)
|
|
||||||
|
|
||||||
const transceiving = computed(() =>
|
|
||||||
providersStore.transceiving || servicesStore.transceiving || nodesStore.transceiving,
|
|
||||||
)
|
|
||||||
|
|
||||||
const provider = computed(() => providersStore.provider(activeProviderId.value))
|
|
||||||
const service = computed(() => servicesStore.service(activeProviderId.value, activeServiceId.value))
|
|
||||||
|
|
||||||
const currentCollections = computed(() =>
|
|
||||||
nodesStore.getChildCollections(activeProviderId.value, activeServiceId.value, currentLocation.value),
|
|
||||||
)
|
|
||||||
|
|
||||||
const currentEntities = computed(() =>
|
|
||||||
nodesStore.getChildEntities(activeProviderId.value, activeServiceId.value, currentLocation.value),
|
|
||||||
)
|
|
||||||
|
|
||||||
const breadcrumbs = computed<BreadcrumbItem[]>(() => {
|
|
||||||
const nodes = nodesStore.getPath(activeProviderId.value, activeServiceId.value, currentLocation.value)
|
|
||||||
return [
|
|
||||||
{ id: ROOT_ID, label: 'Home', isRoot: true },
|
|
||||||
...nodes.map((node) => ({
|
|
||||||
id: String(node.identifier),
|
|
||||||
label: node.properties.label,
|
|
||||||
isRoot: false,
|
|
||||||
})),
|
|
||||||
]
|
|
||||||
})
|
|
||||||
|
|
||||||
function sortCollections(items: CollectionObject[]): CollectionObject[] {
|
|
||||||
return [...items].sort((a, b) => {
|
|
||||||
const aVal = sortField.value === 'label'
|
|
||||||
? a.properties.label
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (a.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (a.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const bVal = sortField.value === 'label'
|
|
||||||
? b.properties.label
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (b.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (b.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
|
|
||||||
const cmp = String(aVal).localeCompare(String(bVal))
|
|
||||||
return sortOrder.value === 'asc' ? cmp : -cmp
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function sortEntities(items: EntityObject[]): EntityObject[] {
|
|
||||||
return [...items].sort((a, b) => {
|
|
||||||
const aVal = sortField.value === 'label'
|
|
||||||
? a.properties.label
|
|
||||||
: sortField.value === 'mime'
|
|
||||||
? (a.properties.mime ?? '')
|
|
||||||
: sortField.value === 'size'
|
|
||||||
? a.properties.size
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (a.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (a.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
const bVal = sortField.value === 'label'
|
|
||||||
? b.properties.label
|
|
||||||
: sortField.value === 'mime'
|
|
||||||
? (b.properties.mime ?? '')
|
|
||||||
: sortField.value === 'size'
|
|
||||||
? b.properties.size
|
|
||||||
: sortField.value === 'modifiedOn'
|
|
||||||
? (b.modified?.getTime() ?? 0)
|
|
||||||
: sortField.value === 'createdOn'
|
|
||||||
? (b.created?.getTime() ?? 0)
|
|
||||||
: ''
|
|
||||||
|
|
||||||
const cmp = String(aVal).localeCompare(String(bVal))
|
|
||||||
return sortOrder.value === 'asc' ? cmp : -cmp
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function filterNode(node: NodeRecord): boolean {
|
|
||||||
if (!searchQuery.value) return true
|
|
||||||
return node.properties.label.toLowerCase().includes(searchQuery.value.toLowerCase())
|
|
||||||
}
|
|
||||||
|
|
||||||
const sortedItems = computed(() => ({
|
|
||||||
collections: sortCollections(currentCollections.value).filter(filterNode),
|
|
||||||
entities: sortEntities(currentEntities.value).filter(filterNode),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const hasItems = computed(() =>
|
|
||||||
sortedItems.value.collections.length > 0 || sortedItems.value.entities.length > 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const isAtRoot = computed(() => currentLocation.value === ROOT_ID)
|
|
||||||
|
|
||||||
async function initialize() {
|
|
||||||
await providersStore.list([activeProviderId.value])
|
|
||||||
await servicesStore.list()
|
|
||||||
await refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
async function refresh() {
|
|
||||||
await nodesStore.fetchNodes(activeProviderId.value, activeServiceId.value, currentLocation.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function navigateTo(collectionId: string | null) {
|
|
||||||
currentLocation.value = collectionId || ROOT_ID
|
|
||||||
await refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
async function navigateToRoot() {
|
|
||||||
await navigateTo(ROOT_ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function navigateUp() {
|
|
||||||
if (currentLocation.value === ROOT_ID) return
|
|
||||||
const currentNode = nodesStore.getNode(activeProviderId.value, activeServiceId.value, currentLocation.value)
|
|
||||||
if (!currentNode) return
|
|
||||||
const parentId = currentNode.collection ? String(currentNode.collection) : ROOT_ID
|
|
||||||
await navigateTo(parentId)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function createFolder(label: string) {
|
|
||||||
await nodesStore.createCollection(
|
|
||||||
activeProviderId.value,
|
|
||||||
activeServiceId.value,
|
|
||||||
currentLocation.value,
|
|
||||||
{ label, owner: '' },
|
|
||||||
)
|
|
||||||
await refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
async function renameNode(node: NodeRecord, label: string) {
|
|
||||||
if (node instanceof CollectionObject) {
|
|
||||||
await nodesStore.updateCollection(
|
|
||||||
activeProviderId.value,
|
|
||||||
activeServiceId.value,
|
|
||||||
node.identifier,
|
|
||||||
{ label, owner: node.properties.owner },
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
await nodesStore.updateEntity(
|
|
||||||
activeProviderId.value,
|
|
||||||
activeServiceId.value,
|
|
||||||
node.collection,
|
|
||||||
node.identifier,
|
|
||||||
{
|
|
||||||
'@type': 'documents.properties',
|
|
||||||
urid: node.properties.urid,
|
|
||||||
size: node.properties.size,
|
|
||||||
label,
|
|
||||||
mime: node.properties.mime,
|
|
||||||
format: node.properties.format,
|
|
||||||
encoding: node.properties.encoding,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
await refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteNode(node: NodeRecord) {
|
|
||||||
if (node instanceof CollectionObject) {
|
|
||||||
await nodesStore.deleteCollection(activeProviderId.value, activeServiceId.value, node.identifier)
|
|
||||||
} else {
|
|
||||||
await nodesStore.deleteEntity(activeProviderId.value, activeServiceId.value, node.collection, node.identifier)
|
|
||||||
}
|
|
||||||
await refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
activeProviderId,
|
|
||||||
activeServiceId,
|
|
||||||
currentLocation,
|
|
||||||
viewMode,
|
|
||||||
sortField,
|
|
||||||
sortOrder,
|
|
||||||
searchQuery,
|
|
||||||
sidebarVisible,
|
|
||||||
transceiving,
|
|
||||||
provider,
|
|
||||||
service,
|
|
||||||
currentCollections,
|
|
||||||
currentEntities,
|
|
||||||
sortedItems,
|
|
||||||
hasItems,
|
|
||||||
breadcrumbs,
|
|
||||||
isAtRoot,
|
|
||||||
initialize,
|
|
||||||
refresh,
|
|
||||||
navigateTo,
|
|
||||||
navigateToRoot,
|
|
||||||
navigateUp,
|
|
||||||
createFolder,
|
|
||||||
renameNode,
|
|
||||||
deleteNode,
|
|
||||||
ROOT_ID,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export { useDocumentsStore } from './documentsStore'
|
|
||||||
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
export type ViewMode = 'grid' | 'list' | 'details'
|
export type ViewMode = 'grid' | 'list' | 'details'
|
||||||
|
|
||||||
export type SortField = 'label' | 'size' | 'modifiedOn' | 'createdOn' | 'mime'
|
export type SortField = 'label' | 'size' | 'modifiedOn' | 'createdOn'
|
||||||
|
|
||||||
export type SortOrder = 'asc' | 'desc'
|
export type SortOrder = 'asc' | 'desc'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user