fix(files): allow uploading to root when another user has same name (#15)
CD — Deployment / deploy (push) Successful in 43s

Root is a personal namespace per user, so duplicate checks must scope to the
current owner when uploading at root level. Subfolders keep their existing
uniqueness rules.

Also fixed folder creation at root with the same owner scope.

---------

Co-authored-by: xEsiah <[email protected]>
Reviewed-on: #15
Reviewed-by: Esiah <[email protected]>
Co-authored-by: Gitea Actions <-[email protected]>
This commit was merged in pull request #15.
This commit is contained in:
Gitea Actions
2026-10-22 10:52:23 +00:00
committed by Esiah
co-authored by Esiah
parent cbe33bf563
commit 699c523caa
11 changed files with 713 additions and 37 deletions
+137 -3
View File
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { useCallback, useEffect, useRef, useState, type DragEvent } from "react";
import { Button, Card, Spinner, cn } from "../ui/index.js";
import {
ApiError,
@@ -70,6 +70,7 @@ export const Browser = () => {
const [files, setFiles] = useState<UploadedFile[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const [notice, setNotice] = useState<string | null>(null);
const [uploading, setUploading] = useState(false);
const [removing, setRemoving] = useState<string | null>(null);
const [dialog, setDialog] = useState<Dialog>(null);
@@ -78,8 +79,14 @@ export const Browser = () => {
const [unread, setUnread] = useState<Record<string, number>>({});
const [kind, setKind] = useState<string>("");
const fileInputRef = useRef<HTMLInputElement>(null);
// Depot par glisser-deposer : `dragDepth` compte les entrees et sorties
// successives. La garde `stillInside` evite en plus que la zone clignote
// quand le pointeur passe d'un element enfant a un autre.
const [dragDepth, setDragDepth] = useState(0);
const [dropTargetId, setDropTargetId] = useState<string | null>(null);
const current = path[path.length - 1] ?? { id: null, name: "Racine" };
const dragActive = dragDepth > 0;
const load = useCallback(async (parentId: string | null) => {
setLoading(true);
@@ -135,6 +142,7 @@ export const Browser = () => {
if (!selected || selected.length === 0) return;
setUploading(true);
setError(null);
setNotice(null);
try {
for (const file of Array.from(selected)) {
await api.uploadFile(file, current.id);
@@ -149,6 +157,108 @@ export const Browser = () => {
}
};
/**
* Depot d'un lot de fichiers dans un dossier precis. Le dossier peut etre le
* dossier affiche ou l'un des sous-dossiers listes ; le serveur revalide les
* droits d'ecriture dans tous les cas.
*/
const uploadInto = async (selected: FileList | null, folderId: string | null, label?: string) => {
if (!selected || selected.length === 0) return;
setUploading(true);
setError(null);
setNotice(null);
try {
for (const file of Array.from(selected)) {
await api.uploadFile(file, folderId);
}
void refresh();
// Seule la vue courante est rechargée : un depot dans un sous-dossier ne
// change rien a l'ecran tant qu'on ne l'ouvre pas.
if (folderId === current.id) await reload();
setNotice(
label
? t("{count} fichier(s) déposé(s) dans {name}.", {
count: selected.length,
name: label,
})
: t("{count} fichier(s) déposé(s) dans ce dossier.", { count: selected.length }),
);
} catch (caught) {
setError(caught instanceof ApiError ? caught.message : t("Envoi impossible."));
} finally {
setUploading(false);
}
};
/** Le glisser porte-t-il des fichiers (et non du texte ou une URL) ? */
const carriesFiles = (event: DragEvent): boolean =>
Array.from(event.dataTransfer.types).includes("Files");
/**
* Le pointeur est-il reste dans la zone qui recoit l'evenement ? Vrai quand
* le pointeur passe d'un enfant a un autre : sans cette garde, la zone
* clignoterait a chaque changement d element.
*/
const stillInside = (event: DragEvent): boolean => {
const related = event.relatedTarget as Node | null;
return related !== null && event.currentTarget.contains(related);
};
const onDragEnter = (event: DragEvent) => {
if (!carriesFiles(event)) return;
event.preventDefault();
if (stillInside(event)) return;
setDragDepth((depth) => depth + 1);
};
const onDragOver = (event: DragEvent) => {
if (!carriesFiles(event)) return;
// Sans preventDefault le navigateur refuse le depot.
event.preventDefault();
event.dataTransfer.dropEffect = "copy";
};
const onDragLeave = (event: DragEvent) => {
if (!carriesFiles(event)) return;
event.preventDefault();
if (stillInside(event)) return;
setDragDepth((depth) => Math.max(0, depth - 1));
};
const onDrop = (event: DragEvent) => {
if (!carriesFiles(event)) return;
event.preventDefault();
setDragDepth(0);
setDropTargetId(null);
void uploadInto(event.dataTransfer.files, current.id);
};
/** Cible precise : un sous-dossier de la liste courante. */
const onFolderDragOver = (event: DragEvent, folderId: string) => {
if (!carriesFiles(event)) return;
event.preventDefault();
event.stopPropagation();
event.dataTransfer.dropEffect = "copy";
setDropTargetId(folderId);
};
const onFolderDragLeave = (event: DragEvent, folderId: string) => {
if (!carriesFiles(event)) return;
event.preventDefault();
event.stopPropagation();
if (stillInside(event)) return;
setDropTargetId((current) => (current === folderId ? null : current));
};
const onFolderDrop = (event: DragEvent, folder: Folder) => {
if (!carriesFiles(event)) return;
event.preventDefault();
event.stopPropagation();
setDragDepth(0);
setDropTargetId(null);
void uploadInto(event.dataTransfer.files, folder.id, folder.name);
};
const removeTarget = async (target: Target) => {
const kind = target.type === "folder" ? t("ce dossier") : t("ce fichier");
const ok = await confirm({
@@ -200,7 +310,24 @@ export const Browser = () => {
: 0;
return (
<div className="flex flex-col gap-5">
<div
className="flex flex-col gap-5"
onDragEnter={onDragEnter}
onDragOver={onDragOver}
onDragLeave={onDragLeave}
onDrop={onDrop}
>
{dragActive ? (
<div
className="pointer-events-none fixed inset-0 z-30 flex items-center justify-center bg-background/70"
aria-hidden="true"
>
<p className="rounded-md border border-accent/50 bg-accent/10 px-4 py-3 text-sm font-medium text-accent">
{t("Déposez vos fichiers ici")}
</p>
</div>
) : null}
<PageHeader
title={current.name}
description={t("Vos dossiers et fichiers. Envoyez un fichier ou créez un dossier.")}
@@ -335,6 +462,7 @@ export const Browser = () => {
) : null}
{error ? <Alert>{error}</Alert> : null}
{notice ? <Alert tone="success">{notice}</Alert> : null}
{loading ? (
<div className="flex justify-center py-16">
@@ -357,7 +485,13 @@ export const Browser = () => {
{folders.map((folder) => (
<li
key={folder.id}
className="flex items-center gap-1 rounded-lg border border-border bg-surface p-2 transition-colors hover:border-border-strong hover:bg-surface-hover"
onDragOver={(event) => onFolderDragOver(event, folder.id)}
onDragLeave={(event) => onFolderDragLeave(event, folder.id)}
onDrop={(event) => onFolderDrop(event, folder)}
className={cn(
"flex items-center gap-1 rounded-lg border border-border bg-surface p-2 transition-colors hover:border-border-strong hover:bg-surface-hover",
dropTargetId === folder.id && "border-accent bg-accent/10 ring-1 ring-accent/50",
)}
>
<button
type="button"