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

refactor: eliminate parentCollectionID field from RESTCollectionViewRequest type

Browse Source 
Collection ID serves the purpose.
This commit is contained in:
jamesgeorge007
2024-02-24 17:48:09 +05:30
parent d70d5bdb16
commit c0978c3b20
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/hoppscotch-common/src/components/new-collections/rest/Request.vue
View File

@@ -256,8 +256,7 @@ const isReorderable = computed(() => {
const isSameParent = computed(() => { const isSameParent = computed(() => {
return ( return (
currentReorderingStatus.value.parentID === currentReorderingStatus.value.parentID === props.requestView.collectionID
props.requestView.parentCollectionID
) )
}) })
@@ -277,7 +276,7 @@ const dragStart = ({ dataTransfer }: DragEvent) => {
changeCurrentReorderStatus({ changeCurrentReorderStatus({
type: "request", type: "request",
id: props.requestView.requestID, id: props.requestView.requestID,
parentID: props.requestView.parentCollectionID, parentID: props.requestView.collectionID,
}) })
} }
} }

12
packages/hoppscotch-common/src/components/new-collections/rest/index.vue
View File

@@ -134,7 +134,7 @@
:save-request="saveRequest" :save-request="saveRequest"
@drag-request=" @drag-request="
dragRequest($event, { dragRequest($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: node.data.value.requestID, requestIndex: node.data.value.requestID,
}) })
" "
@@ -146,13 +146,13 @@
@share-request="shareRequest" @share-request="shareRequest"
@update-request-order=" @update-request-order="
updateRequestOrder($event, { updateRequestOrder($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: node.data.value.requestID, requestIndex: node.data.value.requestID,
}) })
" "
@update-last-request-order=" @update-last-request-order="
updateRequestOrder($event, { updateRequestOrder($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: null, requestIndex: null,
}) })
" "
@@ -240,7 +240,7 @@
:save-request="saveRequest" :save-request="saveRequest"
@drag-request=" @drag-request="
dragRequest($event, { dragRequest($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: node.data.value.requestID, requestIndex: node.data.value.requestID,
}) })
" "
@@ -252,13 +252,13 @@
@share-request="shareRequest" @share-request="shareRequest"
@update-request-order=" @update-request-order="
updateRequestOrder($event, { updateRequestOrder($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: node.data.value.requestID, requestIndex: node.data.value.requestID,
}) })
" "
@update-last-request-order=" @update-last-request-order="
updateRequestOrder($event, { updateRequestOrder($event, {
parentCollectionIndexPath: node.data.value.parentCollectionID, parentCollectionIndexPath: node.data.value.collectionID,
requestIndex: null, requestIndex: null,
}) })
" "

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

@@ -10,7 +10,6 @@ import * as E from "fp-ts/Either"
import { import {
Ref, Ref,
computed, computed,
effect,
effectScope, effectScope,
markRaw, markRaw,
ref, ref,
@@ -46,9 +45,7 @@ import { WorkspaceProvider } from "~/services/new-workspace/provider"
import { import {
RESTCollectionChildrenView, RESTCollectionChildrenView,
RESTCollectionLevelAuthHeadersView, RESTCollectionLevelAuthHeadersView,
RESTCollectionViewCollection,
RESTCollectionViewItem, RESTCollectionViewItem,
RESTCollectionViewRequest,
RESTSearchResultsView, RESTSearchResultsView,
RootRESTCollectionView, RootRESTCollectionView,
} from "~/services/new-workspace/view" } from "~/services/new-workspace/view"
@@ -786,7 +783,7 @@ export class PersonalWorkspaceProviderService
item.requests?.length > 1 item.requests?.length > 1
? id === item.requests.length - 1 ? id === item.requests.length - 1
: false, : false,
parentCollectionID: collectionID, collectionID,
requestID: `${collectionID}/${id}`, requestID: `${collectionID}/${id}`,
request: req, request: req,
}, },

1
packages/hoppscotch-common/src/services/new-workspace/view.ts
View File

@@ -21,7 +21,6 @@ export type RESTCollectionViewRequest = {
request: HoppRESTRequest request: HoppRESTRequest
isLastItem: boolean isLastItem: boolean
parentCollectionID: string | null
} }
export type RESTCollectionViewItem = export type RESTCollectionViewItem =