Merge branch 'feature/discussions' into develop

weni-ai · Nov 16, 2023 · 633fead · 633fead
2 parents 57a6209 + 75d7f8d
commit 633fead
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/src/components/chats/ContactInfo/ModalStartDiscussion.vue b/src/components/chats/ContactInfo/ModalStartDiscussion.vue
@@ -111,6 +111,13 @@ export default {
         initial_message: this.message,
       });
 
+      if (this.$route.path !== 'discussion' && responseDiscussion.uuid) {
+        this.$router.push({
+          name: 'discussion',
+          params: { discussionId: responseDiscussion.uuid },
+        });
+      }
+
       this.close();
 
       if (!responseDiscussion.status) {

diff --git a/src/components/chats/DiscussionSidebar/index.vue b/src/components/chats/DiscussionSidebar/index.vue
@@ -144,10 +144,10 @@ export default {
 }
 
 .discussion-sidebar {
-  padding: $unnnic-spacing-xs;
-  padding-bottom: $unnnic-spacing-sm;
-
   &__room {
+    padding: $unnnic-spacing-xs;
+    padding-bottom: $unnnic-spacing-sm;
+
     display: flex;
     flex-direction: column;
     gap: $unnnic-spacing-xs;

diff --git a/src/components/chats/MessageManager/index.vue b/src/components/chats/MessageManager/index.vue
@@ -50,7 +50,7 @@
 
         <unnnic-button
           v-if="discussionId && showActionButton"
-          @click="openFileUploader"
+          @click="openFileUploader([])"
           type="secondary"
           size="large"
           iconCenter="attachment"
@@ -71,7 +71,7 @@
               :title="$t('record_audio')"
             />
             <more-actions-option
-              :action="openFileUploader"
+              :action="openFileUploader([])"
               icon="attachment"
               :title="$t('attach')"
             />
@@ -419,6 +419,10 @@ export default {
     justify-content: flex-end;
 
     padding-right: $unnnic-spacing-stack-sm;
+
+    :deep(.audio-player) {
+      width: auto;
+    }
   }
 }
 </style>
diff --git a/src/services/api/resources/chats/message.js b/src/services/api/resources/chats/message.js
@@ -103,25 +103,27 @@ export default {
     return response.data;
   },
 
-  async sendDiscussionMedia(roomId, { media, updateLoadingFiles }) {
-    const msg = await this.sendDiscussionMessage(roomId, {
-      text: '',
-    });
-    updateLoadingFiles?.(msg.uuid, 0);
+  async sendDiscussionMedia(discussionUuid, { media, updateLoadingFiles }) {
+    console.log('media', media);
+    console.log('updateLoadingFiles', updateLoadingFiles);
+
+    const mediaUuid = media.name + Date.now();
+
+    updateLoadingFiles?.(mediaUuid, 0);
     const response = await http.postForm(
-      '/media/',
+      `/discussion/${discussionUuid}/send_media_messages/`,
       {
         content_type: media.type,
-        discussion_message: msg.uuid,
+        text: '',
         media_file: media,
       },
       {
         onUploadProgress: (event) => {
           const progress = event.loaded / event.total;
-          updateLoadingFiles?.(msg.uuid, progress);
+          updateLoadingFiles?.(mediaUuid, progress);
         },
       },
     );
-    return response.data;
+    return response.data?.media?.[0];
   },
 };
diff --git a/src/store/modules/chats/discussionMessages.js b/src/store/modules/chats/discussionMessages.js
@@ -183,7 +183,7 @@ export default {
       await sendMedias({
         itemType: 'discussion',
         itemUuid: activeDiscussion.uuid,
-        itemUser: activeDiscussion.user,
+        itemUser: activeDiscussion.user || { email: Profile.state.me?.email },
         medias,
         sendItemMedia: (media) =>
           Message.sendDiscussionMedia(activeDiscussion.uuid, {

diff --git a/src/views/chats/Home.vue b/src/views/chats/Home.vue
@@ -298,7 +298,7 @@ export default {
     openFileUploader(files) {
       this.$refs.fileUploader.open();
 
-      if (files) {
+      if (files?.length > 0) {
         this.files = [...files];
       }
     },