fix minor bug

papermerge · Sep 19, 2024 · ef67b26 · ef67b26
1 parent 1935bfe
commit ef67b26
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/ui2/src/features/document/apiSlice.ts b/ui2/src/features/document/apiSlice.ts
@@ -27,6 +27,7 @@ type MovePagesType = {
   }
   sourceDocID: string
   targetDocID: string
+  sourceDocParentID: string
 }
 
 type ExtractPagesType = {
@@ -111,7 +112,8 @@ export const apiSliceWithDocuments = apiSlice.injectEndpoints({
       }),
       invalidatesTags: (_result, _error, arg) => [
         {type: "Document", id: arg.targetDocID},
-        {type: "Document", id: arg.sourceDocID}
+        {type: "Document", id: arg.sourceDocID},
+        {type: "Node", id: arg.sourceDocParentID}
       ]
     }),
     extractPages: builder.mutation<void, ExtractPagesType>({

diff --git a/ui2/src/features/document/components/Thumbnail/Thumbnail.tsx b/ui2/src/features/document/components/Thumbnail/Thumbnail.tsx
@@ -20,7 +20,8 @@ import {
   selectCurrentDocVerID,
   selectCurrentNodeID,
   selectDraggedPages,
-  selectDraggedPagesDocID
+  selectDraggedPagesDocID,
+  selectDraggedPagesDocParentID
 } from "@/features/ui/uiSlice"
 
 import {setCurrentPage} from "@/slices/dualPanel/dualPanel"
@@ -58,6 +59,7 @@ export default function Thumbnail({page}: Args) {
   const draggedPages = useAppSelector(selectDraggedPages)
   const draggedPagesIDs = draggedPages?.map(p => p.id)
   const draggedPagesDocID = useAppSelector(selectDraggedPagesDocID)
+  const draggedPagesDocParentID = useAppSelector(selectDraggedPagesDocParentID)
   const currentNodeID = useAppSelector(s => selectCurrentNodeID(s, mode))
   const {currentData: doc} = useGetDocumentQuery(currentNodeID!)
   const docVerID = useAppSelector(s => selectCurrentDocVerID(s, mode))
@@ -230,17 +232,21 @@ export default function Thumbnail({page}: Args) {
         />
         {page.number}
       </Stack>
-      {draggedPagesDocID && draggedPagesIDs && doc && (
-        <TransferPagesModal
-          targetDoc={doc}
-          sourceDocID={draggedPagesDocID}
-          sourcePageIDs={draggedPagesIDs}
-          targetPageID={page.id}
-          opened={trPagesDialogOpened}
-          onCancel={trPagesDialogClose}
-          onSubmit={trPagesDialogClose}
-        />
-      )}
+      {draggedPagesDocParentID &&
+        draggedPagesDocID &&
+        draggedPagesIDs &&
+        doc && (
+          <TransferPagesModal
+            targetDoc={doc}
+            sourceDocID={draggedPagesDocID}
+            sourceDocParentID={draggedPagesDocParentID}
+            sourcePageIDs={draggedPagesIDs}
+            targetPageID={page.id}
+            opened={trPagesDialogOpened}
+            onCancel={trPagesDialogClose}
+            onSubmit={trPagesDialogClose}
+          />
+        )}
     </>
   )
 }
diff --git a/ui2/src/features/document/components/TransferPagesModal.tsx b/ui2/src/features/document/components/TransferPagesModal.tsx
@@ -7,6 +7,7 @@ import type {DocumentType, ServerErrorType, TransferStrategyType} from "@/types"
 
 interface Args {
   sourceDocID: string
+  sourceDocParentID: string
   targetDoc: DocumentType
   sourcePageIDs: string[]
   targetPageID: string
@@ -20,6 +21,7 @@ export default function TransferPagesModal({
   onCancel,
   onSubmit,
   sourceDocID,
+  sourceDocParentID,
   targetDoc,
   targetPageID,
   sourcePageIDs
@@ -37,6 +39,7 @@ export default function TransferPagesModal({
         move_strategy: transferStrategy
       },
       sourceDocID: sourceDocID,
+      sourceDocParentID: sourceDocParentID,
       targetDocID: targetDoc.id
     }
     try {

diff --git a/ui2/src/features/nodes/components/Commander.tsx b/ui2/src/features/nodes/components/Commander.tsx
@@ -59,7 +59,7 @@ export default function Commander() {
   const [pageSize, setPageSize] = useState<number>(lastPageSize)
   const [page, setPage] = useState<number>(1)
   const filter = useAppSelector(s => selectFilterText(s, mode))
-  const {currentData, isLoading, isFetching, isError, refetch} =
+  const {data, isLoading, isFetching, isError, refetch} =
     useGetPaginatedNodesQuery({
       nodeID: currentNodeID!,
       page_number: page,
@@ -74,15 +74,15 @@ export default function Commander() {
 
   const {data: currentFolder} = useGetFolderQuery(currentNodeID)
 
-  if (isLoading && !currentData) {
+  if (isLoading && !data) {
     return <div>Loading...</div>
   }
 
   if (isError) {
     return <div>{`some error`}</div>
   }
 
-  if (!currentData) {
+  if (!data) {
     return <div>Data is null</div>
   }
 
@@ -172,7 +172,7 @@ export default function Commander() {
     refetch()
   }
 
-  const nodes = currentData.items.map((n: NodeType) => (
+  const nodes = data.items.map((n: NodeType) => (
     <Node onClick={onClick} key={n.id} node={n} />
   ))
 
@@ -186,7 +186,7 @@ export default function Commander() {
           pagination={{
             pageNumber: page,
             pageSize: pageSize!,
-            numPages: currentData.num_pages
+            numPages: data.num_pages
           }}
           onPageNumberChange={onPageNumberChange}
           onPageSizeChange={onPageSizeChange}