Comment delete message

public/locales/en/translation.json

@@ -525,5 +525,6 @@
   "video": "video",
   "view": "view",
   "viewsWithCount": "{count} {count, plural, one {view} other {views}}",
-  "yesterday": "yesterday"
+  "yesterday": "yesterday",
+  "Failed to delete comment": "Failed to delete comment"
 }

public/locales/ru/translation.json

@@ -552,5 +552,6 @@
   "video": "видео",
   "view": "просмотр",
   "viewsWithCount": "{count} {count, plural, one {просмотр} few {просмотрa} other {просмотров}}",
-  "yesterday": "вчера"
+  "yesterday": "вчера",
+  "Failed to delete comment": "Не удалось удалить комментарий"
 }

src/components/Article/Comment/Comment.tsx

@@ -64,14 +64,19 @@ export const Comment = (props: Props) => {
         })
 
         if (isConfirmed) {
-          await deleteReaction(props.comment.id)
-          // TODO: Учесть то что deleteReaction может вернуть error
-          if (props.onDelete) {
+          const { error } = await deleteReaction(props.comment.id)
+          const notificationType = error ? 'error' : 'success'
+          const notificationMessage = error
+            ? t('Failed to delete comment')
+            : t('Comment successfully deleted')
+          await showSnackbar({ type: notificationType, body: notificationMessage })
+
+          if (!error && props.onDelete) {
             props.onDelete(props.comment.id)
           }
-          await showSnackbar({ body: t('Comment successfully deleted') })
         }
       } catch (error) {
+        await showSnackbar({ body: 'error' })
         console.error('[deleteReaction]', error)
       }
     }

src/context/reactions.tsx

@@ -21,7 +21,7 @@ type ReactionsContextType = {
   }) => Promise<Reaction[]>
   createReaction: (reaction: ReactionInput) => Promise<void>
   updateReaction: (reaction: ReactionInput) => Promise<Reaction>
-  deleteReaction: (id: number) => Promise<void>
+  deleteReaction: (id: number) => Promise<{ error: string }>
 }
 
 const ReactionsContext = createContext<ReactionsContextType>()
@@ -84,16 +84,16 @@ export const ReactionsProvider = (props: { children: JSX.Element }) => {
     setReactionEntities(changes)
   }
 
-  const deleteReaction = async (reaction_id: number): Promise<void> => {
+  const deleteReaction = async (reaction_id: number): Promise<{ error: string; reaction?: string }> => {
     if (reaction_id) {
-      const { error } = await apiClient.destroyReaction(reaction_id)
-      if (error) {
-        await showSnackbar({ type: 'error', body: t(error) })
-      }
+      const result = await apiClient.destroyReaction(reaction_id)
+      if (!result.error) {
         setReactionEntities({
           [reaction_id]: undefined,
         })
       }
+      return result
+    }
   }
 
   const updateReaction = async (input: ReactionInput): Promise<Reaction> => {

src/graphql/client/core.ts

@@ -135,7 +135,6 @@ export const apiClient = {
     user?: string
   }): Promise<AuthorFollows> => {
     const response = await publicGraphQLClient.query(authorFollows, params).toPromise()
-    console.log('!!! response:', response)
     return response.data.get_author_follows
   },
 
@@ -188,7 +187,7 @@ export const apiClient = {
   destroyReaction: async (reaction_id: number) => {
     const response = await apiClient.private.mutation(reactionDestroy, { reaction_id }).toPromise()
     console.debug('[graphql.client.core] destroyReaction:', response)
-    return response.data.delete_reaction.reaction
+    return response.data.delete_reaction
   },
   updateReaction: async (reaction: ReactionInput) => {
     const response = await apiClient.private.mutation(reactionUpdate, { reaction }).toPromise()