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

chore: merge hoppscotch/staging into self-hosted/main

Browse Source
This commit is contained in:
Andrew Bastin
2023-03-29 21:03:52 +05:30
parent ea93162056 39afeab5f8
commit b826b53cee
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/hoppscotch-common/src/newstore/collections.ts
View File

@@ -7,6 +7,7 @@ import {
} from "@hoppscotch/data" } from "@hoppscotch/data"
import DispatchingStore, { defineDispatchers } from "./DispatchingStore" import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
import { getRESTSaveContext, setRESTSaveContext } from "./RESTSession" import { getRESTSaveContext, setRESTSaveContext } from "./RESTSession"
import { cloneDeep } from "lodash-es"
const defaultRESTCollectionState = { const defaultRESTCollectionState = {
state: [ state: [
@@ -105,7 +106,9 @@ const restCollectionDispatchers = defineDispatchers({
) { ) {
return { return {
state: state.map((col, index) => state: state.map((col, index) =>
index === collectionIndex ? { ...col, ...partialCollection } : col index === collectionIndex
? { ...col, ...cloneDeep(partialCollection) }
: col
), ),
} }
}, },
@@ -144,7 +147,7 @@ const restCollectionDispatchers = defineDispatchers({
folder, folder,
}: { }: {
path: string path: string
folder: HoppCollection<HoppRESTRequest> folder: Partial<HoppCollection<HoppRESTRequest>>
} }
) { ) {
const newState = state const newState = state
@@ -160,7 +163,10 @@ const restCollectionDispatchers = defineDispatchers({
return {} return {}
} }
Object.assign(target, folder) Object.assign(target, {
...target,
...cloneDeep(folder),
})
return { return {
state: newState, state: newState,
@@ -540,11 +546,11 @@ const gqlCollectionDispatchers = defineDispatchers({
{ {
collectionIndex, collectionIndex,
collection, collection,
}: { collectionIndex: number; collection: HoppCollection<any> } }: { collectionIndex: number; collection: Partial<HoppCollection<any>> }
) { ) {
return { return {
state: state.map((col, index) => state: state.map((col, index) =>
index === collectionIndex ? collection : col index === collectionIndex ? { ...col, ...cloneDeep(collection) } : col
), ),
} }
}, },
@@ -578,7 +584,10 @@ const gqlCollectionDispatchers = defineDispatchers({
editFolder( editFolder(
{ state }: GraphqlCollectionStoreType, { state }: GraphqlCollectionStoreType,
{ path, folder }: { path: string; folder: HoppCollection<HoppGQLRequest> } {
path,
folder,
}: { path: string; folder: Partial<HoppCollection<HoppGQLRequest>> }
) { ) {
const newState = state const newState = state
@@ -593,7 +602,10 @@ const gqlCollectionDispatchers = defineDispatchers({
return {} return {}
} }
Object.assign(target, folder) Object.assign(target, {
...target,
...cloneDeep(folder),
})
return { return {
state: newState, state: newState,
@@ -850,7 +862,7 @@ export function addRESTFolder(name: string, path: string) {
export function editRESTFolder( export function editRESTFolder(
path: string, path: string,
folder: HoppCollection<HoppRESTRequest> folder: Partial<HoppCollection<HoppRESTRequest>>
) { ) {
restCollectionStore.dispatch({ restCollectionStore.dispatch({
dispatcher: "editFolder", dispatcher: "editFolder",
@@ -1018,7 +1030,7 @@ export function removeGraphqlCollection(collectionIndex: number) {
export function editGraphqlCollection( export function editGraphqlCollection(
collectionIndex: number, collectionIndex: number,
collection: HoppCollection<HoppGQLRequest> collection: Partial<HoppCollection<HoppGQLRequest>>
) { ) {
graphqlCollectionStore.dispatch({ graphqlCollectionStore.dispatch({
dispatcher: "editCollection", dispatcher: "editCollection",
@@ -1041,7 +1053,7 @@ export function addGraphqlFolder(name: string, path: string) {
export function editGraphqlFolder( export function editGraphqlFolder(
path: string, path: string,
folder: HoppCollection<HoppGQLRequest> folder: Partial<HoppCollection<HoppGQLRequest>>
) { ) {
graphqlCollectionStore.dispatch({ graphqlCollectionStore.dispatch({
dispatcher: "editFolder", dispatcher: "editFolder",