btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: unify markup

Browse Source
This commit is contained in:
jamesgeorge007
2024-02-20 20:19:57 +05:30
parent d0c7c4a245
commit 0a0f441da1
5 changed files with 354 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts
View File

@@ -508,13 +508,11 @@ export class PersonalWorkspaceProviderService
draggedCollectionIndex,
destinationCollectionIndex
)
// resolveSaveContextOnCollectionReorder({
// lastIndex: pathToLastIndex(draggedCollectionIndex),
// newIndex: pathToLastIndex(
// destinationCollectionIndex ? destinationCollectionIndex : ""
// ),
// folderPath: draggedCollectionIndex.split("/").slice(0, -1).join("/"),
// })
resolveSaveContextOnCollectionReorder({
lastIndex: this.pathToLastIndex(draggedCollectionIndex),
newIndex: this.pathToLastIndex(destinationCollectionIndex ?? ""),
folderPath: draggedCollectionIndex.split("/").slice(0, -1).join("/"),
})
return Promise.resolve(E.right(undefined))
}
@@ -533,34 +531,38 @@ export class PersonalWorkspaceProviderService
const draggedCollectionIndex = collectionHandle.value.data.collectionID
// const parentFolder = draggedCollectionIndex
// .split("/")
// .slice(0, -1)
// .join("/") // remove last folder to get parent folder
// const totalFoldersOfDestinationCollection =
// getFoldersByPath(
// restCollectionStore.value.state,
// destinationCollectionIndex
// ).length - (parentFolder === destinationCollectionIndex ? 1 : 0)
moveRESTFolder(draggedCollectionIndex, destinationCollectionIndex)
// resolveSaveContextOnCollectionReorder(
// {
// lastIndex: pathToLastIndex(draggedCollectionIndex),
// newIndex: -1,
// folderPath: parentFolder,
// length: getFoldersByPath(restCollectionStore.value.state, parentFolder)
// .length,
// },
// "drop"
// )
if (destinationCollectionIndex === null) {
return Promise.resolve(E.right(undefined))
}
// updateSaveContextForAffectedRequests(
// draggedCollectionIndex,
// `${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`
// )
const parentFolder = draggedCollectionIndex
.split("/")
.slice(0, -1)
.join("/") // remove last folder to get parent folder
const totalFoldersOfDestinationCollection =
getFoldersByPath(
restCollectionStore.value.state,
destinationCollectionIndex
).length - (parentFolder === destinationCollectionIndex ? 1 : 0)
resolveSaveContextOnCollectionReorder(
{
lastIndex: this.pathToLastIndex(draggedCollectionIndex),
newIndex: -1,
folderPath: parentFolder,
length: getFoldersByPath(restCollectionStore.value.state, parentFolder)
.length,
},
"drop"
)
updateSaveContextForAffectedRequests(
draggedCollectionIndex,
`${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`
)
// const { auth, headers } = cascadeParentCollectionForHeaderAuth(
// `${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`,