granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use updated generic conflict API method

Browse source
This commit is contained in:
Justin Edmund 2022-12-24 23:30:48 -08:00
parent 97ed307921
commit 52b314e35e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/CharacterGrid/index.tsx
View file

@ -145,7 +145,8 @@ const CharacterGrid = (props: Props) => {
async function resolveConflict() { async function resolveConflict() {
if (incoming && conflicts.length > 0) { if (incoming && conflicts.length > 0) {
await api await api
.resolveCharacterConflict({ .resolveConflict({
object: 'characters',
incoming: incoming.id, incoming: incoming.id,
conflicting: conflicts.map((c) => c.id), conflicting: conflicts.map((c) => c.id),
position: position, position: position,

5
utils/api.tsx
View file

@ -77,7 +77,8 @@ class Api {
}) })
} }
resolveCharacterConflict({ incoming, conflicting, position, params }: { resolveConflict({ object, incoming, conflicting, position, params }: {
object: 'characters' | 'weapons'
incoming: string incoming: string
conflicting: string[] conflicting: string[]
position: number, position: number,
@ -90,7 +91,7 @@ class Api {
position: position, position: position,
}, },
} }
const resourceUrl = `${this.url}/characters/resolve` const resourceUrl = `${this.url}/${object}/resolve`
return axios.post(resourceUrl, body, { headers: params }) return axios.post(resourceUrl, body, { headers: params })
} }