Handle empty comments
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
b95b3c16e7
commit
968a965763
@ -24,6 +24,9 @@
|
||||
v-model="newComment.text"
|
||||
/>
|
||||
</p>
|
||||
<p class="help is-danger" v-if="emptyCommentError">
|
||||
{{ $t("Comment text can't be empty") }}
|
||||
</p>
|
||||
</div>
|
||||
<div class="send-comment">
|
||||
<b-button
|
||||
@ -125,12 +128,23 @@ export default class CommentTree extends Vue {
|
||||
|
||||
CommentModeration = CommentModeration;
|
||||
|
||||
emptyCommentError = false;
|
||||
|
||||
@Watch("currentActor")
|
||||
watchCurrentActor(currentActor: IPerson): void {
|
||||
this.newComment.actor = currentActor;
|
||||
}
|
||||
|
||||
@Watch("newComment", { deep: true })
|
||||
resetEmptyCommentError(newComment: IComment): void {
|
||||
if (this.emptyCommentError) {
|
||||
this.emptyCommentError = ["", "<p></p>"].includes(newComment.text);
|
||||
}
|
||||
}
|
||||
|
||||
async createCommentForEvent(comment: IComment): Promise<void> {
|
||||
this.emptyCommentError = ["", "<p></p>"].includes(comment.text);
|
||||
if (this.emptyCommentError) return;
|
||||
try {
|
||||
if (!comment.actor) return;
|
||||
await this.$apollo.mutate({
|
||||
@ -216,10 +230,13 @@ export default class CommentTree extends Vue {
|
||||
|
||||
// and reset the new comment field
|
||||
this.newComment = new CommentModel();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
if (error.graphQLErrors && error.graphQLErrors.length > 0) {
|
||||
this.$notifier.error(error.graphQLErrors[0].message);
|
||||
} catch (errors) {
|
||||
console.error(errors);
|
||||
if (errors.graphQLErrors && errors.graphQLErrors.length > 0) {
|
||||
const error = errors.graphQLErrors[0];
|
||||
if (error.field !== "text" && error.message[0] !== "can't be blank") {
|
||||
this.$notifier.error(error.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -968,5 +968,6 @@
|
||||
"{profile} posted a comment on the event {event}.": "{profile} posted a comment on the event {event}.",
|
||||
"You replied to a comment on the event {event}.": "You replied to a comment on the event {event}.",
|
||||
"{profile} replied to a comment on the event {event}.": "{profile} replied to a comment on the event {event}.",
|
||||
"New post": "New post"
|
||||
"New post": "New post",
|
||||
"Comment text can't be empty": "Comment text can't be empty"
|
||||
}
|
||||
|
@ -1062,5 +1062,6 @@
|
||||
"{profile} posted a comment on the event {event}.": "{profile} a posté un commentaire sur l'événement {event}.",
|
||||
"You replied to a comment on the event {event}.": "Vous avez répondu à un commentaire sur l'événement {event}.",
|
||||
"{profile} replied to a comment on the event {event}.": "{profile} a répondu à un commentaire sur l'événement {event}.",
|
||||
"New post": "Nouveau billet"
|
||||
"New post": "Nouveau billet",
|
||||
"Comment text can't be empty": "Le texte du commentaire ne peut être vide"
|
||||
}
|
||||
|
@ -42,6 +42,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Comment do
|
||||
Comments.create_comment(args) do
|
||||
{:ok, comment}
|
||||
else
|
||||
{:error, err} ->
|
||||
{:error, err}
|
||||
|
||||
{:allowed, false} ->
|
||||
{:error, :unauthorized}
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user