Merge branch 'feat/maintainers-edit-wiki-comments' into 'master'

allow maintainers to edit/delete notes

See merge request !177654



Merged-by: Himanshu Kapoor <info@fleon.org>
Approved-by: Alex Fracazo <afracazo@gitlab.com>
Approved-by: Himanshu Kapoor <info@fleon.org>
Co-authored-by: Salihu <salihudickson@gmail.com>

app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_note.vue

@@ -36,11 +36,6 @@ export default {
       required: false,
       default: false,
     },
-    userPermissions: {
-      type: Object,
-      required: false,
-      default: () => ({}),
-    },
   },
   data() {
     return {
@@ -53,18 +48,14 @@ export default {
     userSignedId() {
       return Boolean(this.currentUserData?.id);
     },
+    userPermissions() {
+      return this.note.userPermissions;
+    },
     canReply() {
-      const {
-        userPermissions: { createNote },
-        userSignedId,
-      } = this;
-
-      return createNote && userSignedId && !this.replyNote;
+      return this.userPermissions?.createNote && this.userSignedId && !this.replyNote;
     },
     canEdit() {
-      const { currentUserData, userSignedId } = this;
-
-      return userSignedId && currentUserData?.id.toString() === this.authorId;
+      return this.userSignedId && this.userPermissions?.adminNote;
     },
     canReportAsAbuse() {
       const { currentUserData, userSignedId } = this;

spec/frontend/pages/shared/wikis/notes/components/wiki_note_spec.js

@@ -22,7 +22,6 @@ describe('WikiNote', () => {
   const createWrapper = (props) => {
     return shallowMountExtended(WikiNote, {
       propsData: {
-        note,
         noteableId,
         ...props,
       },
@@ -47,7 +46,7 @@ describe('WikiNote', () => {
   };
 
   beforeEach(() => {
-    wrapper = createWrapper();
+    wrapper = createWrapper({ note });
   });
 
   describe('renders correctly by default', () => {
@@ -95,7 +94,7 @@ describe('WikiNote', () => {
       expect(noteActions.props()).toMatchObject({
         authorId: '1',
         noteUrl: note.url,
-        showReply: false,
+        showReply: true,
         showEdit: false,
         canReportAsAbuse: true,
       });
@@ -114,7 +113,7 @@ describe('WikiNote', () => {
 
   describe('when user is signed in', () => {
     beforeEach(() => {
-      wrapper = createWrapper();
+      wrapper = createWrapper({ note });
     });
 
     it('should emit reply when reply event is fired from note actions', () => {
@@ -125,11 +124,7 @@ describe('WikiNote', () => {
     });
 
     it('should pass prop "showReply" as true to note actions when user can reply', () => {
-      wrapper = createWrapper({
-        userPermissions: {
-          createNote: true,
-        },
-      });
+      wrapper = createWrapper({ note });
 
       const noteActions = wrapper.findComponent(NoteActions);
       expect(noteActions.props().showReply).toBe(true);
@@ -137,8 +132,12 @@ describe('WikiNote', () => {
 
     it('should pass prop "showReply" as false to note actions when user cannot reply', () => {
       wrapper = createWrapper({
-        userPermissions: {
-          createNote: false,
+        note: {
+          ...note,
+          userPermissions: {
+            ...note.userPermissions,
+            createNote: false,
+          },
         },
       });
 
@@ -176,9 +175,9 @@ describe('WikiNote', () => {
         wrapper = createWrapper({
           note: {
             ...note,
-            author: {
-              ...note.author,
-              id: 'gid://gitlab/User/70',
+            userPermissions: {
+              ...note.userPermissions,
+              adminNote: true,
             },
           },
         });