Update bookmark mutation generator function

client/cypress/e2e/frontend/bookmarks.spec.js

@@ -38,6 +38,7 @@ describe('Bookmarks', () => {
         ModuleEditModeQuery: {},
         InstrumentQuery: {
           instrument: {
+            bookmarks: [],
             contents: [
               {
                 type: 'text_block',

client/src/components/content-blocks/ContentComponent.vue

@@ -198,25 +198,21 @@ const editNote = () => {
   store.dispatch('editNote', note);
 };
 
-const { mutation, variables, update, optimisticResponse } = constructContentComponentBookmarkMutation(
+const { mutation, updateCurry, getVariables, optimisticResponse } = constructContentComponentBookmarkMutation(
   props.component.id,
-  bookmarked.value,
   props.parent,
   props.root
 );
 const { mutate: mutateBookmarkContent } = useMutation(mutation, {
-  update,
   optimisticResponse,
 });
 
 const bookmarkContent = (bookmarked: boolean) => {
-  const newVars = {
+  const variables = getVariables(bookmarked);
-    input: {
+  const update = updateCurry(bookmarked);
-      ...variables.input,
+  mutateBookmarkContent(variables, {
-      bookmarked,
+    update,
-    },
+  });
-  };
-  mutateBookmarkContent(newVars);
 };
 
 const markHighlights = () => {

client/src/helpers/update-content-bookmark-mutation.ts

@@ -4,39 +4,28 @@ import { pushToArray, removeAtIndex } from '@/graphql/immutable-operations';
 import { graphql } from '@/__generated__';
 
 const compareUuid = (uuid: string) => (element) => element.uuid === uuid;
+type UpdateCurry = (newBookmarkedValue: boolean) => (store) => void;
+type GetVariables = (newBookmarkedValue: boolean) => any;
 
 interface Mutation {
   mutation: any;
-  variables: any;
-  update: (store: any) => void;
   optimisticResponse: any;
+  updateCurry: UpdateCurry;
+  getVariables: GetVariables;
 }
 
-export const constructContentComponentBookmarkMutation: (
+export const constructContentComponentBookmarkMutation: (uuid: string, parent: any, root: any) => Mutation = (
-  uuid: string,
+  uuid,
-  bookmarked: boolean,
+  parent,
-  parent: any,
+  root
-  root: any
+) => {
-) => Mutation = (uuid, bookmarked, parent, root) => {
+  let mutation: any;
-  let mutation: Mutation;
+  let updateCurry: UpdateCurry;
+  let getVariables: GetVariables;
+  let optimisticResponse: any;
 
   if (parent.__typename === 'InstrumentNode') {
-    mutation = {
+    updateCurry = (newBookmarkedValue: boolean) => (store) => {
-      mutation: graphql(`
-        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {
-          updateInstrumentBookmark(input: $input) {
-            success
-          }
-        }
-      `),
-      variables: {
-        input: {
-          uuid,
-          instrument: root,
-          bookmarked,
-        },
-      },
-      update: (store) => {
       const fragment = INSTRUMENT_FRAGMENT;
       const id = store.identify({
         __typename: 'InstrumentNode',
@@ -48,8 +37,9 @@ export const constructContentComponentBookmarkMutation: (
       });
 
       let bookmarks: any[];
+      console.log(newBookmarkedValue);
 
-        if (bookmarked) {
+      if (newBookmarkedValue) {
         const element = {
           note: null,
           uuid,
@@ -69,38 +59,39 @@ export const constructContentComponentBookmarkMutation: (
         ...instrument,
         bookmarks,
       };
+      console.log(data);
 
       store.writeFragment({
         data,
         fragment,
         id,
       });
+    };
+    getVariables = (newBookmarkedValue: boolean) => {
+      return {
+        input: {
+          uuid,
+          instrument: root,
+          bookmarked: newBookmarkedValue,
         },
-      optimisticResponse: {
+      };
+    };
+    mutation = graphql(`
+      mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {
+        updateInstrumentBookmark(input: $input) {
+          success
+        }
+      }
+    `);
+    optimisticResponse = {
       __typename: 'Mutation',
       updateInstrumentBookmark: {
         __typename: 'UpdateInstrumentBookmarkPayload',
         success: true,
       },
-      },
     };
   } else {
-    mutation = {
+    updateCurry = (newBookmarkedValue: boolean) => (store) => {
-      mutation: graphql(`
-        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {
-          updateContentBookmark(input: $input) {
-            success
-          }
-        }
-      `),
-      variables: {
-        input: {
-          uuid,
-          contentBlock: root,
-          bookmarked,
-        },
-      },
-      update: (store) => {
       const query = CONTENT_BLOCK_QUERY;
       const variables = { id: root };
       const { contentBlock } = store.readQuery({
@@ -111,7 +102,7 @@ export const constructContentComponentBookmarkMutation: (
       // const bookmarks = data.contentBlock.bookmarks;
       let bookmarks: any[];
 
-        if (bookmarked) {
+      if (newBookmarkedValue) {
         const element = {
           note: null,
           uuid,
@@ -139,15 +130,30 @@ export const constructContentComponentBookmarkMutation: (
         query,
         variables,
       });
+    };
+    getVariables = (newBookmarkedValue: boolean) => {
+      return {
+        input: {
+          uuid,
+          contentBlock: root,
+          bookmarked: newBookmarkedValue,
         },
-      optimisticResponse: {
+      };
+    };
+    mutation = graphql(`
+      mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {
+        updateContentBookmark(input: $input) {
+          success
+        }
+      }
+    `);
+    optimisticResponse = {
       __typename: 'Mutation',
       updateContentBookmark: {
         __typename: 'UpdateContentBookmarkPayload',
         success: true,
       },
-      },
     };
   }
-  return mutation;
+  return { mutation, updateCurry, getVariables, optimisticResponse };
 };