This commit is contained in:
2025-10-17 18:03:00 +02:00
parent f9e798f3b3
commit fc3d6cb826
9 changed files with 56 additions and 18 deletions
+13 -4
View File
@@ -1,7 +1,9 @@
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
import { resolveDocumentAssetUrl } from '../asset_manager';
import { getTagColorStyle } from '../utils/colors';
import { DownloadIcon, FolderIcon, EditIcon, ViewListIcon, ViewGridIcon } from '../ui/icons';
import { DownloadIcon, EditIcon, ViewListIcon, ViewGridIcon } from '../ui/icons';
const FOLDER_ICON_SRC = '/folder.svg';
const TAG_MIME_TYPES = ['application/x-papercrate-tag', 'text/papercrate-tag'];
@@ -368,13 +370,16 @@ const DocumentsTable = ({
}}
>
<div className="folder-card__icon">
<FolderIcon className="folder-card__icon-svg" size={128} />
<img
src={FOLDER_ICON_SRC}
alt="Folder"
className="folder-card__icon-svg"
/>
</div>
<div className="folder-card__meta">
<div className="folder-card__name" title={folder.name}>
{folder.name}
</div>
<div className="folder-card__badge">Folder</div>
</div>
</div>
);
@@ -545,7 +550,11 @@ const DocumentsTable = ({
>
<td className="thumb-cell">
<div className="thumb-icon">
<FolderIcon className="icon-inline" size={18} />
<img
src={FOLDER_ICON_SRC}
alt="Folder"
className="thumb-icon__image"
/>
</div>
</td>
<td className="doc-list__name">
+12 -4
View File
@@ -1295,13 +1295,18 @@ const AppLayout = () => {
const ensureFolderData = useCallback(
async (folderId, { force = false } = {}) => {
async (folderId, { force = false, includeDocuments = true } = {}) => {
if (!force && folderContents.has(folderId)) {
return folderContents.get(folderId);
}
const path = folderId === 'root' ? 'root' : folderId;
const { data } = await api.get(`/folders/${path}/contents`);
const params = includeDocuments
? undefined
: { include_documents: false };
const { data } = await api.get(`/folders/${path}/contents`, {
params,
});
const hydrated = assetManager.hydrateFolderContents(data);
setFolderNodes((prev) => {
@@ -1363,7 +1368,10 @@ const AppLayout = () => {
visited.add(nextId);
try {
const contents = await ensureFolderData(nextId, { force: false });
const contents = await ensureFolderData(nextId, {
force: false,
includeDocuments: false,
});
const subfolders = Array.isArray(contents?.subfolders) ? contents.subfolders : [];
subfolders.forEach((entry) => {
if (entry?.id && !visited.has(entry.id)) {
@@ -4090,7 +4098,7 @@ const AppLayout = () => {
const node = folderNodes.get(folderId);
if (node && !node.loaded) {
try {
await ensureFolderData(folderId);
await ensureFolderData(folderId, { includeDocuments: false });
} catch (error) {
notifyApiError(error, 'Failed to load folder.');
}
+4 -2
View File
@@ -1,5 +1,7 @@
import React, { useCallback, useMemo } from 'react';
import { ChevronIcon, FolderIcon, TrashIcon, EditIcon } from '../ui/icons';
import { ChevronIcon, TrashIcon, EditIcon } from '../ui/icons';
const FOLDER_ICON_SRC = '/folder.svg';
import { getTagColorStyle } from '../utils/colors';
const FolderNode = ({
@@ -66,7 +68,7 @@ const FolderNode = ({
</span>
)}
<span className="name">
<FolderIcon className="folder-icon" />
<img src={FOLDER_ICON_SRC} alt="Folder" className="folder-icon-image" />
{node.name}
</span>
{node.id !== 'root' && (
+5 -8
View File
@@ -858,11 +858,10 @@ button.icon-button.ghost:hover:not([disabled]) {
padding-right: 3rem;
}
.folder-row span.name .folder-icon {
.folder-row span.name .folder-icon-image {
width: 1rem;
height: 1rem;
flex-shrink: 0;
color: var(--accent);
}
.folder-row:hover {
@@ -1242,12 +1241,12 @@ button.icon-button.ghost:hover:not([disabled]) {
display: inline-flex;
align-items: center;
justify-content: center;
color: var(--accent);
}
.thumb-icon svg {
.thumb-icon__image {
width: 32px;
height: 32px;
display: block;
}
.documents-panel th.actions-column,
@@ -1380,12 +1379,12 @@ button.icon-button.ghost:hover:not([disabled]) {
justify-content: center;
width: 128px;
height: 128px;
color: var(--accent);
}
.folder-card__icon-svg {
width: 100%;
height: 100%;
object-fit: contain;
}
.folder-card__meta {
@@ -1396,12 +1395,10 @@ button.icon-button.ghost:hover:not([disabled]) {
}
.folder-card__name {
font-weight: 600;
font-size: 0.95rem;
color: var(--fg);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
white-space: break-word;
}