playing around with UI

papermerge/core/routers/documents.py

@@ -134,17 +134,16 @@ def get_document_custom_field_values(
         schemas.User, Security(get_current_user, scopes=[scopes.NODE_VIEW])
     ],
     db_session: db.Session = Depends(db.get_session),
-) -> list[schemas.CustomFieldValue]:
+) -> list[schemas.CFV]:
     """
     Get document custom field values
 
     Required scope: `{scope}`
     """
     try:
-        doc = db.get_document_custom_field_values(
+        doc = db.get_doc_cfv(
             db_session,
-            id=document_id,
-            user_id=user.id,
+            document_id=document_id,
         )
     except NoResultFound:
         raise HTTPException(status_code=404, detail="Document not found")

tests/core/models/test_document.py

@@ -543,6 +543,7 @@ def test_get_docs_by_type_one_doc_with_nonempty_cfv(
 
     assert len(items) == 2
 
+    # returned items are not sorted i.e. may be in any order
     for i in range(0, 2):
         cf = dict(items[i].custom_fields)
         if items[i].id == doc_1.id:

ui2/src/features/document/components/Contextmenu.tsx

@@ -11,7 +11,7 @@ import {
   selectSelectedPages
 } from "@/features/document/documentVersSlice"
 import {useGetFolderQuery} from "@/features/nodes/apiSlice"
-import ExtractPagesModal from "@/features/nodes/components/ExtractPagesModal"
+import ExtractPagesModal from "@/features/nodes/components/Commander/NodesCommander/ExtractPagesModal"
 import {
   selectCurrentDocVerID,
   selectCurrentNodeID,

ui2/src/features/nodes/components/FolderNodeActions.tsx → ui2/src/features/nodes/components/Commander/NodesCommander/FolderNodeActions.tsx

@@ -13,13 +13,13 @@ import type {PanelMode} from "@/types"
 import PanelContext from "@/contexts/PanelContext"
 
 import DuplicatePanelButton from "@/components/DualPanel/DuplicatePanelButton"
-import DeleteButton from "./DeleteButton"
-import EditNodeTagsButton from "./EditNodeTagsButton"
-import EditNodeTitleButton from "./EditNodeTitleButton"
-import NewFolderButton from "./NewFolderButton"
-import QuickFilter from "./QuickFilter"
-import SortMenu from "./SortMenu"
-import UploadButton from "./UploadButton"
+import DeleteButton from "../../DeleteButton"
+import EditNodeTagsButton from "../../EditNodeTagsButton"
+import EditNodeTitleButton from "../../EditNodeTitleButton"
+import NewFolderButton from "../../NewFolderButton"
+import QuickFilter from "../../QuickFilter"
+import SortMenu from "../../SortMenu"
+import UploadButton from "../../UploadButton"
 
 export default function FolderNodeActions() {
   const {height, width} = useViewportSize()

ui2/src/features/nodes/components/Node/Document/Document.tsx → ui2/src/features/nodes/components/Commander/NodesCommander/Node/Document/Document.tsx

@@ -10,7 +10,7 @@ import {
   selectSelectedNodeIds
 } from "@/features/ui/uiSlice"
 
-import Tags from "@/features/nodes/components/Node/Tags"
+import Tags from "@/features/nodes/components/Commander/NodesCommander/Node/Tags"
 import type {NodeType, PanelMode} from "@/types"
 import classes from "./Document.module.scss"
 

ui2/src/features/nodes/components/Node/Folder/Folder.tsx → ui2/src/features/nodes/components/Commander/NodesCommander/Node/Folder/Folder.tsx

@@ -13,8 +13,8 @@ import {
   selectSelectedNodeIds
 } from "@/features/ui/uiSlice"
 
-import DropNodesModal from "@/features/nodes/components/DropNodesDialog"
-import Tags from "@/features/nodes/components/Node/Tags"
+import DropNodesModal from "@/features/nodes/components/Commander/NodesCommander/DropNodesDialog"
+import Tags from "@/features/nodes/components/Commander/NodesCommander/Node/Tags"
 import type {NodeType, PanelMode} from "@/types"
 import classes from "./Folder.module.scss"
 

ui2/src/features/nodes/components/Commander/NodesCommander/index.tsx

@@ -0,0 +1,3 @@
+import NodesCommander from "./NodesCommander"
+
+export default NodesCommander

ui2/src/features/nodes/components/Commander/index.tsx

@@ -0,0 +1,5 @@
+import NodesCommander from "./NodesCommander"
+
+export default function Commander() {
+  return <NodesCommander />
+}

ui2/src/features/nodes/components/UploadButton.tsx

@@ -8,7 +8,7 @@ import {useContext, useState} from "react"
 import {useGetFolderQuery} from "../apiSlice"
 
 import {selectCurrentNodeID} from "@/features/ui/uiSlice"
-import {DropFilesModal} from "./DropFiles"
+import {DropFilesModal} from "./Commander/NodesCommander/DropFiles"
 
 const MIME_TYPES = [
   "image/png",