Commit f26aa795 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '218322-use-comment-path' into 'master'

Use the endpoint provided by the backend

See merge request gitlab-org/gitlab!38286
parents bb120981 a0b0a561
...@@ -4,7 +4,6 @@ import createFlash from '~/flash'; ...@@ -4,7 +4,6 @@ import createFlash from '~/flash';
import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue'; import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { joinPaths } from '~/lib/utils/url_utility';
import HistoryCommentEditor from './history_comment_editor.vue'; import HistoryCommentEditor from './history_comment_editor.vue';
export default { export default {
...@@ -43,9 +42,6 @@ export default { ...@@ -43,9 +42,6 @@ export default {
}, },
computed: { computed: {
noteIdUrl() {
return joinPaths(this.notesUrl, this.comment.id);
},
commentNote() { commentNote() {
return this.comment?.note; return this.comment?.note;
}, },
...@@ -72,7 +68,7 @@ export default { ...@@ -72,7 +68,7 @@ export default {
getSaveConfig(note) { getSaveConfig(note) {
const isUpdatingComment = Boolean(this.comment); const isUpdatingComment = Boolean(this.comment);
const method = isUpdatingComment ? 'put' : 'post'; const method = isUpdatingComment ? 'put' : 'post';
const url = isUpdatingComment ? this.noteIdUrl : this.notesUrl; const url = isUpdatingComment ? this.comment.path : this.notesUrl;
const data = { note: { note } }; const data = { note: { note } };
const emitName = isUpdatingComment ? 'onCommentUpdated' : 'onCommentAdded'; const emitName = isUpdatingComment ? 'onCommentUpdated' : 'onCommentAdded';
...@@ -105,7 +101,7 @@ export default { ...@@ -105,7 +101,7 @@ export default {
}, },
deleteComment() { deleteComment() {
this.isDeletingComment = true; this.isDeletingComment = true;
const deleteUrl = this.noteIdUrl; const deleteUrl = this.comment.path;
axios axios
.delete(deleteUrl) .delete(deleteUrl)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment