Merge branch 'master' into bug/fetch-name-attribute

Author: Daan0709

src/main/frontend/app/routes/editor/editor.tsx

@@ -248,9 +248,7 @@ export default function CodeEditor() {
         const contentType = response.headers.get('content-type')
         if (contentType && contentType.includes('application/json')) {
           const errorData = await response.json()
-          toast.error(
-            `Error saving configuration: ${errorData.title || errorData.error}\nDetails: ${errorData.details}`,
-          )
+          toast.error(`Error saving configuration: ${errorData.error}\nDetails: ${errorData.message}`)
           console.error('Something went wrong saving the configuration: ', errorData)
         } else {
           toast.error(`Error saving configuration. HTTP status: ${response.status}`)

src/main/frontend/app/routes/studio/canvas/flow.tsx

@@ -28,6 +28,8 @@ import { exportFlowToXml } from '~/routes/studio/flow-to-xml-parser'
 import useNodeContextStore from '~/stores/node-context-store'
 import CreateNodeModal from '~/components/flow/create-node-modal'
 import { useProjectStore } from "~/stores/project-store";
+import { toast, ToastContainer } from 'react-toastify'
+import { useTheme } from '~/hooks/use-theme'
 
 export type FlowNode = FrankNode | ExitNode | StickyNote | GroupNode | Node
 
@@ -45,6 +47,7 @@ const selector = (state: FlowState) => ({
 })
 
 function FlowCanvas({ showNodeContextMenu }: Readonly<{ showNodeContextMenu: (b: boolean) => void }>) {
+  const theme = useTheme()
   const [loading, setLoading] = useState(false)
   const { isEditing, setIsEditing, setParentId } = useNodeContextStore(
     useShallow((s) => ({
@@ -500,6 +503,36 @@ function FlowCanvas({ showNodeContextMenu }: Readonly<{ showNodeContextMenu: (b:
     URL.revokeObjectURL(url)
   }
 
+  const saveFlow = async () => {
+    const flowData = reactFlow.toObject()
+    const activeTabName = useTabStore.getState().activeTab
+    const configName = useTabStore.getState().getTab(activeTabName)?.configurationName
+    if (!configName) return
+
+    const xmlString = exportFlowToXml(flowData, activeTabName)
+
+    try {
+      if (!project) return
+      const response = await fetch(
+      `/projects/${encodeURIComponent(project.name)}/${encodeURIComponent(configName)}/adapters/${encodeURIComponent(activeTabName)}`,
+      {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ adapterXml: xmlString }),
+      }
+    )
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`)
+    }
+
+    toast.success('Flow saved successfully!')
+    } catch (error) {
+      console.error('Failed to save XML:', error)
+      toast.error(`Failed to save XML: ${error}`)
+    }
+  }
+
   return (
     <div
       className="relative h-full w-full"
@@ -535,7 +568,16 @@ function FlowCanvas({ showNodeContextMenu }: Readonly<{ showNodeContextMenu: (b:
       >
         <Controls position="top-left" style={{ color: '#000' }}></Controls>
         <Background variant={BackgroundVariant.Dots} size={3} gap={100}></Background>
+        <Panel position="top-center">
+          <button
+            className="border-border hover:bg-hover bg-background border p-2 hover:cursor-pointer"
+            onClick={saveFlow}
+          >
+            Save XML
+          </button>
+        </Panel>
       </ReactFlow>
+      <ToastContainer position="bottom-right" theme={theme} closeOnClick={true} />
       <CreateNodeModal
         isOpen={showModal}
         onClose={() => setShowModal(false)}

src/main/frontend/app/routes/studio/flow-to-xml-parser.ts

@@ -61,15 +61,14 @@ export function exportFlowToXml(json: ReactFlowJson, adaptername: string): strin
 
   const exitsXml = exitNodes.length > 0 ? `      <Exits>\n${generateExitsXml(exitNodes)}\n      </Exits>` : ''
 
-  return `<Configuration>
+  return `
   <Adapter name="${adaptername}" description="Auto-generated from React Flow JSON">
 ${receivers.join('\n')}
     <Pipeline>
 ${exitsXml}
 ${pipelineParts.join('\n')}
     </Pipeline>
-  </Adapter>
-</Configuration>`
+  </Adapter>`
 }
 
 function buildEdgeMaps(edges: Edge[]) {

src/main/frontend/app/routes/studio/studio.tsx

@@ -11,9 +11,12 @@ import { SidebarSide } from '~/components/sidebars-layout/sidebar-layout-store'
 import SidebarLayout from '~/components/sidebars-layout/sidebar-layout'
 import useTabStore from '~/stores/tab-store'
 import { useShallow } from 'zustand/react/shallow'
+import { ToastContainer } from 'react-toastify'
+import { useTheme } from '~/hooks/use-theme'
 
 export default function Studio() {
   const [showNodeContext, setShowNodeContext] = useState(false)
+  const theme = useTheme()
   const nodeId = useNodeContextStore((state) => state.nodeId)
 
   const { activeTab } = useTabStore(
@@ -39,7 +42,10 @@ export default function Studio() {
         <div className="border-b-border bg-background flex h-12 items-center border-b p-4">Path: {activeTab}</div>
 
         {activeTab ? (
-          <Flow showNodeContextMenu={setShowNodeContext} />
+          <>
+            <Flow showNodeContextMenu={setShowNodeContext} />
+            <ToastContainer position="bottom-right" theme={theme} closeOnClick={true} />
+          </>
         ) : (
           <div className="text-muted-foreground flex h-full flex-col items-center justify-center p-8 text-center">
             <div className="border-border bg-background/40 max-w-md rounded-2xl border border-dashed p-10 shadow-inner backdrop-blur-sm">

src/main/frontend/app/routes/studio/xml-to-json-parser.ts

@@ -51,7 +51,11 @@ export async function getAdapterNamesFromConfiguration(projectName: string, file
   })
 }
 
-export async function getAdapterFromConfiguration(projectname: string, filename: string, adapterName: string): Promise<Element | null> {
+export async function getAdapterFromConfiguration(
+  projectname: string,
+  filename: string,
+  adapterName: string,
+): Promise<Element | null> {
   const xmlString = await getXmlString(projectname, filename)
   const parser = new DOMParser()
   const xmlDoc = parser.parseFromString(xmlString, 'text/xml')
@@ -216,10 +220,20 @@ function convertAdapterToFlowNodes(adapter: any): FlowNode[] {
     const forwardElements = [...element.querySelectorAll('Forward')]
     const sourceHandles =
       forwardElements.length > 0
-        ? forwardElements.map((forward, index) => ({
-            type: forward.getAttribute('name') || `forward${index + 1}`,
-            index: index + 1,
-          }))
+        ? forwardElements.map((forward, index) => {
+            const path = forward.getAttribute('path') || ''
+            const loweredPath = path.toLowerCase()
+            // Only check for bad flows/forwards right now, could later be updated to also include exceptions and custom handles
+            const type =
+              loweredPath.includes('error') || loweredPath.includes('bad') || loweredPath.includes('fail')
+                ? 'failure'
+                : 'success'
+
+            return {
+              type,
+              index: index + 1,
+            }
+          })
         : [
             {
               type: 'success',

src/main/java/org/frankframework/flow/configuration/AdapterNotFoundException.java

@@ -0,0 +1,7 @@
+package org.frankframework.flow.configuration;
+
+public class AdapterNotFoundException extends RuntimeException {
+    public AdapterNotFoundException(String message){
+        super(message);
+    }
+}

src/main/java/org/frankframework/flow/configuration/AdapterUpdateDTO.java

@@ -0,0 +1,4 @@
+package org.frankframework.flow.configuration;
+
+public record AdapterUpdateDTO(String adapterXml) {
+}

src/main/java/org/frankframework/flow/exception/GlobalExceptionHandler.java

@@ -1,6 +1,8 @@
 package org.frankframework.flow.exception;
 
+import org.frankframework.flow.configuration.AdapterNotFoundException;
 import org.frankframework.flow.configuration.ConfigurationNotFoundException;
+import org.frankframework.flow.project.InvalidXmlContentException;
 import org.frankframework.flow.project.ProjectNotFoundException;
 import org.frankframework.flow.projectsettings.InvalidFilterTypeException;
 import org.springframework.http.HttpStatus;
@@ -38,4 +40,17 @@ public ResponseEntity<ErrorResponseDTO> handleInvalidFilter(InvalidFilterTypeExc
         return ResponseEntity.badRequest()
                 .body(new ErrorResponseDTO("InvalidFilterType", ex.getMessage()));
     }
+
+    @ExceptionHandler(InvalidXmlContentException.class)
+    public ResponseEntity<ErrorResponseDTO> handleInvalidXml(InvalidXmlContentException ex) {
+        return ResponseEntity.badRequest()
+                .body(new ErrorResponseDTO("InvalidXmlContent", ex.getMessage()));
+    }
+
+    @ExceptionHandler(AdapterNotFoundException.class)
+    public ResponseEntity<ErrorResponseDTO> handleAdapterNotFound(AdapterNotFoundException ex) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                .body(new ErrorResponseDTO("AdapterNotFound", ex.getMessage()));
+    }
+
 }

src/main/java/org/frankframework/flow/project/ErrorDTO.java

@@ -0,0 +1,7 @@
+package org.frankframework.flow.project;
+
+public class InvalidXmlContentException extends RuntimeException {
+    public InvalidXmlContentException(String message) {
+        super(message);
+    }
+}