From 137bc1ce0de312e2cf78ce71a97930ce29839e0a Mon Sep 17 00:00:00 2001
From: Daniel <50702276+daniboygg@users.noreply.github.com>
Date: Thu, 16 May 2024 20:09:48 +0200
Subject: [PATCH] Disable send button on message when title and receivers are
 not set #5465

* Messages: use new component to show user profile when query has user to parameter

* Messages: use async/await for consistency with other code

* Change hardcoded url from component to userService so all strings
 related to endpoints are in the same place

* Messages: allow send message only when title and to is defined

* Messages: migrate a function from deprecated service to a new one

* Add documentation on how to migrate message service

---------

Co-authored-by: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
---
 assets/vue/services/message.js             | 23 +++++++++-
 assets/vue/services/userService.js         |  6 +--
 assets/vue/views/message/MessageCreate.vue | 52 +++++++++++++++-------
 3 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/assets/vue/services/message.js b/assets/vue/services/message.js
index 507b6635bc..5bc6a575a6 100644
--- a/assets/vue/services/message.js
+++ b/assets/vue/services/message.js
@@ -1,3 +1,22 @@
-import makeService from './api';
+import makeService from "./api"
+import baseService from "./baseService"
 
-export default makeService('messages');
+// MIGRATION IN PROGRESS. makeService is deprecated
+// if you use some method in this service you should try to refactor it with new baseService defining async functions
+// like create below. A fully migrated service looks like: assets/vue/services/userService.js.
+// BE AWARE that makeService use vuex, so we need to ensure behaviour to be the same as the older service
+// When makeService is fully migrated, export by default the const messageService and change imports in all components
+// that use this service
+export default makeService("messages")
+
+/**
+ * @param {Object} message
+ * @returns {Promise<Object>}
+ */
+async function create(message) {
+  return await baseService.post("/api/messages", message)
+}
+
+export const messageService = {
+  create,
+}
diff --git a/assets/vue/services/userService.js b/assets/vue/services/userService.js
index 634dad666b..fe8a9947d0 100644
--- a/assets/vue/services/userService.js
+++ b/assets/vue/services/userService.js
@@ -1,11 +1,11 @@
 import baseService from "./baseService"
 
 /**
- * @param {string} userIri
+ * @param {string} userId
  * @returns {Promise<Object>}
  */
-async function find(userIri) {
-  return await baseService.get(userIri)
+async function find(userId) {
+  return await baseService.get(`/api/users/${userId}`)
 }
 
 /**
diff --git a/assets/vue/views/message/MessageCreate.vue b/assets/vue/views/message/MessageCreate.vue
index 32aefac489..4d922d44f0 100644
--- a/assets/vue/views/message/MessageCreate.vue
+++ b/assets/vue/views/message/MessageCreate.vue
@@ -5,14 +5,14 @@
   >
     <div
       v-if="sendToUser"
-      class="field"
+      class="field space-x-4"
     >
       <span v-t="'To'" />
-      <BaseUserAvatar
-        :image-url="sendToUser.illustrationUrl"
-        :alt="t('Picture')"
+      <MessageCommunicationParty
+        :username="sendToUser.username"
+        :full-name="sendToUser.fullName"
+        :profile-image-url="sendToUser.illustrationUrl"
       />
-      <span v-text="sendToUser.fullName" />
     </div>
 
     <BaseAutocomplete
@@ -41,10 +41,18 @@
 
     <BaseButton
       :label="t('Send')"
+      :disabled="!canSubmitMessage"
       icon="plus"
       type="primary"
+      class="mb-2"
       @click="onSubmit"
     />
+    <small
+      v-if="!canSubmitMessage"
+      class="block text-gray-90"
+    >
+      {{ t('Send is disabled because title of message or "to" recipent are not filled in') }}
+    </small>
   </MessageForm>
   <Loading :visible="isLoading || isLoadingUser" />
 </template>
@@ -52,20 +60,20 @@
 <script setup>
 import MessageForm from "../../components/message/Form.vue"
 import Loading from "../../components/Loading.vue"
-import { computed, ref } from "vue"
+import { computed, onMounted, ref } from "vue"
 import BaseAutocomplete from "../../components/basecomponents/BaseAutocomplete.vue"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import { useI18n } from "vue-i18n"
 import { useRoute, useRouter } from "vue-router"
 import { MESSAGE_TYPE_INBOX } from "../../components/message/constants"
 import userService from "../../services/userService"
-import BaseUserAvatar from "../../components/basecomponents/BaseUserAvatar.vue"
 import { useNotification } from "../../composables/notification"
 import { capitalize } from "lodash"
 import BaseTinyEditor from "../../components/basecomponents/BaseTinyEditor.vue"
 import { useSecurityStore } from "../../store/securityStore"
-import messageService from "../../services/message"
+import { messageService } from "../../services/message"
 import messageAttachmentService from "../../services/messageattachment"
+import MessageCommunicationParty from "./MessageCommunicationParty.vue"
 
 const securityStore = useSecurityStore()
 const router = useRouter()
@@ -111,9 +119,16 @@ const receiversCc = computed(() =>
   })),
 )
 
+const canSubmitMessage = computed(() => {
+  return usersTo.value.length > 0 && item.value.title !== ""
+})
+
 const isLoading = ref(false)
 
 const onSubmit = async () => {
+  if (!canSubmitMessage.value) {
+    return
+  }
   item.value.receivers = [...receiversTo.value, ...receiversCc.value]
   isLoading.value = true
 
@@ -145,12 +160,12 @@ const onSubmit = async () => {
 const isLoadingUser = ref(false)
 const sendToUser = ref()
 
-if (route.query.send_to_user) {
-  isLoadingUser.value = true
+onMounted(async () => {
+  if (route.query.send_to_user) {
+    isLoadingUser.value = true
 
-  userService
-    .find("/api/users/" + parseInt(route.query.send_to_user))
-    .then((user) => {
+    try {
+      let user = await userService.find(route.query.send_to_user)
       sendToUser.value = user
 
       usersTo.value.push({
@@ -168,8 +183,11 @@ if (route.query.send_to_user) {
           securityStore.user.firstname,
         ])
       }
-    })
-    .catch((e) => notification.showErrorNotification(e))
-    .finally(() => (isLoadingUser.value = false))
-}
+    } catch (error) {
+      notification.showErrorNotification(error)
+    } finally {
+      isLoadingUser.value = false
+    }
+  }
+})
 </script>