From 5eadff662d1d8cb2aae80e62f2887b5c70010f98 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 26 Jan 2021 17:29:12 +0100
Subject: [PATCH] Disable bookmarking when editing a module

---
 client/src/components/Chapter.vue                        | 4 ++--
 client/src/components/ContentBlock.vue                   | 4 ++--
 .../src/components/content-blocks/ContentComponent.vue   | 4 ++--
 client/src/components/notes/BookmarkActions.vue          | 9 ++++++++-
 client/src/store/index.js                                | 1 -
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index 85cd8d98..10311cf9 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -33,7 +33,7 @@
   import AddContentButton from '@/components/AddContentButton';
   import BookmarkActions from '@/components/notes/BookmarkActions';
 
-  import {mapGetters} from 'vuex';
+  import {mapState} from 'vuex';
   import {isHidden} from '@/helpers/content-block';
   import {meQuery} from '@/graphql/queries';
 
@@ -56,7 +56,7 @@
     },
 
     computed: {
-      ...mapGetters(['editModule']),
+      ...mapState(['editModule']),
       filteredContentBlocks() {
         if (!(this.chapter && this.chapter.contentBlocks)) {
           return [];
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 1b2085d3..92c85d53 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -62,7 +62,7 @@
 
   import {meQuery} from '@/graphql/queries';
 
-  import {mapGetters} from 'vuex';
+  import {mapState} from 'vuex';
 
   import {isHidden} from '@/helpers/content-block';
 
@@ -93,7 +93,7 @@
     },
 
     computed: {
-      ...mapGetters(['editModule']),
+      ...mapState(['editModule']),
       canEditModule() {
         return !this.contentBlock.indent && this.editModule;
       },
diff --git a/client/src/components/content-blocks/ContentComponent.vue b/client/src/components/content-blocks/ContentComponent.vue
index 11b717d5..61fd6e28 100644
--- a/client/src/components/content-blocks/ContentComponent.vue
+++ b/client/src/components/content-blocks/ContentComponent.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import {mapGetters} from 'vuex';
+import {mapState} from 'vuex';
 
 import TextBlock from '@/components/content-blocks/TextBlock';
 import InstrumentWidget from '@/components/content-blocks/InstrumentWidget';
@@ -70,7 +70,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['editModule']),
+    ...mapState(['editModule']),
     bookmarked() {
       return this.bookmarks && !!this.bookmarks.find(bookmark => bookmark.uuid === this.component.id);
     },
diff --git a/client/src/components/notes/BookmarkActions.vue b/client/src/components/notes/BookmarkActions.vue
index 6cf4c55e..69c0de10 100644
--- a/client/src/components/notes/BookmarkActions.vue
+++ b/client/src/components/notes/BookmarkActions.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="bookmark-actions">
+  <div
+    class="bookmark-actions"
+    v-if="!editModule">
     <a
       :class="{'bookmark-actions__action--bookmarked': bookmarked}"
       class="bookmark-actions__action bookmark-actions__bookmark"
@@ -27,12 +29,17 @@
   import AddNoteIcon from '@/components/icons/AddNoteIcon';
   import NoteIcon from '@/components/icons/NoteIcon';
 
+  import {mapState} from 'vuex';
+
   export default {
     props: ['bookmarked', 'note'],
     components: {
       BookmarkIcon,
       AddNoteIcon,
       NoteIcon
+    },
+    computed: {
+      ...mapState(['editModule'])
     }
   };
 </script>
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 06cdd0a2..9a243aa2 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -46,7 +46,6 @@ export default new Vuex.Store({
     scrollToAssignmentReady: state => state.scrollToAssignmentReady,
     scrollingToAssignment: state => state.scrollingToAssignment,
     currentProjectEntry: state => state.currentProjectEntry,
-    editModule: state => state.editModule,
     currentObjectiveGroup: state => state.currentObjectiveGroup,
     currentContent: state => state.currentContent,
     currentNoteBlock: state => state.currentNoteBlock,