Fix merge conflicts

packages/ui/src/api/chatflows.js

@@ -14,6 +14,8 @@ const deleteChatflow = (id) => client.delete(`/chatflows/${id}`)
 
 const getIsChatflowStreaming = (id) => client.get(`/chatflows-streaming/${id}`)
 
+const getAllowChatflowUploads = (id) => client.get(`/chatflows-uploads/${id}`)
+
 export default {
     getAllChatflows,
     getSpecificChatflow,
@@ -21,5 +23,6 @@ export default {
     createNewChatflow,
     updateChatflow,
     deleteChatflow,
-    getIsChatflowStreaming
+    getIsChatflowStreaming,
+    getAllowChatflowUploads
 }

packages/ui/src/api/chatmessage.js

@@ -5,10 +5,12 @@ const getAllChatmessageFromChatflow = (id, params = {}) =>
     client.get(`/chatmessage/${id}`, { params: { order: 'DESC', feedback: true, ...params } })
 const getChatmessageFromPK = (id, params = {}) => client.get(`/chatmessage/${id}`, { params: { order: 'ASC', feedback: true, ...params } })
 const deleteChatmessage = (id, params = {}) => client.delete(`/chatmessage/${id}`, { params: { ...params } })
+const getStoragePath = () => client.get(`/get-upload-path`)
 
 export default {
     getInternalChatmessageFromChatflow,
     getAllChatmessageFromChatflow,
     getChatmessageFromPK,
-    deleteChatmessage
+    deleteChatmessage,
+    getStoragePath
 }