fix: saving teamRequest not inheriting properties
This commit is contained in:
@@ -33,6 +33,7 @@
|
|||||||
@select="onSelect"
|
@select="onSelect"
|
||||||
@update-team="updateTeam"
|
@update-team="updateTeam"
|
||||||
@update-collection-type="updateCollectionType"
|
@update-collection-type="updateCollectionType"
|
||||||
|
@set-team-collection-adapter="teamCollectionAdapter = $event"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -86,6 +87,7 @@ import { platform } from "~/platform"
|
|||||||
import { useService } from "dioc/vue"
|
import { useService } from "dioc/vue"
|
||||||
import { RESTTabService } from "~/services/tab/rest"
|
import { RESTTabService } from "~/services/tab/rest"
|
||||||
import { GQLTabService } from "~/services/tab/graphql"
|
import { GQLTabService } from "~/services/tab/graphql"
|
||||||
|
import TeamCollectionAdapter from "~/helpers/teams/TeamCollectionAdapter"
|
||||||
|
|
||||||
const t = useI18n()
|
const t = useI18n()
|
||||||
const toast = useToast()
|
const toast = useToast()
|
||||||
@@ -93,6 +95,8 @@ const toast = useToast()
|
|||||||
const RESTTabs = useService(RESTTabService)
|
const RESTTabs = useService(RESTTabService)
|
||||||
const GQLTabs = useService(GQLTabService)
|
const GQLTabs = useService(GQLTabService)
|
||||||
|
|
||||||
|
const teamCollectionAdapter = ref<TeamCollectionAdapter>()
|
||||||
|
|
||||||
type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
|
type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
|
||||||
|
|
||||||
type CollectionType =
|
type CollectionType =
|
||||||
@@ -380,7 +384,6 @@ const saveRequestAs = async () => {
|
|||||||
platform: "rest",
|
platform: "rest",
|
||||||
workspaceType: "team",
|
workspaceType: "team",
|
||||||
})
|
})
|
||||||
|
|
||||||
pipe(
|
pipe(
|
||||||
updateTeamRequest(picked.value.requestID, data),
|
updateTeamRequest(picked.value.requestID, data),
|
||||||
TE.match(
|
TE.match(
|
||||||
@@ -388,7 +391,31 @@ const saveRequestAs = async () => {
|
|||||||
toast.error(`${getErrorMessage(err)}`)
|
toast.error(`${getErrorMessage(err)}`)
|
||||||
modalLoadingState.value = false
|
modalLoadingState.value = false
|
||||||
},
|
},
|
||||||
() => {
|
(result) => {
|
||||||
|
const { updateRequest } = result
|
||||||
|
|
||||||
|
RESTTabs.currentActiveTab.value.document = {
|
||||||
|
request: requestUpdated,
|
||||||
|
isDirty: false,
|
||||||
|
saveContext: {
|
||||||
|
originLocation: "team-collection",
|
||||||
|
requestID: updateRequest.id,
|
||||||
|
collectionID: updateRequest.collectionID,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if (teamCollectionAdapter.value) {
|
||||||
|
const { auth, headers } =
|
||||||
|
teamCollectionAdapter.value.cascadeParentCollectionForHeaderAuth(
|
||||||
|
updateRequest.collectionID
|
||||||
|
)
|
||||||
|
|
||||||
|
RESTTabs.currentActiveTab.value.document.inheritedProperties = {
|
||||||
|
auth,
|
||||||
|
headers,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
modalLoadingState.value = false
|
modalLoadingState.value = false
|
||||||
requestSaved()
|
requestSaved()
|
||||||
}
|
}
|
||||||
@@ -516,6 +543,18 @@ const updateTeamCollectionOrFolder = (
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (teamCollectionAdapter.value) {
|
||||||
|
const { auth, headers } =
|
||||||
|
teamCollectionAdapter.value.cascadeParentCollectionForHeaderAuth(
|
||||||
|
createRequestInCollection.collection.id
|
||||||
|
)
|
||||||
|
|
||||||
|
RESTTabs.currentActiveTab.value.document.inheritedProperties = {
|
||||||
|
auth,
|
||||||
|
headers,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
modalLoadingState.value = false
|
modalLoadingState.value = false
|
||||||
requestSaved()
|
requestSaved()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ const emit = defineEmits<{
|
|||||||
(event: "select", payload: Picked | null): void
|
(event: "select", payload: Picked | null): void
|
||||||
(event: "update-team", team: SelectedTeam): void
|
(event: "update-team", team: SelectedTeam): void
|
||||||
(event: "update-collection-type", type: CollectionType["type"]): void
|
(event: "update-collection-type", type: CollectionType["type"]): void
|
||||||
|
(event: "set-team-collection-adapter", adapter: TeamCollectionAdapter): void
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
|
type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
|
||||||
@@ -354,6 +355,7 @@ watch(
|
|||||||
(newTeam) => {
|
(newTeam) => {
|
||||||
if (newTeam) {
|
if (newTeam) {
|
||||||
teamCollectionAdapter.changeTeamID(newTeam.id)
|
teamCollectionAdapter.changeTeamID(newTeam.id)
|
||||||
|
emit("set-team-collection-adapter", teamCollectionAdapter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,5 +2,6 @@ mutation UpdateRequest($data: UpdateTeamRequestInput!, $requestID: ID!) {
|
|||||||
updateRequest(data: $data, requestID: $requestID) {
|
updateRequest(data: $data, requestID: $requestID) {
|
||||||
id
|
id
|
||||||
title
|
title
|
||||||
|
collectionID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user