Merge 5c7ac1a into 2404071

Author: renovate[bot]

package-lock.json

@@ -84,7 +84,7 @@
     "semver": "7.5.4",
     "sharp": "0.32.1",
     "svg-points": "6.0.1",
-    "swr": "1.3.0",
+    "swr": "2.2.0",
     "tailwindcss": "3.1.8",
     "url-loader": "4.1.1",
     "uuid-parse": "1.1.0",

package.json

@@ -77,7 +77,7 @@ export default function Page () {
   const canComment = appeal.state.id < 3 && appeal.acl.comment
   const canUpdateState = appeal.acl.state
   const canAssign = appeal.acl.assign
-  const mutateCommentInsert = (comment) => (data, mutate) => {
+  const mutateCommentInsert = (comment) => ({ data }, mutate) => {
     const records = data.listPlayerAppealComments.records.slice()
 
     records.push(comment)

pages/appeals/[id].js

@@ -37,7 +37,8 @@ const graphQLClient = new GraphQLClient(process.env.BASE_PATH + '/graphql', {
   credentials: 'include'
 })
 
-const graphqlFetcher = (query, ...args) => {
+const graphqlFetcher = (key) => {
+  const [query, ...args] = key
   // Creates an object. Odd indexes are keys and even indexes are values.
   // Needs to be flat to avoid unnecessary rerendering since swr does shallow comparison.
   const variables = [...(args || [])].reduce((acc, arg, index, arr) => {
@@ -66,7 +67,7 @@ export const useMutateApi = (operation) => {
     setLoading(true)
 
     try {
-      const data = await graphqlFetcher(operation.query, ...flatVars)
+      const data = await graphqlFetcher([operation.query, ...flatVars])
 
       setState({ ...state, errors: null, data })
     } catch (error) {
@@ -87,20 +88,17 @@ export const useMatchMutate = () => {
       throw new Error('matchMutate requires the cache provider to be a Map instance')
     }
 
-    const flatVars = toPairs(args).flat()
-    const argKey = unstableSerialize(flatVars).slice(1)
-
     let matchingKey
 
     for (const key of cache.keys()) {
       if (key.includes(operation)) {
         const value = cache.get(key)
 
-        if (!value || !value[operation]) {
+        if (!value) {
           continue
         }
 
-        if (!argKey || key.includes(argKey)) {
+        if (key === unstableSerialize(value._k)) {
           matchingKey = key
           break
         }
@@ -110,7 +108,7 @@ export const useMatchMutate = () => {
     if (!matchingKey) return () => {}
 
     return executor(cache.get(matchingKey), (...args) => {
-      mutate(matchingKey, ...args)
+      mutate(matchingKey, args[0])
     })
   }
 }