Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"prop-types": "15.8.1",
"query-string": "6.14.1",
"raf": "3.4.1",
"ramda": "0.26.1",
"ramda": "0.32.0",
"react": "16.14.0",
"react-addons-shallow-compare": "15.6.3",
"react-day-picker": "7.4.10",
Expand Down
10 changes: 5 additions & 5 deletions frontend/public/src/lib/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ export function csrfSafeMethod(method: string): boolean {
return /^(GET|HEAD|OPTIONS|TRACE)$/.test(method)
}

const headers = R.merge({ headers: {} })
const headers = R.mergeRight({ headers: {} })

const method = R.merge({ method: "GET" })
const method = R.mergeRight({ method: "GET" })

const credentials = R.merge({ credentials: "same-origin" })
const credentials = R.mergeRight({ credentials: "same-origin" })

const setWith = R.curry((path, valFunc, obj) => R.set(path, valFunc(), obj))

Expand All @@ -57,7 +57,7 @@ const csrfToken = R.unless(
setWith(R.lensPath(["headers", "X-CSRFToken"]), () => getCSRFCookie())
)

const jsonHeaders = R.merge({
const jsonHeaders = R.mergeRight({
headers: {
"Content-Type": "application/json",
Accept: "application/json"
Expand Down Expand Up @@ -130,7 +130,7 @@ const _fetchJSONWithCSRF = async (
// and reject a Left.
return R.compose(
resolveEither,
S.bimap(R.merge({ errorStatusCode: response.status }), R.identity),
S.bimap(R.mergeRight({ errorStatusCode: response.status }), R.identity),
filterE(() => response.ok),
parseJSON,
handleEmptyJSON
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14831,7 +14831,7 @@ __metadata:
prop-types: 15.8.1
query-string: 6.14.1
raf: 3.4.1
ramda: 0.26.1
ramda: 0.32.0
react: 16.14.0
react-addons-shallow-compare: 15.6.3
react-day-picker: 7.4.10
Expand Down Expand Up @@ -17500,10 +17500,10 @@ __metadata:
languageName: node
linkType: hard

"ramda@npm:0.26.1":
version: 0.26.1
resolution: "ramda@npm:0.26.1"
checksum: 19c2730e44c129538151ae034c89be9b2c6a4ccc7c65cff57497418bc532ce09282f98cd927c39b0b03c6bc3f1d1a12d822b7b07f96a1634f4958a6c05b7b384
"ramda@npm:0.32.0":
version: 0.32.0
resolution: "ramda@npm:0.32.0"
checksum: d26ce9796b60e89496ba3663d2e3d7f7eb0cb885c3949bc4fb0353b27b4409c25af4006c88f6970888d743ca16a0d8b616bcf8aaa353dc09b830f6f90cddb7b1
languageName: node
linkType: hard

Expand Down