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

refactor: add new tree adapter corresponding to search

Browse Source
This commit is contained in:
jamesgeorge007
2024-02-22 19:46:39 +05:30
parent af7e6b70cd
commit 46654853f0
6 changed files with 128 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/hoppscotch-common/src/services/new-workspace/index.ts
View File

@@ -1,4 +1,6 @@
import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data"
import { Service } from "dioc"
import * as E from "fp-ts/Either"
import {
Component,
Ref,
@@ -8,17 +10,15 @@ import {
shallowRef,
watch,
} from "vue"
import { WorkspaceProvider } from "./provider"
import { HandleRef } from "./handle"
import * as E from "fp-ts/Either"
import { Workspace, WorkspaceCollection, WorkspaceRequest } from "./workspace"
import { WorkspaceProvider } from "./provider"
import {
RESTCollectionChildrenView,
RESTCollectionLevelAuthHeadersView,
RESTSearchResultsView,
RootRESTCollectionView,
} from "./view"
import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data"
import { Workspace, WorkspaceCollection, WorkspaceRequest } from "./workspace"
export type WorkspaceError<ServiceErr> =
| { type: "SERVICE_ERROR"; error: ServiceErr }

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

@@ -1,5 +1,6 @@
import { Ref } from "vue"
import * as E from "fp-ts/Either"
import { HandleRef } from "./handle"
import {
Workspace,

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

@@ -968,7 +968,7 @@ export class PersonalWorkspaceProviderService
}
if (!searchQuery.value) {
return markRaw({
return {
type: "ok" as const,
data: {
providerID: this.providerID,
@@ -976,25 +976,9 @@ export class PersonalWorkspaceProviderService
loading: ref(false),
results: computed(() => {
return this.restCollectionState.value.state.map(
(coll, id) => {
return <RESTCollectionViewItem>{
type: "collection",
value: {
collectionID: id.toString(),
isLastItem:
id ===
this.restCollectionState.value.state.length - 1,
name: coll.name,
parentCollectionID: null,
},
}
}
)
}),
results: ref(this.restCollectionState.value.state),
},
})
}
}
return markRaw({
@@ -1007,104 +991,39 @@ export class PersonalWorkspaceProviderService
results: computed(() => {
const filterText = searchQuery.value.toLowerCase()
const filteredCollections: RESTCollectionViewItem[] = []
const filteredCollections = []
const isMatch = (text: string) =>
text.toLowerCase().includes(filterText)
for (const collection of this.restCollectionState.value.state) {
const filteredRequests: Extract<
RESTCollectionViewItem,
{ type: "request" }
>[] = []
const filteredFolders: Extract<
RESTCollectionViewItem,
{ type: "collection" }
>[] = []
collection.requests.forEach((request, requestID) => {
if (isMatch(request.name)) {
filteredRequests.push({
type: "request",
value: {
collectionID: collection.id!,
isLastItem:
collection.requests?.length > 1
? requestID === collection.requests.length - 1
: false,
// TODO: Replace `parentCollectionID` with `collectionID`
parentCollectionID: collection.id!,
requestID: requestID.toString(),
request: request as HoppRESTRequest,
},
})
const filteredRequests = []
const filteredFolders = []
for (const request of collection.requests) {
if (isMatch(request.name)) filteredRequests.push(request)
}
for (const folder of collection.folders) {
if (isMatch(folder.name)) filteredFolders.push(folder)
const filteredFolderRequests = []
for (const request of folder.requests) {
if (isMatch(request.name))
filteredFolderRequests.push(request)
}
})
collection.folders.forEach(
(childCollection, childCollectionID) => {
if (isMatch(childCollection.name)) {
filteredFolders.push({
type: "collection",
value: {
collectionID: `${collection.id}/${childCollectionID}`,
isLastItem:
collection.folders?.length > 1
? childCollectionID ===
collection.folders.length - 1
: false,
name: childCollection.name,
parentCollectionID: collection.id!,
},
})
}
const filteredFolderRequests: Extract<
RESTCollectionViewItem,
{ type: "request" }
>[] = ([] = [])
childCollection.requests.forEach(
(request: HoppRESTRequest, requestID: number) => {
if (isMatch(request.name))
filteredFolderRequests.push({
type: "request",
value: {
collectionID: childCollection.id!,
isLastItem:
childCollection.requests?.length > 1
? requestID ===
childCollection.requests.length - 1
: false,
// TODO: Replace `parentCollectionID` with `collectionID`
parentCollectionID: childCollection.id!,
requestID: requestID.toString(),
request,
},
})
}
)
if (filteredFolderRequests.length > 0) {
const filteredFolder = Object.assign(
{},
childCollection
)
filteredFolder.requests = filteredFolderRequests
filteredFolders.push(filteredFolder)
}
if (filteredFolderRequests.length > 0) {
const filteredFolder = Object.assign({}, folder)
filteredFolder.requests = filteredFolderRequests
filteredFolders.push(filteredFolder)
}
)
}
if (
filteredRequests.length + filteredFolders.length > 0 ||
isMatch(collection.name)
) {
filteredCollections.push(
...filteredFolders,
...filteredRequests
)
const filteredCollection = Object.assign({}, collection)
filteredCollection.requests = filteredRequests
filteredCollection.folders = filteredFolders
filteredCollections.push(filteredCollection)
}
}

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

@@ -1,4 +1,4 @@
import { HoppRESTRequest } from "@hoppscotch/data"
import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data"
import { Ref } from "vue"
import { HoppInheritedRESTProperty } from "~/helpers/types/HoppInheritedProperties"
@@ -53,5 +53,5 @@ export interface RESTSearchResultsView {
loading: Ref<boolean>
results: Ref<RESTCollectionViewItem[]>
results: Ref<HoppCollection[]>
}