{
- if (event.target === event.currentTarget) {
- onClose();
- }
- }}
+ onClick={(event) => {
+ if (event.target === event.currentTarget) {
+ onClose();
+ }
+ }}
>
);
};
diff --git a/frontend/src/preview/DocumentViewerLayout.tsx b/frontend/src/preview/DocumentViewerLayout.tsx
index b23f133..73760bd 100644
--- a/frontend/src/preview/DocumentViewerLayout.tsx
+++ b/frontend/src/preview/DocumentViewerLayout.tsx
@@ -5,7 +5,7 @@ import { DownloadIcon } from '../ui/icons';
import PdfViewer from './PdfViewer';
interface DocumentLike {
- id?: string | number;
+ id?: string;
title?: string;
mime_type?: string;
filename?: string;
@@ -40,7 +40,7 @@ interface DocumentViewerLayoutProps {
summaryProps?: Record;
- onCorrespondentClick?: (id: string | number) => void;
+ activeCorrespondentIdSet?: Set;
+ onCorrespondentClick?: (id: string) => void;
}
const CorrespondentLinks: React.FC = ({
@@ -23,7 +23,7 @@ const CorrespondentLinks: React.FC = ({
return null;
}
- const activeSet = activeCorrespondentIdSet || new Set();
+ const activeSet = activeCorrespondentIdSet || new Set();
const handleClick = (event: React.MouseEvent | React.KeyboardEvent, correspondent: CorrespondentLinkEntry) => {
if (!onCorrespondentClick || correspondent.id == null) {
return;
diff --git a/frontend/src/documents/DocumentInfoPanel.tsx b/frontend/src/documents/DocumentInfoPanel.tsx
index 7acfa1b..21e6257 100644
--- a/frontend/src/documents/DocumentInfoPanel.tsx
+++ b/frontend/src/documents/DocumentInfoPanel.tsx
@@ -36,7 +36,7 @@ export interface DocumentInfoPanelProps {
activeTab?: string;
onTabChange?: (tabId: string) => void;
defaultTabId?: string;
- resetKey?: string | number | null;
+ resetKey?: string | null;
classNamePrefix?: string;
hideTabNavWhenSingle?: boolean;
summaryPlacement?: 'inline' | 'tabs';
@@ -204,11 +204,11 @@ const DocumentInfoPanel: React.FC = ({
const summaryNode = summaryInline
? (
- <>
- {renderSummarySection()}
- {renderDetailsSection()}
-
- )
+ <>
+ {renderSummarySection()}
+ {renderDetailsSection()}
+
+ )
: null;
const visibleTabs = useMemo(() => {
diff --git a/frontend/src/documents/DocumentSummarySection.tsx b/frontend/src/documents/DocumentSummarySection.tsx
index 03b1b0c..8605740 100644
--- a/frontend/src/documents/DocumentSummarySection.tsx
+++ b/frontend/src/documents/DocumentSummarySection.tsx
@@ -14,11 +14,10 @@ import {
import { describeDocumentSummary, type DocumentSummaryRow } from './documentSummary';
import { useFolderManager } from '../folders/FolderManagerContext';
-
-type Identifier = string | number;
+import type { FolderId, Identifier, TagId } from '../types/identifiers';
interface TagEntry {
- id?: Identifier;
+ id?: TagId;
label?: string;
color?: string | null;
}
@@ -33,7 +32,7 @@ interface DocumentLike {
id?: Identifier;
title?: string;
issued_at?: string | null;
- folder_id?: string | null;
+ folder_id?: FolderId | null;
current_version?: { version_number?: number } | null;
tags?: TagEntry[];
correspondents?: CorrespondentEntry[];
@@ -64,17 +63,17 @@ interface CorrespondentSectionProps {
export interface DocumentSummarySectionProps {
document?: DocumentLike | null;
- tagLookupById?: Map;
+ tagLookupById?: Map;
tagOptions?: SelectionAssignmentMenuItem[];
onTagAdd?: (doc: DocumentLike, value: string, context?: { option?: unknown }) => void;
- onTagRemove?: (docId: Identifier | undefined, tagId: Identifier | undefined) => void;
+ onTagRemove?: (docId: Identifier | undefined, tagId: TagId | undefined) => void;
correspondents?: CorrespondentEntry[];
correspondentOptions?: SelectionAssignmentMenuItem[];
onCorrespondentAdd?: (payload: { document: DocumentLike; name: string; option?: unknown }) => void;
onCorrespondentRemove?: (payload: { documentId: Identifier | undefined; correspondentId: Identifier | undefined }) => void;
onUpdateTitle?: (docId: Identifier | undefined, title: string) => Promise | boolean;
onUpdateIssued?: (docId: Identifier | undefined, timestamp: number | null) => Promise | boolean;
- onFolderNavigate?: (folderId: string | null) => void;
+ onFolderNavigate?: (folderId: FolderId | null) => void;
layout?: 'default' | 'compact';
}
diff --git a/frontend/src/documents/DocumentThumbnailImage.tsx b/frontend/src/documents/DocumentThumbnailImage.tsx
index 70548c9..8b9a1ae 100644
--- a/frontend/src/documents/DocumentThumbnailImage.tsx
+++ b/frontend/src/documents/DocumentThumbnailImage.tsx
@@ -17,7 +17,7 @@ const DEFAULT_THUMBNAIL_SIZE = 48;
// Detect when an element becomes visible within a scroll container so we can delay loading.
const useLazyVisibility = (
rootRef: MutableRefObject | null,
- resetKey?: string | number | null,
+ resetKey?: string | null,
) => {
const targetRef = useRef(null);
const [isVisible, setIsVisible] = useState(false);
diff --git a/frontend/src/documents/DocumentsGrid.tsx b/frontend/src/documents/DocumentsGrid.tsx
index f9f0c99..c942d91 100644
--- a/frontend/src/documents/DocumentsGrid.tsx
+++ b/frontend/src/documents/DocumentsGrid.tsx
@@ -8,8 +8,7 @@ import { resolveCorrespondents } from './correspondents';
import { writeTagTransferData } from './tagTransfer';
import useInlineRename from './useInlineRename';
import { useWorkspaceSelectionContext } from '../app/WorkspaceSelectionContext';
-
-export type Identifier = string | number;
+import type { Identifier } from '../types/identifiers';
export interface FolderLike {
id?: Identifier | 'root';
@@ -153,347 +152,347 @@ const DocumentsGrid: React.FC = ({
const totalSelectionCount = documentSelectionCount + folderSelectionCount;
return (
-
- {
- if (event.target === event.currentTarget) {
+
{
+ if (event.target === event.currentTarget) {
clearSelection();
- }
- }}
- >
- {entries.map((entry) => {
- if (entry.type === 'folder') {
- const folder = entry.folder;
- if (!folder) {
- return null;
}
- const canDragFolder = folder.id !== 'root';
- const isDraggingFolder = draggedFolderId === folder.id;
- const isSelectedFolder = selectedFolderIdsSet?.has(folder.id);
- const classes = ['document-card', 'folder-card'];
- if (isDraggingFolder) classes.push('is-dragging');
- if (isSelectedFolder) classes.push('selected');
- const canRenameFolder = Boolean(onFolderRename) && folder.id !== 'root';
- const isFolderEditing = editingFolderId === folder.id;
- const folderDraftValue = isFolderEditing ? folderDraft : folder.name;
- const trimmedFolderDraft = isFolderEditing ? folderDraft.trim() : '';
- const isFolderSaving = savingFolderId === folder.id;
- const canSubmitFolder =
- isFolderEditing && trimmedFolderDraft.length > 0 && trimmedFolderDraft !== folder.name;
- const allowInlineFolderEdit = canRenameFolder && isSelectedFolder && totalSelectionCount === 1;
+ }}
+ >
+ {entries.map((entry) => {
+ if (entry.type === 'folder') {
+ const folder = entry.folder;
+ if (!folder) {
+ return null;
+ }
+ const canDragFolder = folder.id !== 'root';
+ const isDraggingFolder = draggedFolderId === folder.id;
+ const isSelectedFolder = selectedFolderIdsSet?.has(folder.id);
+ const classes = ['document-card', 'folder-card'];
+ if (isDraggingFolder) classes.push('is-dragging');
+ if (isSelectedFolder) classes.push('selected');
+ const canRenameFolder = Boolean(onFolderRename) && folder.id !== 'root';
+ const isFolderEditing = editingFolderId === folder.id;
+ const folderDraftValue = isFolderEditing ? folderDraft : folder.name;
+ const trimmedFolderDraft = isFolderEditing ? folderDraft.trim() : '';
+ const isFolderSaving = savingFolderId === folder.id;
+ const canSubmitFolder =
+ isFolderEditing && trimmedFolderDraft.length > 0 && trimmedFolderDraft !== folder.name;
+ const allowInlineFolderEdit = canRenameFolder && isSelectedFolder && totalSelectionCount === 1;
- return (
- = ({
const totalSelectionCount = documentSelectionCount + folderSelectionCount;
return (
-
- {
- clearSelection();
- }}
- >
-
+ {
+ clearSelection();
+ }}
+ >
+
+ {(doc.tags || []).length > 0 && (
+ {issuedLabel}
+ {addedLabel}
+
+ );
+ })}
+
+
);
};
diff --git a/frontend/src/documents/DocumentsManager.ts b/frontend/src/documents/DocumentsManager.ts
index 357ad5f..d39711c 100644
--- a/frontend/src/documents/DocumentsManager.ts
+++ b/frontend/src/documents/DocumentsManager.ts
@@ -1,6 +1,5 @@
import { shallowEqual } from 'react-redux';
-
-type DocumentId = string | number;
+import type { DocumentId } from '../types/identifiers';
export type ManagedDocument = { id?: DocumentId | null } & Record;
diff --git a/frontend/src/documents/SelectionAssignmentMenu.tsx b/frontend/src/documents/SelectionAssignmentMenu.tsx
index 3046c5f..bee9893 100644
--- a/frontend/src/documents/SelectionAssignmentMenu.tsx
+++ b/frontend/src/documents/SelectionAssignmentMenu.tsx
@@ -5,18 +5,18 @@ import { CheckIcon, CircleDashedCheckIcon, PlusIcon } from '../ui/icons';
export type AssignmentState = 'all' | 'partial' | 'none';
export interface SelectionAssignmentMenuItem {
- id?: string | number;
+ id?: string;
label?: string;
state?: AssignmentState;
count?: number | null;
total?: number | null;
color?: string | null;
- value?: string | number;
+ value?: string;
payload?: unknown;
}
export interface NormalizedSelectionAssignmentItem {
- id: string | number;
+ id: string;
label: string;
state: AssignmentState;
count: number | null;
@@ -105,7 +105,7 @@ const SelectionAssignmentMenu: React.FC = ({
const inputRef = useRef(null);
const [query, setQuery] = useState('');
const [pending, setPending] = useState(false);
- const [sortSnapshot, setSortSnapshot] = useState | null>(null);
+ const [sortSnapshot, setSortSnapshot] = useState | null>(null);
const {
isOpen,
@@ -175,10 +175,10 @@ const SelectionAssignmentMenu: React.FC = ({
const orderedItems = useMemo(() => {
if (freezeSortOnOpen && sortSnapshot && sortByState) {
- const itemMap = new Map(
+ const itemMap = new Map(
sortedByStateItems.map((item) => [item.id, item]),
);
- const seen = new Set();
+ const seen = new Set();
const fromSnapshot = sortSnapshot
.map((id) => {
const entry = itemMap.get(id);
diff --git a/frontend/src/documents/SelectionFloatingActions.tsx b/frontend/src/documents/SelectionFloatingActions.tsx
index b4374e8..321035a 100644
--- a/frontend/src/documents/SelectionFloatingActions.tsx
+++ b/frontend/src/documents/SelectionFloatingActions.tsx
@@ -12,10 +12,10 @@ import SelectionAssignmentMenu, { SelectionAssignmentMenuItem } from './Selectio
import SelectionSummary from './SelectionSummary';
import { useAppState } from '../app/appState';
import { useWorkspaceSelectionContext } from '../app/WorkspaceSelectionContext';
+import type { DocumentId } from '../types/identifiers';
const ROOT_FOLDER_LABEL = 'Documents';
-type DocumentId = string | number;
type NullableDocumentId = DocumentId | null;
type SelectedIdList = NullableDocumentId[] | null;
@@ -145,7 +145,7 @@ const buildTagAssignments = (
return [];
}
- const map = new Map = ({
const value = isRecord(candidate)
? (candidate?.id ?? candidate?.value ?? null)
: candidate;
- if (!value && value !== 0) {
+ if (!value) {
return;
}
await onMoveDocumentsToFolder(documentIdList, value as DocumentId);
diff --git a/frontend/src/documents/context/DocumentsFilterContext.tsx b/frontend/src/documents/context/DocumentsFilterContext.tsx
index 618b683..706865e 100644
--- a/frontend/src/documents/context/DocumentsFilterContext.tsx
+++ b/frontend/src/documents/context/DocumentsFilterContext.tsx
@@ -1,10 +1,9 @@
import React, { createContext, useContext } from 'react';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
export interface DocumentsFilterValue {
query: string;
- searchResultIds: Array | null;
+ searchResultIds: Array | null;
searchLoading: boolean;
includeDescendants: boolean;
activeTagIds: Identifier[];
diff --git a/frontend/src/documents/correspondents.ts b/frontend/src/documents/correspondents.ts
index 96f9fbc..8c5c0b5 100644
--- a/frontend/src/documents/correspondents.ts
+++ b/frontend/src/documents/correspondents.ts
@@ -1,5 +1,5 @@
export interface CorrespondentReference {
- id?: string | number | null;
+ id?: string | null;
name?: string | null;
key?: string;
}
@@ -9,9 +9,9 @@ export interface DocumentLike {
}
export interface ResolvedCorrespondent {
- id?: string | number | null;
+ id?: string | null;
name: string;
- key: string | number;
+ key: string;
}
export const resolveCorrespondents = (doc?: DocumentLike | null): ResolvedCorrespondent[] => {
@@ -19,7 +19,7 @@ export const resolveCorrespondents = (doc?: DocumentLike | null): ResolvedCorres
return [];
}
- const seen = new Set();
+ const seen = new Set();
const results: ResolvedCorrespondent[] = [];
doc.correspondents.forEach((entry = {}, index) => {
diff --git a/frontend/src/documents/hooks/useBulkDocumentActions.ts b/frontend/src/documents/hooks/useBulkDocumentActions.ts
index 88ae110..374dbe6 100644
--- a/frontend/src/documents/hooks/useBulkDocumentActions.ts
+++ b/frontend/src/documents/hooks/useBulkDocumentActions.ts
@@ -1,7 +1,6 @@
import { useCallback } from 'react';
import { assignCorrespondentsBulk } from '../../lib/apiClient';
-
-export type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
type BulkAssignmentResponse = {
assigned?: number;
@@ -62,35 +61,35 @@ const useBulkDocumentActions = ({
if (!target?.id) {
setStatusMessage('Unable to resolve correspondent.', 'error');
return;
- }
+ }
- const response: BulkAssignmentResponse = await assignCorrespondentsBulk({
- document_ids: targets,
- assignments: [
- {
- correspondent_id: target.id,
- },
- ],
- action: 'add',
- });
-
- const { assigned = 0, removed = 0 } = response;
-
- if (updateDocumentCaches && target.id) {
- targets.forEach((docId) => {
- updateDocumentCaches(docId, (doc) => {
- if (!doc) return doc;
- const current = Array.isArray((doc as any).correspondents) ? (doc as any).correspondents : [];
- if (current.some((entry: any) => entry?.id === target.id)) {
- return doc;
- }
- return {
- ...(doc as any),
- correspondents: [...current, { id: target.id, name: (target as any).name }],
- };
- });
+ const response: BulkAssignmentResponse = await assignCorrespondentsBulk({
+ document_ids: targets,
+ assignments: [
+ {
+ correspondent_id: target.id,
+ },
+ ],
+ action: 'add',
});
- }
+
+ const { assigned = 0, removed = 0 } = response;
+
+ if (updateDocumentCaches && target.id) {
+ targets.forEach((docId) => {
+ updateDocumentCaches(docId, (doc) => {
+ if (!doc) return doc;
+ const current = Array.isArray((doc as any).correspondents) ? (doc as any).correspondents : [];
+ if (current.some((entry: any) => entry?.id === target.id)) {
+ return doc;
+ }
+ return {
+ ...(doc as any),
+ correspondents: [...current, { id: target.id, name: (target as any).name }],
+ };
+ });
+ });
+ }
const assignedSuffix = assigned === 1 ? '' : 's';
if (removed > 0) {
const removedSuffix = removed === 1 ? '' : 's';
@@ -105,18 +104,18 @@ const useBulkDocumentActions = ({
);
}
- if (input) {
- input.value = '';
- }
- },
- [
- correspondentLookupByName,
- handleCorrespondentCreate,
- resolveTargetDocumentIds,
- setStatusMessage,
- updateDocumentCaches,
- ],
-);
+ if (input) {
+ input.value = '';
+ }
+ },
+ [
+ correspondentLookupByName,
+ handleCorrespondentCreate,
+ resolveTargetDocumentIds,
+ setStatusMessage,
+ updateDocumentCaches,
+ ],
+ );
const handleBulkCorrespondentRemove = useCallback(
async ({ assignments = [], documentIds }: { assignments?: CorrespondentAssignment[]; documentIds?: Identifier[] }) => {
@@ -132,33 +131,33 @@ const useBulkDocumentActions = ({
return;
}
- const normalizedAssignments = assignments.map((entry) => ({
- correspondent_id: entry.correspondent_id,
- }));
+ const normalizedAssignments = assignments.map((entry) => ({
+ correspondent_id: entry.correspondent_id,
+ }));
- const response: BulkAssignmentResponse = await assignCorrespondentsBulk({
- document_ids: targets,
- assignments: normalizedAssignments,
- action: 'remove',
- });
-
- const { assigned = 0, removed = 0 } = response;
- if (updateDocumentCaches) {
- targets.forEach((docId) => {
- updateDocumentCaches(docId, (doc) => {
- if (!doc || !Array.isArray((doc as any).correspondents)) {
- return doc;
- }
- const filtered = (doc as any).correspondents.filter(
- (entry: any) =>
- entry && !normalizedAssignments.some((assignment) => assignment.correspondent_id === entry.id),
- );
- return filtered.length === (doc as any).correspondents.length
- ? doc
- : { ...(doc as any), correspondents: filtered };
- });
+ const response: BulkAssignmentResponse = await assignCorrespondentsBulk({
+ document_ids: targets,
+ assignments: normalizedAssignments,
+ action: 'remove',
});
- }
+
+ const { assigned = 0, removed = 0 } = response;
+ if (updateDocumentCaches) {
+ targets.forEach((docId) => {
+ updateDocumentCaches(docId, (doc) => {
+ if (!doc || !Array.isArray((doc as any).correspondents)) {
+ return doc;
+ }
+ const filtered = (doc as any).correspondents.filter(
+ (entry: any) =>
+ entry && !normalizedAssignments.some((assignment) => assignment.correspondent_id === entry.id),
+ );
+ return filtered.length === (doc as any).correspondents.length
+ ? doc
+ : { ...(doc as any), correspondents: filtered };
+ });
+ });
+ }
if (removed > 0) {
const removedSuffix = removed === 1 ? '' : 's';
@@ -169,12 +168,12 @@ const useBulkDocumentActions = ({
} else if (assigned > 0) {
const assignedSuffix = assigned === 1 ? '' : 's';
setStatusMessage(`Correspondent updated ${assigned} link${assignedSuffix}.`, 'info');
- } else {
- setStatusMessage('No correspondents changed.', 'info');
- }
- },
- [resolveTargetDocumentIds, setStatusMessage, updateDocumentCaches],
-);
+ } else {
+ setStatusMessage('No correspondents changed.', 'info');
+ }
+ },
+ [resolveTargetDocumentIds, setStatusMessage, updateDocumentCaches],
+ );
const handleDeleteSelection = useCallback(async () => {
const docIds = Array.isArray(selectedDocumentIds) ? selectedDocumentIds : [];
diff --git a/frontend/src/documents/hooks/useDocumentsPanelProps.ts b/frontend/src/documents/hooks/useDocumentsPanelProps.ts
index 2112984..861526f 100644
--- a/frontend/src/documents/hooks/useDocumentsPanelProps.ts
+++ b/frontend/src/documents/hooks/useDocumentsPanelProps.ts
@@ -1,7 +1,6 @@
import { useMemo } from 'react';
import type { WorkspaceSelectionValue } from '../../app/WorkspaceSelectionContext';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
interface DocumentLinkLike {
url?: string | null;
@@ -96,8 +95,8 @@ const useDocumentsPanelProps = (props: UseDocumentsPanelPropsArgs) => {
searchLoading,
tagLookupById,
activeCorrespondentFilters,
- ensureAssetUrl,
- getDocumentAsset,
+ ensureAssetUrl,
+ getDocumentAsset,
handleDocumentTagDrop,
documentsViewMode,
documentsSortField,
diff --git a/frontend/src/documents/hooks/useDocumentsSelection.ts b/frontend/src/documents/hooks/useDocumentsSelection.ts
index 46c874d..6c7cfa1 100644
--- a/frontend/src/documents/hooks/useDocumentsSelection.ts
+++ b/frontend/src/documents/hooks/useDocumentsSelection.ts
@@ -1,20 +1,21 @@
import { useCallback, useEffect, useMemo, useRef } from 'react';
import { createDocumentEntryKey, createFolderEntryKey, isFolderEntry } from '../../app/entryKey';
+import type { DocumentId, FolderId } from '../../types/identifiers';
interface FolderEntry {
- id: string | number;
+ id: FolderId;
[key: string]: unknown;
}
interface DocumentEntry {
- id: string | number;
+ id: DocumentId;
[key: string]: unknown;
}
interface NavigableRow {
key: string;
type: 'folder' | 'document';
- id: string | number;
+ id: FolderId | DocumentId;
}
interface UseDocumentsSelectionOptions {
@@ -25,19 +26,19 @@ interface UseDocumentsSelectionOptions {
visibleRowKeySet: Set;
selectedEntries: string[];
selectionAnchorRef: { current: string | null };
- promoteSelectionOrderRaw: (id: string | number) => void;
- setFocusedDocumentId: (id: string | number | null) => void;
- setActivePreviewId: (id: string | number | null) => void;
+ promoteSelectionOrderRaw: (id: DocumentId) => void;
+ setFocusedDocumentId: (id: DocumentId | null) => void;
+ setActivePreviewId: (id: DocumentId | null) => void;
clearSelection: () => void;
- focusedDocumentId: string | number | null;
+ focusedDocumentId: DocumentId | null;
setFocusedRowKey: (value: string | null | ((current: string | null) => string | null)) => void;
focusedRowKey: string | null;
}
const useDocumentsSelection = ({
showingSearchResults,
- currentSubfolders,
- visibleDocuments,
+ currentSubfolders = [],
+ visibleDocuments = [],
configureSelectionEnvironment,
visibleRowKeySet,
selectedEntries,
@@ -82,7 +83,7 @@ const useDocumentsSelection = ({
}, [configureSelectionEnvironment, visibleRowKeySet, navigableRowKeys]);
const promoteSelectionOrder = useCallback(
- (docId: string | number | null) => {
+ (docId: DocumentId | null) => {
if (!docId) return;
promoteSelectionOrderRaw(docId);
const rowKey = createDocumentEntryKey(docId);
@@ -99,7 +100,7 @@ const useDocumentsSelection = ({
clearSelection();
}, [clearSelection]);
- const prevFocusedDocIdRef = useRef(focusedDocumentId);
+ const prevFocusedDocIdRef = useRef(focusedDocumentId);
useEffect(() => {
const previous = prevFocusedDocIdRef.current;
if (previous === focusedDocumentId) {
@@ -109,7 +110,7 @@ const useDocumentsSelection = ({
if (focusedDocumentId) {
setFocusedRowKey(createDocumentEntryKey(focusedDocumentId));
} else {
- setFocusedRowKey((current) => (isFolderEntry(current) ? current : null));
+ setFocusedRowKey((current) => (current && isFolderEntry(current) ? current : null));
}
}, [focusedDocumentId, setFocusedRowKey]);
diff --git a/frontend/src/documents/panel/DocumentsPanel.tsx b/frontend/src/documents/panel/DocumentsPanel.tsx
index 175add7..2079f7d 100644
--- a/frontend/src/documents/panel/DocumentsPanel.tsx
+++ b/frontend/src/documents/panel/DocumentsPanel.tsx
@@ -18,6 +18,7 @@ import DocumentsPanelHeader, {
import { SelectionFloatingPanel } from '../SelectionFloatingActions';
import { createDocumentsTableHeaderActions } from './DocumentsToolbar';
import { useDocumentsFilter } from '../context/DocumentsFilterContext';
+import type { Identifier } from '../../types/identifiers';
const DEFAULT_GRID_ICON_SIZE = 144;
@@ -73,7 +74,7 @@ const DocumentsPanelInner: React.FC = ({
documentLinks,
ensureDownloadUrl,
deskWorkspaceProps = null,
- onRefresh = () => {},
+ onRefresh = () => { },
sortField,
sortDirection,
onSortFieldChange,
@@ -108,8 +109,8 @@ const DocumentsPanelInner: React.FC = ({
() =>
Array.isArray(searchResultIds)
? searchResultIds
- .map((id) => documentLookup?.get?.(id) || null)
- .filter((doc): doc is Record => Boolean(doc))
+ .map((id) => documentLookup?.get?.(id) || null)
+ .filter((doc): doc is Record => Boolean(doc))
: null,
[searchResultIds, documentLookup],
);
@@ -256,8 +257,7 @@ const DocumentsPanelInner: React.FC = ({
const isGridView = viewMode === 'grid';
const isDeskView = viewMode === 'desk';
- type Identifier = string | number;
-type ZoomSource = { url: string; alt?: string | null; mimeType?: string | null };
+ type ZoomSource = { url: string; alt?: string | null; mimeType?: string | null };
const [previewDocId, setPreviewDocId] = useState(null);
@@ -499,7 +499,7 @@ type ZoomSource = { url: string; alt?: string | null; mimeType?: string | null }
setFocusedRowKey(targetRow.key);
handleEntrySelection(targetRow.key, {
shiftKey,
- preventDefault: () => {},
+ preventDefault: () => { },
});
},
[
diff --git a/frontend/src/documents/panel/DocumentsPanelHeader.tsx b/frontend/src/documents/panel/DocumentsPanelHeader.tsx
index b58c73e..cae6b80 100644
--- a/frontend/src/documents/panel/DocumentsPanelHeader.tsx
+++ b/frontend/src/documents/panel/DocumentsPanelHeader.tsx
@@ -2,8 +2,7 @@ import React from 'react';
import type { ReactNode } from 'react';
import PanelHeader from '../../ui/PanelHeader';
import BreadcrumbTrail from '../../ui/BreadcrumbTrail';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
export interface DocumentsHeaderBreadcrumb {
id?: Identifier;
@@ -40,12 +39,12 @@ const DocumentsPanelHeader: React.FC = ({
const lastIndex = breadcrumbEntries.length - 1;
const trailEntries = breadcrumbEntries.length
? breadcrumbEntries.map((crumb, index) => ({
- id: crumb.id ?? index,
- label: crumb.name ?? crumb.label ?? crumb.title ?? '',
- onClick: index < lastIndex && onBreadcrumbClick
- ? () => onBreadcrumbClick(crumb)
- : null,
- }))
+ id: crumb.id ?? index,
+ label: crumb.name ?? crumb.label ?? crumb.title ?? '',
+ onClick: index < lastIndex && onBreadcrumbClick
+ ? () => onBreadcrumbClick(crumb)
+ : null,
+ }))
: [{ id: 'current-location', label: header.title }];
const headerTitle = (
diff --git a/frontend/src/documents/tagTransfer.ts b/frontend/src/documents/tagTransfer.ts
index 9555ebd..5c74201 100644
--- a/frontend/src/documents/tagTransfer.ts
+++ b/frontend/src/documents/tagTransfer.ts
@@ -1,14 +1,16 @@
+import type { DocumentId, TagId } from '../types/identifiers';
+
const TAG_MIME_TYPES = ['application/x-papercrate-tag', 'text/papercrate-tag'];
const TAG_TEXT_MIME_TYPE = 'text/plain';
interface TagPayload {
- id: string | number;
+ id: TagId;
label: string;
- sourceDocId: string | number | null;
+ sourceDocId: DocumentId | null;
}
interface TagLike {
- id?: string | number;
+ id?: TagId;
label?: string | null;
}
@@ -21,7 +23,10 @@ const serializePayload = (payload: TagPayload): string | null => {
}
};
-export const createTagTransferPayload = (tag?: TagLike | null, sourceDocId: string | number | null = null): TagPayload | null => {
+export const createTagTransferPayload = (
+ tag?: TagLike | null,
+ sourceDocId: DocumentId | null = null,
+): TagPayload | null => {
if (!tag || tag.id == null) {
return null;
}
@@ -33,7 +38,11 @@ export const createTagTransferPayload = (tag?: TagLike | null, sourceDocId: stri
};
};
-export const writeTagTransferData = (dataTransfer: DataTransfer | null, tag: TagLike, sourceDocId: string | number | null = null): void => {
+export const writeTagTransferData = (
+ dataTransfer: DataTransfer | null,
+ tag: TagLike,
+ sourceDocId: DocumentId | null = null,
+): void => {
if (!dataTransfer) {
return;
}
@@ -122,7 +131,7 @@ export const isTagTransferEvent = (event?: DragEventLike | null): boolean => {
if (!types) {
return false;
}
- const typeList = Array.isArray(types) ? [...types] : Array.from(types);
+ const typeList = Array.isArray(types) ? [...types] : Array.from(types);
return TAG_MIME_TYPES.some((type) => typeList.includes(type));
};
diff --git a/frontend/src/documents/useEntryPointer.ts b/frontend/src/documents/useEntryPointer.ts
index 35f3cdf..7e9451e 100644
--- a/frontend/src/documents/useEntryPointer.ts
+++ b/frontend/src/documents/useEntryPointer.ts
@@ -20,7 +20,7 @@ export const isPrimaryPointerEvent = (event?: PointerEventLike | null): boolean
export type EntryType = 'document' | 'folder';
export interface WorkspaceEntry {
- id: string | number;
+ id: string;
key?: string;
type: EntryType;
[key: string]: unknown;
@@ -28,7 +28,7 @@ export interface WorkspaceEntry {
interface UseEntryPointerOptions {
onSelectEntry?: (entry: WorkspaceEntry, event?: PointerEventLike | null, metadata?: EntryPointerMetadata) => void;
- onDocumentActivate?: (id: string | number, metadata?: EntryPointerMetadata) => void;
+ onDocumentActivate?: (id: string, metadata?: EntryPointerMetadata) => void;
}
export interface EntryPointerMetadata {
@@ -36,7 +36,7 @@ export interface EntryPointerMetadata {
primaryClick: boolean;
rowKey: string;
type: EntryType;
- id: string | number;
+ id: string;
}
export const useEntryPointer = ({
diff --git a/frontend/src/documents/useInlineRename.ts b/frontend/src/documents/useInlineRename.ts
index d5863a2..e50293d 100644
--- a/frontend/src/documents/useInlineRename.ts
+++ b/frontend/src/documents/useInlineRename.ts
@@ -13,22 +13,22 @@ type FocusableInput = (HTMLInputElement | HTMLTextAreaElement) & {
type InlineRenameOptions = {
getCurrentValue?: (entity: TEntity) => string | null;
- getEntityId?: (entity: TEntity) => string | number | null;
+ getEntityId?: (entity: TEntity) => string | null;
};
type InlineRenameHandler = (
- id: string | number,
+ id: string,
value: string,
) => boolean | void | Promise;
type InlineRenameReturn = {
- editingId: string | number | null;
+ editingId: string | null;
draftValue: string;
setDraftValue: Dispatch>;
beginEditing: (entity?: TEntity | null, event?: SyntheticEvent | Event) => void;
cancelEditing: (event?: SyntheticEvent | Event) => void;
submitEditing: (entity?: TEntity | null) => Promise;
- savingId: string | number | null;
+ savingId: string | null;
attachInputRef: (node: FocusableInput | null) => void;
};
@@ -51,18 +51,18 @@ const focusInput = (node: FocusableInput | null) => {
const identity = (value: unknown) => value as string;
const defaultGetEntityId = (entity?: T | null) =>
- (entity as { id?: string | number } | null)?.id ?? null;
+ (entity as { id?: string } | null)?.id ?? null;
const useInlineRename = (
onRename?: InlineRenameHandler,
{
getCurrentValue = identity as (entity: TEntity) => string | null,
- getEntityId = defaultGetEntityId as (entity: TEntity) => string | number | null,
+ getEntityId = defaultGetEntityId as (entity: TEntity) => string | null,
}: InlineRenameOptions = {},
): InlineRenameReturn => {
- const [editingId, setEditingId] = useState(null);
+ const [editingId, setEditingId] = useState(null);
const [draftValue, setDraftValue] = useState('');
- const [savingId, setSavingId] = useState(null);
+ const [savingId, setSavingId] = useState(null);
const inputRef = useRef(null);
const resetState = useCallback(() => {
diff --git a/frontend/src/folders/FolderManagerContext.tsx b/frontend/src/folders/FolderManagerContext.tsx
index 85fcc83..e258b7c 100644
--- a/frontend/src/folders/FolderManagerContext.tsx
+++ b/frontend/src/folders/FolderManagerContext.tsx
@@ -17,7 +17,7 @@ const FolderManagerContext = createContext(defaultManager);
interface FolderManagerProviderProps {
folderNodes?: Map;
- ensureFolderData?: (folderId: string | 'root', options?: { force?: boolean; includeDocuments?: boolean }) => Promise;
+ ensureFolderData?: (folderId: FolderId | 'root', options?: { force?: boolean; includeDocuments?: boolean }) => Promise;
children: ReactNode;
}
diff --git a/frontend/src/hooks/documents/useCorrespondents.ts b/frontend/src/hooks/documents/useCorrespondents.ts
index 9a4541d..bbeb998 100644
--- a/frontend/src/hooks/documents/useCorrespondents.ts
+++ b/frontend/src/hooks/documents/useCorrespondents.ts
@@ -8,7 +8,7 @@ type ApiClient = {
};
interface CorrespondentEntry {
- id?: string | number;
+ id?: string;
name?: string;
[key: string]: unknown;
}
@@ -17,7 +17,7 @@ interface UseCorrespondentsOptions {
apiClient: ApiClient;
notifyApiError: (error: unknown, fallback: string) => void;
setStatusMessage: (message: string, variant?: string) => void;
- tenantIdRef: MutableRefObject;
+ tenantIdRef: MutableRefObject;
mapDocumentCaches?: (mapper: (doc: any) => any) => void;
}
@@ -47,7 +47,7 @@ const useCorrespondents = ({
}, [apiClient, notifyApiError, tenantIdRef]);
const handleCorrespondentUpdate = useCallback(
- async (correspondentId: string | number, changes: { name?: string }) => {
+ async (correspondentId: string, changes: { name?: string }) => {
if (correspondentId == null) {
throw new Error('Missing correspondent identifier.');
}
@@ -100,7 +100,7 @@ const useCorrespondents = ({
);
const handleCorrespondentDelete = useCallback(
- async (correspondentId: string | number) => {
+ async (correspondentId: string) => {
if (correspondentId == null) {
throw new Error('Missing correspondent identifier.');
}
diff --git a/frontend/src/hooks/documents/useDocumentCorrespondentActions.ts b/frontend/src/hooks/documents/useDocumentCorrespondentActions.ts
index 22267b3..c835cad 100644
--- a/frontend/src/hooks/documents/useDocumentCorrespondentActions.ts
+++ b/frontend/src/hooks/documents/useDocumentCorrespondentActions.ts
@@ -1,4 +1,5 @@
import { useCallback, useMemo } from 'react';
+import type { Identifier } from '../../types/identifiers';
type ApiClient = {
@@ -7,13 +8,11 @@ type ApiClient = {
};
interface CorrespondentOption {
- id?: string | number;
+ id?: string;
name?: string;
[key: string]: unknown;
}
-type Identifier = string | number;
-
interface UseDocumentCorrespondentActionsArgs {
apiClient: ApiClient;
correspondents: CorrespondentOption[];
@@ -135,7 +134,7 @@ const useDocumentCorrespondentActions = ({
};
const handleCorrespondentAdd = useCallback(
- async ({ document, name, input = null, option = null }: { document?: { id?: string | number }; name?: string; input?: HTMLInputElement | null; option?: CorrespondentOption | string | null }) => {
+ async ({ document, name, input = null, option = null }: { document?: { id?: string }; name?: string; input?: HTMLInputElement | null; option?: CorrespondentOption | string | null }) => {
if (!document?.id) {
throw new Error('Missing document for correspondent assignment.');
}
diff --git a/frontend/src/hooks/documents/useDocumentDragHandlers.ts b/frontend/src/hooks/documents/useDocumentDragHandlers.ts
index d598466..ab9bd9c 100644
--- a/frontend/src/hooks/documents/useDocumentDragHandlers.ts
+++ b/frontend/src/hooks/documents/useDocumentDragHandlers.ts
@@ -1,9 +1,9 @@
import { useCallback, useEffect, useMemo, useRef } from 'react';
import type { DragEvent } from 'react';
import { createDocumentEntryKey, createFolderEntryKey } from '../../app/entryKey';
+import type { FolderId, Identifier } from '../../types/identifiers';
-type Identifier = string | number;
-type FolderIdentifier = string | 'root';
+type FolderIdentifier = FolderId | 'root';
type FolderInput = FolderIdentifier | number;
interface DocumentLike {
@@ -14,7 +14,7 @@ interface DocumentLike {
type ApplySelectionFn = (
keys: string[],
- options?: { anchor?: string | null; interactedKeys?: string[] },
+ options?: { anchor: string | null; interactedKeys?: string[] },
) => void;
type HandleEntrySelectionFn = (
diff --git a/frontend/src/hooks/documents/useDocumentMutations.ts b/frontend/src/hooks/documents/useDocumentMutations.ts
index 2f333a2..713fbc4 100644
--- a/frontend/src/hooks/documents/useDocumentMutations.ts
+++ b/frontend/src/hooks/documents/useDocumentMutations.ts
@@ -13,9 +13,9 @@ import {
trashDocument,
updateDocument,
} from '../../lib/apiClient';
+import type { DocumentId, FolderId as FolderIdentifier } from '../../types/identifiers';
-type DocumentId = string | number;
-type FolderId = DocumentId | 'root';
+type FolderId = FolderIdentifier | 'root';
type NullableFolderId = FolderId | null;
type StatusLevel = 'success' | 'error' | 'info' | string;
diff --git a/frontend/src/hooks/documents/useDocumentTagging.ts b/frontend/src/hooks/documents/useDocumentTagging.ts
index 404cb54..d01968c 100644
--- a/frontend/src/hooks/documents/useDocumentTagging.ts
+++ b/frontend/src/hooks/documents/useDocumentTagging.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
interface TagRecord {
id?: Identifier;
@@ -79,59 +79,59 @@ const useDocumentTagging = ({
}
try {
- if (action === 'add') {
- const createdIds: Identifier[] = [];
- const createdTags: TagRecord[] = [];
- for (const label of normalized) {
- let tag = tags.find((item) => item.label.toLowerCase() === label.toLowerCase()) || null;
- if (!tag) {
- const payload = tagManager.buildPayload({ label });
- const response = await apiClient.post<{ id?: Identifier; label: string }>('/tags', payload);
- tag = 'data' in response ? response.data : response;
- await refreshTags();
+ if (action === 'add') {
+ const createdIds: Identifier[] = [];
+ const createdTags: TagRecord[] = [];
+ for (const label of normalized) {
+ let tag = tags.find((item) => item.label.toLowerCase() === label.toLowerCase()) || null;
+ if (!tag) {
+ const payload = tagManager.buildPayload({ label });
+ const response = await apiClient.post<{ id?: Identifier; label: string }>('/tags', payload);
+ tag = 'data' in response ? response.data : response;
+ await refreshTags();
+ }
+ createdIds.push(tag.id);
+ createdTags.push(tag);
}
- createdIds.push(tag.id);
- createdTags.push(tag);
- }
- tagIds = Array.from(new Set(createdIds));
+ tagIds = Array.from(new Set(createdIds));
- if (updateDocumentCaches) {
- const tagById = new Map();
- tags.forEach((tag) => {
- if (tag?.id != null) {
- tagById.set(tag.id, tag);
- }
- });
- createdTags.forEach((tag) => {
- if (tag?.id != null) {
- tagById.set(tag.id, tag);
- }
- });
- targetDocumentIds.forEach((docId) => {
- tagIds.forEach((tagId) => {
- const cachedTag = tagById.get(tagId);
- if (!cachedTag) {
- return;
+ if (updateDocumentCaches) {
+ const tagById = new Map();
+ tags.forEach((tag) => {
+ if (tag?.id != null) {
+ tagById.set(tag.id, tag);
}
- updateDocumentCaches(docId, (doc) => {
- if (!doc) {
- return doc;
+ });
+ createdTags.forEach((tag) => {
+ if (tag?.id != null) {
+ tagById.set(tag.id, tag);
+ }
+ });
+ targetDocumentIds.forEach((docId) => {
+ tagIds.forEach((tagId) => {
+ const cachedTag = tagById.get(tagId);
+ if (!cachedTag) {
+ return;
}
- const currentTags = Array.isArray((doc as any).tags) ? (doc as any).tags : [];
- if (currentTags.some((entry: any) => entry?.id === tagId)) {
- return doc;
- }
- return {
- ...(doc as any),
- tags: [...currentTags, { ...cachedTag }],
- };
+ updateDocumentCaches(docId, (doc) => {
+ if (!doc) {
+ return doc;
+ }
+ const currentTags = Array.isArray((doc as any).tags) ? (doc as any).tags : [];
+ if (currentTags.some((entry: any) => entry?.id === tagId)) {
+ return doc;
+ }
+ return {
+ ...(doc as any),
+ tags: [...currentTags, { ...cachedTag }],
+ };
+ });
});
});
- });
+ }
}
- }
- tagIds = Array.from(new Set(tagIds));
+ tagIds = Array.from(new Set(tagIds));
if (!tagIds.length) {
return { ok: false, reason: 'no-tags' };
@@ -205,8 +205,7 @@ const useDocumentTagging = ({
if (result?.ok) {
const { tagCount, docsCount } = result;
setStatusMessage(
- `Assigned ${tagCount} tag${tagCount === 1 ? '' : 's'} to ${docsCount} document${
- docsCount === 1 ? '' : 's'
+ `Assigned ${tagCount} tag${tagCount === 1 ? '' : 's'} to ${docsCount} document${docsCount === 1 ? '' : 's'
}.`,
'success',
);
diff --git a/frontend/src/hooks/documents/useDocumentUploads.ts b/frontend/src/hooks/documents/useDocumentUploads.ts
index c4a3791..f239c74 100644
--- a/frontend/src/hooks/documents/useDocumentUploads.ts
+++ b/frontend/src/hooks/documents/useDocumentUploads.ts
@@ -3,8 +3,8 @@ import type { Dispatch, MutableRefObject, SetStateAction } from 'react';
import useFileDrop from './useFileDrop';
import { DEFAULT_FOLDER_NAME, hasFiles } from '../../app/workspaceUtils';
import { fetchDocument } from '../../lib/apiClient';
+import type { Identifier } from '../../types/identifiers';
-type Identifier = string | number;
type FolderId = Identifier | 'root' | null;
type FileEntry = {
diff --git a/frontend/src/hooks/documents/useDocuments.ts b/frontend/src/hooks/documents/useDocuments.ts
index 8b82955..af8957e 100644
--- a/frontend/src/hooks/documents/useDocuments.ts
+++ b/frontend/src/hooks/documents/useDocuments.ts
@@ -7,8 +7,7 @@ import {
useState,
} from 'react';
import DocumentsManager from '../../documents/DocumentsManager';
-
-type DocumentId = string | number;
+import type { DocumentId } from '../../types/identifiers';
interface DocumentLike {
id?: DocumentId;
diff --git a/frontend/src/hooks/documents/useDocumentsWorkspace.ts b/frontend/src/hooks/documents/useDocumentsWorkspace.ts
index 37fb461..95bd42b 100644
--- a/frontend/src/hooks/documents/useDocumentsWorkspace.ts
+++ b/frontend/src/hooks/documents/useDocumentsWorkspace.ts
@@ -52,6 +52,7 @@ import useWorkspaceTaxonomies from './useWorkspaceTaxonomies';
import useWorkspaceBreadcrumbs from './useWorkspaceBreadcrumbs';
import useWorkspaceDeskProps from './useWorkspaceDeskProps';
import useWorkspaceSelectionSync from './useWorkspaceSelectionSync';
+import type { DocumentId, FolderId as FolderIdentifier, Identifier } from '../../types/identifiers';
const EntryType = Object.freeze({
document: 'document',
@@ -60,9 +61,7 @@ const EntryType = Object.freeze({
const noop = () => { };
-type Identifier = string | number;
-type DocumentId = Identifier;
-type FolderId = Identifier | 'root';
+type FolderId = FolderIdentifier | 'root';
interface DocumentLike {
id?: DocumentId | null;
diff --git a/frontend/src/hooks/documents/useFileDrop.ts b/frontend/src/hooks/documents/useFileDrop.ts
index 8ab6a87..0b02fae 100644
--- a/frontend/src/hooks/documents/useFileDrop.ts
+++ b/frontend/src/hooks/documents/useFileDrop.ts
@@ -1,6 +1,6 @@
import { MutableRefObject, useEffect } from 'react';
-type FolderId = string | number | 'root' | null;
+type FolderId = string | 'root' | null;
interface DropOverlayState {
active: boolean;
diff --git a/frontend/src/hooks/documents/useFolderTree.ts b/frontend/src/hooks/documents/useFolderTree.ts
index 7ac8dd4..b9b1e0e 100644
--- a/frontend/src/hooks/documents/useFolderTree.ts
+++ b/frontend/src/hooks/documents/useFolderTree.ts
@@ -8,9 +8,9 @@ import {
createDocumentEntryKey,
createFolderEntryKey,
} from '../../app/entryKey';
+import type { FolderId as FolderIdentifier, Identifier } from '../../types/identifiers';
-type Identifier = string | number;
-type FolderId = Identifier | 'root';
+type FolderId = FolderIdentifier | 'root';
interface DocumentLike {
id?: Identifier | null;
@@ -126,8 +126,8 @@ const useFolderTree = ({
.filter(Boolean),
);
- let nextDocKeys = [];
- let mergedSelection = [];
+ let nextDocKeys: string[] = [];
+ let mergedSelection: string[] = [];
setSelectedEntries((previous) => {
const previousFolderKeys = previous
@@ -140,9 +140,11 @@ const useFolderTree = ({
});
const nextFocus = (() => {
- const currentFocusedKey = createDocumentEntryKey(focusedDocumentId);
- if (currentFocusedKey && availableDocKeySet.has(currentFocusedKey)) {
- return focusedDocumentId;
+ if (focusedDocumentId) {
+ const currentFocusedKey = createDocumentEntryKey(focusedDocumentId);
+ if (currentFocusedKey && availableDocKeySet.has(currentFocusedKey)) {
+ return focusedDocumentId;
+ }
}
if (nextDocKeys.length) {
const lastDocKey = nextDocKeys[nextDocKeys.length - 1];
@@ -172,7 +174,7 @@ const useFolderTree = ({
if (!targetId || targetId === 'root') {
setFolderNodes((prev: Map) => {
const root = prev.get('root');
- if (root?.expanded) return prev;
+ if (!root || root.expanded) return prev;
const next = new Map(prev);
next.set('root', { ...root, expanded: true });
return next;
diff --git a/frontend/src/hooks/documents/useFolderTreeActions.ts b/frontend/src/hooks/documents/useFolderTreeActions.ts
index 781840b..96c2ff3 100644
--- a/frontend/src/hooks/documents/useFolderTreeActions.ts
+++ b/frontend/src/hooks/documents/useFolderTreeActions.ts
@@ -7,8 +7,8 @@ import {
moveFolder as moveFolderRequest,
renameFolder as renameFolderRequest,
} from '../../lib/apiClient';
+import type { FolderId } from '../../types/identifiers';
-type FolderId = string | number;
type FolderKey = FolderId | 'root';
interface FolderNode {
diff --git a/frontend/src/hooks/documents/useTags.ts b/frontend/src/hooks/documents/useTags.ts
index b00e02d..815cef8 100644
--- a/frontend/src/hooks/documents/useTags.ts
+++ b/frontend/src/hooks/documents/useTags.ts
@@ -1,4 +1,5 @@
import { MutableRefObject, useCallback, useState } from 'react';
+import type { TagId, TenantId } from '../../types/identifiers';
type ApiClient = {
get: (path: string) => Promise<{ data: unknown }>
@@ -12,7 +13,7 @@ interface TagManagerInterface {
}
interface TagEntry {
- id?: string | number;
+ id?: TagId;
label?: string;
color?: string | null;
[key: string]: unknown;
@@ -23,8 +24,8 @@ interface UseTagsOptions {
notifyApiError: (error: unknown, fallback: string) => void;
setStatusMessage: (message: string, variant?: string) => void;
tagManager: TagManagerInterface;
- tenantIdRef: MutableRefObject;
- setActiveTagFilters: (updater: (prev: Array) => Array) => void;
+ tenantIdRef: MutableRefObject;
+ setActiveTagFilters: (updater: (prev: Array) => Array) => void;
mapDocumentCaches?: (mapper: (doc: any) => any) => void;
}
@@ -56,7 +57,7 @@ const useTags = ({
}, [apiClient, notifyApiError, tenantIdRef]);
const handleTagUpdate = useCallback(
- async (tagId: string | number, changes: { label?: string; color?: string | null }) => {
+ async (tagId: TagId, changes: { label?: string; color?: string | null }) => {
if (tagId == null) {
throw new Error('Missing tag identifier.');
}
@@ -104,7 +105,7 @@ const useTags = ({
);
const handleTagDelete = useCallback(
- async (tagId: string | number) => {
+ async (tagId: TagId) => {
if (tagId == null) {
throw new Error('Missing tag identifier.');
}
diff --git a/frontend/src/hooks/documents/useTenantManager.ts b/frontend/src/hooks/documents/useTenantManager.ts
index 192e181..05766f0 100644
--- a/frontend/src/hooks/documents/useTenantManager.ts
+++ b/frontend/src/hooks/documents/useTenantManager.ts
@@ -1,5 +1,6 @@
import { MutableRefObject, useCallback } from 'react';
import type { NavigateFunction } from 'react-router-dom';
+import type { FolderId, TenantId } from '../../types/identifiers';
interface ApiClient {
get: (path: string) => Promise<{ data: unknown }>;
@@ -8,24 +9,24 @@ interface ApiClient {
}
interface TenantOption {
- id?: string | number;
+ id?: TenantId;
name?: string;
}
interface UseTenantManagerOptions {
apiClient: ApiClient;
appDispatch: (action: any) => void;
- currentTenantId: string | number | null;
+ currentTenantId: TenantId | null;
resetWorkspaceState: () => void;
setStatusMessage: (message: string, variant?: string) => void;
notifyApiError: (error: unknown, message: string) => void;
refreshTags: () => Promise;
refreshCorrespondents: () => Promise;
- loadFolder: (folderId: string, options?: { preserveSearch?: boolean }) => Promise;
+ loadFolder: (folderId: FolderId, options?: { preserveSearch?: boolean }) => Promise;
handleDocumentsViewModeChange: (mode: string) => void;
navigate: NavigateFunction;
tokenRef?: MutableRefObject;
- tenantIdRef?: MutableRefObject;
+ tenantIdRef?: MutableRefObject;
}
const useTenantManager = ({
diff --git a/frontend/src/hooks/documents/useWorkspaceBreadcrumbs.ts b/frontend/src/hooks/documents/useWorkspaceBreadcrumbs.ts
index 9d422e2..060afdf 100644
--- a/frontend/src/hooks/documents/useWorkspaceBreadcrumbs.ts
+++ b/frontend/src/hooks/documents/useWorkspaceBreadcrumbs.ts
@@ -1,8 +1,8 @@
import React, { useEffect, useMemo } from 'react';
import { DEFAULT_FOLDER_NAME } from '../../app/workspaceUtils';
+import type { FolderId as FolderIdentifier } from '../../types/identifiers';
-type Identifier = string | number;
-type FolderId = Identifier | 'root';
+type FolderId = FolderIdentifier | 'root';
interface UseWorkspaceBreadcrumbsArgs {
selectedFolder: FolderId | null;
diff --git a/frontend/src/hooks/documents/useWorkspaceDeskProps.ts b/frontend/src/hooks/documents/useWorkspaceDeskProps.ts
index 3a37360..6fe6acb 100644
--- a/frontend/src/hooks/documents/useWorkspaceDeskProps.ts
+++ b/frontend/src/hooks/documents/useWorkspaceDeskProps.ts
@@ -1,11 +1,10 @@
import { useCallback, useMemo } from 'react';
import type { MutableRefObject } from 'react';
import { createDocumentEntryKey } from '../../app/entryKey';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
interface ApplySelectionFn {
- (keys: string[], options?: { anchor?: string | null; interactedKeys?: string[] }): unknown;
+ (keys: string[], options?: { anchor: string | null; interactedKeys?: string[] }): unknown;
}
interface UseWorkspaceDeskPropsArgs {
@@ -17,8 +16,8 @@ interface UseWorkspaceDeskPropsArgs {
applySelection: ApplySelectionFn;
showingSearchResults: boolean;
searchQuery: string;
- activeTagFilters: Array;
- activeCorrespondentFilters: Array;
+ activeTagFilters: Array;
+ activeCorrespondentFilters: Array;
selectedFolder: Identifier | 'root' | null;
promoteSelectionOrder: () => void;
handleDocumentTagDrop: (docId: Identifier, tagId: Identifier) => Promise | void;
diff --git a/frontend/src/hooks/documents/useWorkspaceSelectionSync.ts b/frontend/src/hooks/documents/useWorkspaceSelectionSync.ts
index 9f3236a..b3e2b15 100644
--- a/frontend/src/hooks/documents/useWorkspaceSelectionSync.ts
+++ b/frontend/src/hooks/documents/useWorkspaceSelectionSync.ts
@@ -1,14 +1,13 @@
import { useEffect } from 'react';
import type { MutableRefObject } from 'react';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
interface UseWorkspaceSelectionSyncArgs {
showingSearchResults: boolean;
searchQuery: string;
- setSelectedEntries: (entries: Array) => void;
- setSelectionOrder: (order: Array) => void;
- selectionOrderRef: MutableRefObject>;
+ setSelectedEntries: (entries: Array) => void;
+ setSelectionOrder: (order: Array) => void;
+ selectionOrderRef: MutableRefObject>;
selectionAnchorRef: MutableRefObject;
setFocusedDocumentId: (id: Identifier | null) => void;
selectedDocumentIds: Identifier[];
diff --git a/frontend/src/hooks/documents/useWorkspaceTaxonomies.ts b/frontend/src/hooks/documents/useWorkspaceTaxonomies.ts
index f77756c..261aac1 100644
--- a/frontend/src/hooks/documents/useWorkspaceTaxonomies.ts
+++ b/frontend/src/hooks/documents/useWorkspaceTaxonomies.ts
@@ -5,8 +5,7 @@ import TagManager from '../../tag_manager';
import useCorrespondents from './useCorrespondents';
import useDocumentCorrespondentActions from './useDocumentCorrespondentActions';
import useTags from './useTags';
-
-type Identifier = string | number;
+import type { Identifier } from '../../types/identifiers';
interface UseWorkspaceTaxonomiesArgs {
apiClient: any;
diff --git a/frontend/src/hooks/useAssetNavigator.ts b/frontend/src/hooks/useAssetNavigator.ts
index decf5de..112af21 100644
--- a/frontend/src/hooks/useAssetNavigator.ts
+++ b/frontend/src/hooks/useAssetNavigator.ts
@@ -1,7 +1,6 @@
import { useEffect, useMemo, useState } from 'react';
import { resolveAssetUrl } from '../asset_manager';
-
-type Identifier = string | number;
+import type { Identifier } from '../types/identifiers';
type DocumentLike = {
id?: Identifier;
@@ -27,7 +26,7 @@ type AssetLike = {
type EnsureAssetUrl = (
documentId: Identifier,
asset: AssetLike,
- options?: { force?: boolean; [key: string]: unknown },
+ options?: { force?: boolean;[key: string]: unknown },
) => Promise;
type GetAsset = (document: DocumentLike, assetType: string) => AssetLike | null;
@@ -92,7 +91,7 @@ export const useAssetNavigator = ({
let cancelled = false;
setIsLoading(true);
ensureAssetUrl(documentId, asset, { force: true })
- .catch(() => {})
+ .catch(() => { })
.finally(() => {
if (!cancelled) {
setIsLoading(false);
diff --git a/frontend/src/lib/apiTypes.ts b/frontend/src/lib/apiTypes.ts
index 3c2638c..1abb117 100644
--- a/frontend/src/lib/apiTypes.ts
+++ b/frontend/src/lib/apiTypes.ts
@@ -1,6 +1,7 @@
// Types aligned with OpenAPI schemas for common endpoints.
+import type { Identifier } from '../types/identifiers';
-export type Identifier = string | number;
+export type { Identifier };
export interface DownloadLink {
url: string;
diff --git a/frontend/src/login/LoginView.tsx b/frontend/src/login/LoginView.tsx
index 6ee1b44..3d5910a 100644
--- a/frontend/src/login/LoginView.tsx
+++ b/frontend/src/login/LoginView.tsx
@@ -12,7 +12,7 @@ const StatusBanner: React.FC = ({ status }) => {
};
interface TenantOption {
- id?: string | number;
+ id?: string;
name?: string;
}
@@ -25,7 +25,7 @@ interface LoginViewProps {
tenantSelection?: TenantSelectionState | null;
onSelectTenant?: (tenant: TenantOption) => void;
onCancelSelection?: () => void;
- selectingTenantId?: string | number | null;
+ selectingTenantId?: string | null;
onPasskeyLogin?: (username: string) => void;
onSignup?: (username: string) => void;
passkeySupported?: boolean;
@@ -88,88 +88,88 @@ const LoginView: React.FC = ({
-
-
- onFolderClick?.(folder, event)}
- onDoubleClick={(event) => {
- event.preventDefault();
- onFolderSelect?.(folder.id);
- }}
- onDragOver={(event) => onFolderDragOver?.(event, folder.id)}
- onDragLeave={onFolderDragLeave}
- onDrop={(event) => onFolderDrop?.(event, folder.id)}
- onDragStart={(event) => {
- if (canDragFolder) {
- onFolderDragStart?.(event, folder.id);
- }
- }}
- onDragEnd={(event) => {
- if (canDragFolder) {
- onFolderDragEnd?.(event);
- }
- }}
- >
-
);
};
diff --git a/frontend/src/documents/DocumentsList.tsx b/frontend/src/documents/DocumentsList.tsx
index 570e71d..3ea8284 100644
--- a/frontend/src/documents/DocumentsList.tsx
+++ b/frontend/src/documents/DocumentsList.tsx
@@ -9,8 +9,7 @@ import { resolveCorrespondents } from './correspondents';
import { writeTagTransferData } from './tagTransfer';
import useInlineRename from './useInlineRename';
import { useWorkspaceSelectionContext } from '../app/WorkspaceSelectionContext';
-
-export type Identifier = string | number;
+import type { Identifier } from '../types/identifiers';
export interface FolderLike {
id?: Identifier | 'root';
@@ -160,356 +159,356 @@ const DocumentsList: React.FC
-
-
- {isFolderEditing ? (
-
- );
- }
+ );
+ }
- const doc = entry.document;
- if (!doc) {
- return null;
- }
+ const doc = entry.document;
+ if (!doc) {
+ return null;
+ }
- const isSelected = selectedDocumentIdsSet?.has(doc.id);
- const isDraggingDoc = draggingDocumentIdsSet?.has(doc.id);
- const tagList = Array.isArray(doc.tags) ? doc.tags : [];
- const visibleTags = tagList.slice(0, 3);
- const remainingTagCount = tagList.length > 3 ? tagList.length - 3 : 0;
- const correspondents = resolveCorrespondents(doc);
- const cardClasses = ['document-card', 'document'];
- if (isSelected) cardClasses.push('selected');
- if (isDraggingDoc) cardClasses.push('is-dragging');
- const isEditingDoc = editingDocumentId === doc.id;
- const documentDraftValue = isEditingDoc ? documentDraft : doc.title;
- const trimmedDocumentDraft = isEditingDoc ? documentDraft.trim() : '';
- const isDocumentSaving = savingDocumentId === doc.id;
- const canSubmitDocument =
- isEditingDoc && trimmedDocumentDraft.length > 0 && trimmedDocumentDraft !== doc.title;
- const allowInlineDocumentEdit = onDocumentRename && isSelected && totalSelectionCount === 1;
- return (
-
- setFolderDraft(event.target.value)}
- onClick={(event) => event.stopPropagation()}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault();
+ return (
+
- onFolderClick?.(folder, event)}
+ onDoubleClick={(event) => {
+ event.preventDefault();
+ onFolderSelect?.(folder.id);
+ }}
+ onDragOver={(event) => onFolderDragOver?.(event, folder.id)}
+ onDragLeave={onFolderDragLeave}
+ onDrop={(event) => onFolderDrop?.(event, folder.id)}
+ onDragStart={(event) => {
+ if (canDragFolder) {
+ onFolderDragStart?.(event, folder.id);
+ }
+ }}
+ onDragEnd={(event) => {
+ if (canDragFolder) {
+ onFolderDragEnd?.(event);
+ }
+ }}
+ >
+
+
+
+ {isFolderEditing ? (
+
+ )}
+
+ setFolderDraft(event.target.value)}
+ onClick={(event) => event.stopPropagation()}
+ onKeyDown={(event) => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ submitFolderEditing(folder);
+ } else if (event.key === 'Escape') {
+ event.preventDefault();
+ cancelFolderEditing(event);
+ }
+ }}
+ onBlur={(event) => {
+ const nextFocus = event.relatedTarget;
+ if (!nextFocus || !event.currentTarget.parentElement?.contains(nextFocus)) {
+ cancelFolderEditing();
+ }
+ }}
+ />
+
- ) : (
-
- {
- if (!allowInlineFolderEdit) {
- return;
- }
- event.preventDefault();
- event.stopPropagation();
- beginFolderEditing(folder);
- }}
- onKeyDown={(event) => {
- if (!allowInlineFolderEdit) {
- return;
- }
- if (event.key === 'Enter') {
+ }}
+ >
+
+ ) : (
+
+ {
+ if (!allowInlineFolderEdit) {
+ return;
+ }
event.preventDefault();
event.stopPropagation();
beginFolderEditing(folder);
- }
- }}
- >
- {folder.name}
-
-
- )}
+ }}
+ onKeyDown={(event) => {
+ if (!allowInlineFolderEdit) {
+ return;
+ }
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ event.stopPropagation();
+ beginFolderEditing(folder);
+ }
+ }}
+ >
+ {folder.name}
+
+ onDocumentClick?.(doc, event)}
- onDoubleClick={(event) => onDocumentActivate?.(doc, event)}
- draggable
- onDragStart={(event) => onDocumentDragStart?.(event, doc)}
- onDragEnd={(event) => onDocumentDragEnd?.(event)}
- onDragOver={(event) => onDocumentTagDragOver?.(event)}
- onDragOverCapture={(event) => onDocumentTagDragOver?.(event)}
- onDragLeave={onDocumentTagDragLeave}
- onDragLeaveCapture={onDocumentTagDragLeave}
- onDrop={(event) => onDocumentTagDrop?.(event, doc.id)}
- onDropCapture={(event) => onDocumentTagDrop?.(event, doc.id)}
- >
-
+ );
+ })}
+
-
- );
- })}
-
- {correspondents.length > 0 ? (
-
-
-
- setDocumentDraft(event.target.value)}
- onClick={(event) => event.stopPropagation()}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault();
+ const isSelected = selectedDocumentIdsSet?.has(doc.id);
+ const isDraggingDoc = draggingDocumentIdsSet?.has(doc.id);
+ const tagList = Array.isArray(doc.tags) ? doc.tags : [];
+ const visibleTags = tagList.slice(0, 3);
+ const remainingTagCount = tagList.length > 3 ? tagList.length - 3 : 0;
+ const correspondents = resolveCorrespondents(doc);
+ const cardClasses = ['document-card', 'document'];
+ if (isSelected) cardClasses.push('selected');
+ if (isDraggingDoc) cardClasses.push('is-dragging');
+ const isEditingDoc = editingDocumentId === doc.id;
+ const documentDraftValue = isEditingDoc ? documentDraft : doc.title;
+ const trimmedDocumentDraft = isEditingDoc ? documentDraft.trim() : '';
+ const isDocumentSaving = savingDocumentId === doc.id;
+ const canSubmitDocument =
+ isEditingDoc && trimmedDocumentDraft.length > 0 && trimmedDocumentDraft !== doc.title;
+ const allowInlineDocumentEdit = onDocumentRename && isSelected && totalSelectionCount === 1;
+ return (
+
onDocumentClick?.(doc, event)}
+ onDoubleClick={(event) => onDocumentActivate?.(doc, event)}
+ draggable
+ onDragStart={(event) => onDocumentDragStart?.(event, doc)}
+ onDragEnd={(event) => onDocumentDragEnd?.(event)}
+ onDragOver={(event) => onDocumentTagDragOver?.(event)}
+ onDragOverCapture={(event) => onDocumentTagDragOver?.(event)}
+ onDragLeave={onDocumentTagDragLeave}
+ onDragLeaveCapture={onDocumentTagDragLeave}
+ onDrop={(event) => onDocumentTagDrop?.(event, doc.id)}
+ onDropCapture={(event) => onDocumentTagDrop?.(event, doc.id)}
+ >
+
+ )}
+
+
+ {visibleTags.length > 0 && (
+
+ {correspondents.length > 0 ? (
+
+
- {visibleTags.length > 0 && (
-
+ setDocumentDraft(event.target.value)}
+ onClick={(event) => event.stopPropagation()}
+ onKeyDown={(event) => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ submitDocumentEditing(doc);
+ } else if (event.key === 'Escape') {
+ event.preventDefault();
+ cancelDocumentEditing(event);
+ }
+ }}
+ onBlur={(event) => {
+ const nextFocus = event.relatedTarget;
+ if (!nextFocus || !event.currentTarget.parentElement?.contains(nextFocus)) {
+ cancelDocumentEditing();
+ }
+ }}
+ />
+
- ) : (
-
- {
- if (!allowInlineDocumentEdit) {
- return;
- }
- event.preventDefault();
- event.stopPropagation();
- beginDocumentEditing(doc);
- }}
- onKeyDown={(event) => {
- if (!allowInlineDocumentEdit) {
- return;
- }
- if (event.key === 'Enter') {
+ }}
+ >
+
+ ) : (
+
+ {
+ if (!allowInlineDocumentEdit) {
+ return;
+ }
event.preventDefault();
event.stopPropagation();
beginDocumentEditing(doc);
- }
- }}
- >
- {doc.title}
-
-
- )}
-
- {visibleTags.map((tag, index) => {
- const colorSource = tag?.color || tagLookupById?.get(tag.id)?.color;
- const style = getTagColorStyle(colorSource);
- const tagId = tag?.id ?? null;
- const clickable = tagId != null && typeof onTagClick === 'function';
- const key = tagId ?? `${doc.id}-tag-${index}`;
- return (
- {
- event.stopPropagation();
- if (tagId == null) {
+ }}
+ onKeyDown={(event) => {
+ if (!allowInlineDocumentEdit) {
return;
}
- onTagClick?.(tagId);
- } : undefined}
- draggable
- onDragStart={(event) => {
- event.stopPropagation();
- try {
- if (event.dataTransfer) {
- event.dataTransfer.effectAllowed = 'copyMove';
- }
- } catch (error) {
- console.warn('[documents] Failed to configure drag effect', error);
- }
- writeTagTransferData(event.dataTransfer, tag, doc.id);
- }}
- onDragEnd={(event) => {
- event.stopPropagation();
- }}
- onKeyDown={clickable ? (event) => {
- if (event.key === 'Enter' || event.key === ' ') {
+ if (event.key === 'Enter') {
event.preventDefault();
+ event.stopPropagation();
+ beginDocumentEditing(doc);
+ }
+ }}
+ >
+ {doc.title}
+
+
+ )}
+
+ {visibleTags.map((tag, index) => {
+ const colorSource = tag?.color || tagLookupById?.get(tag.id)?.color;
+ const style = getTagColorStyle(colorSource);
+ const tagId = tag?.id ?? null;
+ const clickable = tagId != null && typeof onTagClick === 'function';
+ const key = tagId ?? `${doc.id}-tag-${index}`;
+ return (
+ {
event.stopPropagation();
if (tagId == null) {
return;
}
onTagClick?.(tagId);
- }
- } : undefined}
- >
- {tag.label}
-
- );
- })}
- {remainingTagCount > 0 && (
- +{remainingTagCount}
- )}
-
- )}
+ } : undefined}
+ draggable
+ onDragStart={(event) => {
+ event.stopPropagation();
+ try {
+ if (event.dataTransfer) {
+ event.dataTransfer.effectAllowed = 'copyMove';
+ }
+ } catch (error) {
+ console.warn('[documents] Failed to configure drag effect', error);
+ }
+ writeTagTransferData(event.dataTransfer, tag, doc.id);
+ }}
+ onDragEnd={(event) => {
+ event.stopPropagation();
+ }}
+ onKeyDown={clickable ? (event) => {
+ if (event.key === 'Enter' || event.key === ' ') {
+ event.preventDefault();
+ event.stopPropagation();
+ if (tagId == null) {
+ return;
+ }
+ onTagClick?.(tagId);
+ }
+ } : undefined}
+ >
+ {tag.label}
+
+ );
+ })}
+ {remainingTagCount > 0 && (
+ +{remainingTagCount}
+ )}
+ | - | Name | -Issued | -Added | -
|---|
| + | Name | +Issued | +Added | +||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
-
-
- |
-
-
-
-
- {isFolderEditing ? (
-
- setFolderDraft(event.target.value)}
- onClick={(event) => event.stopPropagation()}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault();
+ return (
+
+ |
+
+
+
+ |
-
+
+
+ {isFolderEditing ? (
+
+ setFolderDraft(event.target.value)}
+ onClick={(event) => event.stopPropagation()}
+ onKeyDown={(event) => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ submitFolderEditing(folder);
+ } else if (event.key === 'Escape') {
+ event.preventDefault();
+ cancelFolderEditing(event);
+ }
+ }}
+ onBlur={(event) => {
+ const nextFocus = event.relatedTarget;
+ if (!nextFocus || !event.currentTarget.parentElement?.contains(nextFocus)) {
+ cancelFolderEditing();
+ }
+ }}
+ />
+
+
+ ) : (
+ {
- event.stopPropagation();
- submitFolderEditing(folder);
- }}
- >
-
- — |
- — |
-
- |
-
- |
+
-
-
- {correspondents.length > 0 ? (
-
-
+ — |
+ — |
+
+ |
+
+ |
-
+
-
+
+ {correspondents.length > 0 ? (
+
+
- {(doc.tags || []).length > 0 && (
-
- {(doc.tags || []).map((tag, index) => {
- const colorSource = tag?.color || tagLookupById?.get(tag.id)?.color;
- const style = getTagColorStyle(colorSource);
- const tagId = tag?.id ?? null;
- const clickable = tagId != null && typeof onTagClick === 'function';
- const key = tagId ?? `${doc.id}-tag-${index}`;
- return (
- {
- event.stopPropagation();
- if (tagId == null) return;
- onTagClick?.(tagId);
- } : undefined}
- draggable
- onDragStart={(event) => {
- event.stopPropagation();
- try {
- if (event.dataTransfer) {
- event.dataTransfer.effectAllowed = 'copyMove';
- }
- } catch (error) {
- console.warn('[documents] Failed to configure drag effect', error);
- }
- writeTagTransferData(event.dataTransfer, tag, doc.id);
- }}
- onDragEnd={(event) => {
- event.stopPropagation();
- }}
- onKeyDown={clickable ? (event) => {
- if (event.key === 'Enter' || event.key === ' ') {
- event.preventDefault();
- event.stopPropagation();
- if (tagId == null) {
+ }}
+ onKeyDown={(event) => {
+ if (!allowInlineDocumentEdit) {
return;
}
- onTagClick?.(tagId);
- }
- } : undefined}
- >
- {tag.label}
-
- );
- })}
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ event.stopPropagation();
+ beginDocumentEditing(doc);
+ }
+ }}
+ >
+ {doc.title}
+
+ )}
+
+
- )}
- {issuedLabel} |
- {addedLabel} |
- |
+ {(doc.tags || []).map((tag, index) => {
+ const colorSource = tag?.color || tagLookupById?.get(tag.id)?.color;
+ const style = getTagColorStyle(colorSource);
+ const tagId = tag?.id ?? null;
+ const clickable = tagId != null && typeof onTagClick === 'function';
+ const key = tagId ?? `${doc.id}-tag-${index}`;
+ return (
+ {
+ event.stopPropagation();
+ if (tagId == null) return;
+ onTagClick?.(tagId);
+ } : undefined}
+ draggable
+ onDragStart={(event) => {
+ event.stopPropagation();
+ try {
+ if (event.dataTransfer) {
+ event.dataTransfer.effectAllowed = 'copyMove';
+ }
+ } catch (error) {
+ console.warn('[documents] Failed to configure drag effect', error);
+ }
+ writeTagTransferData(event.dataTransfer, tag, doc.id);
+ }}
+ onDragEnd={(event) => {
+ event.stopPropagation();
+ }}
+ onKeyDown={clickable ? (event) => {
+ if (event.key === 'Enter' || event.key === ' ') {
+ event.preventDefault();
+ event.stopPropagation();
+ if (tagId == null) {
+ return;
+ }
+ onTagClick?.(tagId);
+ }
+ } : undefined}
+ >
+ {tag.label}
+
+ );
+ })}
+
+ )}
+
+
+ Papercrate
-
- {hasTenantSelection ? (
-
-
- ) : (
- <>
- Select a tenant to finish signing in.
-
- {tenantSelection?.tenants?.map((tenant) => (
-
- ))}
-
-
+ width={72}
+ height={72}
+ decoding="async"
+ loading="lazy"
+ />
+ Papercrate
Use your registered passkey to sign in or create a new account.
-
-
diff --git a/frontend/src/sidebar/useSidebarProps.ts b/frontend/src/sidebar/useSidebarProps.ts
index 2699f7d..125b4fd 100644
--- a/frontend/src/sidebar/useSidebarProps.ts
+++ b/frontend/src/sidebar/useSidebarProps.ts
@@ -2,8 +2,7 @@ import { useMemo } from 'react';
import type { DragEvent } from 'react';
import { TAG_FILTER_UNTAGGED } from '../app/workspaceUtils';
import type { StatusMessage } from '../hooks/documents/store/useDocumentsStore';
-
-type Identifier = string | number;
+import type { Identifier } from '../types/identifiers';
interface FolderTreeNode {
id: Identifier;
diff --git a/frontend/src/types/identifiers.ts b/frontend/src/types/identifiers.ts
new file mode 100644
index 0000000..635b603
--- /dev/null
+++ b/frontend/src/types/identifiers.ts
@@ -0,0 +1,11 @@
+// Common string-based identifiers used across the app.
+export type Identifier = string;
+
+export type DocumentId = Identifier;
+export type FolderId = Identifier;
+export type CapabilitySetId = Identifier;
+export type CapabilityValue = Identifier;
+export type TenantId = Identifier;
+export type TagId = Identifier;
+export type ApiTokenId = Identifier;
+export type PasskeyId = Identifier;
diff --git a/frontend/src/ui/QuickAddMenu.tsx b/frontend/src/ui/QuickAddMenu.tsx
index f12d68e..e993557 100644
--- a/frontend/src/ui/QuickAddMenu.tsx
+++ b/frontend/src/ui/QuickAddMenu.tsx
@@ -4,10 +4,10 @@ import { PlusIcon } from './icons';
import useFloatingMenu from './useFloatingMenu';
-type QuickAddOption = string | number | { id?: string | number; label?: string; name?: string;[key: string]: unknown };
+type QuickAddOption = string | { id?: string; label?: string; name?: string;[key: string]: unknown };
interface NormalizedOption {
- id?: string | number;
+ id?: string;
label: string;
original: QuickAddOption;
index: number;
@@ -47,7 +47,7 @@ interface FloatingMenuState {
updatePosition: () => void;
}
-type CSSVarStyle = CSSProperties & Record
- Theme
- = ({
}
const tenantMenuContent = tenantMenuOpen && tenantMenuStyle
- ? createPortal(
-
-
-
-
+
+
+ )
: null;
const communityMenuFooter = COMMUNITY_LINKS.length
? (
-
+ Theme
+
- )
+
+
+
+
+
+
-
-
-
- {COMMUNITY_LINKS.map(({ href, label, title, Icon }) => (
-
-
- )
+
+ {COMMUNITY_LINKS.map(({ href, label, title, Icon }) => (
+
+
+ )
: null;
const handleSearchInputChange = useCallback(
@@ -736,62 +736,62 @@ const Sidebar: React.FC
- {showTenantList ? (
-
-
- ) : null}
- Switch tenant
-
- {tenants.map((tenant) => {
- const tenantId = tenant?.id || null;
- const isActive = tenantId === activeTenantId;
- const tenantLabel = tenant?.name || tenantId || 'Tenant';
- return (
-
- );
- })}
-
-
-
,
+ document.body,
+ )
+ : null;
return (
-
-
-
+ ? createPortal(
+
+ {showTenantList ? (
+
+ ) : null}
+
+
,
- document.body,
- )
- : null;
+ Switch tenant
+
+ {tenants.map((tenant) => {
+ const tenantId = tenant?.id || null;
+ const isActive = tenantId === activeTenantId;
+ const tenantLabel = tenant?.name || tenantId || 'Tenant';
+ return (
+
+ );
+ })}
- {themeMenuSection}
- {communityMenuFooter}
-
+
+ {themeMenuSection}
+ {communityMenuFooter}
+
+
+
+
+
{untaggedFilterId ? (
@@ -955,25 +954,25 @@ const Sidebar: React.FC = ({
style={style || undefined}
onClick={() => handleToggleTag(tag.id)}
aria-pressed={isActive}
- draggable
- onDragStart={(event) => {
- try {
- const payload = JSON.stringify({
- id: tag.id,
- label: tag.label,
- color: tag.color || null,
- });
- event.dataTransfer.effectAllowed = 'copy';
- event.dataTransfer.setData('application/x-papercrate-tag', payload);
- event.dataTransfer.setData('text/papercrate-tag', payload);
- } catch (error) {
- console.warn('[sidebar] Failed to set tag drag payload', error);
- }
- }}
- >
- {tag.label}
-
- );
+ draggable
+ onDragStart={(event) => {
+ try {
+ const payload = JSON.stringify({
+ id: tag.id,
+ label: tag.label,
+ color: tag.color || null,
+ });
+ event.dataTransfer.effectAllowed = 'copy';
+ event.dataTransfer.setData('application/x-papercrate-tag', payload);
+ event.dataTransfer.setData('text/papercrate-tag', payload);
+ } catch (error) {
+ console.warn('[sidebar] Failed to set tag drag payload', error);
+ }
+ }}
+ >
+ {tag.label}
+
+ );
})}