fix(files): allow uploading to root when another user has same name (#15)
CD — Deployment / deploy (push) Successful in 43s
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:
@@ -8,7 +8,14 @@ import {
|
||||
type KeyboardEvent as ReactKeyboardEvent,
|
||||
} from "react";
|
||||
import { Button, Spinner, cn } from "../ui/index.js";
|
||||
import { ApiError, api, formatDate, type ChatMember, type ChatMessage } from "../lib/api.js";
|
||||
import {
|
||||
ApiError,
|
||||
api,
|
||||
formatDate,
|
||||
formatDateTimeSeconds,
|
||||
type ChatMember,
|
||||
type ChatMessage,
|
||||
} from "../lib/api.js";
|
||||
import { useI18n } from "../lib/i18n.js";
|
||||
import { getLocale } from "../lib/locale.js";
|
||||
import { useSession } from "../lib/session.js";
|
||||
@@ -16,7 +23,16 @@ import { useConfirm } from "./confirm.js";
|
||||
import { Avatar } from "./Avatar.js";
|
||||
import { IconAction } from "./IconAction.js";
|
||||
import { Alert, Badge, EmptyState } from "./feedback.js";
|
||||
import { ChatIcon, CloseIcon, SendIcon, TrashIcon, UsersIcon } from "./icons.js";
|
||||
import {
|
||||
ArrowRightIcon,
|
||||
ChatIcon,
|
||||
CloseIcon,
|
||||
PenIcon,
|
||||
PinIcon,
|
||||
SendIcon,
|
||||
TrashIcon,
|
||||
UsersIcon,
|
||||
} from "./icons.js";
|
||||
|
||||
const MAX_LENGTH = 2000;
|
||||
const POLL_MESSAGES_MS = 4000;
|
||||
@@ -63,15 +79,25 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
|
||||
const [members, setMembers] = useState<ChatMember[]>([]);
|
||||
const [messages, setMessages] = useState<ChatMessage[]>([]);
|
||||
const [pins, setPins] = useState<ChatMessage[]>([]);
|
||||
const [pinsOpen, setPinsOpen] = useState(false);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [draft, setDraft] = useState("");
|
||||
const [sending, setSending] = useState(false);
|
||||
const [deletingId, setDeletingId] = useState<number | null>(null);
|
||||
const [pinningId, setPinningId] = useState<number | null>(null);
|
||||
const [editingId, setEditingId] = useState<number | null>(null);
|
||||
const [editDraft, setEditDraft] = useState("");
|
||||
const [savingEdit, setSavingEdit] = useState(false);
|
||||
const [membersOpen, setMembersOpen] = useState(false);
|
||||
|
||||
const scrollRef = useRef<HTMLDivElement | null>(null);
|
||||
const lastIdRef = useRef(0);
|
||||
// Curseur d'edition : horodatage delivre par le serveur, renvoye tel quel.
|
||||
// Le curseur d'identifiant ne voit que les messages plus recents, ce second
|
||||
// curseur rattrape les reecritures d'anciens messages.
|
||||
const editedSinceRef = useRef<string | null>(null);
|
||||
// Tant que l'utilisateur reste au bas de la conversation, chaque nouveau
|
||||
// message le ramene en bas ; s'il remonte lire l'historique, on ne le force
|
||||
// pas a redescendre.
|
||||
@@ -86,9 +112,27 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
(incoming: ChatMessage[]) => {
|
||||
if (incoming.length === 0) return;
|
||||
setMessages((previous) => {
|
||||
const known = new Set(previous.map((message) => message.id));
|
||||
const fresh = incoming.filter((message) => !known.has(message.id));
|
||||
return fresh.length > 0 ? [...previous, ...fresh] : previous;
|
||||
const index = new Map(previous.map((message) => [message.id, message]));
|
||||
let changed = false;
|
||||
for (const message of incoming) {
|
||||
const known = index.get(message.id);
|
||||
if (!known) {
|
||||
index.set(message.id, message);
|
||||
changed = true;
|
||||
continue;
|
||||
}
|
||||
// Un message deja connu peut avoir ete reecrit ou change d'etat
|
||||
// d'epinglage : on ne remplace que si la version recue est plus
|
||||
// recente, pour ne pas ecraser une edition locale toute recente.
|
||||
const knownEdited = known.edited_at ? Date.parse(known.edited_at) : 0;
|
||||
const incomingEdited = message.edited_at ? Date.parse(message.edited_at) : 0;
|
||||
if (incomingEdited > knownEdited || message.is_pinned !== known.is_pinned) {
|
||||
index.set(message.id, { ...known, ...message });
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if (!changed) return previous;
|
||||
return [...index.values()].sort((a, b) => a.id - b.id);
|
||||
});
|
||||
lastIdRef.current = Math.max(lastIdRef.current, MAX_ID(incoming));
|
||||
if (stickToBottomRef.current) queueMicrotask(scrollToBottom);
|
||||
@@ -105,17 +149,22 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
let active = true;
|
||||
setLoading(true);
|
||||
setMessages([]);
|
||||
setPins([]);
|
||||
lastIdRef.current = 0;
|
||||
editedSinceRef.current = null;
|
||||
void (async () => {
|
||||
try {
|
||||
const [memberResult, messageResult] = await Promise.all([
|
||||
const [memberResult, messageResult, pinResult] = await Promise.all([
|
||||
api.chatMembers(folderId),
|
||||
api.chatMessages(folderId, 0, 50),
|
||||
api.chatPins(folderId),
|
||||
]);
|
||||
if (!active) return;
|
||||
setMembers(memberResult.members);
|
||||
setMessages(messageResult.messages);
|
||||
setPins(pinResult.messages);
|
||||
lastIdRef.current = MAX_ID(messageResult.messages);
|
||||
editedSinceRef.current = messageResult.cursor;
|
||||
setError(null);
|
||||
} catch (caught) {
|
||||
if (!active) return;
|
||||
@@ -138,8 +187,15 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
const poll = async () => {
|
||||
if (document.hidden) return;
|
||||
try {
|
||||
const { messages: fresh } = await api.chatMessages(folderId, lastIdRef.current, 100);
|
||||
mergeMessages(fresh);
|
||||
const [result, pinResult] = await Promise.all([
|
||||
api.chatMessages(folderId, lastIdRef.current, 100, editedSinceRef.current),
|
||||
api.chatPins(folderId),
|
||||
]);
|
||||
// Le curseur avance avec la reponse : le serveur le calcule avant la
|
||||
// requete, une edition survenue entre les deux sera vue au tour suivant.
|
||||
editedSinceRef.current = result.cursor;
|
||||
mergeMessages(result.messages);
|
||||
setPins(pinResult.messages);
|
||||
} catch {
|
||||
/* le prochain cycle retentera */
|
||||
}
|
||||
@@ -194,7 +250,7 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
mergeMessages([message]);
|
||||
setDraft("");
|
||||
} catch (caught) {
|
||||
setError(caught instanceof ApiError ? caught.message : t("Envoi impossible."));
|
||||
setError(caught instanceof ApiError ? caught.message : t("Envoi du message impossible."));
|
||||
} finally {
|
||||
setSending(false);
|
||||
}
|
||||
@@ -214,6 +270,8 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
try {
|
||||
await api.chatDeleteMessage(folderId, message.id);
|
||||
setMessages((previous) => previous.filter((item) => item.id !== message.id));
|
||||
// Un message retire disparait aussi des epingles.
|
||||
setPins((previous) => previous.filter((item) => item.id !== message.id));
|
||||
} catch (caught) {
|
||||
setError(caught instanceof ApiError ? caught.message : t("Suppression impossible."));
|
||||
} finally {
|
||||
@@ -221,6 +279,58 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
}
|
||||
};
|
||||
|
||||
const startEdit = (message: ChatMessage) => {
|
||||
setEditingId(message.id);
|
||||
setEditDraft(message.body);
|
||||
};
|
||||
|
||||
const cancelEdit = () => {
|
||||
setEditingId(null);
|
||||
setEditDraft("");
|
||||
};
|
||||
|
||||
const saveEdit = async (message: ChatMessage) => {
|
||||
const body = editDraft.trim();
|
||||
if (!body || savingEdit) return;
|
||||
setSavingEdit(true);
|
||||
setError(null);
|
||||
try {
|
||||
const { message: updated } = await api.chatEditMessage(folderId, message.id, body);
|
||||
mergeMessages([updated]);
|
||||
setPins((previous) =>
|
||||
previous.map((item) => (item.id === updated.id ? { ...item, ...updated } : item)),
|
||||
);
|
||||
cancelEdit();
|
||||
} catch (caught) {
|
||||
setError(caught instanceof ApiError ? caught.message : t("Modification impossible."));
|
||||
} finally {
|
||||
setSavingEdit(false);
|
||||
}
|
||||
};
|
||||
|
||||
const togglePin = async (message: ChatMessage) => {
|
||||
if (pinningId !== null) return;
|
||||
setPinningId(message.id);
|
||||
setError(null);
|
||||
try {
|
||||
const { pinned } = await api.chatTogglePin(folderId, message.id);
|
||||
const updated = { ...message, is_pinned: pinned };
|
||||
mergeMessages([updated]);
|
||||
setPins((previous) =>
|
||||
pinned
|
||||
? [updated, ...previous.filter((item) => item.id !== updated.id)]
|
||||
: previous.filter((item) => item.id !== updated.id),
|
||||
);
|
||||
// Le bandeau s'ouvre quand on epingle : c'est le moment ou l'utilisateur
|
||||
// veut voir ce qu'il vient de mettre de cote.
|
||||
if (pinned) setPinsOpen(true);
|
||||
} catch (caught) {
|
||||
setError(caught instanceof ApiError ? caught.message : t("Épinglage impossible."));
|
||||
} finally {
|
||||
setPinningId(null);
|
||||
}
|
||||
};
|
||||
|
||||
const onComposerKeyDown = (event: ReactKeyboardEvent<HTMLTextAreaElement>) => {
|
||||
if (event.key === "Enter" && !event.shiftKey) {
|
||||
event.preventDefault();
|
||||
@@ -241,7 +351,9 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
GROUP_WINDOW_MS;
|
||||
const own = message.user_id === user?.id;
|
||||
const canDelete = own;
|
||||
return { message, newDay, continuation, own, canDelete };
|
||||
// Seul l'auteur peut reecrire son message, sans limite de temps.
|
||||
const canEdit = own;
|
||||
return { message, newDay, continuation, own, canDelete, canEdit };
|
||||
}),
|
||||
[messages, user?.id],
|
||||
);
|
||||
@@ -337,6 +449,49 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{pins.length > 0 ? (
|
||||
<div className="shrink-0 border-b border-border bg-surface px-4 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPinsOpen((value) => !value)}
|
||||
aria-expanded={pinsOpen}
|
||||
className="flex w-full items-center gap-2 text-left text-xs font-medium text-foreground"
|
||||
>
|
||||
<PinIcon className="h-3.5 w-3.5 shrink-0 text-accent" />
|
||||
<span>{t("Messages épinglés")}</span>
|
||||
<span className="text-subtle-foreground">{pins.length}</span>
|
||||
<ArrowRightIcon
|
||||
className={cn(
|
||||
"ml-auto h-3.5 w-3.5 shrink-0 text-subtle-foreground transition-transform",
|
||||
pinsOpen && "rotate-90",
|
||||
)}
|
||||
/>
|
||||
</button>
|
||||
{pinsOpen ? (
|
||||
<ul className="mt-2 flex max-h-48 flex-col gap-2 overflow-y-auto">
|
||||
{pins.map((pin) => (
|
||||
<li
|
||||
key={pin.id}
|
||||
className="rounded-md border border-border bg-background px-3 py-2"
|
||||
>
|
||||
<p className="flex items-center gap-2 text-xs">
|
||||
<span className="font-medium text-foreground">
|
||||
{fullName(pin, t("Compte supprimé"))}
|
||||
</span>
|
||||
<span className="text-[0.6875rem] text-subtle-foreground">
|
||||
{timeOf(pin.created_at)}
|
||||
</span>
|
||||
</p>
|
||||
<p className="mt-1 whitespace-pre-wrap break-words text-sm leading-relaxed text-foreground">
|
||||
{pin.body}
|
||||
</p>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
) : null}
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<div
|
||||
ref={scrollRef}
|
||||
onScroll={onScroll}
|
||||
@@ -356,7 +511,8 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
/>
|
||||
) : (
|
||||
<ol className="flex flex-col gap-1">
|
||||
{rendered.map(({ message, newDay, continuation, own, canDelete }) => (
|
||||
{rendered.map(
|
||||
({ message, newDay, continuation, own, canDelete, canEdit }) => (
|
||||
<li key={message.id}>
|
||||
{newDay ? (
|
||||
<div className="my-3 flex items-center gap-3" role="separator">
|
||||
@@ -389,7 +545,10 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
{continuation ? null : (
|
||||
<p className="flex items-center gap-2 text-xs">
|
||||
<span
|
||||
className={cn("font-medium", own ? "text-accent" : "text-foreground")}
|
||||
className={cn(
|
||||
"font-medium",
|
||||
own ? "text-accent" : "text-foreground",
|
||||
)}
|
||||
>
|
||||
{fullName(message, t("Compte supprimé"))}
|
||||
</span>
|
||||
@@ -398,12 +557,88 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
</span>
|
||||
</p>
|
||||
)}
|
||||
<p className="whitespace-pre-wrap break-words text-sm leading-relaxed text-foreground">
|
||||
{message.body}
|
||||
</p>
|
||||
{editingId === message.id ? (
|
||||
<div className="mt-1 flex flex-col gap-2">
|
||||
<textarea
|
||||
value={editDraft}
|
||||
autoFocus
|
||||
onChange={(event) => setEditDraft(event.target.value.slice(0, MAX_LENGTH))}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key === "Enter" && !event.shiftKey) {
|
||||
event.preventDefault();
|
||||
void saveEdit(message);
|
||||
}
|
||||
if (event.key === "Escape") {
|
||||
event.preventDefault();
|
||||
cancelEdit();
|
||||
}
|
||||
}}
|
||||
rows={2}
|
||||
maxLength={MAX_LENGTH}
|
||||
aria-label={t("Modifier le message")}
|
||||
className="max-h-40 min-h-[2.5rem] resize-y rounded-sm border border-border-control bg-surface px-3 py-2 text-sm text-foreground focus-visible:border-border-strong focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none"
|
||||
/>
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
isLoading={savingEdit}
|
||||
disabled={editDraft.trim().length === 0}
|
||||
onClick={() => void saveEdit(message)}
|
||||
>
|
||||
{t("Enregistrer")}
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
onClick={cancelEdit}
|
||||
>
|
||||
{t("Annuler")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<p className="whitespace-pre-wrap break-words text-sm leading-relaxed text-foreground">
|
||||
{message.body}
|
||||
</p>
|
||||
{message.edited_at ? (
|
||||
<p
|
||||
className="mt-0.5 text-[0.6875rem] text-subtle-foreground"
|
||||
title={formatDateTimeSeconds(message.edited_at)}
|
||||
>
|
||||
{t("(modifié)")}
|
||||
</p>
|
||||
) : null}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{canDelete ? (
|
||||
<span className="opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100">
|
||||
{/* L'epinglage est ouvert a tous les participants ; l'edition
|
||||
et la suppression restent reservees a l'auteur. */}
|
||||
<span className="flex shrink-0 items-center opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100">
|
||||
<IconAction
|
||||
label={
|
||||
message.is_pinned
|
||||
? t("Désépingler le message")
|
||||
: t("Épingler le message")
|
||||
}
|
||||
isLoading={pinningId === message.id}
|
||||
icon={
|
||||
<PinIcon
|
||||
className={cn("h-3.5 w-3.5", message.is_pinned && "text-accent")}
|
||||
/>
|
||||
}
|
||||
onClick={() => void togglePin(message)}
|
||||
/>
|
||||
{canEdit ? (
|
||||
<IconAction
|
||||
label={t("Modifier le message")}
|
||||
icon={<PenIcon className="h-3.5 w-3.5" />}
|
||||
onClick={() => startEdit(message)}
|
||||
/>
|
||||
) : null}
|
||||
{canDelete ? (
|
||||
<IconAction
|
||||
label={t("Supprimer le message")}
|
||||
tone="danger"
|
||||
@@ -411,11 +646,12 @@ export const FolderChat = ({ folder, onClose }: { folder: ChatFolder; onClose: (
|
||||
icon={<TrashIcon className="h-3.5 w-3.5" />}
|
||||
onClick={() => void remove(message)}
|
||||
/>
|
||||
</span>
|
||||
) : null}
|
||||
) : null}
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
),
|
||||
)}
|
||||
</ol>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -185,6 +185,14 @@ export const PenIcon = (props: IconProps) => (
|
||||
</svg>
|
||||
);
|
||||
|
||||
/** Epingle : tete du pushpin en haut, pointe en bas. */
|
||||
export const PinIcon = (props: IconProps) => (
|
||||
<svg {...base(props)}>
|
||||
<path d="M9 3.5h6l-.8 5.2 3.3 3.1H6.5l3.3-3.1Z" />
|
||||
<path d="M12 11.8V20.5" />
|
||||
</svg>
|
||||
);
|
||||
|
||||
export const MoveIcon = (props: IconProps) => (
|
||||
<svg {...base(props)}>
|
||||
<path d="M12 4v16M4 12h16" />
|
||||
|
||||
+34
-3
@@ -172,6 +172,8 @@ export interface ChatMessage {
|
||||
last_name: string | null;
|
||||
body: string;
|
||||
created_at: string;
|
||||
edited_at: string | null;
|
||||
is_pinned: boolean;
|
||||
has_avatar: boolean;
|
||||
avatar_updated_at: string | null;
|
||||
}
|
||||
@@ -234,6 +236,12 @@ const post = <T>(path: string, payload?: unknown): Promise<T> =>
|
||||
const patch = <T>(path: string, payload: unknown): Promise<T> =>
|
||||
request<T>(path, { method: "PATCH", body: JSON.stringify(payload) });
|
||||
|
||||
const put = <T>(path: string, payload?: unknown): Promise<T> =>
|
||||
request<T>(path, {
|
||||
method: "PUT",
|
||||
...(payload === undefined ? {} : { body: JSON.stringify(payload) }),
|
||||
});
|
||||
|
||||
const del = <T>(path: string): Promise<T> => request<T>(path, { method: "DELETE" });
|
||||
|
||||
const query = (params: Record<string, string | number | null | undefined>): string => {
|
||||
@@ -362,12 +370,22 @@ export const api = {
|
||||
// --- Chat d'un dossier ------------------------------------------------
|
||||
chatMembers: (folderId: string) =>
|
||||
request<{ members: ChatMember[] }>(`/folders/${encodeURIComponent(folderId)}/chat/members`),
|
||||
chatMessages: (folderId: string, after = 0, limit = 50) =>
|
||||
request<{ messages: ChatMessage[] }>(
|
||||
`/folders/${encodeURIComponent(folderId)}/chat/messages${query({ after, limit })}`,
|
||||
chatMessages: (folderId: string, after = 0, limit = 50, editedAfter?: string | null) =>
|
||||
request<{ messages: ChatMessage[]; cursor: string }>(
|
||||
`/folders/${encodeURIComponent(folderId)}/chat/messages${query({ after, limit, editedAfter })}`,
|
||||
),
|
||||
chatSend: (folderId: string, body: string) =>
|
||||
post<{ message: ChatMessage }>(`/folders/${encodeURIComponent(folderId)}/chat/messages`, { body }),
|
||||
chatEditMessage: (folderId: string, id: number, body: string) =>
|
||||
patch<{ message: ChatMessage }>(`/folders/${encodeURIComponent(folderId)}/chat/messages/${id}`, {
|
||||
body,
|
||||
}),
|
||||
chatTogglePin: (folderId: string, id: number) =>
|
||||
put<{ pinned: boolean }>(
|
||||
`/folders/${encodeURIComponent(folderId)}/chat/messages/${id}/pin`,
|
||||
),
|
||||
chatPins: (folderId: string) =>
|
||||
request<{ messages: ChatMessage[] }>(`/folders/${encodeURIComponent(folderId)}/chat/pins`),
|
||||
chatDeleteMessage: (folderId: string, id: number) =>
|
||||
del<{ ok: boolean }>(`/folders/${encodeURIComponent(folderId)}/chat/messages/${id}`),
|
||||
chatUnread: () => request<{ unread: Record<string, number> }>("/chat/unread"),
|
||||
@@ -434,3 +452,16 @@ export const formatBytes = (bytes: number): string => {
|
||||
|
||||
export const formatDate = (value: string | null): string =>
|
||||
value ? new Date(value).toLocaleString(getLocale(), { dateStyle: "medium", timeStyle: "short" }) : "—";
|
||||
|
||||
/** Date et heure completes, avec les secondes : utilise au survol d'un mention. */
|
||||
export const formatDateTimeSeconds = (value: string | null): string =>
|
||||
value
|
||||
? new Date(value).toLocaleString(getLocale(), {
|
||||
day: "2-digit",
|
||||
month: "short",
|
||||
year: "numeric",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
})
|
||||
: "—";
|
||||
|
||||
@@ -157,6 +157,10 @@ const en: Record<string, string> = {
|
||||
"{level} · jusqu'au {date}": "{level} · until {date}",
|
||||
"Aucun autre membre à ajouter.": "No other member to add.",
|
||||
|
||||
"Modification impossible.": "Unable to edit.",
|
||||
"Épinglage impossible.": "Unable to pin.",
|
||||
"Envoi du message impossible.": "Unable to send the message.",
|
||||
|
||||
// --- Discussion de dossier --------------------------------------------
|
||||
"Compte supprimé": "Deleted account",
|
||||
"Supprimer le message": "Delete message",
|
||||
@@ -178,6 +182,16 @@ const en: Record<string, string> = {
|
||||
"Écrire un message… (Entrée pour envoyer, Maj+Entrée pour retour à la ligne)":
|
||||
"Write a message… (Enter to send, Shift+Enter for a new line)",
|
||||
"Votre message": "Your message",
|
||||
"(modifié)": "(edited)",
|
||||
"Modifier le message": "Edit message",
|
||||
"Épingler le message": "Pin message",
|
||||
"Désépingler le message": "Unpin message",
|
||||
"Messages épinglés": "Pinned messages",
|
||||
|
||||
// --- Explorateur / drag & drop -----------------------------------------
|
||||
"Déposez vos fichiers ici": "Drop your files here",
|
||||
"{count} fichier(s) déposé(s) dans {name}.": "{count} file(s) uploaded to {name}.",
|
||||
"{count} fichier(s) déposé(s) dans ce dossier.": "{count} file(s) uploaded to this folder.",
|
||||
|
||||
// --- Visionneuse -------------------------------------------------------
|
||||
"Lecture impossible.": "Unable to read.",
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user