fix: change default version and add bearer headers to request API call

components.d.ts

@@ -10,6 +10,8 @@ export {}
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AccessCriteriaSection: typeof import('./src/components/negotiation-tabs/AccessCriteriaSection.vue')['default']
+    AddResourcesButton: typeof import('./src/components/AddResourcesButton.vue')['default']
+    AddResourcesModal: typeof import('./src/components/modals/AddResourcesModal.vue')['default']
     Alert: typeof import('./src/components/Alert.vue')['default']
     BAvatar: typeof import('bootstrap-vue-next')['BAvatar']
     ConfirmationModal: typeof import('./src/components/modals/ConfirmationModal.vue')['default']

src/components/modals/AddResourcesModal.vue

@@ -166,12 +166,10 @@
   </div>
 </template>
 <script setup>
-import { onBeforeMount, onMounted, ref, watch } from "vue"
+import { onMounted, ref, watch } from "vue"
 import { Tooltip } from "bootstrap"
-import { useStore } from "vuex"
-import { useRouter } from "vue-router"
 import debounce from "@popperjs/core/lib/utils/debounce"
-const store = useStore()
+import { useNegotiationPageStore } from "@/store/negotiationPage"
 const resources = ref([])
 const selectedResources = ref([])
 const selectAll = ref(false)
@@ -193,6 +191,7 @@ const props = defineProps({
     required: true
   }
 })
+const store = useNegotiationPageStore()
 watch(() => props.shown, (first, second) => {
   if (props.shown !== false) {
     loadResources()
@@ -208,7 +207,7 @@ onMounted(() => {
   })
 })
 async function loadResources (name = "") {
-  const response = await store.dispatch("retrieveAllResources", name)
+  const response = await store.retrieveAllResources(name)
   resources.value = response?._embedded?.resources ?? []
   pageLinks.value = response._links
   pageNumber.value = response.page.number
@@ -217,7 +216,8 @@ async function loadResources (name = "") {
   loading.value = false
 }
 async function loadStates () {
-  states.value = await store.dispatch("retrieveResourceAllStates")
+  const response = await store.retrieveResourceAllStates()
+  states.value = response._embedded.states
 }
 const emit = defineEmits(["confirm"])
 
@@ -230,11 +230,7 @@ async function addResources () {
     }
   }
   const negotiationId = props.negotiationId
-  await store.dispatch("addResources", { data, negotiationId }).then((response) => {
-    if (response) {
-      console.log(response)
-    }
-  })
+  await store.addResources(data, negotiationId)
   selectedResources.value = []
   emit("confirm")
 }
@@ -263,13 +259,11 @@ async function fetchPage (url) {
 const onSearch = debounce(async () => {
   if (searchQuery.value.length >= 3) {
     loading.value = true
-    console.log(searchQuery.value)
-    await loadResources({ name: searchQuery.value })
+    await loadResources(searchQuery.value)
   }
   if (searchQuery.value.length === 0) {
     loading.value = true
-    console.log(searchQuery.value)
-    await loadResources({ name: searchQuery.value })
+    await loadResources(searchQuery.value)
   }
 }, 1000) // Debounce delay in milliseconds
 function getNumberOfSelectedResources () {

src/store/apiCalls.js

@@ -4,44 +4,44 @@ import { apiPaths, getBearerHeaders } from "../config/apiPaths"
 import { useNotificationsStore } from "./notifications"
 
 export const useApiCallsStore = defineStore("apiCalls", () => {
-    const notifications = useNotificationsStore()
+  const notifications = useNotificationsStore()
 
-    function createRequests(data) {
-        return axios.post(`${apiPaths.REQUESTS_PATH}`, data)
-            .then((response) => {
-                return response.data
-            })
-            .catch(() => {
-                notifications.setNotification("There was an error saving the attachment")
-                return null
-            })
-    }
+  function createRequests (data) {
+    return axios.post(`${apiPaths.REQUESTS_PATH}`, data)
+      .then((response) => {
+        return response.data
+      })
+      .catch(() => {
+        notifications.setNotification("There was an error saving the attachment")
+        return null
+      })
+  }
 
-    function markMessageAsRead(data) {
-        return axios.put(`${apiPaths.NEGOTIATION_PATH}/${data.negotiationId}/posts/${data.postId}`, data, { headers: getBearerHeaders() })
-            .then((response) => {
-                return response.data.id
-            })
-            .catch(() => {
-                return "Failed"
-            })
-    }
+  function markMessageAsRead (data) {
+    return axios.put(`${apiPaths.NEGOTIATION_PATH}/${data.negotiationId}/posts/${data.postId}`, data, { headers: getBearerHeaders() })
+      .then((response) => {
+        return response.data.id
+      })
+      .catch(() => {
+        return "Failed"
+      })
+  }
 
-    function getUnreadMessagesByRole(data) {
-        // the role shoud be complementary in relation of the one from the user
-        const complementaryRole = data.Rolename === ROLES.RESEARCHER ? ROLES.REPRESENTATIVE : ROLES.RESEARCHER
-        return axios.get(`${apiPaths.NEGOTIATION_PATH}/${data.negotiationId}/${complementaryRole}/posts`, { headers: getBearerHeaders() })
-            .then((response) => {
-                return response.data
-            })
-            .catch(() => {
-                return "Failed"
-            })
-    }
+  function getUnreadMessagesByRole (data) {
+    // the role shoud be complementary in relation of the one from the user
+    const complementaryRole = data.Rolename === ROLES.RESEARCHER ? ROLES.REPRESENTATIVE : ROLES.RESEARCHER
+    return axios.get(`${apiPaths.NEGOTIATION_PATH}/${data.negotiationId}/${complementaryRole}/posts`, { headers: getBearerHeaders() })
+      .then((response) => {
+        return response.data
+      })
+      .catch(() => {
+        return "Failed"
+      })
+  }
 
-    return {
-        createRequests,
-        markMessageAsRead,
-        getUnreadMessagesByRole
-    }
-})
+  return {
+    createRequests,
+    markMessageAsRead,
+    getUnreadMessagesByRole
+  }
+})

src/store/negotiationPage.js

@@ -37,7 +37,7 @@ export const useNegotiationPageStore = defineStore("negotiationPage", () => {
         notifications.setNotification("Error getting Possible Events For Resource data from server")
       })
   }
-  
+
   function updateResourceStatus (link) {
     return axios.put(`${link}`, {}, { headers: getBearerHeaders() })
       .then((response) => {
@@ -142,7 +142,7 @@ export const useNegotiationPageStore = defineStore("negotiationPage", () => {
   function retrieveResourcesByNegotiationId (negotiationId) {
     return axios.get(`${apiPaths.NEGOTIATION_PATH}/${negotiationId}/resources`, { headers: getBearerHeaders() })
       .then((response) => {
-        return response.data._embedded.resources
+        return response.data
       })
       .catch(() => {
         notifications.setNotification("Error getting request data from server")
@@ -185,20 +185,73 @@ export const useNegotiationPageStore = defineStore("negotiationPage", () => {
         notifications.setNotification("Error getting Information Submission data from server")
       })
   }
+  async function retrieveAllResources (name) {
+    let url = `${apiPaths.BASE_API_PATH}/resources`
+    if (name) {
+      url = `${apiPaths.BASE_API_PATH}/resources?name=${name}`
+    }
+    return axios.get(`${url}`, { headers: getBearerHeaders() })
+      .then((response) => {
+        return response.data
+      })
+      .catch(() => {
+        notifications.setNotification("There was an error saving the attachment")
+        return null
+      })
+  }
+  async function fetchURL (url) {
+    return axios.get(`${url}`, { headers: getBearerHeaders() })
+      .then((response) => {
+        return response.data
+      })
+      .catch(() => {
+        notifications.setNotification("There was an error saving the attachment")
+        return null
+      })
+  }
+  async function addResources (data, negotiationId) {
+    try {
+      const response = await axios.patch(
+        `${apiPaths.BASE_API_PATH}/negotiations/${negotiationId}/resources`,
+        data,
+        { headers: getBearerHeaders() }
+      )
+      notifications.setNotification("Resources were successfully updated")
+      return response.data
+    } catch (error) {
+      notifications.setNotification("There was an error saving the attachment")
+      return undefined
+    }
+  }
+  async function retrieveResourceAllStates () {
+    return axios.get(`${apiPaths.BASE_API_PATH}/resource-lifecycle/states`, { headers: getBearerHeaders() })
+      .then((response) => {
+        return response.data
+      })
+      .catch(() => {
+        notifications.setNotification("There was an error saving the attachment")
+        return null
+      })
+  }
 
-  return { 
+  return {
     updateNegotiationStatus,
     retrievePossibleEvents,
     retrievePossibleEventsForResource,
     updateResourceStatus,
     retrieveNegotiationById,
     retrievePostsByNegotiationId,
     retrieveAttachmentsByNegotiationId,
-    addMessageToNegotiation, addAttachmentToNegotiation,
+    addMessageToNegotiation,
+    addAttachmentToNegotiation,
     retrieveUserRepresentedResources,
     downloadAttachment,
     retrieveResourcesByNegotiationId,
     downloadAttachmentFromLink,
-    retrieveInformationSubmission
-    }
+    retrieveInformationSubmission,
+    fetchURL,
+    addResources,
+    retrieveAllResources,
+    retrieveResourceAllStates
+  }
 })