fix: fixed rename of collection

mbret · Jul 1, 2024 · c6c2493 · c6c2493
1 parent 0465baa
commit c6c2493
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/packages/web/src/collections/CollectionActionsDrawer/CollectionActionsDrawer.tsx b/packages/web/src/collections/CollectionActionsDrawer/CollectionActionsDrawer.tsx
@@ -21,7 +21,7 @@ import {
   collectionActionDrawerChangesState,
   collectionActionDrawerState
 } from "./useCollectionActionsDrawer"
-import { EditCollectionDialog } from "./EditCollectionDialog"
+import { RenameCollectionDialog } from "./RenameCollectionDialog"
 import { differenceInMinutes } from "date-fns"
 import { COLLECTION_METADATA_LOCK_MN } from "@oboku/shared"
 import { useModalNavigationControl } from "../../navigation/useModalNavigationControl"
@@ -177,12 +177,11 @@ export const CollectionActionsDrawer: FC<{}> = () => {
         }}
         collectionId={collectionId}
       />
-      <EditCollectionDialog
-        id={isEditCollectionDialogOpenedWithId}
+      <RenameCollectionDialog
+        openWith={isEditCollectionDialogOpenedWithId}
         onClose={() => {
           setIsEditCollectionDialogOpenedWithId(undefined)
         }}
-        open={!!isEditCollectionDialogOpenedWithId}
       />
     </>
   )

diff --git a/...ionActionsDrawer/EditCollectionDialog.tsx → ...nActionsDrawer/RenameCollectionDialog.tsx b/...ionActionsDrawer/EditCollectionDialog.tsx → ...nActionsDrawer/RenameCollectionDialog.tsx
@@ -11,14 +11,13 @@ import { getMetadataFromCollection } from "../getMetadataFromCollection"
 import { useCollection } from "../states"
 import { useUpdateCollection } from "../useUpdateCollection"
 
-export const EditCollectionDialog: FC<{
-  open: boolean
-  id: string | undefined
+export const RenameCollectionDialog: FC<{
+  openWith: string | undefined
   onClose: () => void
-}> = ({ onClose, open, id }) => {
+}> = ({ onClose, openWith }) => {
   const [name, setName] = useState("")
   const { data: collection } = useCollection({
-    id
+    id: openWith
   })
   const { mutate: editCollection } = useUpdateCollection()
 
@@ -37,11 +36,11 @@ export const EditCollectionDialog: FC<{
 
   useEffect(() => {
     setName((prev) => title || prev)
-  }, [title, id])
+  }, [title, openWith])
 
   return (
-    <Dialog onClose={onInnerClose} open={open}>
-      <DialogTitle>{getMetadataFromCollection(collection)?.title}</DialogTitle>
+    <Dialog onClose={onInnerClose} open={!!openWith}>
+      <DialogTitle>{title}</DialogTitle>
       <DialogContent>
         <TextField
           autoFocus
@@ -59,7 +58,7 @@ export const EditCollectionDialog: FC<{
         <Button
           onClick={() => {
             onInnerClose()
-            id && onConfirm(id, name)
+            openWith && onConfirm(openWith, name)
           }}
         >
           Save

diff --git a/packages/web/src/collections/CollectionDetailsScreen.tsx b/packages/web/src/collections/CollectionDetailsScreen.tsx
@@ -6,12 +6,12 @@ import CollectionBgSvg from "../assets/series-bg.svg"
 import { useCollection } from "./states"
 import { BookListWithControls } from "../books/bookList/BookListWithControls"
 import { useVisibleBookIds } from "../books/states"
-import { useCollectionActionsDrawer } from "../library/collections/CollectionActionsDrawer/useCollectionActionsDrawer"
 import { signal, useSignalValue } from "reactjrx"
 import {
   ListActionSorting,
   ListActionViewMode
 } from "../common/lists/ListActionsToolbar"
+import { useCollectionActionsDrawer } from "./CollectionActionsDrawer/useCollectionActionsDrawer"
 
 type ScreenParams = {
   id: string

diff --git a/packages/web/src/collections/list/CollectionListItemList.tsx b/packages/web/src/collections/list/CollectionListItemList.tsx
@@ -16,7 +16,7 @@ import { CollectionDocType } from "@oboku/shared"
 import { Cover } from "../../books/Cover"
 import { useCollection } from "../states"
 import { DeepReadonlyObject } from "rxdb"
-import { useCollectionActionsDrawer } from "../../library/collections/CollectionActionsDrawer/useCollectionActionsDrawer"
+import { useCollectionActionsDrawer } from "../CollectionActionsDrawer/useCollectionActionsDrawer"
 
 const ListItem = styled(MuiListItem)(() => ({
   height: `100%`,

diff --git a/packages/web/src/collections/useUpdateCollection.ts b/packages/web/src/collections/useUpdateCollection.ts
@@ -15,11 +15,11 @@ export const useUpdateCollection = () => {
         .findOne({ selector: { _id } })
         .exec()
 
-      item?.atomicUpdate((old) => ({
+      return item?.atomicUpdate((old) => ({
         ...old,
         ...rest,
         metadata: old.metadata?.map((entry) =>
-          entry.type === "user" ? { ...entry, name } : entry
+          entry.type === "user" ? { ...entry, title: name } : entry
         )
       }))
     }