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

@@ -4,10 +4,12 @@ const getInternalChatmessageFromChatflow = (id) => client.get(`/internal-chatmes
 const getAllChatmessageFromChatflow = (id, params = {}) => client.get(`/chatmessage/${id}`, { params: { order: 'DESC', ...params } })
 const getChatmessageFromPK = (id, params = {}) => client.get(`/chatmessage/${id}`, { params: { order: 'ASC', ...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
 }

packages/ui/src/api/marketplaces.js

@@ -2,8 +2,10 @@ import client from './client'
 
 const getAllChatflowsMarketplaces = () => client.get('/marketplaces/chatflows')
 const getAllToolsMarketplaces = () => client.get('/marketplaces/tools')
+const getAllTemplatesFromMarketplaces = () => client.get('/marketplaces/templates')
 
 export default {
     getAllChatflowsMarketplaces,
-    getAllToolsMarketplaces
+    getAllToolsMarketplaces,
+    getAllTemplatesFromMarketplaces
 }

packages/ui/src/api/nodes.js

@@ -4,7 +4,10 @@ const getAllNodes = () => client.get('/nodes')
 
 const getSpecificNode = (name) => client.get(`/nodes/${name}`)
 
+const executeCustomFunctionNode = (body) => client.post(`/node-custom-function`, body)
+
 export default {
     getAllNodes,
-    getSpecificNode
+    getSpecificNode,
+    executeCustomFunctionNode
 }

packages/ui/src/api/prompt.js

@@ -0,0 +1,9 @@
+import client from './client'
+
+const getAvailablePrompts = (body) => client.post(`/prompts-list`, body)
+const getPrompt = (body) => client.post(`/load-prompt`, body)
+
+export default {
+    getAvailablePrompts,
+    getPrompt
+}

packages/ui/src/api/scraper.js

@@ -0,0 +1,8 @@
+import client from './client'
+
+const fetchLinks = (url, relativeLinksMethod, relativeLinksLimit) =>
+    client.get(`/fetch-links?url=${encodeURIComponent(url)}&relativeLinksMethod=${relativeLinksMethod}&limit=${relativeLinksLimit}`)
+
+export default {
+    fetchLinks
+}

packages/ui/src/api/variables.js

@@ -0,0 +1,16 @@
+import client from './client'
+
+const getAllVariables = () => client.get('/variables')
+
+const createVariable = (body) => client.post(`/variables`, body)
+
+const updateVariable = (id, body) => client.put(`/variables/${id}`, body)
+
+const deleteVariable = (id) => client.delete(`/variables/${id}`)
+
+export default {
+    getAllVariables,
+    createVariable,
+    updateVariable,
+    deleteVariable
+}