Merge pull request #400 from bakaphp/hot-fix

fix

Author: buttercubz

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.30.3",
+  "version": "0.30.4",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/modules/messages/index.ts

@@ -16,6 +16,7 @@ import {
   AllLikedMessagesByUser,
   AllForYouMessages,
   AllChannelMessages,
+  MessageWithFileInputInterface,
 } from '../../types';
 import {
   CREATE_MESSAGE_MUTATION,
@@ -30,6 +31,7 @@ import {
   VIEW_MESSAGE_MUTATION,
   DISLIKE_MESSAGE_MUTATION,
   RESTORE_MESSAGE_MUTATION,
+  CREATE_MESSAGE_WITH_FILE_MUTATION,
 } from '../../mutations';
 
 import {
@@ -79,7 +81,10 @@ export class Messages {
     return (await response).data.createMessage as MessagesInterface;
   }
 
-  public async createMessageWithFile(file: File, input: any): Promise<any> {
+  public async createMessageWithFile(
+    file: File,
+    input: MessageWithFileInputInterface
+  ): Promise<any> {
     if (!this.options || !this.axiosClient)
       throw new Error('FileSystem module not initialized');
 
@@ -88,28 +93,17 @@ export class Messages {
     formData.append(
       'operations',
       JSON.stringify({
-        query: `
-          mutation ($file: Upload!, $input: MessageInput!) {
-            createMessage(input: $input) {
-              id
-              message
-              user { id }
-              parent { id }
-              messageType { id }
-              reactions_count
-              tags { data { name } }
-              files { data { id, uuid, name, url } }
-            }
-          }
-        `,
+        query: CREATE_MESSAGE_WITH_FILE_MUTATION,
         variables: {
-          file: null,
-          input,
+          input: {
+            ...input,
+            files: null,
+          },
         },
       })
     );
 
-    formData.append('map', JSON.stringify({ '0': ['variables.file'] }));
+    formData.append('map', JSON.stringify({ '0': ['variables.input.files'] }));
     formData.append('0', file, file.name);
 
     const response = await this.axiosClient.post('', formData);

src/mutations/messages.mutation.ts

@@ -32,35 +32,36 @@ export const CREATE_MESSAGE_MUTATION = gql`
   }
 `;
 
-export const CREATE_MESSAGE_MUTATION_V2 = gql`
-  mutation($file: Upload!) {
-    createMessage(
-      input: {
-        message_verb: "EXE"
-        message: {
-          name: "John Doe"
-          for_review: true
-          is_reviewed: false
-          text: "Sample message text"
-        }
-        entity_id: "550e8400-e29b-41d4-a716-446655440000"
-        tags: [{ name: "test" }, { name: "test2" }]
-        is_public: 1
-        files: [$file]
-      }
-    ) {
+export const CREATE_MESSAGE_WITH_FILE_MUTATION = `
+  mutation createMessage($input: MessageInput!) {
+    createMessage(input: $input) {
       id
+      uuid
+      slug
       message
+      parent_id
+      total_liked
+      total_saved
+      comment_count
+      message_types_id
+      reactions_count
       user {
         id
+        firstname
+        lastname
+        displayname
+      }
+      appModuleMessage {
+        entity_id
+        system_modules
       }
       parent {
         id
+        uuid
       }
       messageType {
         id
       }
-      reactions_count
       tags {
         data {
           name

src/types/messages.ts

@@ -89,6 +89,16 @@ export interface MessageInputInterface {
   distribution?: DistributionInputInterface;
 }
 
+export interface MessageWithFileInputInterface {
+  message_verb: string;
+  message: any;
+  system_modules_id?: string;
+  entity_id?: string;
+  parent_id?: string;
+  distribution?: DistributionInputInterface;
+  files: File[];
+}
+
 export interface MessageUpdateInputInterface {
   message: string;
   message_verb?: string;