feat(shared-with-me): add missing group by sections
This commit is contained in:
@@ -60,7 +60,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
const groupBys: GroupByDef[] = [
|
const groupBys: GroupByDef[] = [
|
||||||
{ key: '', label: t('files.name', 'Name'), orderBy: 'name' },
|
{ key: '', label: t('files.name', 'Name'), orderBy: 'name', icon: 'arrow-up-a-z' },
|
||||||
{
|
{
|
||||||
key: 'owner',
|
key: 'owner',
|
||||||
label: t('groupby.owner', 'Owner'),
|
label: t('groupby.owner', 'Owner'),
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
const groupBys: GroupByDef[] = [
|
const groupBys: GroupByDef[] = [
|
||||||
{ key: '', label: t('files.name', 'Name'), orderBy: 'name' },
|
{ key: '', label: t('files.name', 'Name'), orderBy: 'name', icon: 'arrow-up-a-z' },
|
||||||
{
|
{
|
||||||
key: 'owner',
|
key: 'owner',
|
||||||
label: t('groupby.owner', 'Owner'),
|
label: t('groupby.owner', 'Owner'),
|
||||||
|
|||||||
@@ -2,22 +2,32 @@
|
|||||||
import { errorMessage } from '$lib/utils/errors';
|
import { errorMessage } from '$lib/utils/errors';
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
import { dateBucket, resolveOwnerName, typeLabel } from '$lib/api/endpoints/favorites';
|
||||||
import { fetchSharedWithMe, type IncomingGrantItem } from '$lib/api/endpoints/grants';
|
import { fetchSharedWithMe, type IncomingGrantItem } from '$lib/api/endpoints/grants';
|
||||||
import type { FileItem } from '$lib/api/types';
|
import type { FileItem } from '$lib/api/types';
|
||||||
import { lazyComponent } from '$lib/composables/lazyComponent.svelte';
|
import { lazyComponent } from '$lib/composables/lazyComponent.svelte';
|
||||||
import ResourceList, { type ResourceEntry } from '$lib/components/ResourceList.svelte';
|
import { useOwnerCache } from '$lib/composables/useOwnerCache.svelte';
|
||||||
|
import ResourceList, {
|
||||||
|
type GroupByDef,
|
||||||
|
type ResourceEntry
|
||||||
|
} from '$lib/components/ResourceList.svelte';
|
||||||
import { t } from '$lib/i18n/index.svelte';
|
import { t } from '$lib/i18n/index.svelte';
|
||||||
|
|
||||||
let raw = $state<IncomingGrantItem[]>([]);
|
let raw = $state<IncomingGrantItem[]>([]);
|
||||||
let cursor = $state<string | undefined>(undefined);
|
let cursor = $state<string | undefined>(undefined);
|
||||||
let loading = $state(false);
|
let loading = $state(false);
|
||||||
let error = $state<string | null>(null);
|
let error = $state<string | null>(null);
|
||||||
|
let groupBy = $state<string>('');
|
||||||
|
let reversed = $state(false);
|
||||||
|
|
||||||
|
const sharers = useOwnerCache(resolveOwnerName);
|
||||||
|
|
||||||
const byId = $derived(new Map(raw.map((it) => [it.resource.id, it])));
|
const byId = $derived(new Map(raw.map((it) => [it.resource.id, it])));
|
||||||
|
|
||||||
const entries = $derived(
|
const entries = $derived(
|
||||||
raw.map(
|
raw.map((it): ResourceEntry => {
|
||||||
(it): ResourceEntry => ({
|
const isFile = it.resource_type === 'file';
|
||||||
|
return {
|
||||||
id: it.resource.id,
|
id: it.resource.id,
|
||||||
name: it.resource.name,
|
name: it.resource.name,
|
||||||
kind: it.resource_type,
|
kind: it.resource_type,
|
||||||
@@ -28,20 +38,63 @@
|
|||||||
// resource's real location so the row still shows where it
|
// resource's real location so the row still shows where it
|
||||||
// lives, not a translated string.
|
// lives, not a translated string.
|
||||||
ownerId: it.granted_by ?? null,
|
ownerId: it.granted_by ?? null,
|
||||||
|
ownerName: sharers.name(it.granted_by),
|
||||||
path: it.resource.path,
|
path: it.resource.path,
|
||||||
size: it.resource_type === 'file' ? (it.resource as FileItem).size : null,
|
size: isFile ? (it.resource as FileItem).size : null,
|
||||||
date: it.granted_at
|
date: it.granted_at,
|
||||||
|
category: isFile ? it.resource.category : 'Folder'
|
||||||
|
};
|
||||||
})
|
})
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
async function load(reset = false) {
|
// Server-supported sort_by values (see grant_handler.rs:615):
|
||||||
|
// granted_at, granted_by, name, type
|
||||||
|
// The first entry (no `bucketOf`) renders a flat list sorted by name —
|
||||||
|
// the A-Z icon flags it as "sort, not group" so users don't read it as
|
||||||
|
// a real bucket dimension. The remaining three are honest groupings and
|
||||||
|
// get the default layer-group icon.
|
||||||
|
const groupBys: GroupByDef[] = [
|
||||||
|
{ key: '', label: t('files.name', 'Name'), orderBy: 'name', icon: 'arrow-up-a-z' },
|
||||||
|
{
|
||||||
|
key: 'sharedBy',
|
||||||
|
label: t('groupby.sharedBy', 'Shared by'),
|
||||||
|
orderBy: 'granted_by',
|
||||||
|
bucketOf: (e) => e.ownerId ?? null,
|
||||||
|
labelOf: (id) => sharers.label(id)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'type',
|
||||||
|
label: t('groupby.type', 'Type'),
|
||||||
|
orderBy: 'type',
|
||||||
|
bucketOf: (e) => e.category ?? 'other',
|
||||||
|
labelOf: (k) => typeLabel(k)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'sharedAt',
|
||||||
|
label: t('groupby.sharedAt', 'Shared date'),
|
||||||
|
orderBy: 'granted_at',
|
||||||
|
bucketOf: (e) => dateBucket(e.date)
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
function orderByForGroup(): string {
|
||||||
|
return groupBys.find((g) => g.key === groupBy)?.orderBy ?? 'granted_at';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function load(reset = false, orderBy = 'granted_at', rev = reversed) {
|
||||||
loading = true;
|
loading = true;
|
||||||
error = null;
|
error = null;
|
||||||
try {
|
try {
|
||||||
const page = await fetchSharedWithMe({ cursor: reset ? undefined : cursor });
|
const page = await fetchSharedWithMe({
|
||||||
|
cursor: reset ? undefined : cursor,
|
||||||
|
orderBy,
|
||||||
|
reverse: rev
|
||||||
|
});
|
||||||
raw = reset ? page.items : [...raw, ...page.items];
|
raw = reset ? page.items : [...raw, ...page.items];
|
||||||
cursor = page.next_cursor;
|
cursor = page.next_cursor;
|
||||||
|
// Warm the sharer-name cache so the "Shared by" group headers
|
||||||
|
// show real names instead of UUIDs.
|
||||||
|
void sharers.resolve(page.items.map((i) => i.granted_by).filter((id): id is string => !!id));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error = errorMessage(e);
|
error = errorMessage(e);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -84,8 +137,15 @@
|
|||||||
emptyText={t('shared_with_me.empty', 'Nothing has been shared with you yet.')}
|
emptyText={t('shared_with_me.empty', 'Nothing has been shared with you yet.')}
|
||||||
hasMore={!!cursor}
|
hasMore={!!cursor}
|
||||||
showOwner={true}
|
showOwner={true}
|
||||||
onloadmore={() => load(false)}
|
{groupBys}
|
||||||
|
bind:groupBy
|
||||||
|
bind:reversed
|
||||||
|
onloadmore={() => load(false, orderByForGroup())}
|
||||||
onopen={open}
|
onopen={open}
|
||||||
|
onreload={(orderBy, rev) => {
|
||||||
|
cursor = undefined;
|
||||||
|
load(true, orderBy, rev);
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{#if fileViewer.component}
|
{#if fileViewer.component}
|
||||||
|
|||||||
Reference in New Issue
Block a user