From ae7e3a722c3d47390ddd7aafcb1d2e73c236ea08 Mon Sep 17 00:00:00 2001 From: Anoop M D Date: Tue, 17 Jan 2023 19:27:11 +0530 Subject: [PATCH] chore: disable dragndrop temporarily due to electron issues --- .../Collection/CollectionItem/index.js | 44 +++++++++---------- .../Sidebar/Collections/Collection/index.js | 30 ++++++------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js index 46c8f5b91..f65b423dc 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js @@ -35,28 +35,28 @@ const CollectionItem = ({ item, collection, searchText }) => { const [newFolderModalOpen, setNewFolderModalOpen] = useState(false); const [itemIsCollapsed, setItemisCollapsed] = useState(item.collapsed); - const [{ isDragging }, drag] = useDrag({ - type: 'COLLECTION_ITEM', - item: item, - collect: (monitor) => ({ - isDragging: monitor.isDragging() - }) - }); + // const [{ isDragging }, drag] = useDrag({ + // type: 'COLLECTION_ITEM', + // item: item, + // collect: (monitor) => ({ + // isDragging: monitor.isDragging() + // }) + // }); - const [{ isOver }, drop] = useDrop({ - accept: 'COLLECTION_ITEM', - drop: (draggedItem) => { - if (draggedItem.uid !== item.uid) { - dispatch(moveItem(collection.uid, draggedItem.uid, item.uid)); - } - }, - canDrop: (draggedItem) => { - return draggedItem.uid !== item.uid; - }, - collect: (monitor) => ({ - isOver: monitor.isOver() - }) - }); + // const [{ isOver }, drop] = useDrop({ + // accept: 'COLLECTION_ITEM', + // drop: (draggedItem) => { + // if (draggedItem.uid !== item.uid) { + // dispatch(moveItem(collection.uid, draggedItem.uid, item.uid)); + // } + // }, + // canDrop: (draggedItem) => { + // return draggedItem.uid !== item.uid; + // }, + // collect: (monitor) => ({ + // isOver: monitor.isOver() + // }) + // }); useEffect(() => { if (searchText && searchText.length) { @@ -141,7 +141,7 @@ const CollectionItem = ({ item, collection, searchText }) => { {deleteItemModalOpen && setDeleteItemModalOpen(false)} />} {newRequestModalOpen && setNewRequestModalOpen(false)} />} {newFolderModalOpen && setNewFolderModalOpen(false)} />} -
drag(drop(node))}> +
{indents && indents.length ? indents.map((i) => { diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js index b847ece91..7520565a4 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js @@ -73,20 +73,20 @@ const Collection = ({ collection, searchText }) => { const isLocal = isLocalCollection(collection); - const [{ isOver }, drop] = useDrop({ - accept: 'COLLECTION_ITEM', - drop: (draggedItem) => { - console.log('drop', draggedItem); - dispatch(moveItemToRootOfCollection(collection.uid, draggedItem.uid)); - }, - canDrop: (draggedItem) => { - // todo need to make sure that draggedItem belongs to the collection - return true; - }, - collect: (monitor) => ({ - isOver: monitor.isOver() - }) - }); + // const [{ isOver }, drop] = useDrop({ + // accept: 'COLLECTION_ITEM', + // drop: (draggedItem) => { + // console.log('drop', draggedItem); + // dispatch(moveItemToRootOfCollection(collection.uid, draggedItem.uid)); + // }, + // canDrop: (draggedItem) => { + // // todo need to make sure that draggedItem belongs to the collection + // return true; + // }, + // collect: (monitor) => ({ + // isOver: monitor.isOver() + // }) + // }); return ( @@ -96,7 +96,7 @@ const Collection = ({ collection, searchText }) => { {showRemoveCollectionFromWSModal && setShowRemoveCollectionFromWSModal(false)} />} {showDeleteCollectionModal && setShowDeleteCollectionModal(false)} />} {showRemoveLocalCollectionModal && setShowRemoveLocalCollectionModal(false)} />} -
drop(node)}> +