From 3e5b94671158de6010a8cf0c8b0a2730fed4f5a7 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 28 Jan 2026 19:46:08 +0100 Subject: [PATCH 01/26] improved by putting api calls in services and use hooks to fetch the resources --- src/main/frontend/app/routes/projectlanding/project-landing.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 93a1cfae..cbde6d2f 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -33,6 +33,7 @@ export default function ProjectLanding() { const clearProject = useProjectStore((state) => state.clearProject) const location = useLocation() + // Sync fetched projects to local state for mutations useEffect(() => { if (projectsData) { setProjects(projectsData) From 73ad5e1820da2a74f94ed34fc4a1623212c837a8 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Thu, 29 Jan 2026 15:28:06 +0100 Subject: [PATCH 02/26] Remove unnecessary comments in navigation-store and project-landing files for cleaner code --- src/main/frontend/app/routes/projectlanding/project-landing.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index cbde6d2f..93a1cfae 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -33,7 +33,6 @@ export default function ProjectLanding() { const clearProject = useProjectStore((state) => state.clearProject) const location = useLocation() - // Sync fetched projects to local state for mutations useEffect(() => { if (projectsData) { setProjects(projectsData) From ca7bb61e53fc55b3178c3596c1f01f8a0ae380c1 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 14:00:43 +0100 Subject: [PATCH 03/26] Implement filesystem browser and project management features --- .../filesystem-browser/filesystem-browser.tsx | 78 +++++++ .../projectlanding/load-project-modal.tsx | 63 ------ .../projectlanding/open-project-modal.tsx | 51 +++++ .../routes/projectlanding/project-landing.tsx | 200 ++++++++++-------- .../app/services/filesystem-service.ts | 12 ++ .../frontend/app/services/project-service.ts | 27 +-- .../frontend/app/types/filesystem.types.ts | 11 + src/main/frontend/app/types/global.d.ts | 3 + src/main/frontend/app/types/project.types.ts | 10 + .../flow/filesystem/FilesystemController.java | 42 ++++ .../flow/filesystem/FilesystemEntry.java | 3 + .../flow/filesystem/FilesystemService.java | 71 +++++++ .../flow/filetree/FileTreeService.java | 50 ++--- .../flow/project/ProjectController.java | 45 +++- .../flow/project/ProjectService.java | 103 +++++++-- .../flow/project/RecentProject.java | 3 + .../flow/project/RecentProjectsService.java | 69 ++++++ src/main/resources/application.properties | 4 - .../flow/cypress/RunCypressE2eTest.java | 1 - .../flow/project/ProjectServiceTest.java | 27 +-- 20 files changed, 607 insertions(+), 266 deletions(-) create mode 100644 src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx delete mode 100644 src/main/frontend/app/routes/projectlanding/load-project-modal.tsx create mode 100644 src/main/frontend/app/routes/projectlanding/open-project-modal.tsx create mode 100644 src/main/frontend/app/services/filesystem-service.ts create mode 100644 src/main/frontend/app/types/filesystem.types.ts create mode 100644 src/main/frontend/app/types/global.d.ts create mode 100644 src/main/frontend/app/types/project.types.ts create mode 100644 src/main/java/org/frankframework/flow/filesystem/FilesystemController.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/FilesystemService.java create mode 100644 src/main/java/org/frankframework/flow/project/RecentProject.java create mode 100644 src/main/java/org/frankframework/flow/project/RecentProjectsService.java diff --git a/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx b/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx new file mode 100644 index 00000000..434a1179 --- /dev/null +++ b/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx @@ -0,0 +1,78 @@ +import { useState, useEffect } from 'react' +import FolderIcon from '/icons/solar/Folder.svg?react' +import { type FilesystemEntry, filesystemService } from '~/services/filesystem-service' // Check of dit pad werkt + +interface Props { + onPathSelect: (path: string) => void +} + +export default function FilesystemBrowser({ onPathSelect }: Props) { + const [currentPath, setCurrentPath] = useState('') + const [entries, setEntries] = useState([]) + const [loading, setLoading] = useState(false) + + useEffect(() => { + loadFolder(currentPath) + }, [currentPath]) + + const loadFolder = async (path: string) => { + setLoading(true) + try { + const data = await filesystemService.browse(path) + setEntries(data) + } finally { + setLoading(false) + } + } + + const handleDoubleClick = (entry: FilesystemEntry) => { + setCurrentPath(entry.absolutePath) + onPathSelect(entry.absolutePath) + } + + const goUp = () => { + // Simpele logica om een niveau omhoog te gaan in het pad + const parts = currentPath.split(/[\\/]/).filter(Boolean) + parts.pop() + setCurrentPath(parts.join('/') || '') + } + + return ( +
+ {/* Adresbalk */} +
+ +
+ {currentPath || 'Deze Computer'} +
+
+ + {/* Mappenlijst */} +
+ {loading ? ( +

Laden...

+ ) : ( + + + {entries.map((entry) => ( + handleDoubleClick(entry)} + onClick={() => onPathSelect(entry.absolutePath)} + className="group cursor-default hover:bg-blue-50" + > + + + + ))} + +
+ + {entry.name}
+ )} +
+
+ ) +} diff --git a/src/main/frontend/app/routes/projectlanding/load-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/load-project-modal.tsx deleted file mode 100644 index b6f97be1..00000000 --- a/src/main/frontend/app/routes/projectlanding/load-project-modal.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import FolderIcon from '../../../icons/solar/Folder.svg?react' -import { useBackendFolders } from '~/hooks/use-backend-folders' - -interface LoadProjectModalProperties { - isOpen: boolean - onClose: () => void - onCreate: (name: string, rootPath: string) => void -} - -export default function LoadProjectModal({ isOpen, onClose, onCreate }: Readonly) { - const { data, isLoading: loading, error: fetchError } = useBackendFolders(isOpen) - - const folders = data?.folders ?? [] - const rootPath = data?.rootPath ?? null - const error = fetchError ? fetchError.message : null - - if (!isOpen) return null - - const handleCreate = (name: string) => { - onCreate(name, rootPath || '') - onClose() - } - - return ( -
-
- {/* Header */} -
-

Load Project

- {rootPath &&

Root: {rootPath}

} -
- - {/* Content */} -
- {loading &&

Loading folders...

} - {error &&

{error}

} - {!loading && !error && folders.length === 0 &&

No folders found.

} - -
    - {folders.map((folder) => ( -
  • handleCreate(folder)} - className="hover:bg-backdrop flex items-center gap-2 rounded-md px-2 py-1 hover:cursor-pointer" - > - - {folder} -
    • - ))} -
-
- - {/* Close button */} - -
-
- ) -} diff --git a/src/main/frontend/app/routes/projectlanding/open-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/open-project-modal.tsx new file mode 100644 index 00000000..4d42ae17 --- /dev/null +++ b/src/main/frontend/app/routes/projectlanding/open-project-modal.tsx @@ -0,0 +1,51 @@ +import { useState } from 'react' +import { openProject } from '~/services/project-service' +import FilesystemBrowser from '~/components/filesystem-browser/filesystem-browser' + +interface Props { + isOpen: boolean + onClose: () => void + onSuccess: () => void +} + +export default function OpenProjectModal({ isOpen, onClose, onSuccess }: Props) { + const [selectedPath, setSelectedPath] = useState('') + + if (!isOpen) return null + + const handleOpen = async () => { + try { + await openProject(selectedPath) + onSuccess() + onClose() + } catch (error) { + alert(`Kon project niet openen: ${error}`) + } + } + + return ( +
+
+
Project Openen
+ +
+

Dubbelklik om een map te openen, klik één keer om te selecteren.

+ +
+ +
+ + +
+
+
+ ) +} diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 93a1cfae..64d758d6 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -1,124 +1,136 @@ -import { useEffect, useState } from 'react' +import { useEffect, useState, useCallback } from 'react' +import { useNavigate } from 'react-router' import FfIcon from '/icons/custom/ff!-icon.svg?react' import ArchiveIcon from '/icons/solar/Archive.svg?react' + +import { useProjects } from '~/hooks/use-projects' +import { useProjectStore } from '~/stores/project-store' +import { filesystemService } from '~/services/filesystem-service' +import { openProject, createProject } from '~/services/project-service' + import ProjectRow from './project-row' import Search from '~/components/search/search' import ActionButton from './action-button' -import { useProjectStore } from '~/stores/project-store' -import { useLocation } from 'react-router' import NewProjectModal from './new-project-modal' -import LoadProjectModal from './load-project-modal' -import { useProjects } from '~/hooks/use-projects' -import { createProject as createProjectService } from '~/services/project-service' -import { toast, ToastContainer } from 'react-toastify' -import { useTheme } from '~/hooks/use-theme' -import React from 'react' - -export interface Project { - name: string - rootPath: string - filepaths: string[] - filters: Record // key = filter name (e.g. "HTTP"), value = true/false -} +import type { Project } from '~/types/project.types' export default function ProjectLanding() { - const { data: projectsData, isLoading: loading, error: projectsError } = useProjects() - const [projects, setProjects] = useState([]) - const [search, setSearch] = useState('') - const [showNewProjectModal, setShowNewProjectModal] = useState(false) - const [showLoadProjectModal, setShowLoadProjectModal] = useState(false) - const [localError, setLocalError] = useState(null) - const theme = useTheme() + const navigate = useNavigate() + const { data: initialProjects, isLoading, error: apiError } = useProjects() + const clearProjectState = useProjectStore((state) => state.clearProject) - const clearProject = useProjectStore((state) => state.clearProject) - const location = useLocation() + const [projects, setProjects] = useState([]) + const [searchTerm, setSearchTerm] = useState('') + const [isModalOpen, setIsModalOpen] = useState(false) + const [runtimeError, setRuntimeError] = useState(null) useEffect(() => { - if (projectsData) { - setProjects(projectsData) - } - }, [projectsData]) + if (initialProjects) setProjects(initialProjects) + }, [initialProjects]) - const error = localError || (projectsError ? projectsError.message : null) - - // Reset project when landing on home page useEffect(() => { - clearProject() - }, [location.key, clearProject]) + clearProjectState() + }, [clearProjectState]) - const createProject = async (projectName: string, rootPath?: string) => { + const handleProjectNavigation = useCallback( + (project: Project) => { + navigate(`/studio/${encodeURIComponent(project.name)}`) + }, + [navigate], + ) + + const onOpenNativeFolder = async () => { + setRuntimeError(null) try { - // refresh the project list after creation - const newProject = await createProjectService(projectName, rootPath) - setProjects((previous) => [...previous, newProject]) - } catch (error_) { - toast.error(error_ instanceof Error ? error_.message : 'Failed to create project') + const selection = await filesystemService.selectNativePath() + if (!selection?.path) return + + const project = await openProject(selection.path) + setProjects((prev) => { + const index = prev.findIndex((p) => p.rootPath === project.rootPath) + return index === -1 ? [project, ...prev] : prev.map((p, i) => (i === index ? project : p)) + }) - console.error('Something went wrong loading the project:', error_) + handleProjectNavigation(project) + } catch (error) { + setRuntimeError(error instanceof Error ? error.message : 'Failed to open project') } } - const handleOpenProject = async () => { - setShowLoadProjectModal(true) + const onCreateProject = async (path: string) => { + try { + const project = await createProject(path) + setProjects((prev) => [project, ...prev]) + setIsModalOpen(false) + handleProjectNavigation(project) + } catch (error) { + setRuntimeError(error instanceof Error ? error.message : 'Creation failed') + } } - // Filter projects by search string (case-insensitive) - const filteredProjects = projects.filter((project) => project.name.toLowerCase().includes(search.toLowerCase())) + const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) - if (loading) - return ( -
-

Loading projects...

-
- ) - if (error) return

Error: {error}

+ if (isLoading) return return (
- -
-
- -
Flow
-
-
-
- {/* Header row */} -
-
- Projects -
-
- setSearch(event.target.value)} /> -
-
- {/* Content row */} +
+ +
+ +
-
- setShowNewProjectModal(true)} /> - - console.log('Cloning project')} /> -
-
- {filteredProjects.map((project, index) => ( - - ))} -
+ setIsModalOpen(true)} onOpenClick={onOpenNativeFolder} /> +
-
- setShowNewProjectModal(false)} - onCreate={createProject} - /> - setShowLoadProjectModal(false)} - onCreate={createProject} - /> + + + {(runtimeError || apiError) && ( +

{runtimeError || apiError?.message}

+ )} + + setIsModalOpen(false)} onCreate={onCreateProject} />
) } + +const Header = () => ( +
+ +

Frank!Flow

+
+) + +const Sidebar = ({ onNewClick, onOpenClick }: { onNewClick: () => void; onOpenClick: () => void }) => ( + +) + +const ProjectList = ({ projects }: { projects: Project[] }) => ( +
+ {projects.length === 0 ? ( +

No projects found

+ ) : ( + projects.map((p) => ) + )} +
+) + +const Toolbar = ({ onSearchChange }: { onSearchChange: (val: string) => void }) => ( +
+
+ Recent +
+
+ onSearchChange(e.target.value)} /> +
+
+) + +const LoadingState = () => ( +
+ Initializing workspace... +
+) diff --git a/src/main/frontend/app/services/filesystem-service.ts b/src/main/frontend/app/services/filesystem-service.ts new file mode 100644 index 00000000..fe7e7702 --- /dev/null +++ b/src/main/frontend/app/services/filesystem-service.ts @@ -0,0 +1,12 @@ +import { apiFetch } from '~/utils/api' +import type { FilesystemEntry, PathSelectionResponse } from '~/types/filesystem.types' + +export const filesystemService = { + async browse(path = ''): Promise { + return apiFetch(`/filesystem/browse?path=${encodeURIComponent(path)}`) + }, + + async selectNativePath(): Promise { + return apiFetch('/filesystem/select-native') + }, +} diff --git a/src/main/frontend/app/services/project-service.ts b/src/main/frontend/app/services/project-service.ts index 2f440c00..7fff475b 100644 --- a/src/main/frontend/app/services/project-service.ts +++ b/src/main/frontend/app/services/project-service.ts @@ -2,36 +2,21 @@ import { apiFetch } from '~/utils/api' import type { Project } from '~/routes/projectlanding/project-landing' import type { FileTreeNode } from '~/routes/configurations/configuration-manager' -export interface ConfigImport { - filepath: string - xmlContent: string -} - export async function fetchProjects(signal?: AbortSignal): Promise { return apiFetch('/projects', { signal }) } -export async function fetchProject(name: string, signal?: AbortSignal): Promise { - return apiFetch(`/projects/${encodeURIComponent(name)}`, { signal }) -} - -export async function createProject(name: string, rootPath?: string): Promise { - return apiFetch('/projects', { +export async function openProject(rootPath: string): Promise { + return apiFetch('/projects/open', { method: 'POST', - body: JSON.stringify({ - name, - rootPath: rootPath ?? undefined, - }), + body: JSON.stringify({ rootPath }), }) } -export async function importConfigurations(projectName: string, configs: ConfigImport[]): Promise { - await apiFetch(`/projects/${encodeURIComponent(projectName)}/import-configurations`, { +export async function createProject(rootPath: string): Promise { + return apiFetch('/projects', { method: 'POST', - body: JSON.stringify({ - projectName, - configurations: configs, - }), + body: JSON.stringify({ rootPath }), }) } diff --git a/src/main/frontend/app/types/filesystem.types.ts b/src/main/frontend/app/types/filesystem.types.ts new file mode 100644 index 00000000..49105a7d --- /dev/null +++ b/src/main/frontend/app/types/filesystem.types.ts @@ -0,0 +1,11 @@ +export type EntryType = 'DIRECTORY' | 'FILE' + +export interface FilesystemEntry { + name: string + absolutePath: string + type: EntryType +} + +export interface PathSelectionResponse { + path: string +} diff --git a/src/main/frontend/app/types/global.d.ts b/src/main/frontend/app/types/global.d.ts new file mode 100644 index 00000000..ca8d348b --- /dev/null +++ b/src/main/frontend/app/types/global.d.ts @@ -0,0 +1,3 @@ +interface Window { + showDirectoryPicker(): Promise +} diff --git a/src/main/frontend/app/types/project.types.ts b/src/main/frontend/app/types/project.types.ts new file mode 100644 index 00000000..92f1ab15 --- /dev/null +++ b/src/main/frontend/app/types/project.types.ts @@ -0,0 +1,10 @@ +export interface Project { + name: string + rootPath: string + filepaths: string[] + filters: Record +} + +export interface ProjectCreateDTO { + rootPath: string +} diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java new file mode 100644 index 00000000..de63241d --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java @@ -0,0 +1,42 @@ +package org.frankframework.flow.filesystem; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/filesystem") +public class FilesystemController { + + private final FilesystemService filesystemService; + + public FilesystemController(FilesystemService filesystemService) { + this.filesystemService = filesystemService; + } + + @GetMapping("/browse") + public ResponseEntity> browse( + @RequestParam(required = false, defaultValue = "") String path) throws IOException { + + List entries; + if (path.isBlank()) { + entries = filesystemService.listRoots(); + } else { + entries = filesystemService.listDirectories(path); + } + return ResponseEntity.ok(entries); + } + + @GetMapping("/select-native") + public ResponseEntity> selectNativePath() throws Exception { + return filesystemService.selectDirectoryNative() + .map(path -> ResponseEntity.ok(Map.of("path", path))) + .orElse(ResponseEntity.noContent().build()); + } +} diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java new file mode 100644 index 00000000..909f2b47 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java @@ -0,0 +1,3 @@ +package org.frankframework.flow.filesystem; + +public record FilesystemEntry(String name, String absolutePath, String type) {} diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java new file mode 100644 index 00000000..b7ccb673 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java @@ -0,0 +1,71 @@ +package org.frankframework.flow.filesystem; + +import java.awt.EventQueue; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; +import org.springframework.stereotype.Service; + +import javax.swing.JFileChooser; +import javax.swing.UIManager; + +@Service +public class FilesystemService { + + public Optional selectDirectoryNative() { + final String[] result = new String[1]; + try { + System.setProperty("java.awt.headless", "false"); + + EventQueue.invokeAndWait(() -> { + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + JFileChooser chooser = new JFileChooser(); + chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + chooser.setDialogTitle("Selecteer Project Map"); + + if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { + result[0] = chooser.getSelectedFile().getAbsolutePath(); + } + } catch (Exception e) { e.printStackTrace(); } + }); + } catch (Exception e) { + Thread.currentThread().interrupt(); + } + return Optional.ofNullable(result[0]); + } + + public List listRoots() { + List entries = new ArrayList<>(); + for (File root : File.listRoots()) { + String absolutePath = root.getAbsolutePath(); + entries.add(new FilesystemEntry(absolutePath, absolutePath, "DIRECTORY")); + } + return entries; + } + + public List listDirectories(String path) throws IOException { + Path dir = Paths.get(path).toAbsolutePath().normalize(); + if (!Files.exists(dir) || !Files.isDirectory(dir)) { + throw new IllegalArgumentException("Path does not exist or is not a directory: " + path); + } + + List entries = new ArrayList<>(); + try (Stream stream = Files.list(dir)) { + stream.filter(Files::isDirectory) + .sorted() + .forEach(p -> { + String name = p.getFileName().toString(); + String absolutePath = p.toAbsolutePath().normalize().toString(); + entries.add(new FilesystemEntry(name, absolutePath, "DIRECTORY")); + }); + } + return entries; + } +} diff --git a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java index 4eaa78ae..30ff11cb 100644 --- a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java +++ b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java @@ -13,6 +13,7 @@ import java.util.stream.Stream; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.project.ProjectNotFoundException; import org.frankframework.flow.project.ProjectService; import org.frankframework.flow.utility.XmlAdapterUtils; import org.frankframework.flow.utility.XmlSecurityUtils; @@ -23,40 +24,15 @@ @Service public class FileTreeService { - private final Path projectsRoot; + private final ProjectService projectService; public FileTreeService(ProjectService projectService) { - this.projectsRoot = projectService.getProjectsRoot(); - } - - public List listProjectFolders() throws IOException { - if (!Files.exists(projectsRoot) || !Files.isDirectory(projectsRoot)) { - throw new IllegalStateException("Projects root does not exist or is not a directory"); - } - - try (Stream paths = Files.list(projectsRoot)) { - return paths.filter(Files::isDirectory) - .map(path -> path.getFileName().toString()) - .sorted() - .collect(Collectors.toList()); - } - } - - public Path getProjectsRoot() { - if (!Files.exists(projectsRoot) || !Files.isDirectory(projectsRoot)) { - throw new IllegalStateException("Projects root does not exist or is not a directory"); - } - return projectsRoot; + this.projectService = projectService; } public String readFileContent(String absoluteFilepath) throws IOException { Path filePath = Paths.get(absoluteFilepath).toAbsolutePath().normalize(); - // Make sure file is under projects root - if (!filePath.startsWith(projectsRoot)) { - throw new IllegalArgumentException("File is outside of projects root: " + absoluteFilepath); - } - if (!Files.exists(filePath)) { throw new NoSuchFileException("File does not exist: " + absoluteFilepath); } @@ -71,11 +47,6 @@ public String readFileContent(String absoluteFilepath) throws IOException { public void updateFileContent(String absoluteFilepath, String newContent) throws IOException { Path filePath = Paths.get(absoluteFilepath).toAbsolutePath().normalize(); - // Make sure file is under projects root - if (!filePath.startsWith(projectsRoot)) { - throw new IllegalArgumentException("File is outside of projects root: " + absoluteFilepath); - } - if (!Files.exists(filePath)) { throw new IllegalArgumentException("File does not exist: " + absoluteFilepath); } @@ -88,13 +59,18 @@ public void updateFileContent(String absoluteFilepath, String newContent) throws } public FileTreeNode getProjectTree(String projectName) throws IOException { - Path projectPath = projectsRoot.resolve(projectName).normalize(); + try { + var project = projectService.getProject(projectName); + Path projectPath = Paths.get(project.getRootPath()).toAbsolutePath().normalize(); - if (!Files.exists(projectPath) || !Files.isDirectory(projectPath)) { - throw new IllegalArgumentException("Project does not exist: " + projectName); - } + if (!Files.exists(projectPath) || !Files.isDirectory(projectPath)) { + throw new IllegalArgumentException("Project directory does not exist: " + projectName); + } - return buildShallowTree(projectPath); + return buildShallowTree(projectPath); + } catch (ProjectNotFoundException e) { + throw new IllegalArgumentException("Project does not exist: " + projectName); + } } public FileTreeNode getShallowDirectoryTree(String projectName, String directoryPath) throws IOException { diff --git a/src/main/java/org/frankframework/flow/project/ProjectController.java b/src/main/java/org/frankframework/flow/project/ProjectController.java index 756a39ec..b0de19d1 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectController.java +++ b/src/main/java/org/frankframework/flow/project/ProjectController.java @@ -16,9 +16,11 @@ import org.frankframework.flow.filetree.FileTreeService; import org.frankframework.flow.projectsettings.FilterType; import org.frankframework.flow.projectsettings.InvalidFilterTypeException; +import org.frankframework.flow.recentproject.RecentProjectsService; import org.frankframework.flow.utility.XmlValidator; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -34,10 +36,15 @@ public class ProjectController { private final ProjectService projectService; private final FileTreeService fileTreeService; + private final RecentProjectsService recentProjectsService; - public ProjectController(ProjectService projectService, FileTreeService fileTreeService) { + public ProjectController( + ProjectService projectService, + FileTreeService fileTreeService, + RecentProjectsService recentProjectsService) { this.projectService = projectService; this.fileTreeService = fileTreeService; + this.recentProjectsService = recentProjectsService; } @GetMapping @@ -52,15 +59,19 @@ public ResponseEntity> getAllProjects() { return ResponseEntity.ok(projectDTOList); } - @GetMapping("/backend-folders") - public List getBackendFolders() throws IOException { - return fileTreeService.listProjectFolders(); + @GetMapping("/recent") + public ResponseEntity> getRecentProjects() { + return ResponseEntity.ok(recentProjectsService.getRecentProjects()); } - @GetMapping("/root") - public ResponseEntity> getProjectsRoot() { - return ResponseEntity.ok( - Map.of("rootPath", fileTreeService.getProjectsRoot().toString())); + @DeleteMapping("/recent") + public ResponseEntity removeRecentProject(@RequestBody Map body) { + String rootPath = body.get("rootPath"); + if (rootPath == null || rootPath.isBlank()) { + return ResponseEntity.badRequest().build(); + } + recentProjectsService.removeRecentProject(rootPath); + return ResponseEntity.ok().build(); } @GetMapping("/{name}/tree") @@ -221,9 +232,21 @@ public ResponseEntity updateAdapterFromFile( } @PostMapping - public ResponseEntity createProject(@RequestBody ProjectCreateDTO projectCreateDTO) - throws ProjectAlreadyExistsException { - Project project = projectService.createProject(projectCreateDTO.name(), projectCreateDTO.rootPath()); + public ResponseEntity createProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { + Project project = projectService.createProjectOnDisk(projectCreateDTO.rootPath()); + + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); + + ProjectDTO dto = ProjectDTO.from(project); + + return ResponseEntity.ok(dto); + } + + @PostMapping("/open") + public ResponseEntity openProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { + Project project = projectService.openProjectFromDisk(projectCreateDTO.rootPath()); + + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); ProjectDTO dto = ProjectDTO.from(project); diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index b5532a98..6305c852 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -1,11 +1,15 @@ package org.frankframework.flow.project; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.List; import java.util.Optional; +import java.util.stream.Stream; import lombok.Getter; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; @@ -28,26 +32,95 @@ public class ProjectService { @Getter private final ArrayList projects = new ArrayList<>(); - private static final String DEFAULT_PROJECT_ROOT = "src/main/resources/project"; - private static final int MIN_PARTS_LENGTH = 2; - private final ResourcePatternResolver resolver; - private final Path projectsRoot; + private static final String CONFIGURATIONS_DIR = "src/main/configurations"; + private static final String DEFAULT_CONFIGURATION_XML = + """ + + + + + + + + + + + """; + + public Project createProjectOnDisk(String absolutePath) throws IOException { + if (absolutePath == null || absolutePath.isBlank()) { + throw new IllegalArgumentException("Project path must not be blank"); + } + + Path projectDir = Paths.get(absolutePath).toAbsolutePath().normalize(); + if (Files.exists(projectDir)) { + throw new IllegalArgumentException("Project directory already exists: " + absolutePath); + } + + Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); + Files.createDirectories(configurationsDir); + + Path configFile = configurationsDir.resolve("Configuration.xml"); + Files.writeString(configFile, DEFAULT_CONFIGURATION_XML, StandardCharsets.UTF_8); + + String name = projectDir.getFileName().toString(); + String rootPath = projectDir.toString(); + + Project project = new Project(name, rootPath); + Configuration configuration = new Configuration(configFile.toAbsolutePath().normalize().toString()); + configuration.setXmlContent(DEFAULT_CONFIGURATION_XML); + project.addConfiguration(configuration); - @Autowired - public ProjectService(ResourcePatternResolver resolver, @Value("${app.project.root:}") String rootPath) { - this.resolver = resolver; - this.projectsRoot = resolveProjectRoot(rootPath); + projects.add(project); + return project; } - private Path resolveProjectRoot(String rootPath) { - if (rootPath == null || rootPath.isBlank()) { - return Paths.get(DEFAULT_PROJECT_ROOT).toAbsolutePath().normalize(); + public Project openProjectFromDisk(String absolutePath) throws IOException { + Path projectDir = Paths.get(absolutePath).toAbsolutePath().normalize(); + + // Check if already registered in memory + for (Project project : projects) { + if (Paths.get(project.getRootPath()).toAbsolutePath().normalize().equals(projectDir)) { + return project; + } + } + + if (!Files.exists(projectDir) || !Files.isDirectory(projectDir)) { + throw new IllegalArgumentException("Project directory does not exist: " + absolutePath); } - return Paths.get(rootPath).toAbsolutePath().normalize(); + + String name = projectDir.getFileName().toString(); + String rootPath = projectDir.toString(); + + Project project = new Project(name, rootPath); + + // Scan for XML files in src/main/configurations/ + Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); + if (Files.exists(configurationsDir) && Files.isDirectory(configurationsDir)) { + scanXmlFiles(configurationsDir, project); + } else { + // Fallback: scan project root for XML files (backward compat) + scanXmlFiles(projectDir, project); + } + + projects.add(project); + return project; } - public Path getProjectsRoot() { - return projectsRoot; + private void scanXmlFiles(Path directory, Project project) throws IOException { + try (Stream paths = Files.walk(directory)) { + List xmlFiles = paths.filter(Files::isRegularFile) + .filter(p -> p.toString().endsWith(".xml")) + .toList(); + + for (Path xmlFile : xmlFiles) { + String absolutePath = xmlFile.toAbsolutePath().normalize().toString(); + String xmlContent = Files.readString(xmlFile, StandardCharsets.UTF_8); + Configuration configuration = new Configuration(absolutePath); + configuration.setXmlContent(xmlContent); + project.addConfiguration(configuration); + } + } } public Project createProject(String name, String rootPath) throws ProjectAlreadyExistsException { @@ -139,7 +212,6 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin .findFirst(); if (configOptional.isEmpty()) { - System.err.println("Configuration not found: " + configurationPath); throw new ConfigurationNotFoundException("Configuration not found: " + configurationPath); } @@ -172,7 +244,6 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin return false; } catch (Exception e) { System.err.println("Unexpected error updating adapter: " + e.getMessage()); - e.printStackTrace(); return false; } } diff --git a/src/main/java/org/frankframework/flow/project/RecentProject.java b/src/main/java/org/frankframework/flow/project/RecentProject.java new file mode 100644 index 00000000..e4a84aa5 --- /dev/null +++ b/src/main/java/org/frankframework/flow/project/RecentProject.java @@ -0,0 +1,3 @@ +package org.frankframework.flow.project; + +public record RecentProject(String name, String rootPath, String lastOpened) {} diff --git a/src/main/java/org/frankframework/flow/project/RecentProjectsService.java b/src/main/java/org/frankframework/flow/project/RecentProjectsService.java new file mode 100644 index 00000000..6f9dab3e --- /dev/null +++ b/src/main/java/org/frankframework/flow/project/RecentProjectsService.java @@ -0,0 +1,69 @@ +package org.frankframework.flow.project; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; + +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; + +@Service +public class RecentProjectsService { + + private static final int MAX_RECENT_PROJECTS = 10; + private static final Path RECENT_PROJECTS_FILE = + Paths.get(System.getProperty("user.home"), ".flow", "recent-projects.json"); + + private final ObjectMapper objectMapper = new ObjectMapper(); + + public List getRecentProjects() { + if (!Files.exists(RECENT_PROJECTS_FILE)) { + return new ArrayList<>(); + } + try { + String json = Files.readString(RECENT_PROJECTS_FILE); + return objectMapper.readValue(json, new TypeReference>() {}); + } catch (IOException e) { + System.err.println("Error reading recent projects: " + e.getMessage()); + return new ArrayList<>(); + } + } + + public void addRecentProject(String name, String rootPath) { + List projects = new ArrayList<>(getRecentProjects()); + + // Remove existing entry with same rootPath + projects.removeIf(p -> p.rootPath().equals(rootPath)); + + // Add to the top + projects.addFirst(new RecentProject(name, rootPath, Instant.now().toString())); + + // Cap at max + if (projects.size() > MAX_RECENT_PROJECTS) { + projects = new ArrayList<>(projects.subList(0, MAX_RECENT_PROJECTS)); + } + + saveRecentProjects(projects); + } + + public void removeRecentProject(String rootPath) { + List projects = new ArrayList<>(getRecentProjects()); + projects.removeIf(p -> p.rootPath().equals(rootPath)); + saveRecentProjects(projects); + } + + private void saveRecentProjects(List projects) { + try { + Files.createDirectories(RECENT_PROJECTS_FILE.getParent()); + String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(projects); + Files.writeString(RECENT_PROJECTS_FILE, json); + } catch (IOException e) { + System.err.println("Error saving recent projects: " + e.getMessage()); + } + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 26a897ec..88d8a134 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,4 @@ spring.application.name=Flow cors.allowed.origins=* -# default is resources folder in this project -# change this to your project path if needed -app.project.root= - spring.web.resources.static-locations=classpath:/frontend/ diff --git a/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java b/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java index 041fac55..bd642f0a 100644 --- a/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java +++ b/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java @@ -60,7 +60,6 @@ static void setUp() { private static void startApplication() { SpringApplication springApplication = FlowApplication.configureApplication(); - springApplication.setDefaultProperties(Map.of("app.project.root", "/tmp/flow-projects")); run = springApplication.run(); assertTrue(run.isRunning()); diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index d26963c5..5a94714e 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -5,6 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; import java.io.IOException; import org.frankframework.flow.adapter.AdapterNotFoundException; @@ -17,23 +19,20 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; @ExtendWith(MockitoExtension.class) class ProjectServiceTest { - - @Mock - private ResourcePatternResolver resolver; - private ProjectService projectService; @BeforeEach - void init() throws IOException { - projectService = new ProjectService(resolver, "/path/to/projects"); + void init() { + projectService = new ProjectService(); } @Test - void testAddingProjectToProjectService() throws ProjectNotFoundException, ProjectAlreadyExistsException { + void testAddingProjectToProjectService() throws ProjectNotFoundException { String projectName = "new_project"; String rootPath = "/path/to/new_project"; @@ -46,16 +45,6 @@ void testAddingProjectToProjectService() throws ProjectNotFoundException, Projec assertNotNull(projectService.getProject(projectName)); } - @Test - void testAddingProjectThrowsProjectAlreadyExists() throws ProjectAlreadyExistsException { - String projectName = "existing_project"; - String rootPath = "/path/to/existing_project"; - - projectService.createProject(projectName, rootPath); - - assertThrows(ProjectAlreadyExistsException.class, () -> projectService.createProject(projectName, rootPath)); - } - @Test void testGetProjectThrowsProjectNotFound() { assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("missingProject")); @@ -118,7 +107,7 @@ void testDisableFilterValid() throws Exception { } @Test - void testEnableFilterInvalidFilterType() throws ProjectAlreadyExistsException { + void testEnableFilterInvalidFilterType() { projectService.createProject("proj", "/path/to/proj"); InvalidFilterTypeException ex = assertThrows( @@ -128,7 +117,7 @@ void testEnableFilterInvalidFilterType() throws ProjectAlreadyExistsException { } @Test - void testDisableFilterInvalidFilterType() throws ProjectAlreadyExistsException { + void testDisableFilterInvalidFilterType() { projectService.createProject("proj", "/path/to/proj"); InvalidFilterTypeException ex = assertThrows( From 4271b77c95eed4ef5b6417f72897637dda66c3c2 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 16:04:53 +0100 Subject: [PATCH 04/26] Refactor project management to use recent projects and improve filesystem interactions --- .../filesystem-browser/filesystem-browser.tsx | 78 --------------- .../frontend/app/hooks/use-backend-folders.ts | 17 ---- src/main/frontend/app/hooks/use-projects.ts | 8 +- .../add-configuration-modal.tsx | 2 +- .../projectlanding/new-project-modal.tsx | 96 ++++++++++++------- .../projectlanding/open-project-modal.tsx | 51 ---------- .../routes/projectlanding/project-landing.tsx | 62 +++++++----- .../app/routes/projectlanding/project-row.tsx | 30 ++---- .../app/services/configuration-service.ts | 2 +- .../frontend/app/services/project-service.ts | 21 ++-- src/main/frontend/app/stores/project-store.ts | 2 +- src/main/frontend/app/types/project.types.ts | 6 ++ .../frankframework/flow/FlowApplication.java | 5 +- .../exception/GlobalExceptionHandler.java | 18 ++++ .../flow/filesystem/FilesystemController.java | 23 +++-- .../flow/filesystem/FilesystemService.java | 46 +++------ .../flow/filesystem/NativeDialogService.java | 54 +++++++++++ .../flow/project/ProjectService.java | 20 ++-- .../flow/project/RecentProjectsService.java | 89 +++++++++++++---- .../flow/cypress/RunCypressE2eTest.java | 1 - .../flow/project/ProjectServiceTest.java | 6 -- 21 files changed, 312 insertions(+), 325 deletions(-) delete mode 100644 src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx delete mode 100644 src/main/frontend/app/hooks/use-backend-folders.ts delete mode 100644 src/main/frontend/app/routes/projectlanding/open-project-modal.tsx create mode 100644 src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java diff --git a/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx b/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx deleted file mode 100644 index 434a1179..00000000 --- a/src/main/frontend/app/components/filesystem-browser/filesystem-browser.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import { useState, useEffect } from 'react' -import FolderIcon from '/icons/solar/Folder.svg?react' -import { type FilesystemEntry, filesystemService } from '~/services/filesystem-service' // Check of dit pad werkt - -interface Props { - onPathSelect: (path: string) => void -} - -export default function FilesystemBrowser({ onPathSelect }: Props) { - const [currentPath, setCurrentPath] = useState('') - const [entries, setEntries] = useState([]) - const [loading, setLoading] = useState(false) - - useEffect(() => { - loadFolder(currentPath) - }, [currentPath]) - - const loadFolder = async (path: string) => { - setLoading(true) - try { - const data = await filesystemService.browse(path) - setEntries(data) - } finally { - setLoading(false) - } - } - - const handleDoubleClick = (entry: FilesystemEntry) => { - setCurrentPath(entry.absolutePath) - onPathSelect(entry.absolutePath) - } - - const goUp = () => { - // Simpele logica om een niveau omhoog te gaan in het pad - const parts = currentPath.split(/[\\/]/).filter(Boolean) - parts.pop() - setCurrentPath(parts.join('/') || '') - } - - return ( -
- {/* Adresbalk */} -
- -
- {currentPath || 'Deze Computer'} -
-
- - {/* Mappenlijst */} -
- {loading ? ( -

Laden...

- ) : ( - - - {entries.map((entry) => ( - handleDoubleClick(entry)} - onClick={() => onPathSelect(entry.absolutePath)} - className="group cursor-default hover:bg-blue-50" - > - - - - ))} - -
- - {entry.name}
- )} -
-
- ) -} diff --git a/src/main/frontend/app/hooks/use-backend-folders.ts b/src/main/frontend/app/hooks/use-backend-folders.ts deleted file mode 100644 index d98e6b47..00000000 --- a/src/main/frontend/app/hooks/use-backend-folders.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { useAsync } from './use-async' -import { fetchBackendFolders, fetchProjectRoot } from '~/services/project-service' - -interface BackendFoldersData { - folders: string[] - rootPath: string | null -} - -export function useBackendFolders(enabled: boolean) { - return useAsync( - async (signal) => { - const [folders, rootData] = await Promise.all([fetchBackendFolders(signal), fetchProjectRoot(signal)]) - return { folders, rootPath: rootData.rootPath } - }, - { enabled }, - ) -} diff --git a/src/main/frontend/app/hooks/use-projects.ts b/src/main/frontend/app/hooks/use-projects.ts index 9091a706..3f698e0c 100644 --- a/src/main/frontend/app/hooks/use-projects.ts +++ b/src/main/frontend/app/hooks/use-projects.ts @@ -1,7 +1,7 @@ import { useAsync } from './use-async' -import { fetchProjects } from '~/services/project-service' -import type { Project } from '~/routes/projectlanding/project-landing' +import { fetchRecentProjects } from '~/services/project-service' +import type { RecentProject } from '~/types/project.types' -export function useProjects() { - return useAsync((signal) => fetchProjects(signal)) +export function useRecentProjects() { + return useAsync((signal) => fetchRecentProjects(signal)) } diff --git a/src/main/frontend/app/routes/configurations/add-configuration-modal.tsx b/src/main/frontend/app/routes/configurations/add-configuration-modal.tsx index ff765056..69ff1fc2 100644 --- a/src/main/frontend/app/routes/configurations/add-configuration-modal.tsx +++ b/src/main/frontend/app/routes/configurations/add-configuration-modal.tsx @@ -1,7 +1,7 @@ -import type { Project } from '../projectlanding/project-landing' import { useState } from 'react' import { useProjectStore } from '~/stores/project-store' import { createConfiguration } from '~/services/configuration-service' +import type { Project } from '~/types/project.types' interface AddConfigurationModalProperties { isOpen: boolean diff --git a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx index a58cf9ae..af580d6e 100644 --- a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx @@ -1,56 +1,77 @@ -import { useEffect, useState } from 'react' -import { fetchProjectRoot } from '~/services/project-service' +import { useState } from 'react' +import { filesystemService } from '~/services/filesystem-service' interface NewProjectModalProperties { isOpen: boolean onClose: () => void - onCreate: (name: string, rootPath: string) => void + onCreate: (absolutePath: string) => void } export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly) { const [name, setName] = useState('') - const [rootPath, setRootPath] = useState('') - const [loading, setLoading] = useState(false) + const [location, setLocation] = useState('') const [error, setError] = useState(null) - useEffect(() => { - if (!isOpen) return - - const fetchData = async () => { - setLoading(true) - setError(null) + if (!isOpen) return null - try { - const rootData = await fetchProjectRoot() - setRootPath(rootData.rootPath) - } catch (error) { - setError(error instanceof Error ? error.message : 'Failed to fetch project data') - } finally { - setLoading(false) + const handleSelectLocation = async () => { + setError(null) + try { + const selection = await filesystemService.selectNativePath() + if (selection?.path) { + setLocation(selection.path) } + } catch (error_) { + setError(error_ instanceof Error ? error_.message : 'Failed to open folder picker') } + } - fetchData() - }, [isOpen]) + const handleCreate = () => { + if (!name.trim() || !location) return - if (!isOpen) return null + const separator = location.includes('/') ? '/' : '\\' + const absolutePath = `${location}${separator}${name.trim()}` + onCreate(absolutePath) + setName('') + setLocation('') + setError(null) + onClose() + } - const handleCreate = async () => { - if (!name.trim()) return - onCreate(name, rootPath) + const handleClose = () => { + setName('') + setLocation('') + setError(null) onClose() } return (
-

Add Project

-

Add a new project in {rootPath}

+

New Project

+

Create a new Frank! project on disk

+ +
+ +
+ + +
+
-
- {loading &&

Loading rootfolder...

} - {error &&

{error}

} - +
+ setName(event.target.value)} @@ -60,16 +81,27 @@ export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly< />
+ {location && name.trim() && ( +

+ Project will be created at: {location} + {location.includes('/') ? '/' : '\\'} + {name.trim()} +

+ )} + + {error &&

{error}

} +
- -
-
-
- ) -} diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 64d758d6..be9b5aec 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router' import FfIcon from '/icons/custom/ff!-icon.svg?react' import ArchiveIcon from '/icons/solar/Archive.svg?react' -import { useProjects } from '~/hooks/use-projects' +import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' import { filesystemService } from '~/services/filesystem-service' import { openProject, createProject } from '~/services/project-service' @@ -12,31 +12,34 @@ import ProjectRow from './project-row' import Search from '~/components/search/search' import ActionButton from './action-button' import NewProjectModal from './new-project-modal' -import type { Project } from '~/types/project.types' +import type { RecentProject } from '~/types/project.types' export default function ProjectLanding() { const navigate = useNavigate() - const { data: initialProjects, isLoading, error: apiError } = useProjects() + const { data: recentProjects, isLoading, error: apiError, refetch } = useRecentProjects() const clearProjectState = useProjectStore((state) => state.clearProject) + const setProject = useProjectStore((state) => state.setProject) - const [projects, setProjects] = useState([]) const [searchTerm, setSearchTerm] = useState('') const [isModalOpen, setIsModalOpen] = useState(false) const [runtimeError, setRuntimeError] = useState(null) - useEffect(() => { - if (initialProjects) setProjects(initialProjects) - }, [initialProjects]) - useEffect(() => { clearProjectState() }, [clearProjectState]) - const handleProjectNavigation = useCallback( - (project: Project) => { - navigate(`/studio/${encodeURIComponent(project.name)}`) + const handleOpenProject = useCallback( + async (rootPath: string) => { + setRuntimeError(null) + try { + const project = await openProject(rootPath) + setProject(project) + navigate(`/studio/${encodeURIComponent(project.name)}`) + } catch (error) { + setRuntimeError(error instanceof Error ? error.message : 'Failed to open project') + } }, - [navigate], + [navigate, setProject], ) const onOpenNativeFolder = async () => { @@ -46,28 +49,28 @@ export default function ProjectLanding() { if (!selection?.path) return const project = await openProject(selection.path) - setProjects((prev) => { - const index = prev.findIndex((p) => p.rootPath === project.rootPath) - return index === -1 ? [project, ...prev] : prev.map((p, i) => (i === index ? project : p)) - }) - - handleProjectNavigation(project) + setProject(project) + refetch() + navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { setRuntimeError(error instanceof Error ? error.message : 'Failed to open project') } } - const onCreateProject = async (path: string) => { + const onCreateProject = async (absolutePath: string) => { + setRuntimeError(null) try { - const project = await createProject(path) - setProjects((prev) => [project, ...prev]) + const project = await createProject(absolutePath) + setProject(project) setIsModalOpen(false) - handleProjectNavigation(project) + refetch() + navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { setRuntimeError(error instanceof Error ? error.message : 'Creation failed') } } + const projects = recentProjects ?? [] const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) if (isLoading) return @@ -81,7 +84,7 @@ export default function ProjectLanding() {
setIsModalOpen(true)} onOpenClick={onOpenNativeFolder} /> - +
@@ -103,17 +106,24 @@ const Header = () => ( const Sidebar = ({ onNewClick, onOpenClick }: { onNewClick: () => void; onOpenClick: () => void }) => ( ) -const ProjectList = ({ projects }: { projects: Project[] }) => ( +const ProjectList = ({ + projects, + onProjectClick, +}: { + projects: RecentProject[] + onProjectClick: (rootPath: string) => void +}) => (
{projects.length === 0 ? (

No projects found

) : ( - projects.map((p) => ) + projects.map((p) => onProjectClick(p.rootPath)} />) )}
) diff --git a/src/main/frontend/app/routes/projectlanding/project-row.tsx b/src/main/frontend/app/routes/projectlanding/project-row.tsx index 99a0ad07..bc802b5c 100644 --- a/src/main/frontend/app/routes/projectlanding/project-row.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-row.tsx @@ -1,36 +1,20 @@ -import { useNavigate } from 'react-router' -import { useProjectStore } from '~/stores/project-store' import KebabVerticalIcon from 'icons/solar/Kebab Vertical.svg?react' -import useTabStore from '~/stores/tab-store' -import type { Project } from '~/routes/projectlanding/project-landing' -import useEditorTabStore from '~/stores/editor-tab-store' +import type { RecentProject } from '~/types/project.types' interface ProjectRowProperties { - project: Project + project: RecentProject + onClick: () => void } -export default function ProjectRow({ project }: Readonly) { - const navigate = useNavigate() - - const setProject = useProjectStore((state) => state.setProject) - const clearTabs = useTabStore((state) => state.clearTabs) - const clearEditorTabs = useEditorTabStore((state) => state.clearTabs) - +export default function ProjectRow({ project, onClick }: Readonly) { return (
{ - setProject(project) - clearTabs() - clearEditorTabs() - navigate('/configurations') - }} + onClick={onClick} >
-
{project.name}
-

- {project.rootPath}\{project.name} -

+
{project.name}
+

{project.rootPath}

diff --git a/src/main/frontend/app/services/configuration-service.ts b/src/main/frontend/app/services/configuration-service.ts index 1ab144c6..655807b5 100644 --- a/src/main/frontend/app/services/configuration-service.ts +++ b/src/main/frontend/app/services/configuration-service.ts @@ -1,5 +1,5 @@ import { apiFetch } from '~/utils/api' -import type { Project } from '~/routes/projectlanding/project-landing' +import type { Project } from '~/types/project.types' export async function fetchConfiguration(projectName: string, filepath: string, signal?: AbortSignal): Promise { const data = await apiFetch<{ content: string }>(`/projects/${encodeURIComponent(projectName)}/configuration`, { diff --git a/src/main/frontend/app/services/project-service.ts b/src/main/frontend/app/services/project-service.ts index 7fff475b..875b3176 100644 --- a/src/main/frontend/app/services/project-service.ts +++ b/src/main/frontend/app/services/project-service.ts @@ -1,11 +1,22 @@ import { apiFetch } from '~/utils/api' -import type { Project } from '~/routes/projectlanding/project-landing' import type { FileTreeNode } from '~/routes/configurations/configuration-manager' +import type { Project, RecentProject } from '~/types/project.types' export async function fetchProjects(signal?: AbortSignal): Promise { return apiFetch('/projects', { signal }) } +export async function fetchRecentProjects(signal?: AbortSignal): Promise { + return apiFetch('/projects/recent', { signal }) +} + +export async function removeRecentProject(rootPath: string): Promise { + await apiFetch('/projects/recent', { + method: 'DELETE', + body: JSON.stringify({ rootPath }), + }) +} + export async function openProject(rootPath: string): Promise { return apiFetch('/projects/open', { method: 'POST', @@ -20,14 +31,6 @@ export async function createProject(rootPath: string): Promise { }) } -export async function fetchBackendFolders(signal?: AbortSignal): Promise { - return apiFetch('/projects/backend-folders', { signal }) -} - -export async function fetchProjectRoot(signal?: AbortSignal): Promise<{ rootPath: string }> { - return apiFetch<{ rootPath: string }>('/projects/root', { signal }) -} - export async function fetchProjectTree(projectName: string, signal?: AbortSignal): Promise { return apiFetch(`/projects/${encodeURIComponent(projectName)}/tree/configurations`, { signal }) } diff --git a/src/main/frontend/app/stores/project-store.ts b/src/main/frontend/app/stores/project-store.ts index 8774724d..519f0fb3 100644 --- a/src/main/frontend/app/stores/project-store.ts +++ b/src/main/frontend/app/stores/project-store.ts @@ -1,5 +1,5 @@ import { create } from 'zustand' -import type { Project } from '~/routes/projectlanding/project-landing' +import type { Project } from '~/types/project.types' const SESSION_KEY = 'active-project-name' diff --git a/src/main/frontend/app/types/project.types.ts b/src/main/frontend/app/types/project.types.ts index 92f1ab15..7f451d45 100644 --- a/src/main/frontend/app/types/project.types.ts +++ b/src/main/frontend/app/types/project.types.ts @@ -8,3 +8,9 @@ export interface ProjectCreateDTO { rootPath: string } + +export interface RecentProject { + name: string + rootPath: string + lastOpened: string +} diff --git a/src/main/java/org/frankframework/flow/FlowApplication.java b/src/main/java/org/frankframework/flow/FlowApplication.java index 55cff6c3..48411b83 100644 --- a/src/main/java/org/frankframework/flow/FlowApplication.java +++ b/src/main/java/org/frankframework/flow/FlowApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.Bean; import org.springframework.core.io.ClassPathResource; import org.springframework.web.servlet.function.RequestPredicate; @@ -21,7 +22,9 @@ public static void main(String[] args) { } public static SpringApplication configureApplication() { - return new SpringApplication(FlowApplication.class); + return new SpringApplicationBuilder(FlowApplication.class) + .headless(false) + .build(); } /** diff --git a/src/main/java/org/frankframework/flow/exception/GlobalExceptionHandler.java b/src/main/java/org/frankframework/flow/exception/GlobalExceptionHandler.java index 453c6716..a2dc97a5 100644 --- a/src/main/java/org/frankframework/flow/exception/GlobalExceptionHandler.java +++ b/src/main/java/org/frankframework/flow/exception/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package org.frankframework.flow.exception; import jakarta.servlet.http.HttpServletRequest; +import java.io.IOException; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -43,4 +44,21 @@ public ResponseEntity handleIllegalArgumentException( return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); } + + @ExceptionHandler(IOException.class) + public ResponseEntity handleIOException(IOException exception, HttpServletRequest request) { + log.error( + "I/O error: {} - Method: {} URL: {}", + exception.getMessage(), + request.getMethod(), + request.getRequestURI(), + exception); + + ErrorResponse response = new ErrorResponse( + HttpStatus.INTERNAL_SERVER_ERROR.value(), + List.of("A filesystem error occurred: " + exception.getMessage()), + HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase()); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } } diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java index de63241d..b058440e 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; - +import org.frankframework.flow.exception.ApiException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,14 +15,16 @@ public class FilesystemController { private final FilesystemService filesystemService; + private final NativeDialogService nativeDialogService; - public FilesystemController(FilesystemService filesystemService) { + public FilesystemController(FilesystemService filesystemService, NativeDialogService nativeDialogService) { this.filesystemService = filesystemService; + this.nativeDialogService = nativeDialogService; } @GetMapping("/browse") - public ResponseEntity> browse( - @RequestParam(required = false, defaultValue = "") String path) throws IOException { + public ResponseEntity> browse(@RequestParam(required = false, defaultValue = "") String path) + throws IOException { List entries; if (path.isBlank()) { @@ -33,10 +35,11 @@ public ResponseEntity> browse( return ResponseEntity.ok(entries); } - @GetMapping("/select-native") - public ResponseEntity> selectNativePath() throws Exception { - return filesystemService.selectDirectoryNative() - .map(path -> ResponseEntity.ok(Map.of("path", path))) - .orElse(ResponseEntity.noContent().build()); - } + @GetMapping("/select-native") + public ResponseEntity> selectNativePath() throws ApiException { + return nativeDialogService + .selectDirectory() + .map(path -> ResponseEntity.ok(Map.of("path", path))) + .orElse(ResponseEntity.noContent().build()); + } } diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java index b7ccb673..b166eea4 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java @@ -1,6 +1,5 @@ package org.frankframework.flow.filesystem; -import java.awt.EventQueue; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -8,39 +7,14 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.stream.Stream; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.swing.JFileChooser; -import javax.swing.UIManager; - +@Slf4j @Service public class FilesystemService { - public Optional selectDirectoryNative() { - final String[] result = new String[1]; - try { - System.setProperty("java.awt.headless", "false"); - - EventQueue.invokeAndWait(() -> { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setDialogTitle("Selecteer Project Map"); - - if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { - result[0] = chooser.getSelectedFile().getAbsolutePath(); - } - } catch (Exception e) { e.printStackTrace(); } - }); - } catch (Exception e) { - Thread.currentThread().interrupt(); - } - return Optional.ofNullable(result[0]); - } - public List listRoots() { List entries = new ArrayList<>(); for (File root : File.listRoots()) { @@ -51,6 +25,10 @@ public List listRoots() { } public List listDirectories(String path) throws IOException { + if (path == null || path.isBlank()) { + throw new IllegalArgumentException("Path must not be blank"); + } + Path dir = Paths.get(path).toAbsolutePath().normalize(); if (!Files.exists(dir) || !Files.isDirectory(dir)) { throw new IllegalArgumentException("Path does not exist or is not a directory: " + path); @@ -58,13 +36,11 @@ public List listDirectories(String path) throws IOException { List entries = new ArrayList<>(); try (Stream stream = Files.list(dir)) { - stream.filter(Files::isDirectory) - .sorted() - .forEach(p -> { - String name = p.getFileName().toString(); - String absolutePath = p.toAbsolutePath().normalize().toString(); - entries.add(new FilesystemEntry(name, absolutePath, "DIRECTORY")); - }); + stream.filter(Files::isDirectory).sorted().forEach(p -> { + String name = p.getFileName().toString(); + String absolutePath = p.toAbsolutePath().normalize().toString(); + entries.add(new FilesystemEntry(name, absolutePath, "DIRECTORY")); + }); } return entries; } diff --git a/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java b/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java new file mode 100644 index 00000000..4d870ee2 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java @@ -0,0 +1,54 @@ +package org.frankframework.flow.filesystem; + +import jakarta.annotation.PostConstruct; +import java.awt.EventQueue; +import java.awt.HeadlessException; +import java.util.Optional; +import javax.swing.JFileChooser; +import javax.swing.UIManager; +import lombok.extern.slf4j.Slf4j; +import org.frankframework.flow.exception.ApiException; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class NativeDialogService { + + @PostConstruct + public void init() { + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { + log.warn("Could not set system look and feel, using default", e); + } + } + + public Optional selectDirectory() throws ApiException { + final String[] result = new String[1]; + try { + EventQueue.invokeAndWait(() -> { + JFileChooser chooser = new JFileChooser(); + chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + chooser.setDialogTitle("Select Frank!Flow Project Folder"); + + int returnVal = chooser.showOpenDialog(null); + if (returnVal == JFileChooser.APPROVE_OPTION) { + result[0] = chooser.getSelectedFile().getAbsolutePath(); + } + }); + } catch (HeadlessException e) { + log.error("Cannot open native dialog in headless environment", e); + throw new ApiException( + "Native file dialog is not available in headless mode", HttpStatus.SERVICE_UNAVAILABLE); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + log.warn("Native dialog selection was interrupted"); + return Optional.empty(); + } catch (Exception e) { + log.error("Failed to open native directory dialog", e); + throw new ApiException("Failed to open native directory dialog", HttpStatus.INTERNAL_SERVER_ERROR); + } + return Optional.ofNullable(result[0]); + } +} diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 6305c852..c6d38064 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -9,8 +9,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Stream; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationNotFoundException; @@ -18,19 +20,18 @@ import org.frankframework.flow.projectsettings.InvalidFilterTypeException; import org.frankframework.flow.utility.XmlAdapterUtils; import org.frankframework.flow.utility.XmlSecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.support.ResourcePatternResolver; + import org.springframework.stereotype.Service; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXParseException; +@Slf4j @Service public class ProjectService { @Getter - private final ArrayList projects = new ArrayList<>(); + private final List projects = new CopyOnWriteArrayList<>(); private static final String CONFIGURATIONS_DIR = "src/main/configurations"; private static final String DEFAULT_CONFIGURATION_XML = @@ -67,7 +68,8 @@ public Project createProjectOnDisk(String absolutePath) throws IOException { String rootPath = projectDir.toString(); Project project = new Project(name, rootPath); - Configuration configuration = new Configuration(configFile.toAbsolutePath().normalize().toString()); + Configuration configuration = + new Configuration(configFile.toAbsolutePath().normalize().toString()); configuration.setXmlContent(DEFAULT_CONFIGURATION_XML); project.addConfiguration(configuration); @@ -218,7 +220,6 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin Configuration config = configOptional.get(); try { - // Parse existing config Document configDoc = XmlSecurityUtils.createSecureDocumentBuilder() .parse(new ByteArrayInputStream(config.getXmlContent().getBytes(StandardCharsets.UTF_8))); @@ -228,7 +229,8 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin Node newAdapterNode = configDoc.importNode(newAdapterDoc.getDocumentElement(), true); - if (!XmlAdapterUtils.replaceAdapterInDocument(configDoc, adapterName, newAdapterNode)) { + if (!XmlAdapterUtils.replaceAdapterInDocument( + configDoc, adapterName, newAdapterNode)) { throw new AdapterNotFoundException("Adapter not found: " + adapterName); } @@ -240,10 +242,10 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin } catch (AdapterNotFoundException | ConfigurationNotFoundException | ProjectNotFoundException e) { throw e; } catch (SAXParseException e) { - System.err.println("Invalid XML for adapter " + adapterName + ": " + e.getMessage()); + log.warn("Invalid XML for adapter {}: {}", adapterName, e.getMessage()); return false; } catch (Exception e) { - System.err.println("Unexpected error updating adapter: " + e.getMessage()); + log.error("Unexpected error updating adapter: {}", e.getMessage(), e); return false; } } diff --git a/src/main/java/org/frankframework/flow/project/RecentProjectsService.java b/src/main/java/org/frankframework/flow/project/RecentProjectsService.java index 6f9dab3e..a6bdb866 100644 --- a/src/main/java/org/frankframework/flow/project/RecentProjectsService.java +++ b/src/main/java/org/frankframework/flow/project/RecentProjectsService.java @@ -7,11 +7,14 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; - import tools.jackson.core.type.TypeReference; import tools.jackson.databind.ObjectMapper; +@Slf4j @Service public class RecentProjectsService { @@ -20,50 +23,96 @@ public class RecentProjectsService { Paths.get(System.getProperty("user.home"), ".flow", "recent-projects.json"); private final ObjectMapper objectMapper = new ObjectMapper(); + private final ReadWriteLock lock = new ReentrantReadWriteLock(); public List getRecentProjects() { - if (!Files.exists(RECENT_PROJECTS_FILE)) { - return new ArrayList<>(); - } + lock.readLock().lock(); try { + if (!Files.exists(RECENT_PROJECTS_FILE)) { + return new ArrayList<>(); + } String json = Files.readString(RECENT_PROJECTS_FILE); return objectMapper.readValue(json, new TypeReference>() {}); } catch (IOException e) { - System.err.println("Error reading recent projects: " + e.getMessage()); + log.warn("Error reading recent projects: {}", e.getMessage()); return new ArrayList<>(); + } finally { + lock.readLock().unlock(); } } public void addRecentProject(String name, String rootPath) { - List projects = new ArrayList<>(getRecentProjects()); + if (name == null || name.isBlank() || rootPath == null || rootPath.isBlank()) { + log.warn("Cannot add recent project with blank name or rootPath"); + return; + } - // Remove existing entry with same rootPath - projects.removeIf(p -> p.rootPath().equals(rootPath)); + String normalizedPath = Paths.get(rootPath).toAbsolutePath().normalize().toString(); - // Add to the top - projects.addFirst(new RecentProject(name, rootPath, Instant.now().toString())); + lock.writeLock().lock(); + try { + List projects = new ArrayList<>(readProjectsFromDisk()); - // Cap at max - if (projects.size() > MAX_RECENT_PROJECTS) { - projects = new ArrayList<>(projects.subList(0, MAX_RECENT_PROJECTS)); - } + projects.removeIf(p -> Paths.get(p.rootPath()) + .toAbsolutePath() + .normalize() + .toString() + .equals(normalizedPath)); - saveRecentProjects(projects); + projects.addFirst( + new RecentProject(name, normalizedPath, Instant.now().toString())); + + if (projects.size() > MAX_RECENT_PROJECTS) { + projects = new ArrayList<>(projects.subList(0, MAX_RECENT_PROJECTS)); + } + + saveProjectsToDisk(projects); + } finally { + lock.writeLock().unlock(); + } } public void removeRecentProject(String rootPath) { - List projects = new ArrayList<>(getRecentProjects()); - projects.removeIf(p -> p.rootPath().equals(rootPath)); - saveRecentProjects(projects); + if (rootPath == null || rootPath.isBlank()) { + return; + } + + String normalizedPath = Paths.get(rootPath).toAbsolutePath().normalize().toString(); + + lock.writeLock().lock(); + try { + List projects = new ArrayList<>(readProjectsFromDisk()); + projects.removeIf(p -> Paths.get(p.rootPath()) + .toAbsolutePath() + .normalize() + .toString() + .equals(normalizedPath)); + saveProjectsToDisk(projects); + } finally { + lock.writeLock().unlock(); + } + } + + private List readProjectsFromDisk() { + if (!Files.exists(RECENT_PROJECTS_FILE)) { + return new ArrayList<>(); + } + try { + String json = Files.readString(RECENT_PROJECTS_FILE); + return objectMapper.readValue(json, new TypeReference>() {}); + } catch (IOException e) { + log.warn("Error reading recent projects file: {}", e.getMessage()); + return new ArrayList<>(); + } } - private void saveRecentProjects(List projects) { + private void saveProjectsToDisk(List projects) { try { Files.createDirectories(RECENT_PROJECTS_FILE.getParent()); String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(projects); Files.writeString(RECENT_PROJECTS_FILE, json); } catch (IOException e) { - System.err.println("Error saving recent projects: " + e.getMessage()); + log.error("Error saving recent projects: {}", e.getMessage()); } } } diff --git a/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java b/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java index bd642f0a..cf724004 100644 --- a/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java +++ b/src/test/java/org/frankframework/flow/cypress/RunCypressE2eTest.java @@ -16,7 +16,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; -import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Stream; diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index 5a94714e..dab459bf 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -5,10 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; -import java.io.IOException; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationNotFoundException; @@ -17,10 +14,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.ResourcePatternResolver; @ExtendWith(MockitoExtension.class) class ProjectServiceTest { From d0b234d48d44c6551fb388f5102f44b335f64631 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 16:39:05 +0100 Subject: [PATCH 05/26] Add project cloning functionality and enhance project management UI --- .../projectlanding/clone-project-modal.tsx | 114 ++++++++++++++++++ .../routes/projectlanding/project-landing.tsx | 40 +++++- .../frontend/app/services/project-service.ts | 7 ++ .../flow/filesystem/NativeDialogService.java | 21 +++- .../flow/project/ProjectController.java | 11 ++ .../flow/project/ProjectService.java | 50 +++++++- 6 files changed, 228 insertions(+), 15 deletions(-) create mode 100644 src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx new file mode 100644 index 00000000..2848c349 --- /dev/null +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -0,0 +1,114 @@ +import { useState } from 'react' +import { filesystemService } from '~/services/filesystem-service' + +interface CloneProjectModalProperties { + isOpen: boolean + onClose: () => void + onClone: (repoUrl: string, localPath: string) => void +} + +export default function CloneProjectModal({ isOpen, onClose, onClone }: Readonly) { + const [repoUrl, setRepoUrl] = useState('') + const [location, setLocation] = useState('') + const [error, setError] = useState(null) + + if (!isOpen) return null + + const handleSelectLocation = async () => { + setError(null) + try { + const selection = await filesystemService.selectNativePath() + if (selection?.path) { + setLocation(selection.path) + } + } catch (error_) { + setError(error_ instanceof Error ? error_.message : 'Failed to open folder picker') + } + } + + const repoName = repoUrl + .split('/') + .pop() + ?.replace(/\.git$/, '') + + const handleClone = () => { + if (!repoUrl.trim() || !location) return + const separator = location.includes('/') ? '/' : '\\' + const localPath = `${location}${separator}${repoName}` + onClone(repoUrl.trim(), localPath) + handleClose() + } + + const handleClose = () => { + setRepoUrl('') + setLocation('') + setError(null) + onClose() + } + + return ( +
+
+

Clone Repository

+

Clone a Git repository to a local folder

+ +
+ +
+ + +
+
+ +
+ + setRepoUrl(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="https://github.com/user/repo.git" + aria-label="repository url" + /> +
+ + {location && repoName && ( +

+ Will clone to: {location} + {location.includes('/') ? '/' : '\\'} + {repoName} +

+ )} + + {error &&

{error}

} + +
+ + + +
+
+
+ ) +} diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index be9b5aec..194bfef0 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -6,12 +6,13 @@ import ArchiveIcon from '/icons/solar/Archive.svg?react' import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' import { filesystemService } from '~/services/filesystem-service' -import { openProject, createProject } from '~/services/project-service' +import { openProject, createProject, cloneProject } from '~/services/project-service' import ProjectRow from './project-row' import Search from '~/components/search/search' import ActionButton from './action-button' import NewProjectModal from './new-project-modal' +import CloneProjectModal from './clone-project-modal' import type { RecentProject } from '~/types/project.types' export default function ProjectLanding() { @@ -22,6 +23,7 @@ export default function ProjectLanding() { const [searchTerm, setSearchTerm] = useState('') const [isModalOpen, setIsModalOpen] = useState(false) + const [isCloneModalOpen, setIsCloneModalOpen] = useState(false) const [runtimeError, setRuntimeError] = useState(null) useEffect(() => { @@ -70,6 +72,19 @@ export default function ProjectLanding() { } } + const onCloneProject = async (repoUrl: string, localPath: string) => { + setRuntimeError(null) + try { + const project = await cloneProject(repoUrl, localPath) + setProject(project) + setIsCloneModalOpen(false) + refetch() + navigate(`/studio/${encodeURIComponent(project.name)}`) + } catch (error) { + setRuntimeError(error instanceof Error ? error.message : 'Clone failed') + } + } + const projects = recentProjects ?? [] const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) @@ -83,7 +98,11 @@ export default function ProjectLanding() {
- setIsModalOpen(true)} onOpenClick={onOpenNativeFolder} /> + setIsModalOpen(true)} + onOpenClick={onOpenNativeFolder} + onCloneClick={() => setIsCloneModalOpen(true)} + />
@@ -93,6 +112,11 @@ export default function ProjectLanding() { )} setIsModalOpen(false)} onCreate={onCreateProject} /> + setIsCloneModalOpen(false)} + onClone={onCloneProject} + />
) } @@ -104,10 +128,18 @@ const Header = () => ( ) -const Sidebar = ({ onNewClick, onOpenClick }: { onNewClick: () => void; onOpenClick: () => void }) => ( +const Sidebar = ({ + onNewClick, + onOpenClick, + onCloneClick, +}: { + onNewClick: () => void + onOpenClick: () => void + onCloneClick: () => void +}) => ( ) diff --git a/src/main/frontend/app/services/project-service.ts b/src/main/frontend/app/services/project-service.ts index 875b3176..fff092ee 100644 --- a/src/main/frontend/app/services/project-service.ts +++ b/src/main/frontend/app/services/project-service.ts @@ -24,6 +24,13 @@ export async function openProject(rootPath: string): Promise { }) } +export async function cloneProject(repoUrl: string, localPath: string): Promise { + return apiFetch('/projects/clone', { + method: 'POST', + body: JSON.stringify({ repoUrl, localPath }), + }) +} + export async function createProject(rootPath: string): Promise { return apiFetch('/projects', { method: 'POST', diff --git a/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java b/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java index 4d870ee2..09775b08 100644 --- a/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java +++ b/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java @@ -5,6 +5,7 @@ import java.awt.HeadlessException; import java.util.Optional; import javax.swing.JFileChooser; +import javax.swing.JFrame; import javax.swing.UIManager; import lombok.extern.slf4j.Slf4j; import org.frankframework.flow.exception.ApiException; @@ -28,13 +29,21 @@ public Optional selectDirectory() throws ApiException { final String[] result = new String[1]; try { EventQueue.invokeAndWait(() -> { - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setDialogTitle("Select Frank!Flow Project Folder"); + JFrame frame = new JFrame(); + frame.setAlwaysOnTop(true); + frame.setLocationRelativeTo(null); - int returnVal = chooser.showOpenDialog(null); - if (returnVal == JFileChooser.APPROVE_OPTION) { - result[0] = chooser.getSelectedFile().getAbsolutePath(); + try { + JFileChooser chooser = new JFileChooser(); + chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + chooser.setDialogTitle("Select Frank!Flow Project Folder"); + + int returnVal = chooser.showOpenDialog(frame); + if (returnVal == JFileChooser.APPROVE_OPTION) { + result[0] = chooser.getSelectedFile().getAbsolutePath(); + } + } finally { + frame.dispose(); } }); } catch (HeadlessException e) { diff --git a/src/main/java/org/frankframework/flow/project/ProjectController.java b/src/main/java/org/frankframework/flow/project/ProjectController.java index b0de19d1..fe7f020d 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectController.java +++ b/src/main/java/org/frankframework/flow/project/ProjectController.java @@ -242,6 +242,17 @@ public ResponseEntity createProject(@RequestBody ProjectCreateDTO pr return ResponseEntity.ok(dto); } + @PostMapping("/clone") + public ResponseEntity cloneProject(@RequestBody ProjectCloneDTO projectCloneDTO) throws IOException { + Project project = projectService.cloneAndOpenProject(projectCloneDTO.repoUrl(), projectCloneDTO.localPath()); + + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); + + ProjectDTO dto = ProjectDTO.from(project); + + return ResponseEntity.ok(dto); + } + @PostMapping("/open") public ResponseEntity openProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { Project project = projectService.openProjectFromDisk(projectCreateDTO.rootPath()); diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index c6d38064..5c54b90c 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -2,6 +2,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import java.nio.charset.MalformedInputException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -117,14 +118,54 @@ private void scanXmlFiles(Path directory, Project project) throws IOException { for (Path xmlFile : xmlFiles) { String absolutePath = xmlFile.toAbsolutePath().normalize().toString(); - String xmlContent = Files.readString(xmlFile, StandardCharsets.UTF_8); - Configuration configuration = new Configuration(absolutePath); - configuration.setXmlContent(xmlContent); - project.addConfiguration(configuration); + try { + String xmlContent = Files.readString(xmlFile, StandardCharsets.UTF_8); + Configuration configuration = new Configuration(absolutePath); + configuration.setXmlContent(xmlContent); + project.addConfiguration(configuration); + } catch (MalformedInputException e) { + log.warn("Skipping file with invalid UTF-8 encoding: {}", absolutePath); + } } } } + public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOException { + if (repoUrl == null || repoUrl.isBlank()) { + throw new IllegalArgumentException("Repository URL must not be blank"); + } + if (localPath == null || localPath.isBlank()) { + throw new IllegalArgumentException("Local path must not be blank"); + } + + Path targetDir = Paths.get(localPath).toAbsolutePath().normalize(); + if (Files.exists(targetDir)) { + throw new IllegalArgumentException("Target directory already exists: " + targetDir); + } + + try { + ProcessBuilder processBuilder = new ProcessBuilder("git", "clone", repoUrl, targetDir.toString()); + processBuilder.redirectErrorStream(true); + Process process = processBuilder.start(); + + String output = new String(process.getInputStream().readAllBytes(), StandardCharsets.UTF_8); + int exitCode = process.waitFor(); + + if (exitCode != 0) { + log.error("git clone failed (exit code {}): {}", exitCode, output); + throw new IOException( + "git clone failed: " + output.lines().findFirst().orElse("unknown error")); + } + + log.info("Cloned repository {} to {}", repoUrl, targetDir); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("git clone was interrupted"); + } + + return openProjectFromDisk(targetDir.toString()); + } + public Project createProject(String name, String rootPath) throws ProjectAlreadyExistsException { Project project = new Project(name, rootPath); if (projects.contains(project)) { @@ -223,7 +264,6 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin Document configDoc = XmlSecurityUtils.createSecureDocumentBuilder() .parse(new ByteArrayInputStream(config.getXmlContent().getBytes(StandardCharsets.UTF_8))); - // Parse new adapter Document newAdapterDoc = XmlSecurityUtils.createSecureDocumentBuilder() .parse(new ByteArrayInputStream(newAdapterXml.getBytes(StandardCharsets.UTF_8))); From e36e9bbccc2f61139271e824c501e9cd1f13096d Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 16:40:40 +0100 Subject: [PATCH 06/26] Add ProjectCloneDTO for handling project cloning data --- .../java/org/frankframework/flow/project/ProjectCloneDTO.java | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/java/org/frankframework/flow/project/ProjectCloneDTO.java diff --git a/src/main/java/org/frankframework/flow/project/ProjectCloneDTO.java b/src/main/java/org/frankframework/flow/project/ProjectCloneDTO.java new file mode 100644 index 00000000..e6ed0a66 --- /dev/null +++ b/src/main/java/org/frankframework/flow/project/ProjectCloneDTO.java @@ -0,0 +1,3 @@ +package org.frankframework.flow.project; + +public record ProjectCloneDTO(String repoUrl, String localPath) {} From a20063d9fa6eb81215c53fda329176905c42e8f9 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 16:53:51 +0100 Subject: [PATCH 07/26] Refactor project modals to use DirectoryPicker for folder selection --- .../directory-picker/directory-picker.tsx | 128 +++++++++++++++++ .../projectlanding/clone-project-modal.tsx | 135 +++++++++-------- .../projectlanding/new-project-modal.tsx | 136 +++++++++--------- .../routes/projectlanding/project-landing.tsx | 23 ++- .../app/services/filesystem-service.ts | 6 +- .../frontend/app/types/filesystem.types.ts | 4 - .../frankframework/flow/FlowApplication.java | 4 +- .../flow/filesystem/FilesystemController.java | 14 +- .../flow/filesystem/NativeDialogService.java | 63 -------- 9 files changed, 271 insertions(+), 242 deletions(-) create mode 100644 src/main/frontend/app/components/directory-picker/directory-picker.tsx delete mode 100644 src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java diff --git a/src/main/frontend/app/components/directory-picker/directory-picker.tsx b/src/main/frontend/app/components/directory-picker/directory-picker.tsx new file mode 100644 index 00000000..a1374ff3 --- /dev/null +++ b/src/main/frontend/app/components/directory-picker/directory-picker.tsx @@ -0,0 +1,128 @@ +import { useCallback, useEffect, useState } from 'react' +import { filesystemService } from '~/services/filesystem-service' +import type { FilesystemEntry } from '~/types/filesystem.types' + +interface DirectoryPickerProperties { + isOpen: boolean + onSelect: (absolutePath: string) => void + onCancel: () => void +} + +export default function DirectoryPicker({ isOpen, onSelect, onCancel }: Readonly) { + const [currentPath, setCurrentPath] = useState('') + const [entries, setEntries] = useState([]) + const [selectedEntry, setSelectedEntry] = useState(null) + const [loading, setLoading] = useState(false) + const [error, setError] = useState(null) + + const loadEntries = useCallback(async (path: string) => { + setLoading(true) + setError(null) + setSelectedEntry(null) + try { + const result = await filesystemService.browse(path) + setEntries(result) + setCurrentPath(path) + } catch (error_) { + setError(error_ instanceof Error ? error_.message : 'Failed to load directories') + } finally { + setLoading(false) + } + }, []) + + useEffect(() => { + if (isOpen) { + setSelectedEntry(null) + loadEntries('') + } + }, [isOpen, loadEntries]) + + if (!isOpen) return null + + const parentPath = currentPath ? currentPath.replace(/[\\/][^\\/]*$/, '') : '' + const isRoot = !currentPath + const canGoUp = !isRoot + + const handleNavigateUp = () => { + if (parentPath === currentPath) { + loadEntries('') + } else { + loadEntries(parentPath) + } + } + + const handleClick = (entry: FilesystemEntry) => { + setSelectedEntry(entry.absolutePath) + } + + const handleDoubleClick = (entry: FilesystemEntry) => { + loadEntries(entry.absolutePath) + } + + const activePath = selectedEntry ?? currentPath + + return ( +
+
+
+

Select Directory

+ +
+ +
+ + {currentPath || 'Computer'} +
+ +
+ {loading &&

Loading...

} + {error &&

{error}

} + {!loading && !error && entries.length === 0 && ( +

No subdirectories

+ )} + {!loading && + !error && + entries.map((entry) => ( + + ))} +
+ +
+ + {activePath || 'Select a directory'} + +
+ + +
+
+
+
+ ) +} diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx index 2848c349..f9d86b86 100644 --- a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { filesystemService } from '~/services/filesystem-service' +import DirectoryPicker from '~/components/directory-picker/directory-picker' interface CloneProjectModalProperties { isOpen: boolean @@ -10,22 +10,10 @@ interface CloneProjectModalProperties { export default function CloneProjectModal({ isOpen, onClose, onClone }: Readonly) { const [repoUrl, setRepoUrl] = useState('') const [location, setLocation] = useState('') - const [error, setError] = useState(null) + const [showPicker, setShowPicker] = useState(false) if (!isOpen) return null - const handleSelectLocation = async () => { - setError(null) - try { - const selection = await filesystemService.selectNativePath() - if (selection?.path) { - setLocation(selection.path) - } - } catch (error_) { - setError(error_ instanceof Error ? error_.message : 'Failed to open folder picker') - } - } - const repoName = repoUrl .split('/') .pop() @@ -42,73 +30,82 @@ export default function CloneProjectModal({ isOpen, onClose, onClone }: Readonly const handleClose = () => { setRepoUrl('') setLocation('') - setError(null) + setShowPicker(false) onClose() } return ( -
-
-

Clone Repository

-

Clone a Git repository to a local folder

+ <> +
+
+

Clone Repository

+

Clone a Git repository to a local folder

-
- -
+
+ +
+ + +
+
+ +
+ setRepoUrl(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="https://github.com/user/repo.git" + aria-label="repository url" /> -
-
- -
- - setRepoUrl(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="https://github.com/user/repo.git" - aria-label="repository url" - /> -
- {location && repoName && ( -

- Will clone to: {location} - {location.includes('/') ? '/' : '\\'} - {repoName} -

- )} + {location && repoName && ( +

+ Will clone to: {location} + {location.includes('/') ? '/' : '\\'} + {repoName} +

+ )} - {error &&

{error}

} - -
- +
+ - + +
-
+ + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} + /> + ) } diff --git a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx index af580d6e..4a26eeab 100644 --- a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { filesystemService } from '~/services/filesystem-service' +import DirectoryPicker from '~/components/directory-picker/directory-picker' interface NewProjectModalProperties { isOpen: boolean @@ -10,22 +10,10 @@ interface NewProjectModalProperties { export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly) { const [name, setName] = useState('') const [location, setLocation] = useState('') - const [error, setError] = useState(null) + const [showPicker, setShowPicker] = useState(false) if (!isOpen) return null - const handleSelectLocation = async () => { - setError(null) - try { - const selection = await filesystemService.selectNativePath() - if (selection?.path) { - setLocation(selection.path) - } - } catch (error_) { - setError(error_ instanceof Error ? error_.message : 'Failed to open folder picker') - } - } - const handleCreate = () => { if (!name.trim() || !location) return @@ -34,80 +22,88 @@ export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly< onCreate(absolutePath) setName('') setLocation('') - setError(null) onClose() } const handleClose = () => { setName('') setLocation('') - setError(null) + setShowPicker(false) onClose() } return ( -
-
-

New Project

-

Create a new Frank! project on disk

+ <> +
+
+

New Project

+

Create a new Frank! project on disk

-
- -
+
+ +
+ + +
+
+ +
+ setName(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="Enter project name" + aria-label="project name" /> -
-
- -
- - setName(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="Enter project name" - aria-label="project name" - /> -
- {location && name.trim() && ( -

- Project will be created at: {location} - {location.includes('/') ? '/' : '\\'} - {name.trim()} -

- )} + {location && name.trim() && ( +

+ Project will be created at: {location} + {location.includes('/') ? '/' : '\\'} + {name.trim()} +

+ )} - {error &&

{error}

} - -
- +
+ - + +
-
+ + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} + /> + ) } diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 194bfef0..4c318019 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -5,7 +5,6 @@ import ArchiveIcon from '/icons/solar/Archive.svg?react' import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' -import { filesystemService } from '~/services/filesystem-service' import { openProject, createProject, cloneProject } from '~/services/project-service' import ProjectRow from './project-row' @@ -13,6 +12,7 @@ import Search from '~/components/search/search' import ActionButton from './action-button' import NewProjectModal from './new-project-modal' import CloneProjectModal from './clone-project-modal' +import DirectoryPicker from '~/components/directory-picker/directory-picker' import type { RecentProject } from '~/types/project.types' export default function ProjectLanding() { @@ -24,6 +24,7 @@ export default function ProjectLanding() { const [searchTerm, setSearchTerm] = useState('') const [isModalOpen, setIsModalOpen] = useState(false) const [isCloneModalOpen, setIsCloneModalOpen] = useState(false) + const [isOpenPickerOpen, setIsOpenPickerOpen] = useState(false) const [runtimeError, setRuntimeError] = useState(null) useEffect(() => { @@ -44,19 +45,10 @@ export default function ProjectLanding() { [navigate, setProject], ) - const onOpenNativeFolder = async () => { - setRuntimeError(null) - try { - const selection = await filesystemService.selectNativePath() - if (!selection?.path) return - - const project = await openProject(selection.path) - setProject(project) - refetch() - navigate(`/studio/${encodeURIComponent(project.name)}`) - } catch (error) { - setRuntimeError(error instanceof Error ? error.message : 'Failed to open project') - } + const onOpenFolder = async (selectedPath: string) => { + setIsOpenPickerOpen(false) + await handleOpenProject(selectedPath) + refetch() } const onCreateProject = async (absolutePath: string) => { @@ -100,7 +92,7 @@ export default function ProjectLanding() {
setIsModalOpen(true)} - onOpenClick={onOpenNativeFolder} + onOpenClick={() => setIsOpenPickerOpen(true)} onCloneClick={() => setIsCloneModalOpen(true)} /> @@ -117,6 +109,7 @@ export default function ProjectLanding() { onClose={() => setIsCloneModalOpen(false)} onClone={onCloneProject} /> + setIsOpenPickerOpen(false)} />
) } diff --git a/src/main/frontend/app/services/filesystem-service.ts b/src/main/frontend/app/services/filesystem-service.ts index fe7e7702..bd27b3d1 100644 --- a/src/main/frontend/app/services/filesystem-service.ts +++ b/src/main/frontend/app/services/filesystem-service.ts @@ -1,12 +1,8 @@ import { apiFetch } from '~/utils/api' -import type { FilesystemEntry, PathSelectionResponse } from '~/types/filesystem.types' +import type { FilesystemEntry } from '~/types/filesystem.types' export const filesystemService = { async browse(path = ''): Promise { return apiFetch(`/filesystem/browse?path=${encodeURIComponent(path)}`) }, - - async selectNativePath(): Promise { - return apiFetch('/filesystem/select-native') - }, } diff --git a/src/main/frontend/app/types/filesystem.types.ts b/src/main/frontend/app/types/filesystem.types.ts index 49105a7d..ae0136d3 100644 --- a/src/main/frontend/app/types/filesystem.types.ts +++ b/src/main/frontend/app/types/filesystem.types.ts @@ -5,7 +5,3 @@ export interface FilesystemEntry { absolutePath: string type: EntryType } - -export interface PathSelectionResponse { - path: string -} diff --git a/src/main/java/org/frankframework/flow/FlowApplication.java b/src/main/java/org/frankframework/flow/FlowApplication.java index 48411b83..af916b73 100644 --- a/src/main/java/org/frankframework/flow/FlowApplication.java +++ b/src/main/java/org/frankframework/flow/FlowApplication.java @@ -22,9 +22,7 @@ public static void main(String[] args) { } public static SpringApplication configureApplication() { - return new SpringApplicationBuilder(FlowApplication.class) - .headless(false) - .build(); + return new SpringApplicationBuilder(FlowApplication.class).build(); } /** diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java index b058440e..517d0beb 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java @@ -2,8 +2,6 @@ import java.io.IOException; import java.util.List; -import java.util.Map; -import org.frankframework.flow.exception.ApiException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,11 +13,9 @@ public class FilesystemController { private final FilesystemService filesystemService; - private final NativeDialogService nativeDialogService; - public FilesystemController(FilesystemService filesystemService, NativeDialogService nativeDialogService) { + public FilesystemController(FilesystemService filesystemService) { this.filesystemService = filesystemService; - this.nativeDialogService = nativeDialogService; } @GetMapping("/browse") @@ -34,12 +30,4 @@ public ResponseEntity> browse(@RequestParam(required = fal } return ResponseEntity.ok(entries); } - - @GetMapping("/select-native") - public ResponseEntity> selectNativePath() throws ApiException { - return nativeDialogService - .selectDirectory() - .map(path -> ResponseEntity.ok(Map.of("path", path))) - .orElse(ResponseEntity.noContent().build()); - } } diff --git a/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java b/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java deleted file mode 100644 index 09775b08..00000000 --- a/src/main/java/org/frankframework/flow/filesystem/NativeDialogService.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.frankframework.flow.filesystem; - -import jakarta.annotation.PostConstruct; -import java.awt.EventQueue; -import java.awt.HeadlessException; -import java.util.Optional; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.UIManager; -import lombok.extern.slf4j.Slf4j; -import org.frankframework.flow.exception.ApiException; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class NativeDialogService { - - @PostConstruct - public void init() { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - log.warn("Could not set system look and feel, using default", e); - } - } - - public Optional selectDirectory() throws ApiException { - final String[] result = new String[1]; - try { - EventQueue.invokeAndWait(() -> { - JFrame frame = new JFrame(); - frame.setAlwaysOnTop(true); - frame.setLocationRelativeTo(null); - - try { - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setDialogTitle("Select Frank!Flow Project Folder"); - - int returnVal = chooser.showOpenDialog(frame); - if (returnVal == JFileChooser.APPROVE_OPTION) { - result[0] = chooser.getSelectedFile().getAbsolutePath(); - } - } finally { - frame.dispose(); - } - }); - } catch (HeadlessException e) { - log.error("Cannot open native dialog in headless environment", e); - throw new ApiException( - "Native file dialog is not available in headless mode", HttpStatus.SERVICE_UNAVAILABLE); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - log.warn("Native dialog selection was interrupted"); - return Optional.empty(); - } catch (Exception e) { - log.error("Failed to open native directory dialog", e); - throw new ApiException("Failed to open native directory dialog", HttpStatus.INTERNAL_SERVER_ERROR); - } - return Optional.ofNullable(result[0]); - } -} From dca5d86fd30d8af2edb683ceb5b53936e3376ef8 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 16:59:12 +0100 Subject: [PATCH 08/26] Add project removal functionality to recent projects list --- .../routes/projectlanding/project-landing.tsx | 31 +++++++++++++++---- .../app/routes/projectlanding/project-row.tsx | 16 ++++++++-- .../frontend/icons/solar/Close Square.svg | 2 +- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 4c318019..6b73c114 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -5,7 +5,7 @@ import ArchiveIcon from '/icons/solar/Archive.svg?react' import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' -import { openProject, createProject, cloneProject } from '~/services/project-service' +import { openProject, createProject, cloneProject, removeRecentProject } from '~/services/project-service' import ProjectRow from './project-row' import Search from '~/components/search/search' @@ -48,7 +48,6 @@ export default function ProjectLanding() { const onOpenFolder = async (selectedPath: string) => { setIsOpenPickerOpen(false) await handleOpenProject(selectedPath) - refetch() } const onCreateProject = async (absolutePath: string) => { @@ -57,7 +56,6 @@ export default function ProjectLanding() { const project = await createProject(absolutePath) setProject(project) setIsModalOpen(false) - refetch() navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { setRuntimeError(error instanceof Error ? error.message : 'Creation failed') @@ -70,13 +68,21 @@ export default function ProjectLanding() { const project = await cloneProject(repoUrl, localPath) setProject(project) setIsCloneModalOpen(false) - refetch() navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { setRuntimeError(error instanceof Error ? error.message : 'Clone failed') } } + const onRemoveProject = async (rootPath: string) => { + try { + await removeRecentProject(rootPath) + refetch() + } catch (error) { + setRuntimeError(error instanceof Error ? error.message : 'Failed to remove project') + } + } + const projects = recentProjects ?? [] const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) @@ -95,7 +101,11 @@ export default function ProjectLanding() { onOpenClick={() => setIsOpenPickerOpen(true)} onCloneClick={() => setIsCloneModalOpen(true)} /> - +
@@ -140,15 +150,24 @@ const Sidebar = ({ const ProjectList = ({ projects, onProjectClick, + onRemoveProject, }: { projects: RecentProject[] onProjectClick: (rootPath: string) => void + onRemoveProject: (rootPath: string) => void }) => (
{projects.length === 0 ? (

No projects found

) : ( - projects.map((p) => onProjectClick(p.rootPath)} />) + projects.map((p) => ( + onProjectClick(p.rootPath)} + onRemove={() => onRemoveProject(p.rootPath)} + /> + )) )}
) diff --git a/src/main/frontend/app/routes/projectlanding/project-row.tsx b/src/main/frontend/app/routes/projectlanding/project-row.tsx index bc802b5c..68008e96 100644 --- a/src/main/frontend/app/routes/projectlanding/project-row.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-row.tsx @@ -1,12 +1,13 @@ -import KebabVerticalIcon from 'icons/solar/Kebab Vertical.svg?react' +import CloseSquareIcon from 'icons/solar/Close Square.svg?react' import type { RecentProject } from '~/types/project.types' interface ProjectRowProperties { project: RecentProject onClick: () => void + onRemove: () => void } -export default function ProjectRow({ project, onClick }: Readonly) { +export default function ProjectRow({ project, onClick, onRemove }: Readonly) { return (
{project.rootPath}

- +
) } diff --git a/src/main/frontend/icons/solar/Close Square.svg b/src/main/frontend/icons/solar/Close Square.svg index e71a46c6..addf87ad 100644 --- a/src/main/frontend/icons/solar/Close Square.svg +++ b/src/main/frontend/icons/solar/Close Square.svg @@ -1,4 +1,4 @@ - + From 57ed3a419119ad00e9c924d9da1aea59d84c1948 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 17:13:05 +0100 Subject: [PATCH 09/26] Enhance project fetching and configuration loading in services --- src/main/frontend/app/routes/app-layout.tsx | 3 ++- .../frontend/app/services/project-service.ts | 4 +++ .../flow/project/ProjectService.java | 27 ++++++++----------- .../templates/default-configuration.xml | 10 +++++++ 4 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/templates/default-configuration.xml diff --git a/src/main/frontend/app/routes/app-layout.tsx b/src/main/frontend/app/routes/app-layout.tsx index 974f04b6..c80d97d5 100644 --- a/src/main/frontend/app/routes/app-layout.tsx +++ b/src/main/frontend/app/routes/app-layout.tsx @@ -5,6 +5,7 @@ import { useEffect, useState } from 'react' import { useProjectStore, getStoredProjectName } from '~/stores/project-store' import { fetchProject } from '~/services/project-service' import LoadingSpinner from '~/components/loading-spinner' +import type { Project } from '~/types/project.types' import { Toast } from '~/components/toast' export default function AppLayout() { @@ -18,7 +19,7 @@ export default function AppLayout() { } fetchProject(storedName) - .then((fetched) => { + .then((fetched: Project) => { useProjectStore.getState().setProject(fetched) }) .catch(() => { diff --git a/src/main/frontend/app/services/project-service.ts b/src/main/frontend/app/services/project-service.ts index fff092ee..82cccdae 100644 --- a/src/main/frontend/app/services/project-service.ts +++ b/src/main/frontend/app/services/project-service.ts @@ -6,6 +6,10 @@ export async function fetchProjects(signal?: AbortSignal): Promise { return apiFetch('/projects', { signal }) } +export async function fetchProject(name: string): Promise { + return apiFetch(`/projects/${encodeURIComponent(name)}`) +} + export async function fetchRecentProjects(signal?: AbortSignal): Promise { return apiFetch('/projects/recent', { signal }) } diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 5c54b90c..8e09f5d2 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -22,32 +22,25 @@ import org.frankframework.flow.utility.XmlAdapterUtils; import org.frankframework.flow.utility.XmlSecurityUtils; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXParseException; +@Getter @Slf4j @Service public class ProjectService { - @Getter private final List projects = new CopyOnWriteArrayList<>(); private static final String CONFIGURATIONS_DIR = "src/main/configurations"; - private static final String DEFAULT_CONFIGURATION_XML = - """ - - - - - - - - - - - """; + + private String loadDefaultConfiguration() throws IOException { + ClassPathResource resource = new ClassPathResource("templates/default-configuration.xml"); + return new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8); + } public Project createProjectOnDisk(String absolutePath) throws IOException { if (absolutePath == null || absolutePath.isBlank()) { @@ -62,8 +55,10 @@ public Project createProjectOnDisk(String absolutePath) throws IOException { Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); Files.createDirectories(configurationsDir); + String defaultXml = loadDefaultConfiguration(); + Path configFile = configurationsDir.resolve("Configuration.xml"); - Files.writeString(configFile, DEFAULT_CONFIGURATION_XML, StandardCharsets.UTF_8); + Files.writeString(configFile, defaultXml, StandardCharsets.UTF_8); String name = projectDir.getFileName().toString(); String rootPath = projectDir.toString(); @@ -71,7 +66,7 @@ public Project createProjectOnDisk(String absolutePath) throws IOException { Project project = new Project(name, rootPath); Configuration configuration = new Configuration(configFile.toAbsolutePath().normalize().toString()); - configuration.setXmlContent(DEFAULT_CONFIGURATION_XML); + configuration.setXmlContent(defaultXml); project.addConfiguration(configuration); projects.add(project); diff --git a/src/main/resources/templates/default-configuration.xml b/src/main/resources/templates/default-configuration.xml new file mode 100644 index 00000000..2dc25387 --- /dev/null +++ b/src/main/resources/templates/default-configuration.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 144ecf140de64a3219c1707ba08a722ddd7d3405 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Wed, 4 Feb 2026 18:12:09 +0100 Subject: [PATCH 10/26] Refactor FileTreeServiceTest to improve readability and add new test cases for file operations --- .../flow/FlowApplicationTests.java | 2 +- .../flow/filetree/FileTreeServiceTest.java | 281 ++++++++---------- .../flow/project/ProjectControllerTest.java | 21 +- 3 files changed, 131 insertions(+), 173 deletions(-) diff --git a/src/test/java/org/frankframework/flow/FlowApplicationTests.java b/src/test/java/org/frankframework/flow/FlowApplicationTests.java index 1287039b..d6de88a4 100644 --- a/src/test/java/org/frankframework/flow/FlowApplicationTests.java +++ b/src/test/java/org/frankframework/flow/FlowApplicationTests.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest(properties = {"app.project.root=target/test-projects"}) +@SpringBootTest class FlowApplicationTests { @Test diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index d48ecb6b..ce8e260a 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -4,186 +4,143 @@ import static org.mockito.Mockito.*; import java.io.IOException; -import java.nio.file.*; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.util.Comparator; import java.util.List; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.project.Project; +import org.frankframework.flow.project.ProjectNotFoundException; import org.frankframework.flow.project.ProjectService; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +/** + * Validates filesystem operations, recursive tree building, and XML adapter updates. + */ @ExtendWith(MockitoExtension.class) -class FileTreeServiceTest { +public class FileTreeServiceTest { @Mock private ProjectService projectService; private FileTreeService fileTreeService; - private Path tempRoot; + private Path tempProjectRoot; + private static final String TEST_PROJECT_NAME = "FrankFlowTestProject"; @BeforeEach - void setUp() throws IOException { - tempRoot = Files.createTempDirectory("testProjectRoot"); - - when(projectService.getProjectsRoot()).thenReturn(tempRoot); - + public void setUp() throws IOException { + tempProjectRoot = Files.createTempDirectory("flow_unit_test"); fileTreeService = new FileTreeService(projectService); - - Files.createDirectory(tempRoot.resolve("ProjectA")); - Files.createDirectory(tempRoot.resolve("ProjectB")); - Files.writeString(tempRoot.resolve("ProjectA/config1.xml"), "original"); } @AfterEach - void tearDown() throws IOException { - if (tempRoot != null && Files.exists(tempRoot)) { - Files.walk(tempRoot).sorted((a, b) -> b.compareTo(a)).forEach(path -> { - try { - Files.deleteIfExists(path); - } catch (IOException e) { - // ignore - } - }); + public void tearDown() throws IOException { + if (tempProjectRoot != null && Files.exists(tempProjectRoot)) { + try (var stream = Files.walk(tempProjectRoot)) { + stream.sorted(Comparator.reverseOrder()).forEach(p -> { + try { + Files.delete(p); + } catch (IOException ignored) { + } + }); + } } } @Test - void listProjectFoldersReturnsAllFolders() throws IOException { - List folders = fileTreeService.listProjectFolders(); - - assertEquals(2, folders.size()); - assertTrue(folders.contains("ProjectA")); - assertTrue(folders.contains("ProjectB")); - } - - @Test - void listProjectFoldersThrowsIfRootDoesNotExist() { - Path nonExistentPath = Paths.get("some/nonexistent/path"); - when(projectService.getProjectsRoot()).thenReturn(nonExistentPath); - - FileTreeService service = new FileTreeService(projectService); - - IllegalStateException exception = assertThrows(IllegalStateException.class, service::listProjectFolders); - - assertTrue(exception.getMessage().contains("Projects root does not exist or is not a directory")); + @DisplayName("Should correctly read content from an existing file") + public void readFileContent_Success() throws IOException { + Path file = tempProjectRoot.resolve("test.xml"); + String content = "data"; + Files.writeString(file, content, StandardCharsets.UTF_8); + + String result = fileTreeService.readFileContent(file.toAbsolutePath().toString()); + assertEquals(content, result); } @Test - void listProjectFoldersThrowsIfRootIsAFile() throws IOException { - Path tempFile = Files.createTempFile("not-a-directory", ".txt"); - - when(projectService.getProjectsRoot()).thenReturn(tempFile); - - FileTreeService service = new FileTreeService(projectService); - - IllegalStateException exception = assertThrows(IllegalStateException.class, service::listProjectFolders); - - assertTrue(exception.getMessage().contains("Projects root does not exist or is not a directory")); - - Files.deleteIfExists(tempFile); + @DisplayName("Should throw NoSuchFileException when file does not exist") + public void readFileContent_FileNotFound() { + String path = tempProjectRoot.resolve("non-existent.xml").toString(); + assertThrows(NoSuchFileException.class, () -> fileTreeService.readFileContent(path)); } @Test - void readFileContentReturnsContentWhenFileExists() throws IOException { - Path file = Files.createTempFile(tempRoot, "config", ".xml"); - String expectedContent = "hello"; - Files.writeString(file, expectedContent); - - String content = fileTreeService.readFileContent(file.toString()); - assertEquals(expectedContent, content); + @DisplayName("Should throw IllegalArgumentException when path is a directory") + public void readFileContent_IsDirectory() throws IOException { + Path dir = Files.createDirectory(tempProjectRoot.resolve("subdir")); + String path = dir.toAbsolutePath().toString(); - Files.deleteIfExists(file); + assertThrows(IllegalArgumentException.class, () -> fileTreeService.readFileContent(path)); } @Test - void readFileContentThrowsIfFileOutsideProjectRoot() throws IOException { - Path outsideFile = Files.createTempFile("outside", ".txt"); - - IllegalArgumentException exception = assertThrows( - IllegalArgumentException.class, () -> fileTreeService.readFileContent(outsideFile.toString())); - assertTrue(exception.getMessage().contains("File is outside of projects root")); + @DisplayName("Should successfully overwrite a file with new content") + public void updateFileContent_Success() throws IOException { + Path file = tempProjectRoot.resolve("update.xml"); + Files.writeString(file, "old content"); - Files.deleteIfExists(outsideFile); - } - - @Test - void readFileContentThrowsIfFileDoesNotExist() { - Path missingFile = tempRoot.resolve("missing.xml"); + String newContent = "new content"; + fileTreeService.updateFileContent(file.toAbsolutePath().toString(), newContent); - assertThrows(NoSuchFileException.class, () -> fileTreeService.readFileContent(missingFile.toString())); + assertEquals(newContent, Files.readString(file)); } @Test - void readFileContentThrowsIfPathIsDirectory() throws IOException { - Path dir = Files.createTempDirectory(tempRoot, "subdir"); - - IllegalArgumentException exception = - assertThrows(IllegalArgumentException.class, () -> fileTreeService.readFileContent(dir.toString())); - assertTrue(exception.getMessage().contains("Requested path is a directory")); - - Files.deleteIfExists(dir); + @DisplayName("Should fail when updating a non-existent file") + public void updateFileContent_MissingFile() { + String path = tempProjectRoot.resolve("missing-file.xml").toString(); + assertThrows(IllegalArgumentException.class, () -> fileTreeService.updateFileContent(path, "data")); } @Test - void updateFileContentWritesNewContent() throws IOException { - Path file = Files.createTempFile(tempRoot, "config", ".xml"); + @DisplayName("Should build a recursive tree structure for deep directories") + public void getProjectTree_DeepStructure() throws IOException, ProjectNotFoundException { + Files.writeString(tempProjectRoot.resolve("fileA.xml"), "A"); + Path dir1 = Files.createDirectory(tempProjectRoot.resolve("dir1")); + Files.writeString(dir1.resolve("fileB.xml"), "B"); + Path dir2 = Files.createDirectory(dir1.resolve("dir2")); + Files.writeString(dir2.resolve("fileC.xml"), "C"); - String initialContent = "old"; - Files.writeString(file, initialContent); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); - String newContent = "updated"; - fileTreeService.updateFileContent(file.toString(), newContent); + FileTreeNode tree = fileTreeService.getProjectTree(TEST_PROJECT_NAME); - String readBack = Files.readString(file); - assertEquals(newContent, readBack); + assertNotNull(tree); + assertEquals(tempProjectRoot.getFileName().toString(), tree.getName()); - Files.deleteIfExists(file); - } + List children = tree.getChildren(); + assertTrue(children.stream().anyMatch(n -> n.getName().equals("fileA.xml"))); - @Test - void updateFileContentThrowsIfFileOutsideProjectRoot() throws IOException { - Path outsideFile = Files.createTempFile("outside", ".txt"); - - IllegalArgumentException exception = assertThrows( - IllegalArgumentException.class, - () -> fileTreeService.updateFileContent(outsideFile.toString(), "content")); - assertTrue(exception.getMessage().contains("File is outside of projects root")); - - Files.deleteIfExists(outsideFile); - } - - @Test - void updateFileContentThrowsIfFileDoesNotExist() { - Path missingFile = tempRoot.resolve("missing.xml"); - - IllegalArgumentException exception = assertThrows( - IllegalArgumentException.class, - () -> fileTreeService.updateFileContent(missingFile.toString(), "content")); - assertTrue(exception.getMessage().contains("File does not exist")); - } - - @Test - void updateFileContentThrowsIfPathIsDirectory() throws IOException { - Path dir = Files.createTempDirectory(tempRoot, "subdir"); - - IllegalArgumentException exception = assertThrows( - IllegalArgumentException.class, () -> fileTreeService.updateFileContent(dir.toString(), "content")); - assertTrue(exception.getMessage().contains("Cannot update a directory")); + FileTreeNode nodeDir1 = children.stream() + .filter(n -> n.getName().equals("dir1")) + .findFirst() + .orElseThrow(); + assertEquals(2, nodeDir1.getChildren().size()); - Files.deleteIfExists(dir); + FileTreeNode nodeDir2 = nodeDir1.getChildren().stream() + .filter(n -> n.getName().equals("dir2")) + .findFirst() + .orElseThrow(); + assertEquals("fileC.xml", nodeDir2.getChildren().getFirst().getName()); } @Test - void getProjectTreeBuildsTreeCorrectly() throws IOException { - FileTreeNode tree = fileTreeService.getProjectTree("ProjectA"); - - assertEquals("ProjectA", tree.getName()); - assertEquals(1, tree.getChildren().size()); - assertEquals("config1.xml", tree.getChildren().get(0).getName()); + @DisplayName("Should fail if the project is not registered in ProjectService") + public void getProjectTree_ProjectMissing() throws ProjectNotFoundException { + when(projectService.getProject("Unknown")).thenThrow(new ProjectNotFoundException("err")); + assertThrows(IllegalArgumentException.class, () -> fileTreeService.getProjectTree("Unknown")); } @Test @@ -194,61 +151,59 @@ void getProjectTreeThrowsIfProjectDoesNotExist() { } @Test - void updateAdapterFromFileReturnsFalseIfInvalidXml() - throws IOException, AdapterNotFoundException, ConfigurationNotFoundException { - Path filePath = tempRoot.resolve("ProjectA/config1.xml"); + @DisplayName("Should replace a specific adapter XML block in a configuration file") + public void updateAdapterFromFile_Success() throws Exception { + Path configFile = tempProjectRoot.resolve("Configuration.xml"); + String originalXml = ""; + Files.writeString(configFile, originalXml); - // Provide malformed XML - boolean result = fileTreeService.updateAdapterFromFile("ProjectA", filePath, "MyAdapter", ""; - assertFalse(result, "Malformed XML should return false"); + boolean result = fileTreeService.updateAdapterFromFile(TEST_PROJECT_NAME, configFile, "Test", newAdapterXml); + + assertTrue(result); + String updatedXml = Files.readString(configFile); + assertTrue(updatedXml.contains("")); } @Test - void updateAdapterFromFileThrowsIfAdapterNotFound() { - Path filePath = tempRoot.resolve("ProjectA/config1.xml"); + @DisplayName("Should throw AdapterNotFoundException if adapter name is missing") + void updateAdapterFromFile_AdapterNotFound() throws IOException { + Path configFile = tempProjectRoot.resolve("config.xml"); + Files.writeString(configFile, ""); - AdapterNotFoundException thrown = assertThrows( + assertThrows( AdapterNotFoundException.class, - () -> fileTreeService.updateAdapterFromFile( - "ProjectA", filePath, "NonExistentAdapter", "")); - - assertTrue(thrown.getMessage().contains("Adapter not found")); + () -> fileTreeService.updateAdapterFromFile(TEST_PROJECT_NAME, configFile, "Target", "")); } @Test - void getProjectsRootReturnsCorrectPath() { - Path root = fileTreeService.getProjectsRoot(); - assertEquals(tempRoot.toAbsolutePath(), root.toAbsolutePath()); - } - - @Test - void getProjectsRootThrowsIfRootDoesNotExist() { - // Mock ProjectService to return a non-existent path - Path nonExistentPath = Paths.get("some/nonexistent/path"); - when(projectService.getProjectsRoot()).thenReturn(nonExistentPath); - - FileTreeService service = new FileTreeService(projectService); + @DisplayName("Should return false if the new adapter XML is malformed") + public void updateAdapterFromFile_MalformedXml() + throws IOException, AdapterNotFoundException, ConfigurationNotFoundException { + Path configFile = tempProjectRoot.resolve("config.xml"); + Files.writeString(configFile, ""); - IllegalStateException exception = assertThrows(IllegalStateException.class, service::getProjectsRoot); + String badXml = "()); - Project createdProject = new Project(projectName, rootPath); - - when(projectService.createProject(projectName, rootPath)).thenReturn(createdProject); + when(projectService.createProjectOnDisk(rootPath)).thenReturn(project); mockMvc.perform( post("/api/projects") @@ -297,16 +301,15 @@ void createProjectReturnsProjectDto() throws Exception { .content( """ { - "name": "NewProject", "rootPath": "/path/to/new/project" } """)) .andExpect(status().isOk()) - .andExpect(jsonPath("$.name").value(projectName)) - .andExpect(jsonPath("$.filepaths").isEmpty()) - .andExpect(jsonPath("$.filters").isNotEmpty()); + .andExpect(jsonPath("$.name").value("NewProject")) + .andExpect(jsonPath("$.rootPath").value(rootPath)); - verify(projectService).createProject(projectName, rootPath); + verify(projectService).createProjectOnDisk(rootPath); + verify(recentProjectsService).addRecentProject("NewProject", rootPath); } @Test From 6f9f0bc8b0e4d2770eaaaf43afaf9dc6affe0c59 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Thu, 5 Feb 2026 11:10:54 +0100 Subject: [PATCH 11/26] Add ToastContainer to AppLayout and update error handling in project operations --- src/main/frontend/app/root.tsx | 10 +++++-- src/main/frontend/app/routes/app-layout.tsx | 4 +++ .../frontend/app/routes/editor/editor.tsx | 2 +- .../routes/projectlanding/project-landing.tsx | 26 +++++++++---------- .../app/routes/studio/canvas/flow.tsx | 5 +--- .../frontend/app/routes/studio/studio.tsx | 4 --- .../flow/project/ProjectService.java | 21 ++------------- 7 files changed, 28 insertions(+), 44 deletions(-) diff --git a/src/main/frontend/app/root.tsx b/src/main/frontend/app/root.tsx index 525d3fbb..6bca4b45 100644 --- a/src/main/frontend/app/root.tsx +++ b/src/main/frontend/app/root.tsx @@ -1,6 +1,7 @@ import { useEffect } from 'react' import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router' - +import { ToastContainer } from 'react-toastify' +import 'react-toastify/dist/ReactToastify.css' import type { Route } from './+types/root' import 'allotment/dist/style.css' import './app.css' @@ -40,7 +41,12 @@ function ThemeProvider({ children }: { children: React.ReactNode }) { document.documentElement.dataset.theme = theme }, [theme]) - return <>{children} + return ( + <> + {children} + + + ) } export function Layout({ children }: Readonly<{ children: React.ReactNode }>) { diff --git a/src/main/frontend/app/routes/app-layout.tsx b/src/main/frontend/app/routes/app-layout.tsx index c80d97d5..b164b82a 100644 --- a/src/main/frontend/app/routes/app-layout.tsx +++ b/src/main/frontend/app/routes/app-layout.tsx @@ -7,8 +7,12 @@ import { fetchProject } from '~/services/project-service' import LoadingSpinner from '~/components/loading-spinner' import type { Project } from '~/types/project.types' import { Toast } from '~/components/toast' +import { ToastContainer } from 'react-toastify' +import { useTheme } from '~/hooks/use-theme' export default function AppLayout() { + const theme = useTheme() + const [restoring, setRestoring] = useState(!!getStoredProjectName()) useEffect(() => { diff --git a/src/main/frontend/app/routes/editor/editor.tsx b/src/main/frontend/app/routes/editor/editor.tsx index bfd1198e..f3bbc5d3 100644 --- a/src/main/frontend/app/routes/editor/editor.tsx +++ b/src/main/frontend/app/routes/editor/editor.tsx @@ -1,6 +1,7 @@ import Editor, { type Monaco, type OnMount } from '@monaco-editor/react' import { useShallow } from 'zustand/react/shallow' import { toast, ToastContainer } from 'react-toastify' +import { toast } from 'react-toastify' import SidebarHeader from '~/components/sidebars-layout/sidebar-header' import SidebarLayout from '~/components/sidebars-layout/sidebar-layout' import { SidebarSide } from '~/components/sidebars-layout/sidebar-layout-store' @@ -322,7 +323,6 @@ export default function CodeEditor() { onMount={handleEditorMount} options={{ automaticLayout: true, quickSuggestions: false }} /> -
) : ( diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 6b73c114..8469ae42 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -2,7 +2,7 @@ import { useEffect, useState, useCallback } from 'react' import { useNavigate } from 'react-router' import FfIcon from '/icons/custom/ff!-icon.svg?react' import ArchiveIcon from '/icons/solar/Archive.svg?react' - +import { toast } from 'react-toastify' import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' import { openProject, createProject, cloneProject, removeRecentProject } from '~/services/project-service' @@ -25,21 +25,25 @@ export default function ProjectLanding() { const [isModalOpen, setIsModalOpen] = useState(false) const [isCloneModalOpen, setIsCloneModalOpen] = useState(false) const [isOpenPickerOpen, setIsOpenPickerOpen] = useState(false) - const [runtimeError, setRuntimeError] = useState(null) useEffect(() => { clearProjectState() }, [clearProjectState]) + useEffect(() => { + if (apiError) { + toast.error(`Could not load in projects: ${apiError.message}`) + } + }, [apiError]) + const handleOpenProject = useCallback( async (rootPath: string) => { - setRuntimeError(null) try { const project = await openProject(rootPath) setProject(project) navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { - setRuntimeError(error instanceof Error ? error.message : 'Failed to open project') + toast.error(error instanceof Error ? error.message : 'Failed to open project') } }, [navigate, setProject], @@ -51,26 +55,24 @@ export default function ProjectLanding() { } const onCreateProject = async (absolutePath: string) => { - setRuntimeError(null) try { const project = await createProject(absolutePath) setProject(project) setIsModalOpen(false) navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { - setRuntimeError(error instanceof Error ? error.message : 'Creation failed') + toast.error(error instanceof Error ? error.message : 'Failed to create project') } } const onCloneProject = async (repoUrl: string, localPath: string) => { - setRuntimeError(null) try { const project = await cloneProject(repoUrl, localPath) setProject(project) setIsCloneModalOpen(false) navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { - setRuntimeError(error instanceof Error ? error.message : 'Clone failed') + toast.error(error instanceof Error ? error.message : 'Failed to clone project from GitHub') } } @@ -78,8 +80,8 @@ export default function ProjectLanding() { try { await removeRecentProject(rootPath) refetch() - } catch (error) { - setRuntimeError(error instanceof Error ? error.message : 'Failed to remove project') + } catch { + toast.error('Failed to remove recent opened project') } } @@ -109,10 +111,6 @@ export default function ProjectLanding() {
- {(runtimeError || apiError) && ( -

{runtimeError || apiError?.message}

- )} - setIsModalOpen(false)} onCreate={onCreateProject} /> ({ }) function FlowCanvas({ showNodeContextMenu }: Readonly<{ showNodeContextMenu: (b: boolean) => void }>) { - const theme = useTheme() const [loading, setLoading] = useState(false) const { isEditing, setIsEditing, setParentId, setDraggedName } = useNodeContextStore( useShallow((s) => ({ @@ -661,7 +659,6 @@ function FlowCanvas({ showNodeContextMenu }: Readonly<{ showNodeContextMenu: (b: - setShowModal(false)} diff --git a/src/main/frontend/app/routes/studio/studio.tsx b/src/main/frontend/app/routes/studio/studio.tsx index 91fed7ec..a7086813 100644 --- a/src/main/frontend/app/routes/studio/studio.tsx +++ b/src/main/frontend/app/routes/studio/studio.tsx @@ -11,15 +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' import CodeIcon from '/icons/solar/Code.svg?react' import { openInEditor } from '~/actions/navigationActions' import Button from '~/components/inputs/button' export default function Studio() { const [showNodeContext, setShowNodeContext] = useState(false) - const theme = useTheme() const nodeId = useNodeContextStore((state) => state.nodeId) const { activeTab, activeTabPath } = useTabStore( @@ -63,7 +60,6 @@ export default function Studio() {
- ) : (
diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 8e09f5d2..77a594b7 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -7,7 +7,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.CopyOnWriteArrayList; @@ -76,7 +75,6 @@ public Project createProjectOnDisk(String absolutePath) throws IOException { public Project openProjectFromDisk(String absolutePath) throws IOException { Path projectDir = Paths.get(absolutePath).toAbsolutePath().normalize(); - // Check if already registered in memory for (Project project : projects) { if (Paths.get(project.getRootPath()).toAbsolutePath().normalize().equals(projectDir)) { return project; @@ -92,12 +90,10 @@ public Project openProjectFromDisk(String absolutePath) throws IOException { Project project = new Project(name, rootPath); - // Scan for XML files in src/main/configurations/ Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); if (Files.exists(configurationsDir) && Files.isDirectory(configurationsDir)) { scanXmlFiles(configurationsDir, project); } else { - // Fallback: scan project root for XML files (backward compat) scanXmlFiles(projectDir, project); } @@ -161,15 +157,14 @@ public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOEx return openProjectFromDisk(targetDir.toString()); } - public Project createProject(String name, String rootPath) throws ProjectAlreadyExistsException { + public void createProject(String name, String rootPath) { Project project = new Project(name, rootPath); if (projects.contains(project)) { throw new ProjectAlreadyExistsException( "Project with name '" + name + "' and rootPath '" + rootPath + "' already exists."); } projects.add(project); - return project; - } + } public Project getProject(String name) throws ProjectNotFoundException { for (Project project : projects) { @@ -181,18 +176,6 @@ public Project getProject(String name) throws ProjectNotFoundException { throw new ProjectNotFoundException(String.format("Project with name: %s cannot be found", name)); } - public Project addConfigurations(String projectName, ArrayList configurationPaths) - throws ProjectNotFoundException { - Project project = getProject(projectName); - - for (String path : configurationPaths) { - Configuration config = new Configuration(path); - project.addConfiguration(config); - } - - return project; - } - public boolean updateConfigurationXml(String projectName, String filepath, String xmlContent) throws ProjectNotFoundException, ConfigurationNotFoundException { From e50a34faec5807f352f497aeff7146d6e8515d3b Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Thu, 12 Feb 2026 16:16:54 +0100 Subject: [PATCH 12/26] feat: made it filesystem cloud and local proof --- docker-compose.yml | 2 + pom.xml | 6 + .../directory-picker/directory-picker.tsx | 22 +- .../file-structure/editor-data-provider.ts | 42 +- src/main/frontend/app/hooks/use-projects.ts | 2 +- .../projectlanding/clone-project-modal.tsx | 185 +++++---- .../projectlanding/new-project-modal.tsx | 180 +++++---- .../routes/projectlanding/project-landing.tsx | 109 ++++- .../app/routes/projectlanding/project-row.tsx | 41 +- .../frontend/app/services/app-info-service.ts | 10 + .../frontend/app/services/project-service.ts | 57 ++- .../app/services/recent-project-service.ts | 13 + .../frontend/app/types/filesystem.types.ts | 3 +- src/main/frontend/app/utils/api.ts | 35 +- .../frankframework/flow/FlowApplication.java | 2 + .../flow/appinfo/AppInfoController.java | 26 ++ .../config/ApiPrefixConfiguration.java | 2 +- .../flow/{ => common}/config/CorsConfig.java | 2 +- .../common/config/MapperConfiguration.java | 13 + .../config/RestTemplateConfig.java | 2 +- .../flow/common/mapper/Mapper.java | 49 +++ .../flow/common/mapper/MappingException.java | 10 + .../CloudFileSystemStorageService.java | 140 +++++++ .../flow/filesystem/FileSystemStorage.java | 48 +++ .../flow/filesystem/FilesystemController.java | 10 +- .../flow/filesystem/FilesystemEntry.java | 2 +- .../flow/filesystem/FilesystemService.java | 47 --- .../LocalFileSystemStorageService.java | 69 ++++ .../filesystem/WorkspaceCleanupService.java | 59 +++ .../flow/filetree/FileTreeNode.java | 1 + .../flow/filetree/FileTreeService.java | 92 +++-- .../flow/project/ProjectController.java | 263 +++++-------- .../flow/project/ProjectDTO.java | 18 +- .../flow/project/ProjectService.java | 313 +++++++++------ .../flow/project/RecentProjectsService.java | 118 ------ .../RecentProject.java | 2 +- .../RecentProjectController.java | 49 +++ .../recentproject/RecentProjectsService.java | 117 ++++++ .../flow/security/UserContextFilter.java | 95 +++++ .../flow/security/UserWorkspaceContext.java | 22 ++ .../flow/utility/XmlSecurityUtils.java | 27 -- .../flow/utility/XmlValidator.java | 4 +- src/main/resources/application.properties | 3 + .../flow/FlowApplicationTests.java | 2 + .../flow/filetree/FileTreeServiceTest.java | 33 +- .../flow/project/ProjectControllerTest.java | 104 ++++- .../flow/project/ProjectServiceTest.java | 371 ++++++++++++++++-- 47 files changed, 2007 insertions(+), 815 deletions(-) create mode 100644 src/main/frontend/app/services/app-info-service.ts create mode 100644 src/main/frontend/app/services/recent-project-service.ts create mode 100644 src/main/java/org/frankframework/flow/appinfo/AppInfoController.java rename src/main/java/org/frankframework/flow/{ => common}/config/ApiPrefixConfiguration.java (92%) rename src/main/java/org/frankframework/flow/{ => common}/config/CorsConfig.java (94%) create mode 100644 src/main/java/org/frankframework/flow/common/config/MapperConfiguration.java rename src/main/java/org/frankframework/flow/{ => common}/config/RestTemplateConfig.java (86%) create mode 100644 src/main/java/org/frankframework/flow/common/mapper/Mapper.java create mode 100644 src/main/java/org/frankframework/flow/common/mapper/MappingException.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java delete mode 100644 src/main/java/org/frankframework/flow/filesystem/FilesystemService.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java create mode 100644 src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java delete mode 100644 src/main/java/org/frankframework/flow/project/RecentProjectsService.java rename src/main/java/org/frankframework/flow/{project => recentproject}/RecentProject.java (63%) create mode 100644 src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java create mode 100644 src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java create mode 100644 src/main/java/org/frankframework/flow/security/UserContextFilter.java create mode 100644 src/main/java/org/frankframework/flow/security/UserWorkspaceContext.java diff --git a/docker-compose.yml b/docker-compose.yml index 73953d5d..82c4acf1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,5 +4,7 @@ services: build: dockerfile: ./docker/Dockerfile context: . + environment: + SPRING_PROFILES_ACTIVE: cloud ports: - "8080:8080" diff --git a/pom.xml b/pom.xml index 29e021af..76b00fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ 3.0.0-SNAPSHOT 21 + 2.20.1 1.18.42 3.0.0 3.6.0 @@ -111,6 +112,11 @@ spring-boot-testcontainers test + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate6 + ${jackson.version} + org.apache.commons commons-compress diff --git a/src/main/frontend/app/components/directory-picker/directory-picker.tsx b/src/main/frontend/app/components/directory-picker/directory-picker.tsx index a1374ff3..0d3774e4 100644 --- a/src/main/frontend/app/components/directory-picker/directory-picker.tsx +++ b/src/main/frontend/app/components/directory-picker/directory-picker.tsx @@ -6,9 +6,10 @@ interface DirectoryPickerProperties { isOpen: boolean onSelect: (absolutePath: string) => void onCancel: () => void + rootLabel?: string } -export default function DirectoryPicker({ isOpen, onSelect, onCancel }: Readonly) { +export default function DirectoryPicker({ isOpen, onSelect, onCancel, rootLabel = 'Computer' }: Readonly) { const [currentPath, setCurrentPath] = useState('') const [entries, setEntries] = useState([]) const [selectedEntry, setSelectedEntry] = useState(null) @@ -52,11 +53,11 @@ export default function DirectoryPicker({ isOpen, onSelect, onCancel }: Readonly } const handleClick = (entry: FilesystemEntry) => { - setSelectedEntry(entry.absolutePath) + setSelectedEntry(entry.path) } const handleDoubleClick = (entry: FilesystemEntry) => { - loadEntries(entry.absolutePath) + loadEntries(entry.path) } const activePath = selectedEntry ?? currentPath @@ -79,7 +80,9 @@ export default function DirectoryPicker({ isOpen, onSelect, onCancel }: Readonly > .. - {currentPath || 'Computer'} + + {currentPath || rootLabel} +
@@ -92,14 +95,19 @@ export default function DirectoryPicker({ isOpen, onSelect, onCancel }: Readonly !error && entries.map((entry) => ( ))} diff --git a/src/main/frontend/app/components/file-structure/editor-data-provider.ts b/src/main/frontend/app/components/file-structure/editor-data-provider.ts index 153ed5cd..58735f1b 100644 --- a/src/main/frontend/app/components/file-structure/editor-data-provider.ts +++ b/src/main/frontend/app/components/file-structure/editor-data-provider.ts @@ -5,12 +5,14 @@ import { sortChildren } from './tree-utilities' export interface FileNode { name: string path: string + projectRoot?: boolean } export interface FileTreeNode { name: string path: string type: 'FILE' | 'DIRECTORY' + projectRoot?: boolean children?: FileTreeNode[] } @@ -22,11 +24,18 @@ export default class EditorFilesDataProvider implements TreeDataProvider { constructor(projectName: string) { this.projectName = projectName - this.loadRoot() } - /** Fetch root directory from backend and build the provider's data */ - private async loadRoot() { + /** + * Public method to initialize data loading. + * Call this from your React component's useEffect. + */ + public async loadData(): Promise { + await this.fetchAndBuildTree() + } + + /** Fetch file tree from backend and build the provider's data */ + private async fetchAndBuildTree() { try { if (!this.projectName) return @@ -38,30 +47,7 @@ export default class EditorFilesDataProvider implements TreeDataProvider { return } - this.data['root'] = { - index: 'root', - data: { name: tree.name, path: tree.path }, - isFolder: true, - children: [], - } - - // Sort directories first, then files, both alphabetically - const sortedChildren = sortChildren(tree.children) - - for (const child of sortedChildren) { - const childIndex = `root/${child.name}` - - this.data[childIndex] = { - index: childIndex, - data: { name: child.name, path: child.path }, - isFolder: child.type === 'DIRECTORY', - children: child.type === 'DIRECTORY' ? [] : undefined, - } - - this.data['root'].children!.push(childIndex) - } - - this.loadedDirectories.add(tree.path) + this.buildTreeFromFileTree(tree) this.notifyListeners(['root']) } catch (error) { console.error('[EditorFilesDataProvider] Unexpected error loading tree:', error) @@ -92,7 +78,7 @@ export default class EditorFilesDataProvider implements TreeDataProvider { this.data[childIndex] = { index: childIndex, - data: { name: child.name, path: child.path }, + data: { name: child.name, path: child.path, projectRoot: node.projectRoot }, isFolder: child.type === 'DIRECTORY', children: child.type === 'DIRECTORY' ? [] : undefined, } diff --git a/src/main/frontend/app/hooks/use-projects.ts b/src/main/frontend/app/hooks/use-projects.ts index 3f698e0c..ec9e1e45 100644 --- a/src/main/frontend/app/hooks/use-projects.ts +++ b/src/main/frontend/app/hooks/use-projects.ts @@ -1,6 +1,6 @@ import { useAsync } from './use-async' -import { fetchRecentProjects } from '~/services/project-service' import type { RecentProject } from '~/types/project.types' +import { fetchRecentProjects } from '~/services/recent-project-service' export function useRecentProjects() { return useAsync((signal) => fetchRecentProjects(signal)) diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx index f9d86b86..e295a64a 100644 --- a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -1,29 +1,54 @@ -import { useState } from 'react' +import { useState, useEffect } from 'react' import DirectoryPicker from '~/components/directory-picker/directory-picker' interface CloneProjectModalProperties { isOpen: boolean + isLocal: boolean // <--- NIEUW onClose: () => void onClone: (repoUrl: string, localPath: string) => void } -export default function CloneProjectModal({ isOpen, onClose, onClone }: Readonly) { +export default function CloneProjectModal({ + isOpen, + isLocal, + onClose, + onClone + }: Readonly) { const [repoUrl, setRepoUrl] = useState('') const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) + // Reset velden als modal opent + useEffect(() => { + if (isOpen) { + setLocation('') + } + }, [isOpen]) + if (!isOpen) return null const repoName = repoUrl - .split('/') - .pop() - ?.replace(/\.git$/, '') + .split('/') + .pop() + ?.replace(/\.git$/, '') const handleClone = () => { - if (!repoUrl.trim() || !location) return - const separator = location.includes('/') ? '/' : '\\' - const localPath = `${location}${separator}${repoName}` - onClone(repoUrl.trim(), localPath) + // Validatie: Repo URL is altijd nodig. Location alleen als lokaal. + if (!repoUrl.trim()) return + if (isLocal && !location) return + + let finalPath = '' + + if (isLocal) { + const separator = location.includes('/') ? '/' : '\\' + finalPath = `${location}${separator}${repoName}` + } else { + // Cloud: combineer optionele subfolder met reponaam + const name = repoName || 'cloned-project' + finalPath = location ? `${location}/${name}` : name + } + + onClone(repoUrl.trim(), finalPath) handleClose() } @@ -35,77 +60,79 @@ export default function CloneProjectModal({ isOpen, onClose, onClone }: Readonly } return ( - <> -
-
-

Clone Repository

-

Clone a Git repository to a local folder

- -
- -
- - + <> +
+
+

Clone Repository

+

+ {isLocal ? "Clone a Git repository to a local folder" : "Clone a Git repository into the workspace"} +

+ +
+ +
+ + + +
+
+ +
+ + setRepoUrl(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="https://github.com/user/repo.git" + aria-label="repository url" + /> +
+ + {repoName && ( +

+ Will clone to: {isLocal ? `${location}/${repoName}` : `${location ? `${location}/` : ''}${repoName}`} +

+ )} + +
+ + + +
+
-
- -
- - setRepoUrl(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="https://github.com/user/repo.git" - aria-label="repository url" + + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} /> -
- - {location && repoName && ( -

- Will clone to: {location} - {location.includes('/') ? '/' : '\\'} - {repoName} -

- )} - -
- - - -
-
-
- - { - setLocation(path) - setShowPicker(false) - }} - onCancel={() => setShowPicker(false)} - /> - + ) } diff --git a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx index 4a26eeab..b69d048c 100644 --- a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx @@ -1,28 +1,48 @@ -import { useState } from 'react' +import { useState, useEffect } from 'react' import DirectoryPicker from '~/components/directory-picker/directory-picker' interface NewProjectModalProperties { isOpen: boolean + isLocal: boolean // <--- NIEUW onClose: () => void - onCreate: (absolutePath: string) => void + onCreate: (pathOrName: string) => void } -export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly) { +export default function NewProjectModal({ + isOpen, + isLocal, + onClose, + onCreate + }: Readonly) { const [name, setName] = useState('') const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) + // Reset velden als modal opent + useEffect(() => { + if (isOpen) { + setLocation('') + } + }, [isOpen]) + if (!isOpen) return null const handleCreate = () => { - if (!name.trim() || !location) return + if (!name.trim()) return + if (isLocal && !location) return - const separator = location.includes('/') ? '/' : '\\' - const absolutePath = `${location}${separator}${name.trim()}` - onCreate(absolutePath) - setName('') - setLocation('') - onClose() + if (isLocal) { + const separator = location.includes('/') ? '/' : '\\' + const absolutePath = `${location}${separator}${name.trim()}` + onCreate(absolutePath) + } else { + // Cloud: combineer optionele subfolder met naam + const trimmedName = name.trim() + const path = location ? `${location}/${trimmedName}` : trimmedName + onCreate(path) + } + + handleClose() } const handleClose = () => { @@ -33,77 +53,77 @@ export default function NewProjectModal({ isOpen, onClose, onCreate }: Readonly< } return ( - <> -
-
-

New Project

-

Create a new Frank! project on disk

- -
- -
- - + <> +
+
+

New Project

+

+ {isLocal ? "Create a new Frank! project on disk" : "Create a new project in the workspace"} +

+ +
+ +
+ + + +
+
+ +
+ + setName(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="Enter project name" + /> +
+ + {name.trim() && ( +

+ Project will be created at: {isLocal ? `${location}/${name.trim()}` : `${location ? `${location}/` : ''}${name.trim()}`} +

+ )} + +
+ + + +
+
-
- -
- - setName(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="Enter project name" - aria-label="project name" + + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} /> -
- - {location && name.trim() && ( -

- Project will be created at: {location} - {location.includes('/') ? '/' : '\\'} - {name.trim()} -

- )} - -
- - - -
-
-
- - { - setLocation(path) - setShowPicker(false) - }} - onCancel={() => setShowPicker(false)} - /> - + ) } diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index 8469ae42..acad4d41 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -1,11 +1,17 @@ -import { useEffect, useState, useCallback } from 'react' +import { useEffect, useState, useCallback, useRef } from 'react' import { useNavigate } from 'react-router' import FfIcon from '/icons/custom/ff!-icon.svg?react' import ArchiveIcon from '/icons/solar/Archive.svg?react' import { toast } from 'react-toastify' import { useRecentProjects } from '~/hooks/use-projects' import { useProjectStore } from '~/stores/project-store' -import { openProject, createProject, cloneProject, removeRecentProject } from '~/services/project-service' +import { + openProject, + createProject, + cloneProject, + exportProject, + importProjectFolder, +} from '~/services/project-service' import ProjectRow from './project-row' import Search from '~/components/search/search' @@ -14,6 +20,8 @@ import NewProjectModal from './new-project-modal' import CloneProjectModal from './clone-project-modal' import DirectoryPicker from '~/components/directory-picker/directory-picker' import type { RecentProject } from '~/types/project.types' +import { fetchAppInfo } from '~/services/app-info-service' +import { removeRecentProject } from '~/services/recent-project-service' export default function ProjectLanding() { const navigate = useNavigate() @@ -25,11 +33,30 @@ export default function ProjectLanding() { const [isModalOpen, setIsModalOpen] = useState(false) const [isCloneModalOpen, setIsCloneModalOpen] = useState(false) const [isOpenPickerOpen, setIsOpenPickerOpen] = useState(false) + const [isLocalEnvironment, setIsLocalEnvironment] = useState(true) + const [rootLocationName, setRootLocationName] = useState('Computer') + const importInputRef = useRef(null) useEffect(() => { clearProjectState() }, [clearProjectState]) + useEffect(() => { + const loadAppInfo = async () => { + try { + const info = await fetchAppInfo() + setIsLocalEnvironment(info.isLocal) + + if (info.workspaceRoot) { + setRootLocationName(info.workspaceRoot) + } + } catch { + toast.error('Failed to fetch app info, defaulting to local mode.') + } + } + loadAppInfo() + }, []) + useEffect(() => { if (apiError) { toast.error(`Could not load in projects: ${apiError.message}`) @@ -85,6 +112,32 @@ export default function ProjectLanding() { } } + const onExportProject = async (projectName: string) => { + try { + await exportProject(projectName) + } catch (error) { + toast.error(error instanceof Error ? error.message : 'Failed to export project') + } + } + + const handleImportFolderChange = async (e: React.ChangeEvent) => { + const files = e.target.files + if (!files || files.length === 0) return + + try { + const project = await importProjectFolder(files) + setProject(project) + refetch() + navigate(`/studio/${encodeURIComponent(project.name)}`) + } catch (error) { + toast.error(error instanceof Error ? error.message : 'Failed to import project') + } + + if (importInputRef.current) { + importInputRef.current.value = '' + } + } + const projects = recentProjects ?? [] const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) @@ -99,25 +152,58 @@ export default function ProjectLanding() {
setIsModalOpen(true)} onOpenClick={() => setIsOpenPickerOpen(true)} onCloneClick={() => setIsCloneModalOpen(true)} + onImportClick={() => importInputRef.current?.click()} />
+ + {!isLocalEnvironment && ( +
+ Cloud workspace projects are automatically removed after 24 hours of inactivity. + Use Export to download a backup. +
+ )} - setIsModalOpen(false)} onCreate={onCreateProject} /> + + + setIsModalOpen(false)} + onCreate={onCreateProject} + isLocal={isLocalEnvironment} + /> setIsCloneModalOpen(false)} onClone={onCloneProject} /> - setIsOpenPickerOpen(false)} /> + setIsOpenPickerOpen(false)} + rootLabel={rootLocationName} + />
) } @@ -130,29 +216,38 @@ const Header = () => ( ) const Sidebar = ({ + isLocal, onNewClick, onOpenClick, onCloneClick, + onImportClick, }: { + isLocal?: boolean onNewClick: () => void onOpenClick: () => void onCloneClick: () => void + onImportClick: () => void }) => ( ) const ProjectList = ({ projects, + isLocal, onProjectClick, onRemoveProject, + onExportProject, }: { projects: RecentProject[] + isLocal: boolean onProjectClick: (rootPath: string) => void onRemoveProject: (rootPath: string) => void + onExportProject: (projectName: string) => void }) => (
{projects.length === 0 ? ( @@ -162,8 +257,10 @@ const ProjectList = ({ onProjectClick(p.rootPath)} onRemove={() => onRemoveProject(p.rootPath)} + onExport={() => onExportProject(p.name)} /> )) )} diff --git a/src/main/frontend/app/routes/projectlanding/project-row.tsx b/src/main/frontend/app/routes/projectlanding/project-row.tsx index 68008e96..caf09754 100644 --- a/src/main/frontend/app/routes/projectlanding/project-row.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-row.tsx @@ -1,13 +1,16 @@ import CloseSquareIcon from 'icons/solar/Close Square.svg?react' +import ArchiveIcon from '/icons/solar/Archive.svg?react' import type { RecentProject } from '~/types/project.types' interface ProjectRowProperties { project: RecentProject + isLocal: boolean onClick: () => void onRemove: () => void + onExport: () => void } -export default function ProjectRow({ project, onClick, onRemove }: Readonly) { +export default function ProjectRow({ project, isLocal, onClick, onRemove, onExport }: Readonly) { return (
{project.rootPath}

- +
+ {!isLocal && ( + + )} + + +
) } diff --git a/src/main/frontend/app/services/app-info-service.ts b/src/main/frontend/app/services/app-info-service.ts new file mode 100644 index 00000000..74005e06 --- /dev/null +++ b/src/main/frontend/app/services/app-info-service.ts @@ -0,0 +1,10 @@ +import { apiFetch } from '~/utils/api' + +export interface AppInfo { + isLocal: boolean + workspaceRoot: string +} + +export async function fetchAppInfo(signal?: AbortSignal): Promise { + return apiFetch('/app-info', { signal }) +} diff --git a/src/main/frontend/app/services/project-service.ts b/src/main/frontend/app/services/project-service.ts index 82cccdae..4069abbf 100644 --- a/src/main/frontend/app/services/project-service.ts +++ b/src/main/frontend/app/services/project-service.ts @@ -1,26 +1,11 @@ -import { apiFetch } from '~/utils/api' +import { apiFetch, apiUrl } from '~/utils/api' import type { FileTreeNode } from '~/routes/configurations/configuration-manager' -import type { Project, RecentProject } from '~/types/project.types' - -export async function fetchProjects(signal?: AbortSignal): Promise { - return apiFetch('/projects', { signal }) -} +import type { Project } from '~/types/project.types' export async function fetchProject(name: string): Promise { return apiFetch(`/projects/${encodeURIComponent(name)}`) } -export async function fetchRecentProjects(signal?: AbortSignal): Promise { - return apiFetch('/projects/recent', { signal }) -} - -export async function removeRecentProject(rootPath: string): Promise { - await apiFetch('/projects/recent', { - method: 'DELETE', - body: JSON.stringify({ rootPath }), - }) -} - export async function openProject(rootPath: string): Promise { return apiFetch('/projects/open', { method: 'POST', @@ -66,3 +51,41 @@ export async function toggleProjectFilter(projectName: string, filter: string, e method: 'PATCH', }) } + +export async function exportProject(projectName: string): Promise { + const url = apiUrl(`/projects/${encodeURIComponent(projectName)}/export`) + const sessionId = sessionStorage.getItem('frankflow_anon_session_id') ?? '' + + const headers: Record = { 'X-Session-ID': sessionId } + const token = localStorage.getItem('access_token') + if (token) headers['Authorization'] = `Bearer ${token}` + + const response = await fetch(url, { headers }) + if (!response.ok) throw new Error('Export failed') + + const blob = await response.blob() + const a = document.createElement('a') + a.href = URL.createObjectURL(blob) + a.download = `${projectName}.zip` + a.click() + URL.revokeObjectURL(a.href) +} + +export async function importProjectFolder(files: FileList): Promise { + const formData = new FormData() + + const firstPath = files[0].webkitRelativePath + const projectName = firstPath.split('/')[0] + formData.append('projectName', projectName) + + for (const file of files) { + formData.append('files', file) + const relativePath = file.webkitRelativePath.split('/').slice(1).join('/') + formData.append('paths', relativePath) + } + + return apiFetch('/projects/import', { + method: 'POST', + body: formData, + }) +} diff --git a/src/main/frontend/app/services/recent-project-service.ts b/src/main/frontend/app/services/recent-project-service.ts new file mode 100644 index 00000000..b4ee30ff --- /dev/null +++ b/src/main/frontend/app/services/recent-project-service.ts @@ -0,0 +1,13 @@ +import type { RecentProject } from '~/types/project.types' +import { apiFetch } from '~/utils/api' + +export async function fetchRecentProjects(signal?: AbortSignal): Promise { + return apiFetch('/recent-projects', { signal }) +} + +export async function removeRecentProject(rootPath: string): Promise { + await apiFetch('/recent-projects', { + method: 'DELETE', + body: JSON.stringify({ rootPath }), + }) +} diff --git a/src/main/frontend/app/types/filesystem.types.ts b/src/main/frontend/app/types/filesystem.types.ts index ae0136d3..3d9b7256 100644 --- a/src/main/frontend/app/types/filesystem.types.ts +++ b/src/main/frontend/app/types/filesystem.types.ts @@ -2,6 +2,7 @@ export interface FilesystemEntry { name: string - absolutePath: string + path: string type: EntryType + projectRoot: boolean } diff --git a/src/main/frontend/app/utils/api.ts b/src/main/frontend/app/utils/api.ts index e5596828..10b28cad 100644 --- a/src/main/frontend/app/utils/api.ts +++ b/src/main/frontend/app/utils/api.ts @@ -4,6 +4,20 @@ export function apiUrl(path: string): string { return `${variables.apiBaseUrl}/api${path}` } +const getAnonymousSessionId = () => { + const STORAGE_KEY = 'frankflow_anon_session_id'; + let id = sessionStorage.getItem(STORAGE_KEY) + if (!id) { + id = crypto.randomUUID() + sessionStorage.setItem(STORAGE_KEY, id) + } + return id +} + +const getAuthToken = () => { + return localStorage.getItem('access_token') || null +} + interface BackendErrorResponse { httpStatus: number messages: string[] @@ -22,9 +36,26 @@ export class ApiError extends Error { } export async function apiFetch(path: string, options?: RequestInit): Promise { - const headers: HeadersInit = options?.body ? { 'Content-Type': 'application/json' } : {} + const isFormData = options?.body instanceof FormData + + const defaultHeaders: Record = + options?.body && !isFormData ? { 'Content-Type': 'application/json' } : {} + + const headers: Record = { + ...defaultHeaders, + 'X-Session-ID': getAnonymousSessionId(), + ...(options?.headers as Record) + } + + const token = getAuthToken(); + if (token) { + headers['Authorization'] = `Bearer ${token}`; + } - const response = await fetch(apiUrl(path), { ...options, headers: { ...headers, ...options?.headers } }) + const response = await fetch(apiUrl(path), { + ...options, + headers + }) if (!response.ok) { const contentType = response.headers.get('content-type') diff --git a/src/main/java/org/frankframework/flow/FlowApplication.java b/src/main/java/org/frankframework/flow/FlowApplication.java index af916b73..62940d39 100644 --- a/src/main/java/org/frankframework/flow/FlowApplication.java +++ b/src/main/java/org/frankframework/flow/FlowApplication.java @@ -9,11 +9,13 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.Bean; import org.springframework.core.io.ClassPathResource; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.servlet.function.RequestPredicate; import org.springframework.web.servlet.function.RouterFunction; import org.springframework.web.servlet.function.ServerResponse; @SpringBootApplication +@EnableScheduling public class FlowApplication { public static void main(String[] args) { diff --git a/src/main/java/org/frankframework/flow/appinfo/AppInfoController.java b/src/main/java/org/frankframework/flow/appinfo/AppInfoController.java new file mode 100644 index 00000000..a31da971 --- /dev/null +++ b/src/main/java/org/frankframework/flow/appinfo/AppInfoController.java @@ -0,0 +1,26 @@ +package org.frankframework.flow.appinfo; + +import java.util.Map; +import org.frankframework.flow.filesystem.FileSystemStorage; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/app-info") +public class AppInfoController { + private final FileSystemStorage fileSystemStorage; + + public AppInfoController(FileSystemStorage fileSystemStorage) { + this.fileSystemStorage = fileSystemStorage; + } + + @GetMapping + public Map getInfo() { + return Map.of( + "isLocal", + fileSystemStorage.isLocalEnvironment(), + "workspaceRoot", + fileSystemStorage.isLocalEnvironment() ? "Computer" : "Cloud Workspace"); + } +} diff --git a/src/main/java/org/frankframework/flow/config/ApiPrefixConfiguration.java b/src/main/java/org/frankframework/flow/common/config/ApiPrefixConfiguration.java similarity index 92% rename from src/main/java/org/frankframework/flow/config/ApiPrefixConfiguration.java rename to src/main/java/org/frankframework/flow/common/config/ApiPrefixConfiguration.java index ef627f47..77627686 100644 --- a/src/main/java/org/frankframework/flow/config/ApiPrefixConfiguration.java +++ b/src/main/java/org/frankframework/flow/common/config/ApiPrefixConfiguration.java @@ -1,4 +1,4 @@ -package org.frankframework.flow.config; +package org.frankframework.flow.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/org/frankframework/flow/config/CorsConfig.java b/src/main/java/org/frankframework/flow/common/config/CorsConfig.java similarity index 94% rename from src/main/java/org/frankframework/flow/config/CorsConfig.java rename to src/main/java/org/frankframework/flow/common/config/CorsConfig.java index ba44eef7..9687da83 100644 --- a/src/main/java/org/frankframework/flow/config/CorsConfig.java +++ b/src/main/java/org/frankframework/flow/common/config/CorsConfig.java @@ -1,4 +1,4 @@ -package org.frankframework.flow.config; +package org.frankframework.flow.common.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/frankframework/flow/common/config/MapperConfiguration.java b/src/main/java/org/frankframework/flow/common/config/MapperConfiguration.java new file mode 100644 index 00000000..01b4a245 --- /dev/null +++ b/src/main/java/org/frankframework/flow/common/config/MapperConfiguration.java @@ -0,0 +1,13 @@ +package org.frankframework.flow.common.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MapperConfiguration { + @Bean + public ObjectMapper objectMapper() { + return new ObjectMapper(); + } +} diff --git a/src/main/java/org/frankframework/flow/config/RestTemplateConfig.java b/src/main/java/org/frankframework/flow/common/config/RestTemplateConfig.java similarity index 86% rename from src/main/java/org/frankframework/flow/config/RestTemplateConfig.java rename to src/main/java/org/frankframework/flow/common/config/RestTemplateConfig.java index d2af4a06..670d0850 100644 --- a/src/main/java/org/frankframework/flow/config/RestTemplateConfig.java +++ b/src/main/java/org/frankframework/flow/common/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package org.frankframework.flow.config; +package org.frankframework.flow.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/frankframework/flow/common/mapper/Mapper.java b/src/main/java/org/frankframework/flow/common/mapper/Mapper.java new file mode 100644 index 00000000..7a13571b --- /dev/null +++ b/src/main/java/org/frankframework/flow/common/mapper/Mapper.java @@ -0,0 +1,49 @@ +package org.frankframework.flow.common.mapper; + +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class Mapper { + private final ObjectMapper objectMapper; + + public Mapper(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + public E toEntity(D dto, Class entityClass) { + return objectMapper.convertValue(dto, entityClass); + } + + public D toDTO(E entity, Class dtoClass) { + return objectMapper.convertValue(entity, dtoClass); + } + + public Set toEntity(Set dtoSet, Class entityClass) throws MappingException { + try { + log.info("Converting {} DTOs to Entities [{}]", dtoSet.size(), entityClass.getSimpleName()); + Set entities = + dtoSet.stream().map(dto -> toEntity(dto, entityClass)).collect(Collectors.toSet()); + log.info("Successfully mapped {} DTOs to Entities [{}]", dtoSet.size(), entityClass.getSimpleName()); + return entities; + } catch (Exception e) { + throw new MappingException("Failed to convert DTOs to Entities: " + e.getMessage(), e); + } + } + + public Set toDTO(Set entitySet, Class dtoClass) throws MappingException { + try { + log.info("Converting {} Entities to DTOs [{}]", entitySet.size(), dtoClass.getSimpleName()); + Set dtos = + entitySet.stream().map(entity -> toDTO(entity, dtoClass)).collect(Collectors.toSet()); + log.info("Successfully mapped {} Entities to DTOs [{}]", entitySet.size(), dtoClass.getSimpleName()); + return dtos; + } catch (Exception e) { + throw new MappingException("Failed to convert Entities to DTOs: " + e.getMessage(), e); + } + } +} diff --git a/src/main/java/org/frankframework/flow/common/mapper/MappingException.java b/src/main/java/org/frankframework/flow/common/mapper/MappingException.java new file mode 100644 index 00000000..113405f0 --- /dev/null +++ b/src/main/java/org/frankframework/flow/common/mapper/MappingException.java @@ -0,0 +1,10 @@ +package org.frankframework.flow.common.mapper; + +import org.frankframework.flow.exception.ApiException; +import org.springframework.http.HttpStatus; + +public class MappingException extends ApiException { + public MappingException(String message, Throwable cause) { + super(message, HttpStatus.BAD_REQUEST, cause); + } +} diff --git a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java new file mode 100644 index 00000000..8bcc37dd --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java @@ -0,0 +1,140 @@ +package org.frankframework.flow.filesystem; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.FileTime; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Stream; +import lombok.extern.slf4j.Slf4j; +import org.frankframework.flow.security.UserWorkspaceContext; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +@Service +@Profile("cloud") +@Slf4j +public class CloudFileSystemStorageService implements FileSystemStorage { + @Value("${frankflow.workspace.root:/tmp/frankflow/workspace}") + private String baseWorkspacePath; + + private final UserWorkspaceContext userContext; + + public CloudFileSystemStorageService(UserWorkspaceContext userContext) { + this.userContext = userContext; + } + + private Path getUserRoot() { + String workspaceId = userContext.getWorkspaceId(); + if (workspaceId == null) workspaceId = "anonymous"; + + Path userRoot = + Paths.get(baseWorkspacePath, workspaceId).toAbsolutePath().normalize(); + + if (!Files.exists(userRoot)) { + try { + Files.createDirectories(userRoot); + } catch (IOException e) { + throw new RuntimeException("Storage error", e); + } + } + + try { + Files.setLastModifiedTime(userRoot, FileTime.from(Instant.now())); + } catch (IOException e) { + log.debug("Could not touch workspace dir", e); + } + + return userRoot; + } + + @Override + public boolean isLocalEnvironment() { + return false; + } + + @Override + public List listRoots() { + try { + return listDirectory(""); + } catch (IOException e) { + log.warn("Error listing workspace root", e); + return Collections.emptyList(); + } + } + + @Override + public List listDirectory(String path) throws IOException { + Path userRoot = getUserRoot(); + Path dir = resolveSecurely(path); + + List entries = new ArrayList<>(); + + try (Stream stream = Files.list(dir)) { + stream.filter(Files::isDirectory).sorted().forEach(p -> { + String relativePath = + userRoot.relativize(p.toAbsolutePath()).toString().replace("\\", "/"); + boolean isProjectRoot = Files.isDirectory(p.resolve("src/main/configurations")); + + entries.add(new FilesystemEntry(p.getFileName().toString(), relativePath, "DIRECTORY", isProjectRoot)); + }); + } + return entries; + } + + @Override + public String readFile(String path) throws IOException { + return Files.readString(resolveSecurely(path), StandardCharsets.UTF_8); + } + + @Override + public void writeFile(String path, String content) throws IOException { + Files.writeString(resolveSecurely(path), content, StandardCharsets.UTF_8); + } + + @Override + public Path createProjectDirectory(String path) throws IOException { + Path projectDir = resolveSecurely(path); + Files.createDirectories(projectDir); + return projectDir; + } + + @Override + public Path toAbsolutePath(String path) { + return resolveSecurely(path); + } + + @Override + public String toRelativePath(String absolutePath) { + String normalized = absolutePath.replace("\\", "/"); + String userRoot = getUserRoot().toString().replace("\\", "/"); + if (normalized.startsWith(userRoot)) { + String relative = normalized.substring(userRoot.length()); + if (relative.isEmpty()) return "/"; + if (!relative.startsWith("/")) relative = "/" + relative; + return relative; + } + return normalized; + } + + private Path resolveSecurely(String path) { + Path root = getUserRoot(); + + if (path == null || path.isBlank() || path.equals("/") || path.equals("\\")) { + return root; + } + + Path resolved = root.resolve(path).normalize(); + + if (!resolved.startsWith(root)) { + throw new SecurityException("Access denied: " + path); + } + return resolved; + } +} diff --git a/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java new file mode 100644 index 00000000..a85c6c69 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java @@ -0,0 +1,48 @@ +package org.frankframework.flow.filesystem; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; + +public interface FileSystemStorage { + boolean isLocalEnvironment(); + + /** + * Geeft de root-mappen terug. + * Lokaal: C:\, D:\, /Users + * Cloud: /opt/frankflow/workspace + */ + List listRoots(); + + /** + * Geeft de inhoud van een map. + */ + List listDirectory(String path) throws IOException; + + /** + * Leest een bestand. + * Het path kan een absoluut lokaal pad zijn OF een relatief pad in de cloud workspace. + */ + String readFile(String path) throws IOException; + + /** + * Schrijft een bestand. + */ + void writeFile(String path, String content) throws IOException; + + /** + * Maakt een map aan voor een nieuw project. + */ + Path createProjectDirectory(String path) throws IOException; + + Path toAbsolutePath(String path); + + /** + * Strips the workspace root prefix from a path. + * Local: returns the path unchanged. + * Cloud: returns the path relative to the user's workspace root. + */ + default String toRelativePath(String absolutePath) { + return absolutePath; + } +} diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java index 517d0beb..3c2c95ad 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java @@ -12,10 +12,10 @@ @RequestMapping("/filesystem") public class FilesystemController { - private final FilesystemService filesystemService; + private final FileSystemStorage fileSystemStorage; - public FilesystemController(FilesystemService filesystemService) { - this.filesystemService = filesystemService; + public FilesystemController(FileSystemStorage fileSystemStorage) { + this.fileSystemStorage = fileSystemStorage; } @GetMapping("/browse") @@ -24,9 +24,9 @@ public ResponseEntity> browse(@RequestParam(required = fal List entries; if (path.isBlank()) { - entries = filesystemService.listRoots(); + entries = fileSystemStorage.listRoots(); } else { - entries = filesystemService.listDirectories(path); + entries = fileSystemStorage.listDirectory(path); } return ResponseEntity.ok(entries); } diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java index 909f2b47..95035641 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemEntry.java @@ -1,3 +1,3 @@ package org.frankframework.flow.filesystem; -public record FilesystemEntry(String name, String absolutePath, String type) {} +public record FilesystemEntry(String name, String path, String type, boolean projectRoot) {} diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java deleted file mode 100644 index b166eea4..00000000 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemService.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.frankframework.flow.filesystem; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class FilesystemService { - - public List listRoots() { - List entries = new ArrayList<>(); - for (File root : File.listRoots()) { - String absolutePath = root.getAbsolutePath(); - entries.add(new FilesystemEntry(absolutePath, absolutePath, "DIRECTORY")); - } - return entries; - } - - public List listDirectories(String path) throws IOException { - if (path == null || path.isBlank()) { - throw new IllegalArgumentException("Path must not be blank"); - } - - Path dir = Paths.get(path).toAbsolutePath().normalize(); - if (!Files.exists(dir) || !Files.isDirectory(dir)) { - throw new IllegalArgumentException("Path does not exist or is not a directory: " + path); - } - - List entries = new ArrayList<>(); - try (Stream stream = Files.list(dir)) { - stream.filter(Files::isDirectory).sorted().forEach(p -> { - String name = p.getFileName().toString(); - String absolutePath = p.toAbsolutePath().normalize().toString(); - entries.add(new FilesystemEntry(name, absolutePath, "DIRECTORY")); - }); - } - return entries; - } -} diff --git a/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java new file mode 100644 index 00000000..eaa2f7d1 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java @@ -0,0 +1,69 @@ +package org.frankframework.flow.filesystem; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +@Service +@Profile("local") +public class LocalFileSystemStorageService implements FileSystemStorage { + @Override + public boolean isLocalEnvironment() { + return true; + } + + @Override + public List listRoots() { + List entries = new ArrayList<>(); + for (File root : File.listRoots()) { + String absolutePath = root.getAbsolutePath(); + entries.add(new FilesystemEntry(absolutePath, absolutePath, "DIRECTORY", false)); + } + return entries; + } + + @Override + public List listDirectory(String path) throws IOException { + Path dir = Paths.get(path).toAbsolutePath().normalize(); + List entries = new ArrayList<>(); + + try (Stream stream = Files.list(dir)) { + stream.filter(Files::isDirectory).sorted().forEach(p -> { + boolean isProjectRoot = Files.isDirectory(p.resolve("src/main/configurations")); + entries.add(new FilesystemEntry( + p.getFileName().toString(), p.toAbsolutePath().toString(), "DIRECTORY", isProjectRoot)); + }); + } + return entries; + } + + @Override + public String readFile(String path) throws IOException { + return Files.readString(Paths.get(path), StandardCharsets.UTF_8); + } + + @Override + public void writeFile(String path, String content) throws IOException { + Files.writeString(Paths.get(path), content, StandardCharsets.UTF_8); + } + + @Override + public Path createProjectDirectory(String path) throws IOException { + Path dir = Paths.get(path); + Files.createDirectories(dir); + return dir; + } + + @Override + public Path toAbsolutePath(String path) { + return Paths.get(path).toAbsolutePath().normalize(); + } +} diff --git a/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java b/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java new file mode 100644 index 00000000..8f0b5056 --- /dev/null +++ b/src/main/java/org/frankframework/flow/filesystem/WorkspaceCleanupService.java @@ -0,0 +1,59 @@ +package org.frankframework.flow.filesystem; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.FileTime; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.stream.Stream; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.springframework.util.FileSystemUtils; + +@Slf4j +@Service +@Profile("cloud") +public class WorkspaceCleanupService { + private static final long CLEANUP_INTERVAL_MS = 3_600_000L; + + @Value("${frankflow.workspace.root:/tmp/frankflow/workspace}") + private String workspaceRootPath; + + @Value("${frankflow.workspace.retention-hours:24}") + private int retentionHours; + + @Scheduled(fixedRate = CLEANUP_INTERVAL_MS) + public void cleanupOldWorkspaces() { + log.info("Starting workspace cleanup check..."); + + Path root = Paths.get(workspaceRootPath); + if (!Files.exists(root)) { + log.info("Workspace root does not exist yet, skipping cleanup: {}", root); + return; + } + + Instant cutoffTime = Instant.now().minus(retentionHours, ChronoUnit.HOURS); + + try (Stream sessions = Files.list(root)) { + sessions.filter(Files::isDirectory).forEach(sessionDir -> { + try { + FileTime lastModifiedTime = Files.getLastModifiedTime(sessionDir); + + if (lastModifiedTime.toInstant().isBefore(cutoffTime)) { + log.info("Deleting expired workspace: {}", sessionDir); + FileSystemUtils.deleteRecursively(sessionDir); + } + } catch (IOException e) { + log.error("Failed to clean up session: {}", sessionDir, e); + } + }); + } catch (IOException e) { + log.error("Error accessing workspace root for cleanup", e); + } + } +} diff --git a/src/main/java/org/frankframework/flow/filetree/FileTreeNode.java b/src/main/java/org/frankframework/flow/filetree/FileTreeNode.java index 9906ff44..1063ae30 100644 --- a/src/main/java/org/frankframework/flow/filetree/FileTreeNode.java +++ b/src/main/java/org/frankframework/flow/filetree/FileTreeNode.java @@ -10,6 +10,7 @@ public class FileTreeNode { private String name; private String path; private NodeType type; + private boolean projectRoot; private List children; public FileTreeNode() {} diff --git a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java index 30ff11cb..2b76b02c 100644 --- a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java +++ b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java @@ -6,13 +6,15 @@ import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.filesystem.FileSystemStorage; import org.frankframework.flow.project.ProjectNotFoundException; import org.frankframework.flow.project.ProjectService; import org.frankframework.flow.utility.XmlAdapterUtils; @@ -25,52 +27,67 @@ public class FileTreeService { private final ProjectService projectService; + private final FileSystemStorage fileSystemStorage; - public FileTreeService(ProjectService projectService) { + private final Map treeCache = new ConcurrentHashMap<>(); + + public FileTreeService(ProjectService projectService, FileSystemStorage fileSystemStorage) { this.projectService = projectService; + this.fileSystemStorage = fileSystemStorage; } - public String readFileContent(String absoluteFilepath) throws IOException { - Path filePath = Paths.get(absoluteFilepath).toAbsolutePath().normalize(); + public String readFileContent(String filepath) throws IOException { + Path filePath = fileSystemStorage.toAbsolutePath(filepath); if (!Files.exists(filePath)) { - throw new NoSuchFileException("File does not exist: " + absoluteFilepath); + throw new NoSuchFileException("File does not exist: " + filepath); } if (Files.isDirectory(filePath)) { - throw new IllegalArgumentException("Requested path is a directory, not a file: " + absoluteFilepath); + throw new IllegalArgumentException("Requested path is a directory, not a file: " + filepath); } - return Files.readString(filePath, StandardCharsets.UTF_8); + return fileSystemStorage.readFile(filepath); } - public void updateFileContent(String absoluteFilepath, String newContent) throws IOException { - Path filePath = Paths.get(absoluteFilepath).toAbsolutePath().normalize(); + public void updateFileContent(String filepath, String newContent) throws IOException { + Path filePath = fileSystemStorage.toAbsolutePath(filepath); if (!Files.exists(filePath)) { - throw new IllegalArgumentException("File does not exist: " + absoluteFilepath); + throw new IllegalArgumentException("File does not exist: " + filepath); } if (Files.isDirectory(filePath)) { - throw new IllegalArgumentException("Cannot update a directory: " + absoluteFilepath); + throw new IllegalArgumentException("Cannot update a directory: " + filepath); } - Files.writeString(filePath, newContent, StandardCharsets.UTF_8); + fileSystemStorage.writeFile(filepath, newContent); + invalidateTreeCache(); } public FileTreeNode getProjectTree(String projectName) throws IOException { + FileTreeNode cached = treeCache.get(projectName); + if (cached != null) { + return cached; + } + try { var project = projectService.getProject(projectName); - Path projectPath = Paths.get(project.getRootPath()).toAbsolutePath().normalize(); + Path projectPath = fileSystemStorage.toAbsolutePath(project.getRootPath()); if (!Files.exists(projectPath) || !Files.isDirectory(projectPath)) { throw new IllegalArgumentException("Project directory does not exist: " + projectName); } - return buildShallowTree(projectPath); - } catch (ProjectNotFoundException e) { - throw new IllegalArgumentException("Project does not exist: " + projectName); - } + boolean useRelativePaths = !fileSystemStorage.isLocalEnvironment(); + Path relativizeRoot = useRelativePaths ? fileSystemStorage.toAbsolutePath("") : projectPath; + FileTreeNode tree = b(projectPath, relativizeRoot, useRelativePaths); + tree.setProjectRoot(true); + treeCache.put(projectName, tree); + return tree; + } catch (ProjectNotFoundException e) { + throw new IllegalArgumentException("Project does not exist: " + projectName); + } } public FileTreeNode getShallowDirectoryTree(String projectName, String directoryPath) throws IOException { @@ -113,54 +130,67 @@ public FileTreeNode getConfigurationsDirectoryTree(String projectName) throws IO return buildTree(configDirPath); } + public void invalidateTreeCache() { + treeCache.clear(); + } + + public void invalidateTreeCache(String projectName) { + treeCache.remove(projectName); + } + public boolean updateAdapterFromFile( String projectName, Path configurationFile, String adapterName, String newAdapterXml) throws ConfigurationNotFoundException, AdapterNotFoundException { - if (!Files.exists(configurationFile)) { + Path absConfigFile = fileSystemStorage.toAbsolutePath(configurationFile.toString()); + + if (!Files.exists(absConfigFile)) { throw new ConfigurationNotFoundException("Configuration file not found: " + configurationFile); } try { - // Parse configuration XML from file Document configDoc = - XmlSecurityUtils.createSecureDocumentBuilder().parse(Files.newInputStream(configurationFile)); + XmlSecurityUtils.createSecureDocumentBuilder().parse(Files.newInputStream(absConfigFile)); - // Parse new adapter XML Document newAdapterDoc = XmlSecurityUtils.createSecureDocumentBuilder() .parse(new ByteArrayInputStream(newAdapterXml.getBytes(StandardCharsets.UTF_8))); Node newAdapterNode = newAdapterDoc.getDocumentElement(); - // Delegate replacement logic boolean replaced = XmlAdapterUtils.replaceAdapterInDocument(configDoc, adapterName, newAdapterNode); if (!replaced) { throw new AdapterNotFoundException("Adapter not found: " + adapterName); } - // Delegate document to string conversion String updatedXml = XmlAdapterUtils.convertDocumentToString(configDoc); - // Write updated XML back to file - Files.writeString( - configurationFile, updatedXml, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING); + Files.writeString(absConfigFile, updatedXml, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING); + invalidateTreeCache(projectName); return true; } catch (AdapterNotFoundException | ConfigurationNotFoundException e) { - throw e; // let GlobalExceptionHandler deal with it + throw e; } catch (Exception e) { System.err.println("Error updating adapter in file: " + e.getMessage()); return false; } } - // Recursive method to build the entire file tree - private FileTreeNode buildTree(Path path) throws IOException { + private FileTreeNode buildTree(Path path, Path relativizeRoot, boolean useRelativePaths) throws IOException { FileTreeNode node = new FileTreeNode(); node.setName(path.getFileName().toString()); - node.setPath(path.toAbsolutePath().toString()); + + if (useRelativePaths) { + String relativePath = relativizeRoot.relativize(path).toString().replace("\\", "/"); + if (relativePath.isEmpty()) { + relativePath = "."; + } + node.setPath(relativePath); + } else { + node.setPath(path.toAbsolutePath().toString()); + } if (Files.isDirectory(path)) { node.setType(NodeType.DIRECTORY); @@ -168,7 +198,7 @@ private FileTreeNode buildTree(Path path) throws IOException { try (Stream stream = Files.list(path)) { List children = stream.map(p -> { try { - return buildTree(p); + return buildTree(p, relativizeRoot, useRelativePaths); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/main/java/org/frankframework/flow/project/ProjectController.java b/src/main/java/org/frankframework/flow/project/ProjectController.java index fe7f020d..73199776 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectController.java +++ b/src/main/java/org/frankframework/flow/project/ProjectController.java @@ -1,26 +1,24 @@ package org.frankframework.flow.project; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.adapter.AdapterUpdateDTO; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationDTO; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.filesystem.FileSystemStorage; import org.frankframework.flow.filetree.FileTreeNode; import org.frankframework.flow.filetree.FileTreeService; -import org.frankframework.flow.projectsettings.FilterType; import org.frankframework.flow.projectsettings.InvalidFilterTypeException; import org.frankframework.flow.recentproject.RecentProjectsService; import org.frankframework.flow.utility.XmlValidator; -import org.springframework.http.HttpStatus; +import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -30,53 +28,33 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; -@RestController() +@RestController @RequestMapping("/projects") public class ProjectController { + private final ProjectService projectService; private final FileTreeService fileTreeService; private final RecentProjectsService recentProjectsService; + private final FileSystemStorage fileSystemStorage; public ProjectController( ProjectService projectService, FileTreeService fileTreeService, - RecentProjectsService recentProjectsService) { + RecentProjectsService recentProjectsService, + FileSystemStorage fileSystemStorage) { this.projectService = projectService; this.fileTreeService = fileTreeService; this.recentProjectsService = recentProjectsService; + this.fileSystemStorage = fileSystemStorage; } @GetMapping public ResponseEntity> getAllProjects() { - List projectDTOList = new ArrayList<>(); List projects = projectService.getProjects(); - - for (Project project : projects) { - ProjectDTO dto = ProjectDTO.from(project); - projectDTOList.add(dto); - } - return ResponseEntity.ok(projectDTOList); - } - - @GetMapping("/recent") - public ResponseEntity> getRecentProjects() { - return ResponseEntity.ok(recentProjectsService.getRecentProjects()); - } - - @DeleteMapping("/recent") - public ResponseEntity removeRecentProject(@RequestBody Map body) { - String rootPath = body.get("rootPath"); - if (rootPath == null || rootPath.isBlank()) { - return ResponseEntity.badRequest().build(); - } - recentProjectsService.removeRecentProject(rootPath); - return ResponseEntity.ok().build(); - } - - @GetMapping("/{name}/tree") - public FileTreeNode getProjectTree(@PathVariable String name) throws IOException { - return fileTreeService.getProjectTree(name); + List dtos = projects.stream().map(this::toDto).toList(); + return ResponseEntity.ok(dtos); } @GetMapping("/{name}/tree/configurations") @@ -93,126 +71,94 @@ public FileTreeNode getConfigurationTree( @GetMapping("/{projectName}") public ResponseEntity getProject(@PathVariable String projectName) throws ProjectNotFoundException { - Project project = projectService.getProject(projectName); - - ProjectDTO dto = ProjectDTO.from(project); - - return ResponseEntity.ok(dto); - } - - @GetMapping(value = "/{projectname}", params = "path") - public FileTreeNode getDirectoryContent(@PathVariable String projectname, @RequestParam String path) - throws IOException { - - return fileTreeService.getShallowDirectoryTree(projectname, path); + return ResponseEntity.ok(toDto(project)); } - @PatchMapping("/{projectname}") - public ResponseEntity patchProject( - @PathVariable String projectname, @RequestBody ProjectDTO projectDTO) { + @GetMapping(value = "/{projectname}", params = "path") + public FileTreeNode getDirectoryContent(@PathVariable String projectname, @RequestParam String path) + throws IOException { - try { - Project project = projectService.getProject(projectname); - if (project == null) { - return ResponseEntity.notFound().build(); - } - - // 1. Update project name (only if present) - if (projectDTO.name() != null && !projectDTO.name().equals(project.getName())) { - project.setName(projectDTO.name()); - } + return fileTreeService.getShallowDirectoryTree(projectname, path); + } - // 2. Update configuration list (only if present) - if (projectDTO.filepaths() != null) { - // Replace entire configuration list - project.clearConfigurations(); - for (String filepath : projectDTO.filepaths()) { - project.addConfiguration(new Configuration(filepath)); - } - } + @PostMapping + public ResponseEntity createProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { + Project project = projectService.createProjectOnDisk(projectCreateDTO.rootPath()); + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); + return ResponseEntity.ok(toDto(project)); + } - // 3. Merge filter map (only update provided filters) - if (projectDTO.filters() != null) { - for (var entry : projectDTO.filters().entrySet()) { - FilterType type = entry.getKey(); - Boolean enabled = entry.getValue(); + @PostMapping("/clone") + public ResponseEntity cloneProject(@RequestBody ProjectCloneDTO projectCloneDTO) throws IOException { + Project project = projectService.cloneAndOpenProject(projectCloneDTO.repoUrl(), projectCloneDTO.localPath()); + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); + return ResponseEntity.ok(toDto(project)); + } - if (enabled == null) continue; + @PostMapping("/open") + public ResponseEntity openProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { + Project project = projectService.openProjectFromDisk(projectCreateDTO.rootPath()); + recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); + return ResponseEntity.ok(toDto(project)); + } - if (enabled) { - project.enableFilter(type); - } else { - project.disableFilter(type); - } - } - } + @PostMapping("/{projectname}/configurations/{configname}") + public ResponseEntity addConfiguration( + @PathVariable String projectname, @PathVariable String configname) throws ProjectNotFoundException { + Project project = projectService.addConfiguration(projectname, configname); + return ResponseEntity.ok(toDto(project)); + } - ProjectDTO dto = ProjectDTO.from(project); + @PatchMapping("/{projectname}/filters/{type}/enable") + public ResponseEntity enableFilter(@PathVariable String projectname, @PathVariable String type) + throws ProjectNotFoundException, InvalidFilterTypeException { + Project project = projectService.enableFilter(projectname, type); + return ResponseEntity.ok(toDto(project)); + } - return ResponseEntity.ok(dto); + @PatchMapping("/{projectname}/filters/{type}/disable") + public ResponseEntity disableFilter(@PathVariable String projectname, @PathVariable String type) + throws ProjectNotFoundException, InvalidFilterTypeException { + Project project = projectService.disableFilter(projectname, type); + return ResponseEntity.ok(toDto(project)); + } - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); - } + @GetMapping("/{name}/tree") + public FileTreeNode getProjectTree(@PathVariable String name) throws IOException { + return fileTreeService.getProjectTree(name); } @PostMapping("/{projectName}/configuration") public ResponseEntity getConfigurationByPath( @PathVariable String projectName, @RequestBody ConfigurationPathDTO requestBody) - throws ProjectNotFoundException, ConfigurationNotFoundException, IOException { + throws ConfigurationNotFoundException, IOException { String filepath = requestBody.filepath(); - - // Find configuration by filepath - String content; try { - content = fileTreeService.readFileContent(filepath); + String content = fileTreeService.readFileContent(filepath); + return ResponseEntity.ok(new ConfigurationDTO(filepath, content)); } catch (NoSuchFileException e) { throw new ConfigurationNotFoundException("Configuration file not found: " + filepath); } catch (IllegalArgumentException e) { throw new ConfigurationNotFoundException("Invalid configuration path: " + filepath); } - - ConfigurationDTO dto = new ConfigurationDTO(filepath, content); - return ResponseEntity.ok(dto); - } - - @PostMapping("/{projectname}/import-configurations") - public ResponseEntity importConfigurations( - @PathVariable String projectname, @RequestBody ProjectImportDTO importDTO) throws ProjectNotFoundException { - - Project project = projectService.getProject(projectname); - if (project == null) return ResponseEntity.notFound().build(); - - for (ImportConfigurationDTO conf : importDTO.configurations()) { - Configuration c = new Configuration(conf.filepath()); - c.setXmlContent(conf.xmlContent()); - project.addConfiguration(c); - } - - ProjectDTO dto = ProjectDTO.from(project); - - return ResponseEntity.ok(dto); } @PutMapping("/{projectName}/configuration") public ResponseEntity updateConfiguration( @PathVariable String projectName, @RequestBody ConfigurationDTO configurationDTO) - throws ProjectNotFoundException, ConfigurationNotFoundException, InvalidXmlContentException, IOException { + throws ConfigurationNotFoundException, InvalidXmlContentException, IOException { - // Validate XML if (configurationDTO.filepath().toLowerCase().endsWith(".xml")) { XmlValidator.validateXml(configurationDTO.content()); } - try { fileTreeService.updateFileContent(configurationDTO.filepath(), configurationDTO.content()); + return ResponseEntity.ok().build(); } catch (IllegalArgumentException e) { throw new ConfigurationNotFoundException("Invalid file path: " + configurationDTO.filepath()); } - - return ResponseEntity.ok().build(); } @PutMapping("/{projectName}/adapters") @@ -220,74 +166,47 @@ public ResponseEntity updateAdapterFromFile( @PathVariable String projectName, @RequestBody AdapterUpdateDTO dto) throws AdapterNotFoundException, ConfigurationNotFoundException { Path configPath = Paths.get(dto.configurationPath()); - boolean updated = fileTreeService.updateAdapterFromFile(projectName, configPath, dto.adapterName(), dto.adapterXml()); - - if (!updated) { - return ResponseEntity.notFound().build(); - } - - return ResponseEntity.ok().build(); + return updated ? ResponseEntity.ok().build() : ResponseEntity.notFound().build(); } - @PostMapping - public ResponseEntity createProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { - Project project = projectService.createProjectOnDisk(projectCreateDTO.rootPath()); - - recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); - - ProjectDTO dto = ProjectDTO.from(project); + @GetMapping("/{projectName}/export") + public void exportProject(@PathVariable String projectName, HttpServletResponse response) + throws IOException, ProjectNotFoundException { + response.setContentType("application/zip"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + projectName + ".zip\""); - return ResponseEntity.ok(dto); + projectService.exportProjectAsZip(projectName, response.getOutputStream()); } - @PostMapping("/clone") - public ResponseEntity cloneProject(@RequestBody ProjectCloneDTO projectCloneDTO) throws IOException { - Project project = projectService.cloneAndOpenProject(projectCloneDTO.repoUrl(), projectCloneDTO.localPath()); - - recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); - - ProjectDTO dto = ProjectDTO.from(project); - - return ResponseEntity.ok(dto); - } + @PostMapping("/import") + public ResponseEntity importProject( + @RequestParam("files") List files, + @RequestParam("paths") List paths, + @RequestParam("projectName") String projectName) + throws IOException { - @PostMapping("/open") - public ResponseEntity openProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { - Project project = projectService.openProjectFromDisk(projectCreateDTO.rootPath()); + if (files.isEmpty() || files.size() != paths.size()) { + return ResponseEntity.badRequest().build(); + } + Project project = projectService.importProjectFromFiles(projectName, files, paths); recentProjectsService.addRecentProject(project.getName(), project.getRootPath()); - - ProjectDTO dto = ProjectDTO.from(project); - - return ResponseEntity.ok(dto); - } - - @PostMapping("/{projectname}/configurations/{configname}") - public ResponseEntity addConfiguration( - @PathVariable String projectname, @PathVariable String configname) throws ProjectNotFoundException { - Project project = projectService.addConfiguration(projectname, configname); - - ProjectDTO projectDTO = ProjectDTO.from(project); - return ResponseEntity.ok(projectDTO); - } - - @PatchMapping("/{projectname}/filters/{type}/enable") - public ResponseEntity enableFilter(@PathVariable String projectname, @PathVariable String type) - throws ProjectNotFoundException, InvalidFilterTypeException { - - Project project = projectService.enableFilter(projectname, type); - ProjectDTO dto = ProjectDTO.from(project); - return ResponseEntity.ok(dto); + return ResponseEntity.ok(toDto(project)); } - @PatchMapping("/{projectname}/filters/{type}/disable") - public ResponseEntity disableFilter(@PathVariable String projectname, @PathVariable String type) - throws ProjectNotFoundException, InvalidFilterTypeException { + private ProjectDTO toDto(Project project) { + String cleanPath = fileSystemStorage.toRelativePath(project.getRootPath()); + List filepaths = project.getConfigurations().stream() + .map(Configuration::getFilepath) + .map(fileSystemStorage::toRelativePath) + .toList(); - Project project = projectService.disableFilter(projectname, type); - ProjectDTO dto = ProjectDTO.from(project); - return ResponseEntity.ok(dto); + return new ProjectDTO( + project.getName(), + cleanPath, + filepaths, + project.getProjectSettings().getFilters()); } } diff --git a/src/main/java/org/frankframework/flow/project/ProjectDTO.java b/src/main/java/org/frankframework/flow/project/ProjectDTO.java index 992c911d..7fbabea8 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectDTO.java +++ b/src/main/java/org/frankframework/flow/project/ProjectDTO.java @@ -1,23 +1,7 @@ package org.frankframework.flow.project; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.projectsettings.FilterType; -public record ProjectDTO(String name, String rootPath, List filepaths, Map filters) { - - // Factory method to create a ProjectDTO from a Project - public static ProjectDTO from(Project project) { - List filepaths = new ArrayList<>(); - for (Configuration configuration : project.getConfigurations()) { - filepaths.add(configuration.getFilepath()); - } - return new ProjectDTO( - project.getName(), - project.getRootPath(), - filepaths, - project.getProjectSettings().getFilters()); - } -} +public record ProjectDTO(String name, String rootPath, List filepaths, Map filters) {} diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 77a594b7..13895b36 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -2,136 +2,137 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.OutputStream; import java.nio.charset.MalformedInputException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; -import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; -import lombok.Getter; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import lombok.extern.slf4j.Slf4j; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.filesystem.FileSystemStorage; +import org.frankframework.flow.filesystem.FilesystemEntry; import org.frankframework.flow.projectsettings.FilterType; import org.frankframework.flow.projectsettings.InvalidFilterTypeException; +import org.frankframework.flow.recentproject.RecentProject; +import org.frankframework.flow.recentproject.RecentProjectsService; +import org.frankframework.flow.utility.XmlSecurityUtils; +import org.springframework.context.annotation.Lazy; import org.frankframework.flow.utility.XmlAdapterUtils; import org.frankframework.flow.utility.XmlSecurityUtils; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import org.w3c.dom.Node; +import org.xml.sax.SAXParseException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXParseException; -@Getter @Slf4j @Service public class ProjectService { + private static final String CONFIGURATIONS_DIR = "src/main/configurations"; - private final List projects = new CopyOnWriteArrayList<>(); + private final FileSystemStorage fileSystemStorage; + private final RecentProjectsService recentProjectsService; - private static final String CONFIGURATIONS_DIR = "src/main/configurations"; + private final Map projectCache = new ConcurrentHashMap<>(); - private String loadDefaultConfiguration() throws IOException { - ClassPathResource resource = new ClassPathResource("templates/default-configuration.xml"); - return new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8); + public ProjectService(FileSystemStorage fileSystemStorage, @Lazy RecentProjectsService recentProjectsService) { + this.fileSystemStorage = fileSystemStorage; + this.recentProjectsService = recentProjectsService; } - public Project createProjectOnDisk(String absolutePath) throws IOException { - if (absolutePath == null || absolutePath.isBlank()) { - throw new IllegalArgumentException("Project path must not be blank"); + public List getProjects() { + if (fileSystemStorage.isLocalEnvironment()) { + return getProjectsFromRecentList(); } + return getProjectsFromWorkspaceScan(); + } - Path projectDir = Paths.get(absolutePath).toAbsolutePath().normalize(); - if (Files.exists(projectDir)) { - throw new IllegalArgumentException("Project directory already exists: " + absolutePath); - } - - Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); - Files.createDirectories(configurationsDir); - - String defaultXml = loadDefaultConfiguration(); - - Path configFile = configurationsDir.resolve("Configuration.xml"); - Files.writeString(configFile, defaultXml, StandardCharsets.UTF_8); - - String name = projectDir.getFileName().toString(); - String rootPath = projectDir.toString(); - - Project project = new Project(name, rootPath); - Configuration configuration = - new Configuration(configFile.toAbsolutePath().normalize().toString()); - configuration.setXmlContent(defaultXml); - project.addConfiguration(configuration); + private List getProjectsFromRecentList() { + List foundProjects = new ArrayList<>(); + List recentProjects = recentProjectsService.getRecentProjects(); - projects.add(project); - return project; + for (RecentProject recent : recentProjects) { + try { + Project p = loadProjectCached(recent.rootPath()); + foundProjects.add(p); + } catch (Exception e) { + log.debug("Recent project no longer valid: {}", recent.rootPath()); + } + } + return foundProjects; } - public Project openProjectFromDisk(String absolutePath) throws IOException { - Path projectDir = Paths.get(absolutePath).toAbsolutePath().normalize(); + private List getProjectsFromWorkspaceScan() { + List foundProjects = new ArrayList<>(); + List entries = fileSystemStorage.listRoots(); - for (Project project : projects) { - if (Paths.get(project.getRootPath()).toAbsolutePath().normalize().equals(projectDir)) { - return project; + for (FilesystemEntry entry : entries) { + try { + Project p = loadProjectCached(entry.path()); + foundProjects.add(p); + } catch (Exception e) { + // Not a valid project, skip } } + return foundProjects; + } - if (!Files.exists(projectDir) || !Files.isDirectory(projectDir)) { - throw new IllegalArgumentException("Project directory does not exist: " + absolutePath); + public Project getProject(String name) throws ProjectNotFoundException { + for (Project cached : projectCache.values()) { + if (cached.getName().equals(name)) { + return cached; + } } - String name = projectDir.getFileName().toString(); - String rootPath = projectDir.toString(); + return getProjects().stream() + .filter(p -> p.getName().equals(name)) + .findFirst() + .orElseThrow(() -> new ProjectNotFoundException("Project not found: " + name)); + } - Project project = new Project(name, rootPath); + public Project createProjectOnDisk(String path) throws IOException { + Path projectPath = fileSystemStorage.createProjectDirectory(path); - Path configurationsDir = projectDir.resolve(CONFIGURATIONS_DIR); - if (Files.exists(configurationsDir) && Files.isDirectory(configurationsDir)) { - scanXmlFiles(configurationsDir, project); - } else { - scanXmlFiles(projectDir, project); - } + Files.createDirectories(projectPath.resolve(CONFIGURATIONS_DIR)); - projects.add(project); - return project; - } + String defaultXml = new String( + new ClassPathResource("templates/default-configuration.xml") + .getInputStream() + .readAllBytes(), + StandardCharsets.UTF_8); + fileSystemStorage.writeFile( + projectPath + .resolve(CONFIGURATIONS_DIR) + .resolve("Configuration.xml") + .toString(), + defaultXml); - private void scanXmlFiles(Path directory, Project project) throws IOException { - try (Stream paths = Files.walk(directory)) { - List xmlFiles = paths.filter(Files::isRegularFile) - .filter(p -> p.toString().endsWith(".xml")) - .toList(); + return loadProjectAndCache(projectPath.toString()); + } - for (Path xmlFile : xmlFiles) { - String absolutePath = xmlFile.toAbsolutePath().normalize().toString(); - try { - String xmlContent = Files.readString(xmlFile, StandardCharsets.UTF_8); - Configuration configuration = new Configuration(absolutePath); - configuration.setXmlContent(xmlContent); - project.addConfiguration(configuration); - } catch (MalformedInputException e) { - log.warn("Skipping file with invalid UTF-8 encoding: {}", absolutePath); - } - } - } + public Project openProjectFromDisk(String path) throws IOException { + return loadProjectAndCache(path); } public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOException { - if (repoUrl == null || repoUrl.isBlank()) { - throw new IllegalArgumentException("Repository URL must not be blank"); - } - if (localPath == null || localPath.isBlank()) { - throw new IllegalArgumentException("Local path must not be blank"); - } + Path targetDir = fileSystemStorage.toAbsolutePath(localPath); - Path targetDir = Paths.get(localPath).toAbsolutePath().normalize(); if (Files.exists(targetDir)) { - throw new IllegalArgumentException("Target directory already exists: " + targetDir); + throw new IllegalArgumentException("Project already exists at: " + targetDir); } try { @@ -154,80 +155,153 @@ public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOEx throw new IOException("git clone was interrupted"); } - return openProjectFromDisk(targetDir.toString()); + return loadProjectAndCache(targetDir.toString()); } - public void createProject(String name, String rootPath) { - Project project = new Project(name, rootPath); - if (projects.contains(project)) { - throw new ProjectAlreadyExistsException( - "Project with name '" + name + "' and rootPath '" + rootPath + "' already exists."); - } - projects.add(project); - } + public void invalidateCache() { + projectCache.clear(); + } - public Project getProject(String name) throws ProjectNotFoundException { - for (Project project : projects) { - if (project.getName().equals(name)) { - return project; - } + public void invalidateProject(String projectName) { + projectCache.entrySet().removeIf(e -> e.getValue().getName().equals(projectName)); + } + + // --- Core Loading Logic --- + + private Project loadProjectCached(String path) throws IOException { + String cacheKey = fileSystemStorage.toAbsolutePath(path).toString(); + Project cached = projectCache.get(cacheKey); + if (cached != null) { + return cached; } + return loadProjectAndCache(path); + } - throw new ProjectNotFoundException(String.format("Project with name: %s cannot be found", name)); + private Project loadProjectAndCache(String path) throws IOException { + Project project = loadProjectFromStorage(path); + String cacheKey = fileSystemStorage.toAbsolutePath(path).toString(); + projectCache.put(cacheKey, project); + return project; } - public boolean updateConfigurationXml(String projectName, String filepath, String xmlContent) - throws ProjectNotFoundException, ConfigurationNotFoundException { + private Project loadProjectFromStorage(String path) throws IOException { + Path absPath = fileSystemStorage.toAbsolutePath(path); + + if (!Files.exists(absPath) || !Files.isDirectory(absPath)) { + throw new IOException("Invalid project path: " + absPath); + } + Project project = new Project(absPath.getFileName().toString(), absPath.toString()); + + Path configDir = absPath.resolve(CONFIGURATIONS_DIR); + if (!Files.exists(configDir)) { + return project; + } + + try (Stream s = Files.walk(configDir)) { + s.filter(p -> p.toString().endsWith(".xml")).forEach(p -> { + try { + String content = fileSystemStorage.readFile(p.toString()); + Configuration c = new Configuration(p.toString()); + c.setXmlContent(content); + project.addConfiguration(c); + } catch (IOException e) { + log.error("Error reading config file {}: {}", p, e.getMessage(), e); + } + }); + } + return project; + } + + public void exportProjectAsZip(String projectName, OutputStream outputStream) + throws IOException, ProjectNotFoundException { Project project = getProject(projectName); + Path projectPath = fileSystemStorage.toAbsolutePath(project.getRootPath()); + + if (!Files.exists(projectPath) || !Files.isDirectory(projectPath)) { + throw new ProjectNotFoundException("Project directory not found: " + projectName); + } - for (Configuration config : project.getConfigurations()) { - if (config.getFilepath().equals(filepath)) { - config.setXmlContent(xmlContent); - return true; + try (ZipOutputStream zos = new ZipOutputStream(outputStream); + Stream paths = Files.walk(projectPath)) { + paths.filter(Files::isRegularFile).forEach(filePath -> { + try { + String entryName = + projectPath.relativize(filePath).toString().replace("\\", "/"); + zos.putNextEntry(new ZipEntry(entryName)); + Files.copy(filePath, zos); + zos.closeEntry(); + } catch (IOException e) { + throw new RuntimeException("Error zipping file: " + filePath, e); + } + }); + } + } + + public Project importProjectFromFiles(String projectName, List files, List paths) + throws IOException { + Path projectDir = fileSystemStorage.createProjectDirectory(projectName); + + for (int i = 0; i < files.size(); i++) { + String relativePath = paths.get(i).replace("\\", "/"); + + if (relativePath.contains("..") || relativePath.startsWith("/")) { + throw new SecurityException("Invalid file path: " + relativePath); } + + Path targetPath = projectDir.resolve(relativePath).normalize(); + if (!targetPath.startsWith(projectDir)) { + throw new SecurityException("File path escapes project directory: " + relativePath); + } + + Files.createDirectories(targetPath.getParent()); + files.get(i).transferTo(targetPath); } - throw new ConfigurationNotFoundException( - String.format("Configuration with filepath: %s can not be found", filepath)); + return loadProjectAndCache(projectDir.toString()); } - public Project enableFilter(String projectName, String type) - throws ProjectNotFoundException, InvalidFilterTypeException { + public boolean updateConfigurationXml(String projectName, String filepath, String xmlContent) + throws ProjectNotFoundException, ConfigurationNotFoundException, IOException { Project project = getProject(projectName); - FilterType filterType; - try { - filterType = FilterType.valueOf(type.toUpperCase()); - } catch (IllegalArgumentException e) { - throw new InvalidFilterTypeException("Invalid filter type: " + type); - } + Configuration targetConfig = project.getConfigurations().stream() + .filter(c -> c.getFilepath().equals(filepath)) + .findFirst() + .orElseThrow(() -> new ConfigurationNotFoundException( + String.format("Configuration with filepath: %s not found", filepath))); + + fileSystemStorage.writeFile(filepath, xmlContent); + targetConfig.setXmlContent(xmlContent); + return true; + } - project.enableFilter(filterType); + public Project enableFilter(String projectName, String type) + throws ProjectNotFoundException, InvalidFilterTypeException { + Project project = getProject(projectName); + project.enableFilter(parseFilterType(type)); return project; } public Project disableFilter(String projectName, String type) throws ProjectNotFoundException, InvalidFilterTypeException { - Project project = getProject(projectName); + project.disableFilter(parseFilterType(type)); + return project; + } - FilterType filterType; + private FilterType parseFilterType(String type) throws InvalidFilterTypeException { try { - filterType = FilterType.valueOf(type.toUpperCase()); + return FilterType.valueOf(type.toUpperCase()); } catch (IllegalArgumentException e) { throw new InvalidFilterTypeException("Invalid filter type: " + type); } - - project.disableFilter(filterType); - return project; } public boolean updateAdapter(String projectName, String configurationPath, String adapterName, String newAdapterXml) throws ProjectNotFoundException, ConfigurationNotFoundException, AdapterNotFoundException { Project project = getProject(projectName); - Optional configOptional = project.getConfigurations().stream() .filter(configuration -> configuration.getFilepath().equals(configurationPath)) .findFirst(); @@ -254,9 +328,7 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin String xmlOutput = XmlAdapterUtils.convertDocumentToString(configDoc); config.setXmlContent(xmlOutput); - return true; - } catch (AdapterNotFoundException | ConfigurationNotFoundException | ProjectNotFoundException e) { throw e; } catch (SAXParseException e) { @@ -270,7 +342,6 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin public Project addConfiguration(String projectName, String configurationName) throws ProjectNotFoundException { Project project = getProject(projectName); - Configuration configuration = new Configuration(configurationName); project.addConfiguration(configuration); return project; diff --git a/src/main/java/org/frankframework/flow/project/RecentProjectsService.java b/src/main/java/org/frankframework/flow/project/RecentProjectsService.java deleted file mode 100644 index a6bdb866..00000000 --- a/src/main/java/org/frankframework/flow/project/RecentProjectsService.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.frankframework.flow.project; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import tools.jackson.core.type.TypeReference; -import tools.jackson.databind.ObjectMapper; - -@Slf4j -@Service -public class RecentProjectsService { - - private static final int MAX_RECENT_PROJECTS = 10; - private static final Path RECENT_PROJECTS_FILE = - Paths.get(System.getProperty("user.home"), ".flow", "recent-projects.json"); - - private final ObjectMapper objectMapper = new ObjectMapper(); - private final ReadWriteLock lock = new ReentrantReadWriteLock(); - - public List getRecentProjects() { - lock.readLock().lock(); - try { - if (!Files.exists(RECENT_PROJECTS_FILE)) { - return new ArrayList<>(); - } - String json = Files.readString(RECENT_PROJECTS_FILE); - return objectMapper.readValue(json, new TypeReference>() {}); - } catch (IOException e) { - log.warn("Error reading recent projects: {}", e.getMessage()); - return new ArrayList<>(); - } finally { - lock.readLock().unlock(); - } - } - - public void addRecentProject(String name, String rootPath) { - if (name == null || name.isBlank() || rootPath == null || rootPath.isBlank()) { - log.warn("Cannot add recent project with blank name or rootPath"); - return; - } - - String normalizedPath = Paths.get(rootPath).toAbsolutePath().normalize().toString(); - - lock.writeLock().lock(); - try { - List projects = new ArrayList<>(readProjectsFromDisk()); - - projects.removeIf(p -> Paths.get(p.rootPath()) - .toAbsolutePath() - .normalize() - .toString() - .equals(normalizedPath)); - - projects.addFirst( - new RecentProject(name, normalizedPath, Instant.now().toString())); - - if (projects.size() > MAX_RECENT_PROJECTS) { - projects = new ArrayList<>(projects.subList(0, MAX_RECENT_PROJECTS)); - } - - saveProjectsToDisk(projects); - } finally { - lock.writeLock().unlock(); - } - } - - public void removeRecentProject(String rootPath) { - if (rootPath == null || rootPath.isBlank()) { - return; - } - - String normalizedPath = Paths.get(rootPath).toAbsolutePath().normalize().toString(); - - lock.writeLock().lock(); - try { - List projects = new ArrayList<>(readProjectsFromDisk()); - projects.removeIf(p -> Paths.get(p.rootPath()) - .toAbsolutePath() - .normalize() - .toString() - .equals(normalizedPath)); - saveProjectsToDisk(projects); - } finally { - lock.writeLock().unlock(); - } - } - - private List readProjectsFromDisk() { - if (!Files.exists(RECENT_PROJECTS_FILE)) { - return new ArrayList<>(); - } - try { - String json = Files.readString(RECENT_PROJECTS_FILE); - return objectMapper.readValue(json, new TypeReference>() {}); - } catch (IOException e) { - log.warn("Error reading recent projects file: {}", e.getMessage()); - return new ArrayList<>(); - } - } - - private void saveProjectsToDisk(List projects) { - try { - Files.createDirectories(RECENT_PROJECTS_FILE.getParent()); - String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(projects); - Files.writeString(RECENT_PROJECTS_FILE, json); - } catch (IOException e) { - log.error("Error saving recent projects: {}", e.getMessage()); - } - } -} diff --git a/src/main/java/org/frankframework/flow/project/RecentProject.java b/src/main/java/org/frankframework/flow/recentproject/RecentProject.java similarity index 63% rename from src/main/java/org/frankframework/flow/project/RecentProject.java rename to src/main/java/org/frankframework/flow/recentproject/RecentProject.java index e4a84aa5..f80195ac 100644 --- a/src/main/java/org/frankframework/flow/project/RecentProject.java +++ b/src/main/java/org/frankframework/flow/recentproject/RecentProject.java @@ -1,3 +1,3 @@ -package org.frankframework.flow.project; +package org.frankframework.flow.recentproject; public record RecentProject(String name, String rootPath, String lastOpened) {} diff --git a/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java new file mode 100644 index 00000000..af68b006 --- /dev/null +++ b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java @@ -0,0 +1,49 @@ +package org.frankframework.flow.recentproject; + +import java.util.List; +import java.util.Map; +import org.frankframework.flow.filesystem.FileSystemStorage; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/recent-projects") +public class RecentProjectController { + private final RecentProjectsService recentProjectsService; + private final FileSystemStorage fileSystemStorage; + + public RecentProjectController(RecentProjectsService recentProjectsService, FileSystemStorage fileSystemStorage) { + this.recentProjectsService = recentProjectsService; + this.fileSystemStorage = fileSystemStorage; + } + + @GetMapping + public ResponseEntity> getRecentProjects() { + List projects = recentProjectsService.getRecentProjects(); + + if (!fileSystemStorage.isLocalEnvironment()) { + projects = projects.stream() + .map(p -> new RecentProject( + p.name(), + fileSystemStorage.toRelativePath(p.rootPath()), + p.lastOpened())) + .toList(); + } + + return ResponseEntity.ok(projects); + } + + @DeleteMapping + public ResponseEntity removeRecentProject(@RequestBody Map body) { + String rootPath = body.get("rootPath"); + if (rootPath == null || rootPath.isBlank()) { + return ResponseEntity.badRequest().build(); + } + recentProjectsService.removeRecentProject(rootPath); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java b/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java new file mode 100644 index 00000000..baff0686 --- /dev/null +++ b/src/main/java/org/frankframework/flow/recentproject/RecentProjectsService.java @@ -0,0 +1,117 @@ +package org.frankframework.flow.recentproject; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import lombok.extern.slf4j.Slf4j; +import org.frankframework.flow.filesystem.FileSystemStorage; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class RecentProjectsService { + + private static final int MAX_RECENT_PROJECTS = 10; + private static final String RECENT_FILENAME = "recent-projects.json"; + + private static final Path LOCAL_USER_FILE = Paths.get(System.getProperty("user.home"), ".flow", RECENT_FILENAME); + private final ReadWriteLock lock = new ReentrantReadWriteLock(); + + private final ObjectMapper objectMapper; + private final FileSystemStorage fileSystemStorage; + + public RecentProjectsService(FileSystemStorage fileSystemStorage, ObjectMapper objectMapper) { + this.fileSystemStorage = fileSystemStorage; + this.objectMapper = objectMapper; + } + + public List getRecentProjects() { + lock.readLock().lock(); + try { + if (fileSystemStorage.isLocalEnvironment()) { + if (!Files.exists(LOCAL_USER_FILE)) return new ArrayList<>(); + return objectMapper.readValue(Files.readString(LOCAL_USER_FILE), new TypeReference<>() {}); + } + + try { + String json = fileSystemStorage.readFile(RECENT_FILENAME); + return objectMapper.readValue(json, new TypeReference<>() {}); + } catch (Exception e) { + return new ArrayList<>(); + } + } catch (IOException e) { + log.warn("Error reading recent projects: {}", e.getMessage()); + return new ArrayList<>(); + } finally { + lock.readLock().unlock(); + } + } + + public void addRecentProject(String name, String rootPath) { + if (name == null || name.isBlank() || rootPath == null || rootPath.isBlank()) return; + + String normalizedPath = Paths.get(rootPath).normalize().toString(); + + lock.writeLock().lock(); + try { + List projects = new ArrayList<>(getRecentProjects()); + + projects.removeIf(p -> { + String pPath = Paths.get(p.rootPath()).normalize().toString(); + return pPath.equals(normalizedPath); + }); + + projects.addFirst( + new RecentProject(name, normalizedPath, Instant.now().toString())); + + if (projects.size() > MAX_RECENT_PROJECTS) { + projects = new ArrayList<>(projects.subList(0, MAX_RECENT_PROJECTS)); + } + + saveProjects(projects); + } finally { + lock.writeLock().unlock(); + } + } + + public void removeRecentProject(String rootPath) { + if (rootPath == null || rootPath.isBlank()) return; + + String normalizedPath = Paths.get(rootPath).normalize().toString(); + + lock.writeLock().lock(); + try { + List projects = new ArrayList<>(getRecentProjects()); + projects.removeIf(p -> { + String pPath = Paths.get(p.rootPath()).normalize().toString(); + return pPath.equals(normalizedPath); + }); + saveProjects(projects); + } finally { + lock.writeLock().unlock(); + } + } + + private void saveProjects(List projects) { + try { + String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(projects); + + if (fileSystemStorage.isLocalEnvironment()) { + Files.createDirectories(LOCAL_USER_FILE.getParent()); + Files.writeString(LOCAL_USER_FILE, json); + } else { + fileSystemStorage.writeFile(RECENT_FILENAME, json); + } + } catch (IOException e) { + log.error("Error saving recent projects: {}", e.getMessage()); + } + } +} diff --git a/src/main/java/org/frankframework/flow/security/UserContextFilter.java b/src/main/java/org/frankframework/flow/security/UserContextFilter.java new file mode 100644 index 00000000..f429ec6c --- /dev/null +++ b/src/main/java/org/frankframework/flow/security/UserContextFilter.java @@ -0,0 +1,95 @@ +package org.frankframework.flow.security; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; +import java.util.HexFormat; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class UserContextFilter extends HttpFilter { + + private static final String BEARER_PREFIX = "Bearer "; + private static final int SESSION_HASH_LENGTH = 16; + private static final int MIN_JWT_PARTS = 2; + + private final UserWorkspaceContext userWorkspaceContext; + private final ObjectMapper objectMapper; + + public UserContextFilter(UserWorkspaceContext userWorkspaceContext, ObjectMapper objectMapper) { + this.userWorkspaceContext = userWorkspaceContext; + this.objectMapper = objectMapper; + } + + @Override + protected void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws IOException, ServletException { + + if (!userWorkspaceContext.isInitialized()) { + String workspaceId = determineWorkspaceId(request); + userWorkspaceContext.initialize(workspaceId); + log.debug("Context initialized for workspace: {}", workspaceId); + } + + chain.doFilter(request, response); + } + + private String determineWorkspaceId(HttpServletRequest request) { + String authHeader = request.getHeader("Authorization"); + if (authHeader != null && authHeader.startsWith(BEARER_PREFIX)) { + String userId = extractUserIdFromJwt(authHeader.substring(BEARER_PREFIX.length())); + if (userId != null) return sanitize(userId); + } + + String sessionId = request.getHeader("X-Session-ID"); + if (sessionId != null && !sessionId.isBlank()) { + return "anon-" + hashSessionId(sessionId); + } + + return "anonymous"; + } + + private String hashSessionId(String sessionId) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hash = digest.digest(sessionId.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(hash).substring(0, SESSION_HASH_LENGTH); + } catch (NoSuchAlgorithmException e) { + return sanitize(sessionId); + } + } + + private String sanitize(String input) { + return input.replaceAll("[^a-zA-Z0-9.@-]", "_"); + } + + private String extractUserIdFromJwt(String token) { + try { + String[] parts = token.split("\\."); + if (parts.length < MIN_JWT_PARTS) return null; + String payload = new String(Base64.getUrlDecoder().decode(parts[1])); + JsonNode claims = objectMapper.readTree(payload); + + if (!claims.path("sub").isMissingNode()) { + return claims.path("sub").asText(); + } + if (!claims.path("preferred_username").isMissingNode()) { + return claims.path("preferred_username").asText(); + } + } catch (Exception e) { + log.warn("Invalid JWT format"); + } + return null; + } +} diff --git a/src/main/java/org/frankframework/flow/security/UserWorkspaceContext.java b/src/main/java/org/frankframework/flow/security/UserWorkspaceContext.java new file mode 100644 index 00000000..cb2ebaa3 --- /dev/null +++ b/src/main/java/org/frankframework/flow/security/UserWorkspaceContext.java @@ -0,0 +1,22 @@ +package org.frankframework.flow.security; + +import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import org.springframework.stereotype.Component; +import org.springframework.web.context.annotation.RequestScope; + +@Component +@RequestScope +@Getter +@Setter +public class UserWorkspaceContext implements Serializable { + + private String workspaceId; + private boolean initialized = false; + + public void initialize(String id) { + this.workspaceId = id; + this.initialized = true; + } +} diff --git a/src/main/java/org/frankframework/flow/utility/XmlSecurityUtils.java b/src/main/java/org/frankframework/flow/utility/XmlSecurityUtils.java index dc1462fe..303d9f49 100644 --- a/src/main/java/org/frankframework/flow/utility/XmlSecurityUtils.java +++ b/src/main/java/org/frankframework/flow/utility/XmlSecurityUtils.java @@ -6,10 +6,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerFactory; import lombok.experimental.UtilityClass; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * Utility class for creating secure XML parsers and transformers that prevent XXE vulnerabilities. @@ -67,27 +63,4 @@ public static TransformerFactory createSecureTransformerFactory() { } return factory; } - - /** - * Replaces an element in a document by tag name and attribute value. - * - * @param document The document to search in - * @param tagName The tag name to search for (e.g., "Adapter") - * @param attributeName The attribute name to match (e.g., "name") - * @param attributeValue The attribute value to match - * @param replacementNode The node to replace with - * @return true if the element was found and replaced, false otherwise - */ - public static boolean replaceElementByAttribute( - Document document, String tagName, String attributeName, String attributeValue, Node replacementNode) { - NodeList elements = document.getElementsByTagName(tagName); - for (int i = 0; i < elements.getLength(); i++) { - Element element = (Element) elements.item(i); - if (attributeValue.equals(element.getAttribute(attributeName))) { - element.getParentNode().replaceChild(replacementNode, element); - return true; - } - } - return false; - } } diff --git a/src/main/java/org/frankframework/flow/utility/XmlValidator.java b/src/main/java/org/frankframework/flow/utility/XmlValidator.java index 1a8e7356..cf9ada45 100644 --- a/src/main/java/org/frankframework/flow/utility/XmlValidator.java +++ b/src/main/java/org/frankframework/flow/utility/XmlValidator.java @@ -5,14 +5,14 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import lombok.experimental.UtilityClass; import org.frankframework.flow.project.InvalidXmlContentException; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +@UtilityClass public class XmlValidator { - private XmlValidator() {} - public static void validateXml(String xmlContent) throws InvalidXmlContentException { if (xmlContent == null || xmlContent.isBlank()) { return; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 88d8a134..a9a26def 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,3 +2,6 @@ spring.application.name=Flow cors.allowed.origins=* spring.web.resources.static-locations=classpath:/frontend/ + +spring.servlet.multipart.max-file-size=50MB +spring.servlet.multipart.max-request-size=50MB diff --git a/src/test/java/org/frankframework/flow/FlowApplicationTests.java b/src/test/java/org/frankframework/flow/FlowApplicationTests.java index d6de88a4..1537bfd8 100644 --- a/src/test/java/org/frankframework/flow/FlowApplicationTests.java +++ b/src/test/java/org/frankframework/flow/FlowApplicationTests.java @@ -2,8 +2,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("local") class FlowApplicationTests { @Test diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index ce8e260a..43ad483a 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -1,6 +1,7 @@ package org.frankframework.flow.filetree; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import java.io.IOException; @@ -8,10 +9,12 @@ import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Comparator; import java.util.List; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.filesystem.FileSystemStorage; import org.frankframework.flow.project.Project; import org.frankframework.flow.project.ProjectNotFoundException; import org.frankframework.flow.project.ProjectService; @@ -32,14 +35,42 @@ public class FileTreeServiceTest { @Mock private ProjectService projectService; + @Mock + private FileSystemStorage fileSystemStorage; + private FileTreeService fileTreeService; + private Path tempProjectRoot; private static final String TEST_PROJECT_NAME = "FrankFlowTestProject"; @BeforeEach public void setUp() throws IOException { tempProjectRoot = Files.createTempDirectory("flow_unit_test"); - fileTreeService = new FileTreeService(projectService); + fileTreeService = new FileTreeService(projectService, fileSystemStorage); + + // Configure fileSystemStorage mock to delegate to real filesystem operations. + // toAbsolutePath returns the path as-is since tests use absolute temp paths. + lenient().when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + return Paths.get(path); + }); + + // readFile delegates to the real filesystem + lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + return Files.readString(Paths.get(path)); + }); + + // writeFile delegates to the real filesystem + lenient().doAnswer(invocation -> { + String path = invocation.getArgument(0); + String content = invocation.getArgument(1); + Files.writeString(Paths.get(path), content); + return null; + }).when(fileSystemStorage).writeFile(anyString(), anyString()); + + // Default to local environment + lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); } @AfterEach diff --git a/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java b/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java index 47a281da..4ae74243 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java @@ -6,28 +6,34 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import java.io.OutputStream; import java.nio.file.NoSuchFileException; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.frankframework.flow.configuration.Configuration; +import org.frankframework.flow.filesystem.FileSystemStorage; import org.frankframework.flow.filetree.FileTreeService; import org.frankframework.flow.projectsettings.FilterType; import org.frankframework.flow.projectsettings.InvalidFilterTypeException; import org.frankframework.flow.projectsettings.ProjectSettings; +import org.frankframework.flow.recentproject.RecentProjectsService; import org.frankframework.flow.utility.XmlValidator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; import org.springframework.http.MediaType; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(ProjectController.class) +@AutoConfigureMockMvc(addFilters = false) class ProjectControllerTest { @Autowired @@ -42,9 +48,25 @@ class ProjectControllerTest { @MockitoBean private RecentProjectsService recentProjectsService; + @MockitoBean + private FileSystemStorage fileSystemStorage; + + @MockitoBean + private org.frankframework.flow.security.UserContextFilter userContextFilter; + + @MockitoBean + private org.frankframework.flow.security.UserWorkspaceContext userWorkspaceContext; + + @BeforeEach + void setUp() { + Mockito.reset(projectService); + when(fileSystemStorage.toRelativePath(anyString())).thenAnswer(inv -> inv.getArgument(0)); + } + private Project mockProject() { Project project = mock(Project.class); when(project.getName()).thenReturn("MyProject"); + when(project.getRootPath()).thenReturn("/path/to/MyProject"); Configuration config = mock(Configuration.class); when(config.getFilepath()).thenReturn("config1.xml"); @@ -62,11 +84,6 @@ private Project mockProject() { return project; } - @BeforeEach - void resetMocks() { - Mockito.reset(projectService); - } - @Test void getAllProjectsReturnsExpectedJson() throws Exception { Project project = mockProject(); @@ -75,6 +92,7 @@ void getAllProjectsReturnsExpectedJson() throws Exception { mockMvc.perform(get("/api/projects").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$[0].name").value("MyProject")) + .andExpect(jsonPath("$[0].rootPath").value("/path/to/MyProject")) .andExpect(jsonPath("$[0].filepaths[0]").value("config1.xml")) .andExpect(jsonPath("$[0].filters.ADAPTER").value(true)) .andExpect(jsonPath("$[0].filters.AMQP").value(false)); @@ -90,6 +108,7 @@ void getProjectReturnsExpectedJson() throws Exception { mockMvc.perform(get("/api/projects/MyProject").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.name").value("MyProject")) + .andExpect(jsonPath("$.rootPath").value("/path/to/MyProject")) .andExpect(jsonPath("$.filepaths[0]").value("config1.xml")) .andExpect(jsonPath("$.filters.ADAPTER").value(true)) .andExpect(jsonPath("$.filters.AMQP").value(false)); @@ -126,7 +145,6 @@ void getConfigurationByPathReturnsExpectedJson() throws Exception { .andExpect(jsonPath("$.filepath").value(filepath)) .andExpect(jsonPath("$.content").value(xmlContent)); - // Verify verify(fileTreeService).readFileContent(filepath); } @@ -271,7 +289,7 @@ void updateAdapterFromFileNotFoundReturns404() throws Exception { mockMvc.perform( put("/api/projects/MyProject/adapters") .contentType(MediaType.APPLICATION_JSON) - .content( + .content( """ { "configurationPath": "config1.xml", @@ -322,6 +340,7 @@ void enableFilterTogglesFilterToTrue() throws Exception { Project updatedProject = mock(Project.class); when(updatedProject.getName()).thenReturn("MyProject"); + when(updatedProject.getRootPath()).thenReturn("/path/to/MyProject"); ArrayList configs = new ArrayList<>(project.getConfigurations()); when(updatedProject.getConfigurations()).thenReturn(configs); @@ -380,6 +399,7 @@ void disableFilterTogglesFilterToFalse() throws Exception { Project updatedProject = mock(Project.class); when(updatedProject.getName()).thenReturn("MyProject"); + when(updatedProject.getRootPath()).thenReturn("/path/to/MyProject"); ArrayList configs = new ArrayList<>(project.getConfigurations()); when(updatedProject.getConfigurations()).thenReturn(configs); @@ -427,4 +447,74 @@ void disableFilterInvalidFilterTypeReturns400() throws Exception { verify(projectService).disableFilter("MyProject", filterType); } + + @Test + void exportProjectReturnsZipFile() throws Exception { + doAnswer(invocation -> { + OutputStream os = invocation.getArgument(1); + os.write("fake-zip-content".getBytes()); + return null; + }).when(projectService).exportProjectAsZip(eq("MyProject"), any(OutputStream.class)); + + mockMvc.perform(get("/api/projects/MyProject/export")) + .andExpect(status().isOk()) + .andExpect(header().string("Content-Disposition", "attachment; filename=\"MyProject.zip\"")) + .andExpect(content().contentType("application/zip")); + + verify(projectService).exportProjectAsZip(eq("MyProject"), any(OutputStream.class)); + } + + @Test + void exportProjectNotFoundReturns404() throws Exception { + doThrow(new ProjectNotFoundException("Project not found")) + .when(projectService) + .exportProjectAsZip(eq("Unknown"), any(OutputStream.class)); + + mockMvc.perform(get("/api/projects/Unknown/export")) + .andExpect(status().isNotFound()); + + verify(projectService).exportProjectAsZip(eq("Unknown"), any(OutputStream.class)); + } + + @Test + void importProjectReturnsProjectDto() throws Exception { + Project project = mockProject(); + when(project.getName()).thenReturn("ImportedProject"); + when(project.getRootPath()).thenReturn("/path/to/ImportedProject"); + when(project.getConfigurations()).thenReturn(new ArrayList<>()); + + when(projectService.importProjectFromFiles(eq("ImportedProject"), anyList(), anyList())) + .thenReturn(project); + + MockMultipartFile file1 = new MockMultipartFile( + "files", "Configuration.xml", MediaType.APPLICATION_XML_VALUE, "test".getBytes()); + MockMultipartFile file2 = new MockMultipartFile( + "files", "pom.xml", MediaType.APPLICATION_XML_VALUE, "".getBytes()); + + mockMvc.perform(multipart("/api/projects/import") + .file(file1) + .file(file2) + .param("paths", "src/main/configurations/Configuration.xml", "pom.xml") + .param("projectName", "ImportedProject")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.name").value("ImportedProject")) + .andExpect(jsonPath("$.rootPath").value("/path/to/ImportedProject")); + + verify(projectService).importProjectFromFiles(eq("ImportedProject"), anyList(), anyList()); + verify(recentProjectsService).addRecentProject("ImportedProject", "/path/to/ImportedProject"); + } + + @Test + void importProjectWithMismatchedFilesAndPathsReturnsBadRequest() throws Exception { + MockMultipartFile file1 = new MockMultipartFile( + "files", "Configuration.xml", MediaType.APPLICATION_XML_VALUE, "test".getBytes()); + + mockMvc.perform(multipart("/api/projects/import") + .file(file1) + .param("paths", "path1.xml", "path2.xml") + .param("projectName", "TestProject")) + .andExpect(status().isBadRequest()); + + verify(projectService, never()).importProjectFromFiles(anyString(), anyList(), anyList()); + } } diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index dab459bf..37322c63 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -1,58 +1,188 @@ package org.frankframework.flow.project; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; - +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationNotFoundException; +import org.frankframework.flow.filesystem.FileSystemStorage; import org.frankframework.flow.projectsettings.FilterType; import org.frankframework.flow.projectsettings.InvalidFilterTypeException; +import org.frankframework.flow.recentproject.RecentProject; +import org.frankframework.flow.recentproject.RecentProjectsService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.multipart.MultipartFile; @ExtendWith(MockitoExtension.class) class ProjectServiceTest { + private ProjectService projectService; + @Mock + private FileSystemStorage fileSystemStorage; + + @Mock + private RecentProjectsService recentProjectsService; + + @TempDir + Path tempDir; + + private final List recentProjects = new ArrayList<>(); + @BeforeEach - void init() { - projectService = new ProjectService(); + void init() throws IOException { + lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + + lenient().when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path dirPath = Path.of(dirName); + String projectName = dirPath.getFileName().toString(); + Path projectDir = tempDir.resolve(projectName); + Files.createDirectories(projectDir); + return projectDir; + }); + + lenient().when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + Path p = Path.of(path); + if (p.isAbsolute()) { + return p; + } + return tempDir.resolve(path); + }); + + lenient().doAnswer(invocation -> { + String path = invocation.getArgument(0); + String content = invocation.getArgument(1); + Path filePath = Path.of(path); + if (filePath.getParent() != null) { + Files.createDirectories(filePath.getParent()); + } + Files.writeString(filePath, content, StandardCharsets.UTF_8); + return null; + }) + .when(fileSystemStorage) + .writeFile(anyString(), anyString()); + + lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + return Files.readString(Path.of(path), StandardCharsets.UTF_8); + }); + + lenient().when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + + recentProjects.clear(); + + projectService = new ProjectService(fileSystemStorage, recentProjectsService); } + // ---- Create and retrieve projects ---- + @Test - void testAddingProjectToProjectService() throws ProjectNotFoundException { + void testAddingProjectToProjectService() throws ProjectNotFoundException, IOException { String projectName = "new_project"; - String rootPath = "/path/to/new_project"; assertEquals(0, projectService.getProjects().size()); assertThrows(ProjectNotFoundException.class, () -> projectService.getProject(projectName)); - projectService.createProject(projectName, rootPath); + projectService.createProjectOnDisk(projectName); - assertEquals(1, projectService.getProjects().size()); + // After creation the project is cached, so getProject should find it assertNotNull(projectService.getProject(projectName)); } + @Test + void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { + String projectName = "test_proj"; + + Project project = projectService.createProjectOnDisk(projectName); + + assertNotNull(project); + assertEquals(projectName, project.getName()); + + // Verify that src/main/configurations directory was created + Path configDir = tempDir.resolve(projectName).resolve("src/main/configurations"); + assertTrue(Files.exists(configDir), "configurations directory should exist"); + + // Verify that Configuration.xml was written with default content + Path configFile = configDir.resolve("Configuration.xml"); + assertTrue(Files.exists(configFile), "Configuration.xml should exist"); + String content = Files.readString(configFile, StandardCharsets.UTF_8); + assertTrue(content.contains("DefaultConfig"), "Default configuration content should be written"); + } + + @Test + void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotFoundException { + String projectName = "loaded_proj"; + + projectService.createProjectOnDisk(projectName); + + Project project = projectService.getProject(projectName); + assertNotNull(project); + assertFalse(project.getConfigurations().isEmpty(), "Project should have at least one configuration loaded"); + } + @Test void testGetProjectThrowsProjectNotFound() { assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("missingProject")); } + @Test + void testGetProjectsReturnsEmptyListInitially() { + List projects = projectService.getProjects(); + assertEquals(0, projects.size()); + } + + @Test + void testGetProjectsFromRecentList() throws IOException, ProjectNotFoundException { + // Create a project first so it exists on disk + projectService.createProjectOnDisk("my_project"); + + // Now simulate the recent projects list containing that project + Path projectDir = tempDir.resolve("my_project"); + recentProjects.add(new RecentProject("my_project", projectDir.toString(), "2026-01-01T00:00:00Z")); + + // Clear the cache so getProjects must reload + projectService.invalidateCache(); + + List projects = projectService.getProjects(); + assertEquals(1, projects.size()); + assertEquals("my_project", projects.get(0).getName()); + } + + // ---- Update configuration XML ---- + @Test void testUpdateConfigurationXmlSuccess() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); - Configuration config = new Configuration("config.xml"); - project.getConfigurations().add(config); + // The project should already have at least one configuration from disk + assertFalse(project.getConfigurations().isEmpty()); + Configuration config = project.getConfigurations().get(0); + String filepath = config.getFilepath(); - boolean updated = projectService.updateConfigurationXml("proj", "config.xml", ""); + boolean updated = projectService.updateConfigurationXml("proj", filepath, ""); assertTrue(updated); assertEquals("", config.getXmlContent()); @@ -67,16 +197,18 @@ void testUpdateConfigurationXmlThrowsProjectNotFound() { @Test void testUpdateConfigurationXmlConfigNotFound() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); assertThrows( ConfigurationNotFoundException.class, () -> projectService.updateConfigurationXml("proj", "missingConfig.xml", "")); } + // ---- Filter enable / disable ---- + @Test void testEnableFilterValid() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); Project project = projectService.enableFilter("proj", "ADAPTER"); @@ -85,7 +217,7 @@ void testEnableFilterValid() throws Exception { @Test void testDisableFilterValid() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); // enable first projectService.enableFilter("proj", "ADAPTER"); @@ -101,8 +233,8 @@ void testDisableFilterValid() throws Exception { } @Test - void testEnableFilterInvalidFilterType() { - projectService.createProject("proj", "/path/to/proj"); + void testEnableFilterInvalidFilterType() throws IOException { + projectService.createProjectOnDisk("proj"); InvalidFilterTypeException ex = assertThrows( InvalidFilterTypeException.class, () -> projectService.enableFilter("proj", "INVALID_TYPE")); @@ -111,8 +243,8 @@ void testEnableFilterInvalidFilterType() { } @Test - void testDisableFilterInvalidFilterType() { - projectService.createProject("proj", "/path/to/proj"); + void testDisableFilterInvalidFilterType() throws IOException { + projectService.createProjectOnDisk("proj"); InvalidFilterTypeException ex = assertThrows( InvalidFilterTypeException.class, () -> projectService.disableFilter("proj", "INVALID_TYPE")); @@ -125,7 +257,7 @@ void testEnableFilterProjectNotFound() { ProjectNotFoundException ex = assertThrows( ProjectNotFoundException.class, () -> projectService.enableFilter("unknownProject", "ADAPTER")); - assertTrue(ex.getMessage().contains("Project with name: unknownProject")); + assertTrue(ex.getMessage().contains("unknownProject")); } @Test @@ -133,13 +265,14 @@ void testDisableFilterProjectNotFound() { ProjectNotFoundException ex = assertThrows( ProjectNotFoundException.class, () -> projectService.disableFilter("unknownProject", "ADAPTER")); - assertTrue(ex.getMessage().contains("Project with name: unknownProject")); + assertTrue(ex.getMessage().contains("unknownProject")); } + // ---- Update adapter ---- + @Test void updateAdapterSuccess() throws Exception { - // Arrange - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); String originalXml = @@ -165,10 +298,8 @@ void updateAdapterSuccess() throws Exception { """; - // Act boolean result = projectService.updateAdapter("proj", "conf.xml", "A1", newAdapterXml); - // Assert assertTrue(result); String updatedXml = config.getXmlContent(); assertTrue(updatedXml.contains("999")); @@ -181,12 +312,12 @@ void updateAdapterProjectNotFoundThrows() { ProjectNotFoundException ex = assertThrows(ProjectNotFoundException.class, () -> { projectService.updateAdapter("unknownProject", "conf.xml", "A1", ""); }); - assertTrue(ex.getMessage().contains("Project with name: unknownProject")); + assertTrue(ex.getMessage().contains("unknownProject")); } @Test void updateAdapterConfigurationNotFoundThrows() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); ConfigurationNotFoundException ex = assertThrows(ConfigurationNotFoundException.class, () -> { projectService.updateAdapter("proj", "missing.xml", "A1", ""); @@ -197,7 +328,7 @@ void updateAdapterConfigurationNotFoundThrows() throws Exception { @Test void updateAdapterAdapterNotFoundThrows() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); String xml = @@ -221,7 +352,7 @@ void updateAdapterAdapterNotFoundThrows() throws Exception { @Test void updateAdapterInvalidXmlReturnsFalse() throws Exception { - projectService.createProject("proj", "/path/to/proj"); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); String xml = @@ -242,4 +373,184 @@ void updateAdapterInvalidXmlReturnsFalse() throws Exception { assertFalse(result); assertEquals(xml, config.getXmlContent()); } + + // ---- Import project from files ---- + + @Test + void importProjectFromFilesSuccess() throws Exception { + String projectName = "imported_project"; + + MockMultipartFile configFile = new MockMultipartFile( + "files", + "Configuration.xml", + "application/xml", + "".getBytes(StandardCharsets.UTF_8)); + + MockMultipartFile propsFile = new MockMultipartFile( + "files", + "application.properties", + "text/plain", + "key=value".getBytes(StandardCharsets.UTF_8)); + + List files = List.of(configFile, propsFile); + List paths = + List.of("src/main/configurations/Configuration.xml", "src/main/resources/application.properties"); + + Project project = projectService.importProjectFromFiles(projectName, files, paths); + + assertNotNull(project); + assertEquals(projectName, project.getName()); + + // Verify files were actually written to disk + Path projectDir = tempDir.resolve(projectName); + Path writtenConfig = projectDir.resolve("src/main/configurations/Configuration.xml"); + assertTrue(Files.exists(writtenConfig), "Configuration.xml should be written to disk"); + String writtenContent = Files.readString(writtenConfig, StandardCharsets.UTF_8); + assertTrue(writtenContent.contains("TestAdapter")); + + Path writtenProps = projectDir.resolve("src/main/resources/application.properties"); + assertTrue(Files.exists(writtenProps), "application.properties should be written to disk"); + assertEquals("key=value", Files.readString(writtenProps, StandardCharsets.UTF_8)); + } + + @Test + void importProjectFromFilesLoadsConfigurations() throws Exception { + String projectName = "imported_with_configs"; + + String configXml = + """ + + + + """; + + MockMultipartFile configFile = new MockMultipartFile( + "files", "MyConfig.xml", "application/xml", configXml.getBytes(StandardCharsets.UTF_8)); + + List files = List.of(configFile); + List paths = List.of("src/main/configurations/MyConfig.xml"); + + Project project = projectService.importProjectFromFiles(projectName, files, paths); + + assertNotNull(project); + assertFalse(project.getConfigurations().isEmpty(), "Imported project should have configurations loaded"); + + boolean hasConfig = project.getConfigurations().stream() + .anyMatch(c -> c.getXmlContent().contains("ImportedAdapter")); + assertTrue(hasConfig, "Configuration content should contain the imported adapter"); + } + + @Test + void importProjectFromFilesRejectsPathTraversalWithDoubleDots() { + String projectName = "traversal_project"; + + MockMultipartFile maliciousFile = new MockMultipartFile( + "files", "evil.xml", "application/xml", "".getBytes(StandardCharsets.UTF_8)); + + List files = List.of(maliciousFile); + List paths = List.of("../../../etc/evil.xml"); + + SecurityException ex = assertThrows( + SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); + + assertTrue(ex.getMessage().contains("Invalid file path")); + } + + @Test + void importProjectFromFilesRejectsAbsolutePath() { + String projectName = "abs_path_project"; + + MockMultipartFile maliciousFile = new MockMultipartFile( + "files", "evil.xml", "application/xml", "".getBytes(StandardCharsets.UTF_8)); + + List files = List.of(maliciousFile); + List paths = List.of("/etc/passwd"); + + SecurityException ex = assertThrows( + SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); + + assertTrue(ex.getMessage().contains("Invalid file path")); + } + + @Test + void importProjectFromFilesRejectsBackslashPathTraversal() { + String projectName = "backslash_project"; + + MockMultipartFile maliciousFile = new MockMultipartFile( + "files", "evil.xml", "application/xml", "".getBytes(StandardCharsets.UTF_8)); + + List files = List.of(maliciousFile); + // Backslashes get normalized to forward slashes, but .. is still detected + List paths = List.of("..\\..\\etc\\evil.xml"); + + assertThrows( + SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); + } + + // ---- Cache invalidation ---- + + @Test + void testInvalidateCacheClearsAllProjects() throws Exception { + projectService.createProjectOnDisk("proj1"); + projectService.createProjectOnDisk("proj2"); + + assertNotNull(projectService.getProject("proj1")); + assertNotNull(projectService.getProject("proj2")); + + projectService.invalidateCache(); + + // After invalidation, projects are no longer in cache; without recent projects entries they are not found + assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj1")); + assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj2")); + } + + @Test + void testInvalidateProjectRemovesSingleProject() throws Exception { + projectService.createProjectOnDisk("proj1"); + projectService.createProjectOnDisk("proj2"); + + projectService.invalidateProject("proj1"); + + // proj1 is removed from cache, proj2 remains + assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj1")); + assertNotNull(projectService.getProject("proj2")); + } + + // ---- Open project from disk ---- + + @Test + void testOpenProjectFromDisk() throws Exception { + // Manually create a project directory on disk + String projectName = "manual_project"; + Path projectDir = tempDir.resolve(projectName); + Files.createDirectories(projectDir.resolve("src/main/configurations")); + Files.writeString( + projectDir.resolve("src/main/configurations/TestConfig.xml"), + "", + StandardCharsets.UTF_8); + + Project project = projectService.openProjectFromDisk(projectDir.toString()); + + assertNotNull(project); + assertEquals(projectName, project.getName()); + assertFalse(project.getConfigurations().isEmpty()); + } + + // ---- Add configuration ---- + + @Test + void testAddConfigurationToProject() throws Exception { + projectService.createProjectOnDisk("proj"); + + Project project = projectService.addConfiguration("proj", "NewConfig.xml"); + + boolean hasNewConfig = project.getConfigurations().stream() + .anyMatch(c -> c.getFilepath().equals("NewConfig.xml")); + assertTrue(hasNewConfig, "Project should contain the newly added configuration"); + } + + @Test + void testAddConfigurationProjectNotFound() { + assertThrows(ProjectNotFoundException.class, () -> projectService.addConfiguration("noSuchProject", "Conf.xml")); + } } From afb686c92967d22dcf1ad8f2041be3007c345d3a Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 10:21:22 +0100 Subject: [PATCH 13/26] fix: introduced JGIT and solved sonar hotspot --- pom.xml | 5 ++++ .../flow/project/ProjectService.java | 25 ++++++------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 76b00fe8..d07769c2 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,11 @@ commons-compress ${apache.commons.version} + + org.eclipse.jgit + org.eclipse.jgit + 7.1.0.202411261347-r + org.apache.commons commons-lang3 diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 13895b36..d31dff6a 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -16,6 +16,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import lombok.extern.slf4j.Slf4j; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; import org.frankframework.flow.adapter.AdapterNotFoundException; import org.frankframework.flow.configuration.Configuration; import org.frankframework.flow.configuration.ConfigurationNotFoundException; @@ -135,24 +137,13 @@ public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOEx throw new IllegalArgumentException("Project already exists at: " + targetDir); } - try { - ProcessBuilder processBuilder = new ProcessBuilder("git", "clone", repoUrl, targetDir.toString()); - processBuilder.redirectErrorStream(true); - Process process = processBuilder.start(); - - String output = new String(process.getInputStream().readAllBytes(), StandardCharsets.UTF_8); - int exitCode = process.waitFor(); - - if (exitCode != 0) { - log.error("git clone failed (exit code {}): {}", exitCode, output); - throw new IOException( - "git clone failed: " + output.lines().findFirst().orElse("unknown error")); - } - + try (Git git = Git.cloneRepository() + .setURI(repoUrl) + .setDirectory(targetDir.toFile()) + .call()) { log.info("Cloned repository {} to {}", repoUrl, targetDir); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("git clone was interrupted"); + } catch (GitAPIException e) { + throw new IOException("git clone failed: " + e.getMessage(), e); } return loadProjectAndCache(targetDir.toString()); From ebe5bfe1cce30d1dd4b4d6d34a20eb3f505b599c Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 11:41:55 +0100 Subject: [PATCH 14/26] feat: improved code and tests --- .../datamapper/forms/add-field-form.tsx | 2 +- .../directory-picker/directory-picker.tsx | 16 +- .../file-structure/editor-data-provider.ts | 58 ++++--- src/main/frontend/app/routes/app-layout.tsx | 4 - .../app/routes/datamapper/property-list.tsx | 12 +- .../frontend/app/routes/editor/editor.tsx | 1 - .../projectlanding/clone-project-modal.tsx | 162 +++++++++--------- .../projectlanding/new-project-modal.tsx | 148 ++++++++-------- .../routes/projectlanding/project-landing.tsx | 28 +-- src/main/frontend/app/utils/api.ts | 10 +- .../flow/filetree/FileTreeService.java | 66 ++++--- .../flow/project/ProjectController.java | 10 +- .../flow/project/ProjectService.java | 12 +- .../RecentProjectController.java | 6 +- .../flow/filetree/FileTreeServiceTest.java | 117 +++++++------ .../flow/project/ProjectControllerTest.java | 19 +- .../flow/project/ProjectServiceTest.java | 25 +-- 17 files changed, 353 insertions(+), 343 deletions(-) diff --git a/src/main/frontend/app/components/datamapper/forms/add-field-form.tsx b/src/main/frontend/app/components/datamapper/forms/add-field-form.tsx index 27b87069..7832940c 100644 --- a/src/main/frontend/app/components/datamapper/forms/add-field-form.tsx +++ b/src/main/frontend/app/components/datamapper/forms/add-field-form.tsx @@ -41,7 +41,7 @@ function AddFieldForm({ fieldType, onSave, parents, formatDefinition, initialDat const propertyRules = format?.properties.find((a) => a.name == variableType) setDefaultValueRules(propertyRules?.rules) setDefaultValueInputType(propertyRules?.type) - }, [variableType]) + }, [fieldType, formatDefinition, variableType]) const isFormIncomplete = !variableType || !label diff --git a/src/main/frontend/app/components/directory-picker/directory-picker.tsx b/src/main/frontend/app/components/directory-picker/directory-picker.tsx index 0d3774e4..2da47a6f 100644 --- a/src/main/frontend/app/components/directory-picker/directory-picker.tsx +++ b/src/main/frontend/app/components/directory-picker/directory-picker.tsx @@ -9,7 +9,12 @@ interface DirectoryPickerProperties { rootLabel?: string } -export default function DirectoryPicker({ isOpen, onSelect, onCancel, rootLabel = 'Computer' }: Readonly) { +export default function DirectoryPicker({ + isOpen, + onSelect, + onCancel, + rootLabel = 'Computer', +}: Readonly) { const [currentPath, setCurrentPath] = useState('') const [entries, setEntries] = useState([]) const [selectedEntry, setSelectedEntry] = useState(null) @@ -80,9 +85,7 @@ export default function DirectoryPicker({ isOpen, onSelect, onCancel, rootLabel > .. - - {currentPath || rootLabel} - + {currentPath || rootLabel}
@@ -105,7 +108,10 @@ export default function DirectoryPicker({ isOpen, onSelect, onCancel, rootLabel 📁 {entry.projectRoot && ( - + )} {entry.name} diff --git a/src/main/frontend/app/components/file-structure/editor-data-provider.ts b/src/main/frontend/app/components/file-structure/editor-data-provider.ts index 58735f1b..a5afd510 100644 --- a/src/main/frontend/app/components/file-structure/editor-data-provider.ts +++ b/src/main/frontend/app/components/file-structure/editor-data-provider.ts @@ -24,14 +24,7 @@ export default class EditorFilesDataProvider implements TreeDataProvider { constructor(projectName: string) { this.projectName = projectName - } - - /** - * Public method to initialize data loading. - * Call this from your React component's useEffect. - */ - public async loadData(): Promise { - await this.fetchAndBuildTree() + void this.fetchAndBuildTree() } /** Fetch file tree from backend and build the provider's data */ @@ -47,7 +40,15 @@ export default class EditorFilesDataProvider implements TreeDataProvider { return } - this.buildTreeFromFileTree(tree) + this.data['root'] = { + index: 'root', + data: { name: tree.name, path: tree.path, projectRoot: true }, + isFolder: true, + children: [], + } + + this.data['root'].children = this.buildChildren('root', tree.children) + this.loadedDirectories.add(tree.path) this.notifyListeners(['root']) } catch (error) { console.error('[EditorFilesDataProvider] Unexpected error loading tree:', error) @@ -65,34 +66,35 @@ export default class EditorFilesDataProvider implements TreeDataProvider { const directory = await fetchDirectoryByPath(this.projectName, item.data.path) if (!directory) { console.warn('[EditorFilesDataProvider] Received empty directory from API') - this.data = {} return } - const sortedChildren = sortChildren(directory.children) - - const children: TreeItemIndex[] = [] + item.children = this.buildChildren(itemId, directory.children) + this.loadedDirectories.add(item.data.path) + this.notifyListeners([itemId]) + } catch (error) { + console.error('Failed to load directory', error) + } + } - for (const child of sortedChildren) { - const childIndex = `${itemId}/${child.name}` + private buildChildren(parentIndex: TreeItemIndex, children?: FileTreeNode[]): TreeItemIndex[] { + const sorted = sortChildren(children) + const childIds: TreeItemIndex[] = [] - this.data[childIndex] = { - index: childIndex, - data: { name: child.name, path: child.path, projectRoot: node.projectRoot }, - isFolder: child.type === 'DIRECTORY', - children: child.type === 'DIRECTORY' ? [] : undefined, - } + for (const child of sorted) { + const childIndex = `${parentIndex}/${child.name}` - children.push(childIndex) + this.data[childIndex] = { + index: childIndex, + data: { name: child.name, path: child.path }, + isFolder: child.type === 'DIRECTORY', + children: child.type === 'DIRECTORY' ? [] : undefined, } - item.children = children - - this.loadedDirectories.add(item.data.path) - this.notifyListeners([itemId]) - } catch (error) { - console.error('Failed to load directory', error) + childIds.push(childIndex) } + + return childIds } public async getAllItems(): Promise[]> { diff --git a/src/main/frontend/app/routes/app-layout.tsx b/src/main/frontend/app/routes/app-layout.tsx index b164b82a..c80d97d5 100644 --- a/src/main/frontend/app/routes/app-layout.tsx +++ b/src/main/frontend/app/routes/app-layout.tsx @@ -7,12 +7,8 @@ import { fetchProject } from '~/services/project-service' import LoadingSpinner from '~/components/loading-spinner' import type { Project } from '~/types/project.types' import { Toast } from '~/components/toast' -import { ToastContainer } from 'react-toastify' -import { useTheme } from '~/hooks/use-theme' export default function AppLayout() { - const theme = useTheme() - const [restoring, setRestoring] = useState(!!getStoredProjectName()) useEffect(() => { diff --git a/src/main/frontend/app/routes/datamapper/property-list.tsx b/src/main/frontend/app/routes/datamapper/property-list.tsx index aa5f968d..acd201c8 100644 --- a/src/main/frontend/app/routes/datamapper/property-list.tsx +++ b/src/main/frontend/app/routes/datamapper/property-list.tsx @@ -98,7 +98,7 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) { setEditingMapping, openMapping, }) - }, []) //UseMemo is used here to ensure nodetype is not changed throughout rerenders. If the variable is update reactflow throws a warning in the console; + }, [flow, openMapping]) //UseMemo is used here to ensure nodetype is not changed throughout rerenders. If the variable is update reactflow throws a warning in the console; useEffect(() => { if (!reactFlowInstance) return @@ -117,7 +117,7 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) { return () => { window.removeEventListener('resize', updateSize) } - }, [reactFlowInstance]) + }, [flow, reactFlowInstance]) useEffect(() => { if (!reactFlowInstance) return @@ -126,12 +126,12 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) { type: 'SET_PROPERTY_DATA', payload: reactFlowInstance.toObject(), }) - }, [reactFlowNodes, edges]) + }, [reactFlowNodes, edges, reactFlowInstance, configDispatch]) //Updates the outer canvas whenever something is added useEffect(() => { setCanvasSize((size) => flow.updateCanvasSize(reactFlowNodes, size)) - }, [reactFlowNodes]) + }, [flow, reactFlowNodes]) useEffect(() => { if (!reactFlowInstance || initHasRun.current) return @@ -150,7 +150,7 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) { flow.importMultipleSchematics(sourceSchematics) } clearFiles() - }, [reactFlowInstance]) + }, [clearFiles, config.propertyData.nodes, flow, reactFlowInstance, sourceSchematics, targetSchematic]) const onReactFlowNodeChange = useCallback( (changes: NodeChange[]) => setReactFlowNodes((nodes) => applyNodeChanges(changes, nodes) as Node[]), @@ -191,7 +191,7 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) { } restoreFlow() - }, [setReactFlowNodes]) + }, [config.propertyData, flow]) function openMapping() { requestAnimationFrame(() => { diff --git a/src/main/frontend/app/routes/editor/editor.tsx b/src/main/frontend/app/routes/editor/editor.tsx index f3bbc5d3..d30d0949 100644 --- a/src/main/frontend/app/routes/editor/editor.tsx +++ b/src/main/frontend/app/routes/editor/editor.tsx @@ -1,6 +1,5 @@ import Editor, { type Monaco, type OnMount } from '@monaco-editor/react' import { useShallow } from 'zustand/react/shallow' -import { toast, ToastContainer } from 'react-toastify' import { toast } from 'react-toastify' import SidebarHeader from '~/components/sidebars-layout/sidebar-header' import SidebarLayout from '~/components/sidebars-layout/sidebar-layout' diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx index e295a64a..2ae5e7f6 100644 --- a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -9,11 +9,11 @@ interface CloneProjectModalProperties { } export default function CloneProjectModal({ - isOpen, - isLocal, - onClose, - onClone - }: Readonly) { + isOpen, + isLocal, + onClose, + onClone, +}: Readonly) { const [repoUrl, setRepoUrl] = useState('') const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) @@ -28,16 +28,16 @@ export default function CloneProjectModal({ if (!isOpen) return null const repoName = repoUrl - .split('/') - .pop() - ?.replace(/\.git$/, '') + .split('/') + .pop() + ?.replace(/\.git$/, '') const handleClone = () => { // Validatie: Repo URL is altijd nodig. Location alleen als lokaal. if (!repoUrl.trim()) return if (isLocal && !location) return - let finalPath = '' + let finalPath: string if (isLocal) { const separator = location.includes('/') ? '/' : '\\' @@ -60,79 +60,79 @@ export default function CloneProjectModal({ } return ( - <> -
-
-

Clone Repository

-

- {isLocal ? "Clone a Git repository to a local folder" : "Clone a Git repository into the workspace"} -

- -
- -
- - - -
-
- -
- - setRepoUrl(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="https://github.com/user/repo.git" - aria-label="repository url" - /> -
- - {repoName && ( -

- Will clone to: {isLocal ? `${location}/${repoName}` : `${location ? `${location}/` : ''}${repoName}`} -

- )} - -
- - - -
-
+ <> +
+
+

Clone Repository

+

+ {isLocal ? 'Clone a Git repository to a local folder' : 'Clone a Git repository into the workspace'} +

+ +
+ +
+ + +
- - { - setLocation(path) - setShowPicker(false) - }} - onCancel={() => setShowPicker(false)} +
+ +
+ + setRepoUrl(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="https://github.com/user/repo.git" + aria-label="repository url" /> - +
+ + {repoName && ( +

+ Will clone to: {isLocal ? `${location}/${repoName}` : `${location ? `${location}/` : ''}${repoName}`} +

+ )} + +
+ + + +
+
+
+ + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} + /> + ) } diff --git a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx index b69d048c..846c1097 100644 --- a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx @@ -8,12 +8,7 @@ interface NewProjectModalProperties { onCreate: (pathOrName: string) => void } -export default function NewProjectModal({ - isOpen, - isLocal, - onClose, - onCreate - }: Readonly) { +export default function NewProjectModal({ isOpen, isLocal, onClose, onCreate }: Readonly) { const [name, setName] = useState('') const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) @@ -53,77 +48,78 @@ export default function NewProjectModal({ } return ( - <> -
-
-

New Project

-

- {isLocal ? "Create a new Frank! project on disk" : "Create a new project in the workspace"} -

- -
- -
- - - -
-
- -
- - setName(event.target.value)} - className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" - placeholder="Enter project name" - /> -
- - {name.trim() && ( -

- Project will be created at: {isLocal ? `${location}/${name.trim()}` : `${location ? `${location}/` : ''}${name.trim()}`} -

- )} - -
- - - -
-
+ <> +
+
+

New Project

+

+ {isLocal ? 'Create a new Frank! project on disk' : 'Create a new project in the workspace'} +

+ +
+ +
+ + +
- - { - setLocation(path) - setShowPicker(false) - }} - onCancel={() => setShowPicker(false)} +
+ +
+ + setName(event.target.value)} + className="border-border bg-background focus:border-foreground-active focus:ring-foreground-active w-full rounded border px-2 py-1 text-sm transition focus:ring-2 focus:outline-none" + placeholder="Enter project name" /> - +
+ + {name.trim() && ( +

+ Project will be created at:{' '} + {isLocal ? `${location}/${name.trim()}` : `${location ? `${location}/` : ''}${name.trim()}`} +

+ )} + +
+ + + +
+
+
+ + { + setLocation(path) + setShowPicker(false) + }} + onCancel={() => setShowPicker(false)} + /> + ) } diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index acad4d41..a42a3d8c 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -112,6 +112,7 @@ export default function ProjectLanding() { } } + // eslint-disable-next-line unicorn/consistent-function-scoping const onExportProject = async (projectName: string) => { try { await exportProject(projectName) @@ -168,23 +169,24 @@ export default function ProjectLanding() {
{!isLocalEnvironment && ( -
- Cloud workspace projects are automatically removed after 24 hours of inactivity. - Use Export to download a backup. +
+ Cloud workspace projects are automatically removed after 24 hours of inactivity. Use Export to download a + backup.
)} - + {!isLocalEnvironment && ( + + )} { - const STORAGE_KEY = 'frankflow_anon_session_id'; + const STORAGE_KEY = 'frankflow_anon_session_id' let id = sessionStorage.getItem(STORAGE_KEY) if (!id) { id = crypto.randomUUID() @@ -44,17 +44,17 @@ export async function apiFetch(path: string, options?: RequestInit): Promise< const headers: Record = { ...defaultHeaders, 'X-Session-ID': getAnonymousSessionId(), - ...(options?.headers as Record) + ...(options?.headers as Record), } - const token = getAuthToken(); + const token = getAuthToken() if (token) { - headers['Authorization'] = `Bearer ${token}`; + headers['Authorization'] = `Bearer ${token}` } const response = await fetch(apiUrl(path), { ...options, - headers + headers, }) if (!response.ok) { diff --git a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java index 2b76b02c..2b33ff92 100644 --- a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java +++ b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java @@ -81,7 +81,7 @@ public FileTreeNode getProjectTree(String projectName) throws IOException { boolean useRelativePaths = !fileSystemStorage.isLocalEnvironment(); Path relativizeRoot = useRelativePaths ? fileSystemStorage.toAbsolutePath("") : projectPath; - FileTreeNode tree = b(projectPath, relativizeRoot, useRelativePaths); + FileTreeNode tree = buildTree(projectPath, relativizeRoot, useRelativePaths); tree.setProjectRoot(true); treeCache.put(projectName, tree); return tree; @@ -91,43 +91,59 @@ public FileTreeNode getProjectTree(String projectName) throws IOException { } public FileTreeNode getShallowDirectoryTree(String projectName, String directoryPath) throws IOException { - Path dirPath = projectsRoot.resolve(projectName).resolve(directoryPath).normalize(); + try { + var project = projectService.getProject(projectName); + Path projectPath = fileSystemStorage.toAbsolutePath(project.getRootPath()); + Path dirPath = projectPath.resolve(directoryPath).normalize(); - if (!dirPath.startsWith(projectsRoot.resolve(projectName))) { - throw new SecurityException("Invalid path: outside project directory"); - } + if (!dirPath.startsWith(projectPath)) { + throw new SecurityException("Invalid path: outside project directory"); + } - if (!Files.exists(dirPath) || !Files.isDirectory(dirPath)) { - throw new IllegalArgumentException("Directory does not exist: " + dirPath); - } + if (!Files.exists(dirPath) || !Files.isDirectory(dirPath)) { + throw new IllegalArgumentException("Directory does not exist: " + dirPath); + } - return buildShallowTree(dirPath); + return buildShallowTree(dirPath); + } catch (ProjectNotFoundException e) { + throw new IllegalArgumentException("Project does not exist: " + projectName); + } } public FileTreeNode getShallowConfigurationsDirectoryTree(String projectName) throws IOException { - Path configDirPath = projectsRoot - .resolve(projectName) - .resolve("src/main/configurations") - .normalize(); + try { + var project = projectService.getProject(projectName); + Path configDirPath = fileSystemStorage + .toAbsolutePath(project.getRootPath()) + .resolve("src/main/configurations") + .normalize(); - if (!Files.exists(configDirPath) || !Files.isDirectory(configDirPath)) { - throw new IllegalArgumentException("Configurations directory does not exist: " + configDirPath); - } + if (!Files.exists(configDirPath) || !Files.isDirectory(configDirPath)) { + throw new IllegalArgumentException("Configurations directory does not exist: " + configDirPath); + } - return buildShallowTree(configDirPath); + return buildShallowTree(configDirPath); + } catch (ProjectNotFoundException e) { + throw new IllegalArgumentException("Configurations directory does not exist: " + projectName); + } } public FileTreeNode getConfigurationsDirectoryTree(String projectName) throws IOException { - Path configDirPath = projectsRoot - .resolve(projectName) - .resolve("src/main/configurations") - .normalize(); + try { + var project = projectService.getProject(projectName); + Path projectPath = fileSystemStorage.toAbsolutePath(project.getRootPath()); + Path configDirPath = projectPath.resolve("src/main/configurations").normalize(); - if (!Files.exists(configDirPath) || !Files.isDirectory(configDirPath)) { - throw new IllegalArgumentException("Configurations directory does not exist: " + configDirPath); - } + if (!Files.exists(configDirPath) || !Files.isDirectory(configDirPath)) { + throw new IllegalArgumentException("Configurations directory does not exist: " + configDirPath); + } - return buildTree(configDirPath); + boolean useRelativePaths = !fileSystemStorage.isLocalEnvironment(); + Path relativizeRoot = useRelativePaths ? fileSystemStorage.toAbsolutePath("") : projectPath; + return buildTree(configDirPath, relativizeRoot, useRelativePaths); + } catch (ProjectNotFoundException e) { + throw new IllegalArgumentException("Configurations directory does not exist: " + projectName); + } } public void invalidateTreeCache() { diff --git a/src/main/java/org/frankframework/flow/project/ProjectController.java b/src/main/java/org/frankframework/flow/project/ProjectController.java index 73199776..211d18e9 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectController.java +++ b/src/main/java/org/frankframework/flow/project/ProjectController.java @@ -75,12 +75,12 @@ public ResponseEntity getProject(@PathVariable String projectName) t return ResponseEntity.ok(toDto(project)); } - @GetMapping(value = "/{projectname}", params = "path") - public FileTreeNode getDirectoryContent(@PathVariable String projectname, @RequestParam String path) - throws IOException { + @GetMapping(value = "/{projectname}", params = "path") + public FileTreeNode getDirectoryContent(@PathVariable String projectname, @RequestParam String path) + throws IOException { - return fileTreeService.getShallowDirectoryTree(projectname, path); - } + return fileTreeService.getShallowDirectoryTree(projectname, path); + } @PostMapping public ResponseEntity createProject(@RequestBody ProjectCreateDTO projectCreateDTO) throws IOException { diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index d31dff6a..2d11e320 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -3,7 +3,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; -import java.nio.charset.MalformedInputException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -27,16 +26,12 @@ import org.frankframework.flow.projectsettings.InvalidFilterTypeException; import org.frankframework.flow.recentproject.RecentProject; import org.frankframework.flow.recentproject.RecentProjectsService; -import org.frankframework.flow.utility.XmlSecurityUtils; -import org.springframework.context.annotation.Lazy; import org.frankframework.flow.utility.XmlAdapterUtils; import org.frankframework.flow.utility.XmlSecurityUtils; - +import org.springframework.context.annotation.Lazy; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import org.w3c.dom.Node; -import org.xml.sax.SAXParseException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXParseException; @@ -142,7 +137,7 @@ public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOEx .setDirectory(targetDir.toFile()) .call()) { log.info("Cloned repository {} to {}", repoUrl, targetDir); - } catch (GitAPIException e) { + } catch (GitAPIException e) { throw new IOException("git clone failed: " + e.getMessage(), e); } @@ -312,8 +307,7 @@ public boolean updateAdapter(String projectName, String configurationPath, Strin Node newAdapterNode = configDoc.importNode(newAdapterDoc.getDocumentElement(), true); - if (!XmlAdapterUtils.replaceAdapterInDocument( - configDoc, adapterName, newAdapterNode)) { + if (!XmlAdapterUtils.replaceAdapterInDocument(configDoc, adapterName, newAdapterNode)) { throw new AdapterNotFoundException("Adapter not found: " + adapterName); } diff --git a/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java index af68b006..d2260916 100644 --- a/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java +++ b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java @@ -27,10 +27,8 @@ public ResponseEntity> getRecentProjects() { if (!fileSystemStorage.isLocalEnvironment()) { projects = projects.stream() - .map(p -> new RecentProject( - p.name(), - fileSystemStorage.toRelativePath(p.rootPath()), - p.lastOpened())) + .map(p -> + new RecentProject(p.name(), fileSystemStorage.toRelativePath(p.rootPath()), p.lastOpened())) .toList(); } diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index 43ad483a..81d5f308 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -10,6 +10,7 @@ import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.Comparator; import java.util.List; import org.frankframework.flow.adapter.AdapterNotFoundException; @@ -62,12 +63,15 @@ public void setUp() throws IOException { }); // writeFile delegates to the real filesystem - lenient().doAnswer(invocation -> { - String path = invocation.getArgument(0); - String content = invocation.getArgument(1); - Files.writeString(Paths.get(path), content); - return null; - }).when(fileSystemStorage).writeFile(anyString(), anyString()); + lenient() + .doAnswer(invocation -> { + String path = invocation.getArgument(0); + String content = invocation.getArgument(1); + Files.writeString(Paths.get(path), content); + return null; + }) + .when(fileSystemStorage) + .writeFile(anyString(), anyString()); // Default to local environment lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); @@ -238,57 +242,61 @@ void integration_MultipleOperations() throws IOException { } @Test - public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOException { + public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOException, ProjectNotFoundException { + // Create project structure + Files.writeString(tempProjectRoot.resolve("config1.xml"), ""); + Files.writeString(tempProjectRoot.resolve("readme.txt"), "hello"); - // Add one more file in ProjectA to test multiple children - Path additionalFile = tempRoot.resolve("ProjectA/readme.txt"); - Files.writeString(additionalFile, "hello"); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); - FileTreeNode node = fileTreeService.getShallowDirectoryTree("ProjectA", "."); + FileTreeNode node = fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "."); assertNotNull(node); - assertEquals("ProjectA", node.getName()); assertEquals(NodeType.DIRECTORY, node.getType()); assertNotNull(node.getChildren()); - - // We expect two children now: config1.xml and readme.txt assertEquals(2, node.getChildren().size()); - // Verify children names assertTrue(node.getChildren().stream().anyMatch(c -> c.getName().equals("config1.xml"))); assertTrue(node.getChildren().stream().anyMatch(c -> c.getName().equals("readme.txt"))); } @Test - void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() { + void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() throws ProjectNotFoundException { + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + SecurityException ex = assertThrows( - SecurityException.class, () -> fileTreeService.getShallowDirectoryTree("ProjectA", "../ProjectB")); + SecurityException.class, + () -> fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "../other")); assertTrue(ex.getMessage().contains("Invalid path")); } @Test - void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExist() { + void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExist() throws ProjectNotFoundException { + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + IllegalArgumentException ex = assertThrows( IllegalArgumentException.class, - () -> fileTreeService.getShallowDirectoryTree("ProjectA", "nonexistent")); + () -> fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "nonexistent")); assertTrue(ex.getMessage().contains("Directory does not exist")); } @Test - public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory() throws IOException { - // Move the existing config1.xml into the expected configurations folder - Path configsDir = tempRoot.resolve("ProjectA/src/main/configurations"); + public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory() + throws IOException, ProjectNotFoundException { + Path configsDir = tempProjectRoot.resolve("src/main/configurations"); Files.createDirectories(configsDir); - Files.move( - tempRoot.resolve("ProjectA/config1.xml"), - configsDir.resolve("config1.xml"), - StandardCopyOption.REPLACE_EXISTING); - + Files.writeString(configsDir.resolve("config1.xml"), ""); Files.writeString(configsDir.resolve("readme.txt"), "hello"); - FileTreeNode node = fileTreeService.getShallowConfigurationsDirectoryTree("ProjectA"); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + + FileTreeNode node = fileTreeService.getShallowConfigurationsDirectoryTree(TEST_PROJECT_NAME); assertNotNull(node); assertEquals("configurations", node.getName().toLowerCase()); @@ -301,18 +309,21 @@ public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory } @Test - public void getShallowConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() { - // No src/main/configurations created for ProjectB + public void getShallowConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + IllegalArgumentException ex = assertThrows( IllegalArgumentException.class, - () -> fileTreeService.getShallowConfigurationsDirectoryTree("ProjectB")); + () -> fileTreeService.getShallowConfigurationsDirectoryTree(TEST_PROJECT_NAME)); assertTrue(ex.getMessage().contains("Configurations directory does not exist")); } @Test - public void getShallowConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() { - // Project does not exist + public void getShallowConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() throws ProjectNotFoundException { + when(projectService.getProject("NonExistentProject")).thenThrow(new ProjectNotFoundException("err")); + IllegalArgumentException ex = assertThrows( IllegalArgumentException.class, () -> fileTreeService.getShallowConfigurationsDirectoryTree("NonExistentProject")); @@ -321,57 +332,55 @@ public void getShallowConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() { } @Test - public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() throws IOException { - // Reuse the existing setup: create the configurations folder - Path configsDir = tempRoot.resolve("ProjectA/src/main/configurations"); + public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() + throws IOException, ProjectNotFoundException { + Path configsDir = tempProjectRoot.resolve("src/main/configurations"); Files.createDirectories(configsDir); - - // Move existing config1.xml into this folder - Files.move( - tempRoot.resolve("ProjectA/config1.xml"), - configsDir.resolve("config1.xml"), - StandardCopyOption.REPLACE_EXISTING); - - // Add an extra file and subdirectory to test recursion + Files.writeString(configsDir.resolve("config1.xml"), ""); Files.writeString(configsDir.resolve("readme.txt"), "hello"); Path subDir = configsDir.resolve("subconfigs"); Files.createDirectory(subDir); Files.writeString(subDir.resolve("nested.xml"), ""); - FileTreeNode node = fileTreeService.getConfigurationsDirectoryTree("ProjectA"); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + + FileTreeNode node = fileTreeService.getConfigurationsDirectoryTree(TEST_PROJECT_NAME); assertNotNull(node); assertEquals("configurations", node.getName().toLowerCase()); assertEquals(NodeType.DIRECTORY, node.getType()); assertNotNull(node.getChildren()); - assertEquals(3, node.getChildren().size()); // config1.xml, readme.txt, subconfigs + assertEquals(3, node.getChildren().size()); - // Check for files assertTrue(node.getChildren().stream().anyMatch(c -> c.getName().equals("config1.xml"))); assertTrue(node.getChildren().stream().anyMatch(c -> c.getName().equals("readme.txt"))); - // Check for subdirectory FileTreeNode subConfigNode = node.getChildren().stream() .filter(c -> c.getName().equals("subconfigs")) .findFirst() .orElseThrow(); assertEquals(NodeType.DIRECTORY, subConfigNode.getType()); assertEquals(1, subConfigNode.getChildren().size()); - assertEquals("nested.xml", subConfigNode.getChildren().get(0).getName()); + assertEquals("nested.xml", subConfigNode.getChildren().getFirst().getName()); } @Test - public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() { - // The "src/main/configurations" folder does NOT exist yet + public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); + IllegalArgumentException ex = assertThrows( - IllegalArgumentException.class, () -> fileTreeService.getConfigurationsDirectoryTree("ProjectA")); + IllegalArgumentException.class, + () -> fileTreeService.getConfigurationsDirectoryTree(TEST_PROJECT_NAME)); assertTrue(ex.getMessage().contains("Configurations directory does not exist")); } @Test - public void getConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() { - // Project folder itself does not exist + public void getConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() throws ProjectNotFoundException { + when(projectService.getProject("NonExistingProject")).thenThrow(new ProjectNotFoundException("err")); + IllegalArgumentException ex = assertThrows( IllegalArgumentException.class, () -> fileTreeService.getConfigurationsDirectoryTree("NonExistingProject")); diff --git a/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java b/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java index 4ae74243..ff1df8ee 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectControllerTest.java @@ -289,7 +289,7 @@ void updateAdapterFromFileNotFoundReturns404() throws Exception { mockMvc.perform( put("/api/projects/MyProject/adapters") .contentType(MediaType.APPLICATION_JSON) - .content( + .content( """ { "configurationPath": "config1.xml", @@ -451,10 +451,12 @@ void disableFilterInvalidFilterTypeReturns400() throws Exception { @Test void exportProjectReturnsZipFile() throws Exception { doAnswer(invocation -> { - OutputStream os = invocation.getArgument(1); - os.write("fake-zip-content".getBytes()); - return null; - }).when(projectService).exportProjectAsZip(eq("MyProject"), any(OutputStream.class)); + OutputStream os = invocation.getArgument(1); + os.write("fake-zip-content".getBytes()); + return null; + }) + .when(projectService) + .exportProjectAsZip(eq("MyProject"), any(OutputStream.class)); mockMvc.perform(get("/api/projects/MyProject/export")) .andExpect(status().isOk()) @@ -470,8 +472,7 @@ void exportProjectNotFoundReturns404() throws Exception { .when(projectService) .exportProjectAsZip(eq("Unknown"), any(OutputStream.class)); - mockMvc.perform(get("/api/projects/Unknown/export")) - .andExpect(status().isNotFound()); + mockMvc.perform(get("/api/projects/Unknown/export")).andExpect(status().isNotFound()); verify(projectService).exportProjectAsZip(eq("Unknown"), any(OutputStream.class)); } @@ -488,8 +489,8 @@ void importProjectReturnsProjectDto() throws Exception { MockMultipartFile file1 = new MockMultipartFile( "files", "Configuration.xml", MediaType.APPLICATION_XML_VALUE, "test".getBytes()); - MockMultipartFile file2 = new MockMultipartFile( - "files", "pom.xml", MediaType.APPLICATION_XML_VALUE, "".getBytes()); + MockMultipartFile file2 = + new MockMultipartFile("files", "pom.xml", MediaType.APPLICATION_XML_VALUE, "".getBytes()); mockMvc.perform(multipart("/api/projects/import") .file(file1) diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index 37322c63..290a1d56 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -6,9 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.when; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -71,7 +69,8 @@ void init() throws IOException { return tempDir.resolve(path); }); - lenient().doAnswer(invocation -> { + lenient() + .doAnswer(invocation -> { String path = invocation.getArgument(0); String content = invocation.getArgument(1); Path filePath = Path.of(path); @@ -154,24 +153,19 @@ void testGetProjectsReturnsEmptyListInitially() { } @Test - void testGetProjectsFromRecentList() throws IOException, ProjectNotFoundException { - // Create a project first so it exists on disk + void testGetProjectsFromRecentList() throws IOException { projectService.createProjectOnDisk("my_project"); - // Now simulate the recent projects list containing that project Path projectDir = tempDir.resolve("my_project"); recentProjects.add(new RecentProject("my_project", projectDir.toString(), "2026-01-01T00:00:00Z")); - // Clear the cache so getProjects must reload projectService.invalidateCache(); List projects = projectService.getProjects(); assertEquals(1, projects.size()); - assertEquals("my_project", projects.get(0).getName()); + assertEquals("my_project", projects.getFirst().getName()); } - // ---- Update configuration XML ---- - @Test void testUpdateConfigurationXmlSuccess() throws Exception { projectService.createProjectOnDisk("proj"); @@ -387,10 +381,7 @@ void importProjectFromFilesSuccess() throws Exception { "".getBytes(StandardCharsets.UTF_8)); MockMultipartFile propsFile = new MockMultipartFile( - "files", - "application.properties", - "text/plain", - "key=value".getBytes(StandardCharsets.UTF_8)); + "files", "application.properties", "text/plain", "key=value".getBytes(StandardCharsets.UTF_8)); List files = List.of(configFile, propsFile); List paths = @@ -483,8 +474,7 @@ void importProjectFromFilesRejectsBackslashPathTraversal() { // Backslashes get normalized to forward slashes, but .. is still detected List paths = List.of("..\\..\\etc\\evil.xml"); - assertThrows( - SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); + assertThrows(SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); } // ---- Cache invalidation ---- @@ -551,6 +541,7 @@ void testAddConfigurationToProject() throws Exception { @Test void testAddConfigurationProjectNotFound() { - assertThrows(ProjectNotFoundException.class, () -> projectService.addConfiguration("noSuchProject", "Conf.xml")); + assertThrows( + ProjectNotFoundException.class, () -> projectService.addConfiguration("noSuchProject", "Conf.xml")); } } From 3a4343548b2fd3041b3bde16fa17deafb9e45900 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 11:48:07 +0100 Subject: [PATCH 15/26] chore: applied spotless --- .../flow/project/ProjectService.java | 2 +- .../flow/filetree/FileTreeServiceTest.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 2d11e320..93ae072e 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -137,7 +137,7 @@ public Project cloneAndOpenProject(String repoUrl, String localPath) throws IOEx .setDirectory(targetDir.toFile()) .call()) { log.info("Cloned repository {} to {}", repoUrl, targetDir); - } catch (GitAPIException e) { + } catch (GitAPIException e) { throw new IOException("git clone failed: " + e.getMessage(), e); } diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index 81d5f308..8ffe0125 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -10,7 +10,6 @@ import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; import java.util.Comparator; import java.util.List; import org.frankframework.flow.adapter.AdapterNotFoundException; @@ -247,7 +246,8 @@ public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOExcep Files.writeString(tempProjectRoot.resolve("config1.xml"), ""); Files.writeString(tempProjectRoot.resolve("readme.txt"), "hello"); - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); FileTreeNode node = fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "."); @@ -263,19 +263,21 @@ public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOExcep @Test void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() throws ProjectNotFoundException { - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); SecurityException ex = assertThrows( - SecurityException.class, - () -> fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "../other")); + SecurityException.class, () -> fileTreeService.getShallowDirectoryTree(TEST_PROJECT_NAME, "../other")); assertTrue(ex.getMessage().contains("Invalid path")); } @Test - void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExist() throws ProjectNotFoundException { - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExist() + throws ProjectNotFoundException { + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); IllegalArgumentException ex = assertThrows( @@ -293,7 +295,8 @@ public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory Files.writeString(configsDir.resolve("config1.xml"), ""); Files.writeString(configsDir.resolve("readme.txt"), "hello"); - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); FileTreeNode node = fileTreeService.getShallowConfigurationsDirectoryTree(TEST_PROJECT_NAME); @@ -310,7 +313,8 @@ public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory @Test public void getShallowConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); IllegalArgumentException ex = assertThrows( @@ -342,7 +346,8 @@ public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() Files.createDirectory(subDir); Files.writeString(subDir.resolve("nested.xml"), ""); - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); FileTreeNode node = fileTreeService.getConfigurationsDirectoryTree(TEST_PROJECT_NAME); @@ -367,7 +372,8 @@ public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() @Test public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { - Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); + Project project = + new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); IllegalArgumentException ex = assertThrows( From 9c59d52d1f8ee756be5ee9c2310191073f209c1c Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 11:54:29 +0100 Subject: [PATCH 16/26] fix: improved failing FileTreeService test --- .../org/frankframework/flow/filetree/FileTreeServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index 8ffe0125..34aa3121 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -178,7 +178,8 @@ public void getProjectTree_ProjectMissing() throws ProjectNotFoundException { } @Test - void getProjectTreeThrowsIfProjectDoesNotExist() { + void getProjectTreeThrowsIfProjectDoesNotExist() throws ProjectNotFoundException { + when(projectService.getProject("NonExistentProject")).thenThrow(new ProjectNotFoundException("err")); IllegalArgumentException exception = assertThrows( IllegalArgumentException.class, () -> fileTreeService.getProjectTree("NonExistentProject")); assertTrue(exception.getMessage().contains("Project does not exist: NonExistentProject")); From bc35a3836ca7f95655ff3e4b973f068ecd93b825 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 12:14:08 +0100 Subject: [PATCH 17/26] fix: solved sonar security issues and added tests to cover new implementation --- .../LocalFileSystemStorageService.java | 29 ++- .../flow/project/ProjectService.java | 14 +- .../CloudFileSystemStorageServiceTest.java | 191 ++++++++++++++++ .../LocalFileSystemStorageServiceTest.java | 141 ++++++++++++ .../WorkspaceCleanupServiceTest.java | 121 ++++++++++ .../RecentProjectsServiceTest.java | 210 ++++++++++++++++++ .../flow/security/UserContextFilterTest.java | 188 ++++++++++++++++ 7 files changed, 888 insertions(+), 6 deletions(-) create mode 100644 src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java create mode 100644 src/test/java/org/frankframework/flow/filesystem/LocalFileSystemStorageServiceTest.java create mode 100644 src/test/java/org/frankframework/flow/filesystem/WorkspaceCleanupServiceTest.java create mode 100644 src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java create mode 100644 src/test/java/org/frankframework/flow/security/UserContextFilterTest.java diff --git a/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java index eaa2f7d1..ad9d54cc 100644 --- a/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java +++ b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -32,7 +33,7 @@ public List listRoots() { @Override public List listDirectory(String path) throws IOException { - Path dir = Paths.get(path).toAbsolutePath().normalize(); + Path dir = sanitizePath(path); List entries = new ArrayList<>(); try (Stream stream = Files.list(dir)) { @@ -47,23 +48,41 @@ public List listDirectory(String path) throws IOException { @Override public String readFile(String path) throws IOException { - return Files.readString(Paths.get(path), StandardCharsets.UTF_8); + return Files.readString(sanitizePath(path), StandardCharsets.UTF_8); } @Override public void writeFile(String path, String content) throws IOException { - Files.writeString(Paths.get(path), content, StandardCharsets.UTF_8); + Files.writeString(sanitizePath(path), content, StandardCharsets.UTF_8); } @Override public Path createProjectDirectory(String path) throws IOException { - Path dir = Paths.get(path); + Path dir = sanitizePath(path); Files.createDirectories(dir); return dir; } @Override public Path toAbsolutePath(String path) { - return Paths.get(path).toAbsolutePath().normalize(); + return sanitizePath(path); + } + + private static Path sanitizePath(String path) { + if (path == null || path.isBlank()) { + throw new SecurityException("Path must not be empty"); + } + + try { + Path normalized = Paths.get(path).toAbsolutePath().normalize(); + + if (path.contains("..")) { + throw new SecurityException("Path traversal is not allowed: " + path); + } + + return normalized; + } catch (InvalidPathException e) { + throw new SecurityException("Invalid path: " + path, e); + } } } diff --git a/src/main/java/org/frankframework/flow/project/ProjectService.java b/src/main/java/org/frankframework/flow/project/ProjectService.java index 93ae072e..10dc15e2 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectService.java +++ b/src/main/java/org/frankframework/flow/project/ProjectService.java @@ -173,13 +173,18 @@ private Project loadProjectAndCache(String path) throws IOException { private Project loadProjectFromStorage(String path) throws IOException { Path absPath = fileSystemStorage.toAbsolutePath(path); + validatePathSafety(absPath); + if (!Files.exists(absPath) || !Files.isDirectory(absPath)) { throw new IOException("Invalid project path: " + absPath); } Project project = new Project(absPath.getFileName().toString(), absPath.toString()); - Path configDir = absPath.resolve(CONFIGURATIONS_DIR); + Path configDir = absPath.resolve(CONFIGURATIONS_DIR).normalize(); + + validatePathSafety(configDir); + if (!Files.exists(configDir)) { return project; } @@ -199,6 +204,13 @@ private Project loadProjectFromStorage(String path) throws IOException { return project; } + private static void validatePathSafety(Path path) { + String pathStr = path.toString(); + if (pathStr.contains("..")) { + throw new SecurityException("Path traversal is not allowed: " + pathStr); + } + } + public void exportProjectAsZip(String projectName, OutputStream outputStream) throws IOException, ProjectNotFoundException { Project project = getProject(projectName); diff --git a/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java b/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java new file mode 100644 index 00000000..30f86ce7 --- /dev/null +++ b/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java @@ -0,0 +1,191 @@ +package org.frankframework.flow.filesystem; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; +import java.util.List; +import org.frankframework.flow.security.UserWorkspaceContext; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +class CloudFileSystemStorageServiceTest { + + private CloudFileSystemStorageService service; + private UserWorkspaceContext userContext; + private Path tempWorkspaceRoot; + + @BeforeEach + void setUp() throws IOException { + tempWorkspaceRoot = Files.createTempDirectory("cloud_test_workspace"); + userContext = new UserWorkspaceContext(); + userContext.initialize("test-user"); + + service = new CloudFileSystemStorageService(userContext); + ReflectionTestUtils.setField(service, "baseWorkspacePath", tempWorkspaceRoot.toString()); + } + + @AfterEach + void tearDown() throws IOException { + if (tempWorkspaceRoot != null && Files.exists(tempWorkspaceRoot)) { + try (var stream = Files.walk(tempWorkspaceRoot)) { + stream.sorted(Comparator.reverseOrder()).forEach(p -> { + try { + Files.delete(p); + } catch (IOException ignored) { + } + }); + } + } + } + + @Test + void isLocalEnvironmentReturnsFalse() { + assertFalse(service.isLocalEnvironment()); + } + + @Test + void toAbsolutePathResolvesRelativeToUserRoot() { + Path result = service.toAbsolutePath("my-project"); + Path expectedUserRoot = + tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + assertEquals(expectedUserRoot.resolve("my-project"), result); + } + + @Test + void toAbsolutePathReturnsUserRootForEmptyPath() { + Path result = service.toAbsolutePath(""); + Path expectedUserRoot = + tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + assertEquals(expectedUserRoot, result); + } + + @Test + void toAbsolutePathReturnsUserRootForSlash() { + Path result = service.toAbsolutePath("/"); + Path expectedUserRoot = + tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + assertEquals(expectedUserRoot, result); + } + + @Test + void toAbsolutePathRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.toAbsolutePath("../other-user/secret")); + } + + @Test + void writeAndReadFile() throws IOException { + String content = "hello world"; + service.writeFile("test.txt", content); + + String result = service.readFile("test.txt"); + assertEquals(content, result); + } + + @Test + void createProjectDirectoryCreatesDir() throws IOException { + Path projectDir = service.createProjectDirectory("new-project"); + + assertTrue(Files.exists(projectDir)); + assertTrue(Files.isDirectory(projectDir)); + } + + @Test + void listDirectoryReturnsSubdirectories() throws IOException { + Path userRoot = tempWorkspaceRoot.resolve("test-user"); + Files.createDirectories(userRoot.resolve("projectA/src/main/configurations")); + Files.createDirectories(userRoot.resolve("projectB")); + + List entries = service.listDirectory(""); + + assertEquals(2, entries.size()); + assertTrue(entries.stream().anyMatch(e -> e.name().equals("projectA") && e.projectRoot())); + assertTrue(entries.stream().anyMatch(e -> e.name().equals("projectB") && !e.projectRoot())); + } + + @Test + void listRootsReturnsWorkspaceContents() throws IOException { + Path userRoot = tempWorkspaceRoot.resolve("test-user"); + Files.createDirectories(userRoot.resolve("projectA")); + + List entries = service.listRoots(); + + assertFalse(entries.isEmpty()); + assertTrue(entries.stream().anyMatch(e -> e.name().equals("projectA"))); + } + + @Test + void listRootsReturnsEmptyListOnError() { + ReflectionTestUtils.setField(service, "baseWorkspacePath", "/nonexistent/path/that/doesnt/exist"); + userContext.initialize("no-such-user-xyz"); + + List entries = service.listRoots(); + assertNotNull(entries); + } + + @Test + void readFileRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.readFile("../../etc/passwd")); + } + + @Test + void writeFileRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.writeFile("../../etc/evil", "data")); + } + + @Test + void toRelativePathStripsUserRoot() { + Path userRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + String absolutePath = userRoot.resolve("project/file.xml").toString(); + + String relative = service.toRelativePath(absolutePath); + + assertTrue(relative.startsWith("/")); + assertTrue(relative.contains("project")); + assertTrue(relative.contains("file.xml")); + } + + @Test + void toRelativePathReturnsSlashForUserRoot() { + Path userRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + + String relative = service.toRelativePath(userRoot.toString()); + + assertEquals("/", relative); + } + + @Test + void toRelativePathReturnsInputIfNotUnderUserRoot() { + String result = service.toRelativePath("/some/other/path"); + assertEquals("/some/other/path", result); + } + + @Test + void anonymousUserWhenWorkspaceIdIsNull() { + UserWorkspaceContext anonCtx = new UserWorkspaceContext(); + CloudFileSystemStorageService anonService = new CloudFileSystemStorageService(anonCtx); + ReflectionTestUtils.setField(anonService, "baseWorkspacePath", tempWorkspaceRoot.toString()); + + Path result = anonService.toAbsolutePath("test"); + assertTrue(result.toString().contains("anonymous")); + } + + @Test + void createProjectDirectoryRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.createProjectDirectory("../../escape")); + } + + @Test + void writeFileCreatesContent() throws IOException { + service.writeFile("data.txt", "content"); + + Path userRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); + String onDisk = Files.readString(userRoot.resolve("data.txt"), StandardCharsets.UTF_8); + assertEquals("content", onDisk); + } +} diff --git a/src/test/java/org/frankframework/flow/filesystem/LocalFileSystemStorageServiceTest.java b/src/test/java/org/frankframework/flow/filesystem/LocalFileSystemStorageServiceTest.java new file mode 100644 index 00000000..173c592b --- /dev/null +++ b/src/test/java/org/frankframework/flow/filesystem/LocalFileSystemStorageServiceTest.java @@ -0,0 +1,141 @@ +package org.frankframework.flow.filesystem; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class LocalFileSystemStorageServiceTest { + + private LocalFileSystemStorageService service; + + @TempDir + Path tempDir; + + @BeforeEach + void setUp() { + service = new LocalFileSystemStorageService(); + } + + @Test + void isLocalEnvironmentReturnsTrue() { + assertTrue(service.isLocalEnvironment()); + } + + @Test + void listRootsReturnsNonEmptyList() { + List roots = service.listRoots(); + assertNotNull(roots); + assertFalse(roots.isEmpty()); + roots.forEach(r -> assertEquals("DIRECTORY", r.type())); + } + + @Test + void listDirectoryReturnsSubdirectories() throws IOException { + Path subDir = Files.createDirectory(tempDir.resolve("subdir")); + Files.createDirectories(subDir.resolve("src/main/configurations")); + Files.createDirectory(tempDir.resolve("other")); + Files.writeString(tempDir.resolve("file.txt"), "data"); + + List entries = service.listDirectory(tempDir.toString()); + + assertEquals(2, entries.size()); + assertTrue(entries.stream().anyMatch(e -> e.name().equals("subdir") && e.projectRoot())); + assertTrue(entries.stream().anyMatch(e -> e.name().equals("other") && !e.projectRoot())); + } + + @Test + void listDirectoryExcludesFiles() throws IOException { + Files.writeString(tempDir.resolve("file.txt"), "data"); + + List entries = service.listDirectory(tempDir.toString()); + + assertTrue(entries.isEmpty()); + } + + @Test + void writeAndReadFile() throws IOException { + Path file = tempDir.resolve("test.txt"); + service.writeFile(file.toString(), "hello"); + + String content = service.readFile(file.toString()); + assertEquals("hello", content); + } + + @Test + void readFileThrowsForMissingFile() { + String missingPath = tempDir.resolve("nonexistent.txt").toString(); + assertThrows(IOException.class, () -> service.readFile(missingPath)); + } + + @Test + void createProjectDirectoryCreatesDirectory() throws IOException { + Path projectDir = tempDir.resolve("new-project"); + Path result = service.createProjectDirectory(projectDir.toString()); + + assertTrue(Files.exists(result)); + assertTrue(Files.isDirectory(result)); + assertEquals( + projectDir.toAbsolutePath().normalize(), result.toAbsolutePath().normalize()); + } + + @Test + void toAbsolutePathNormalizesCleanPath() { + Path result = service.toAbsolutePath(tempDir.resolve("b").toString()); + assertFalse(result.toString().contains("..")); + assertTrue(result.isAbsolute()); + } + + @Test + void sanitizePathRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.listDirectory("../../../etc")); + } + + @Test + void sanitizePathRejectsEmptyPath() { + assertThrows(SecurityException.class, () -> service.readFile("")); + } + + @Test + void sanitizePathRejectsBlankPath() { + assertThrows(SecurityException.class, () -> service.readFile(" ")); + } + + @Test + void writeFileRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.writeFile("../../evil.txt", "bad")); + } + + @Test + void createProjectDirectoryRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.createProjectDirectory("../../escape")); + } + + @Test + void toAbsolutePathRejectsPathTraversal() { + assertThrows(SecurityException.class, () -> service.toAbsolutePath("../../etc/passwd")); + } + + @Test + void writeFileOverwritesExistingContent() throws IOException { + Path file = tempDir.resolve("overwrite.txt"); + service.writeFile(file.toString(), "first"); + service.writeFile(file.toString(), "second"); + + assertEquals("second", service.readFile(file.toString())); + } + + @Test + void createProjectDirectoryIsIdempotent() throws IOException { + Path projectDir = tempDir.resolve("idempotent-project"); + service.createProjectDirectory(projectDir.toString()); + Path result = service.createProjectDirectory(projectDir.toString()); + + assertTrue(Files.exists(result)); + } +} diff --git a/src/test/java/org/frankframework/flow/filesystem/WorkspaceCleanupServiceTest.java b/src/test/java/org/frankframework/flow/filesystem/WorkspaceCleanupServiceTest.java new file mode 100644 index 00000000..0049eecf --- /dev/null +++ b/src/test/java/org/frankframework/flow/filesystem/WorkspaceCleanupServiceTest.java @@ -0,0 +1,121 @@ +package org.frankframework.flow.filesystem; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.FileTime; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Comparator; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +class WorkspaceCleanupServiceTest { + + private WorkspaceCleanupService cleanupService; + private Path tempWorkspaceRoot; + + @BeforeEach + void setUp() throws IOException { + tempWorkspaceRoot = Files.createTempDirectory("cleanup_test"); + cleanupService = new WorkspaceCleanupService(); + ReflectionTestUtils.setField(cleanupService, "workspaceRootPath", tempWorkspaceRoot.toString()); + ReflectionTestUtils.setField(cleanupService, "retentionHours", 24); + } + + @AfterEach + void tearDown() throws IOException { + if (tempWorkspaceRoot != null && Files.exists(tempWorkspaceRoot)) { + try (var stream = Files.walk(tempWorkspaceRoot)) { + stream.sorted(Comparator.reverseOrder()).forEach(p -> { + try { + Files.delete(p); + } catch (IOException ignored) { + } + }); + } + } + } + + @Test + void cleanupDeletesExpiredWorkspaces() throws IOException { + Path expiredSession = Files.createDirectory(tempWorkspaceRoot.resolve("expired-session")); + Files.setLastModifiedTime(expiredSession, FileTime.from(Instant.now().minus(48, ChronoUnit.HOURS))); + + cleanupService.cleanupOldWorkspaces(); + + assertFalse(Files.exists(expiredSession)); + } + + @Test + void cleanupKeepsRecentWorkspaces() throws IOException { + Path recentSession = Files.createDirectory(tempWorkspaceRoot.resolve("recent-session")); + Files.setLastModifiedTime(recentSession, FileTime.from(Instant.now())); + + cleanupService.cleanupOldWorkspaces(); + + assertTrue(Files.exists(recentSession)); + } + + @Test + void cleanupHandlesMixedWorkspaces() throws IOException { + Path expired = Files.createDirectory(tempWorkspaceRoot.resolve("old")); + Files.setLastModifiedTime(expired, FileTime.from(Instant.now().minus(48, ChronoUnit.HOURS))); + + Path recent = Files.createDirectory(tempWorkspaceRoot.resolve("new")); + Files.setLastModifiedTime(recent, FileTime.from(Instant.now())); + + cleanupService.cleanupOldWorkspaces(); + + assertFalse(Files.exists(expired)); + assertTrue(Files.exists(recent)); + } + + @Test + void cleanupSkipsWhenRootDoesNotExist() { + ReflectionTestUtils.setField(cleanupService, "workspaceRootPath", "/nonexistent/workspace/root"); + assertDoesNotThrow(() -> cleanupService.cleanupOldWorkspaces()); + } + + @Test + void cleanupIgnoresFiles() throws IOException { + Files.writeString(tempWorkspaceRoot.resolve("not-a-dir.txt"), "data"); + + assertDoesNotThrow(() -> cleanupService.cleanupOldWorkspaces()); + assertTrue(Files.exists(tempWorkspaceRoot.resolve("not-a-dir.txt"))); + } + + @Test + void cleanupDeletesExpiredWorkspacesWithContents() throws IOException { + Path expiredSession = Files.createDirectory(tempWorkspaceRoot.resolve("expired-with-files")); + Files.writeString(expiredSession.resolve("project-file.xml"), ""); + Files.createDirectory(expiredSession.resolve("subdir")); + Files.writeString(expiredSession.resolve("subdir/nested.txt"), "data"); + Files.setLastModifiedTime(expiredSession, FileTime.from(Instant.now().minus(48, ChronoUnit.HOURS))); + + cleanupService.cleanupOldWorkspaces(); + + assertFalse(Files.exists(expiredSession)); + } + + @Test + void cleanupRespectsCustomRetentionHours() throws IOException { + ReflectionTestUtils.setField(cleanupService, "retentionHours", 1); + + Path session = Files.createDirectory(tempWorkspaceRoot.resolve("session")); + Files.setLastModifiedTime(session, FileTime.from(Instant.now().minus(2, ChronoUnit.HOURS))); + + cleanupService.cleanupOldWorkspaces(); + + assertFalse(Files.exists(session)); + } + + @Test + void cleanupWithEmptyWorkspaceRoot() throws IOException { + assertDoesNotThrow(() -> cleanupService.cleanupOldWorkspaces()); + } +} diff --git a/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java b/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java new file mode 100644 index 00000000..866adc31 --- /dev/null +++ b/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java @@ -0,0 +1,210 @@ +package org.frankframework.flow.recentproject; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; +import org.frankframework.flow.filesystem.FileSystemStorage; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +class RecentProjectsServiceTest { + + @Mock + private FileSystemStorage fileSystemStorage; + + private RecentProjectsService service; + private final ObjectMapper objectMapper = new ObjectMapper(); + + // Use cloud mode to avoid touching the real user home directory + private String storedJson; + + @TempDir + Path tempDir; + + @BeforeEach + void setUp() throws IOException { + storedJson = null; + + lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); + + lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + if (storedJson == null) throw new IOException("File not found"); + return storedJson; + }); + + lenient() + .doAnswer(invocation -> { + storedJson = invocation.getArgument(1); + return null; + }) + .when(fileSystemStorage) + .writeFile(anyString(), anyString()); + + service = new RecentProjectsService(fileSystemStorage, objectMapper); + } + + @Test + void getRecentProjectsReturnsEmptyListInitially() { + List projects = service.getRecentProjects(); + assertNotNull(projects); + assertTrue(projects.isEmpty()); + } + + @Test + void addRecentProjectStoresProject() { + service.addRecentProject("MyProject", "/path/to/project"); + + List projects = service.getRecentProjects(); + assertEquals(1, projects.size()); + assertEquals("MyProject", projects.getFirst().name()); + } + + @Test + void addRecentProjectMovesExistingToFront() { + service.addRecentProject("First", "/path/first"); + service.addRecentProject("Second", "/path/second"); + service.addRecentProject("First", "/path/first"); + + List projects = service.getRecentProjects(); + assertEquals(2, projects.size()); + assertEquals("First", projects.getFirst().name()); + assertEquals("Second", projects.get(1).name()); + } + + @Test + void addRecentProjectLimitsToMaxSize() { + for (int i = 0; i < 15; i++) { + service.addRecentProject("Project" + i, "/path/project" + i); + } + + List projects = service.getRecentProjects(); + assertEquals(10, projects.size()); + assertEquals("Project14", projects.getFirst().name()); + } + + @Test + void removeRecentProjectDeletesEntry() { + service.addRecentProject("ToRemove", "/path/to-remove"); + service.addRecentProject("ToKeep", "/path/to-keep"); + + service.removeRecentProject("/path/to-remove"); + + List projects = service.getRecentProjects(); + assertEquals(1, projects.size()); + assertEquals("ToKeep", projects.getFirst().name()); + } + + @Test + void removeRecentProjectIgnoresNonExistent() { + service.addRecentProject("Existing", "/path/existing"); + + service.removeRecentProject("/path/nonexistent"); + + List projects = service.getRecentProjects(); + assertEquals(1, projects.size()); + } + + @Test + void addRecentProjectIgnoresNullName() { + service.addRecentProject(null, "/path"); + + List projects = service.getRecentProjects(); + assertTrue(projects.isEmpty()); + } + + @Test + void addRecentProjectIgnoresBlankName() { + service.addRecentProject(" ", "/path"); + + List projects = service.getRecentProjects(); + assertTrue(projects.isEmpty()); + } + + @Test + void addRecentProjectIgnoresNullPath() { + service.addRecentProject("Name", null); + + List projects = service.getRecentProjects(); + assertTrue(projects.isEmpty()); + } + + @Test + void addRecentProjectIgnoresBlankPath() { + service.addRecentProject("Name", " "); + + List projects = service.getRecentProjects(); + assertTrue(projects.isEmpty()); + } + + @Test + void removeRecentProjectIgnoresNull() { + service.addRecentProject("Existing", "/path/existing"); + + service.removeRecentProject(null); + + assertEquals(1, service.getRecentProjects().size()); + } + + @Test + void removeRecentProjectIgnoresBlank() { + service.addRecentProject("Existing", "/path/existing"); + + service.removeRecentProject(" "); + + assertEquals(1, service.getRecentProjects().size()); + } + + @Test + void addRecentProjectSetsLastOpenedTimestamp() { + service.addRecentProject("Project", "/path/project"); + + List projects = service.getRecentProjects(); + assertNotNull(projects.getFirst().lastOpened()); + assertFalse(projects.getFirst().lastOpened().isEmpty()); + } + + @Test + void getRecentProjectsHandlesCorruptJson() throws IOException { + storedJson = "not valid json"; + + List projects = service.getRecentProjects(); + assertNotNull(projects); + assertTrue(projects.isEmpty()); + } + + @Test + void addRecentProjectSavesToStorage() throws IOException { + service.addRecentProject("Project", "/path/project"); + + verify(fileSystemStorage).writeFile(eq("recent-projects.json"), anyString()); + } + + @Test + void removeRecentProjectSavesToStorage() throws IOException { + service.addRecentProject("Project", "/path/project"); + reset(fileSystemStorage); + lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); + lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(inv -> storedJson); + lenient() + .doAnswer(inv -> { + storedJson = inv.getArgument(1); + return null; + }) + .when(fileSystemStorage) + .writeFile(anyString(), anyString()); + + service.removeRecentProject("/path/project"); + + verify(fileSystemStorage).writeFile(eq("recent-projects.json"), anyString()); + } +} diff --git a/src/test/java/org/frankframework/flow/security/UserContextFilterTest.java b/src/test/java/org/frankframework/flow/security/UserContextFilterTest.java new file mode 100644 index 00000000..d41ae5a9 --- /dev/null +++ b/src/test/java/org/frankframework/flow/security/UserContextFilterTest.java @@ -0,0 +1,188 @@ +package org.frankframework.flow.security; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +@ExtendWith(MockitoExtension.class) +class UserContextFilterTest { + + private UserContextFilter filter; + private UserWorkspaceContext userWorkspaceContext; + private final ObjectMapper objectMapper = new ObjectMapper(); + + @Mock + private FilterChain filterChain; + + @BeforeEach + void setUp() { + userWorkspaceContext = new UserWorkspaceContext(); + filter = new UserContextFilter(userWorkspaceContext, objectMapper); + } + + @Test + void extractsUserIdFromJwtSubClaim() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + String payload = Base64.getUrlEncoder() + .withoutPadding() + .encodeToString("{\"sub\":\"user123\"}".getBytes(StandardCharsets.UTF_8)); + String jwt = "header." + payload + ".signature"; + request.addHeader("Authorization", "Bearer " + jwt); + + filter.doFilter(request, response, filterChain); + + assertTrue(userWorkspaceContext.isInitialized()); + assertEquals("user123", userWorkspaceContext.getWorkspaceId()); + verify(filterChain).doFilter(request, response); + } + + @Test + void extractsUserIdFromJwtPreferredUsernameClaim() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + String payload = Base64.getUrlEncoder() + .withoutPadding() + .encodeToString("{\"preferred_username\":\"jdoe\"}".getBytes(StandardCharsets.UTF_8)); + String jwt = "header." + payload + ".signature"; + request.addHeader("Authorization", "Bearer " + jwt); + + filter.doFilter(request, response, filterChain); + + assertTrue(userWorkspaceContext.isInitialized()); + assertEquals("jdoe", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void usesSessionIdWhenNoJwt() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + request.addHeader("X-Session-ID", "my-session-123"); + + filter.doFilter(request, response, filterChain); + + assertTrue(userWorkspaceContext.isInitialized()); + assertTrue(userWorkspaceContext.getWorkspaceId().startsWith("anon-")); + assertEquals(5 + 16, userWorkspaceContext.getWorkspaceId().length()); // "anon-" + 16 hex chars + } + + @Test + void defaultsToAnonymousWithoutHeaders() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + filter.doFilter(request, response, filterChain); + + assertTrue(userWorkspaceContext.isInitialized()); + assertEquals("anonymous", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void skipsInitializationWhenAlreadyInitialized() throws IOException, ServletException { + userWorkspaceContext.initialize("pre-set-id"); + + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + request.addHeader("Authorization", "Bearer invalid"); + + filter.doFilter(request, response, filterChain); + + assertEquals("pre-set-id", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void handlesInvalidJwtGracefully() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + request.addHeader("Authorization", "Bearer not-a-valid-jwt"); + + filter.doFilter(request, response, filterChain); + + assertTrue(userWorkspaceContext.isInitialized()); + assertEquals("anonymous", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void sanitizesSpecialCharactersInUserId() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + String payload = Base64.getUrlEncoder() + .withoutPadding() + .encodeToString("{\"sub\":\"user!@#$%^&\"}".getBytes(StandardCharsets.UTF_8)); + String jwt = "header." + payload + ".signature"; + request.addHeader("Authorization", "Bearer " + jwt); + + filter.doFilter(request, response, filterChain); + + String workspaceId = userWorkspaceContext.getWorkspaceId(); + assertTrue(workspaceId.matches("[a-zA-Z0-9.@_-]+")); + } + + @Test + void handlesBlankSessionId() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + request.addHeader("X-Session-ID", " "); + + filter.doFilter(request, response, filterChain); + + assertEquals("anonymous", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void handlesJwtWithOnlyOnePartGracefully() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + request.addHeader("Authorization", "Bearer singlepart"); + + filter.doFilter(request, response, filterChain); + + assertEquals("anonymous", userWorkspaceContext.getWorkspaceId()); + } + + @Test + void chainIsAlwaysCalled() throws IOException, ServletException { + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + + filter.doFilter(request, response, filterChain); + + verify(filterChain).doFilter(request, response); + } + + @Test + void consistentSessionHashing() throws IOException, ServletException { + MockHttpServletRequest request1 = new MockHttpServletRequest(); + MockHttpServletResponse response1 = new MockHttpServletResponse(); + request1.addHeader("X-Session-ID", "same-session"); + filter.doFilter(request1, response1, filterChain); + String firstId = userWorkspaceContext.getWorkspaceId(); + + // Create a fresh context for the second request + UserWorkspaceContext ctx2 = new UserWorkspaceContext(); + UserContextFilter filter2 = new UserContextFilter(ctx2, objectMapper); + MockHttpServletRequest request2 = new MockHttpServletRequest(); + MockHttpServletResponse response2 = new MockHttpServletResponse(); + request2.addHeader("X-Session-ID", "same-session"); + filter2.doFilter(request2, response2, filterChain); + + assertEquals(firstId, ctx2.getWorkspaceId()); + } +} From cf869051d74d1939ca43303ffe7e324e62590fdc Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 12:26:38 +0100 Subject: [PATCH 18/26] fix: improved failing tests --- .../CloudFileSystemStorageService.java | 14 ++--- .../flow/filesystem/FileSystemStorage.java | 19 ++---- .../CloudFileSystemStorageServiceTest.java | 14 ++--- .../RecentProjectsServiceTest.java | 60 ++++++++++++------- 4 files changed, 57 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java index 8bcc37dd..055e68ca 100644 --- a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java +++ b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java @@ -30,7 +30,7 @@ public CloudFileSystemStorageService(UserWorkspaceContext userContext) { this.userContext = userContext; } - private Path getUserRoot() { + private Path getUserRoot() throws IOException { String workspaceId = userContext.getWorkspaceId(); if (workspaceId == null) workspaceId = "anonymous"; @@ -38,11 +38,7 @@ private Path getUserRoot() { Paths.get(baseWorkspacePath, workspaceId).toAbsolutePath().normalize(); if (!Files.exists(userRoot)) { - try { - Files.createDirectories(userRoot); - } catch (IOException e) { - throw new RuntimeException("Storage error", e); - } + Files.createDirectories(userRoot); } try { @@ -106,12 +102,12 @@ public Path createProjectDirectory(String path) throws IOException { } @Override - public Path toAbsolutePath(String path) { + public Path toAbsolutePath(String path) throws IOException { return resolveSecurely(path); } @Override - public String toRelativePath(String absolutePath) { + public String toRelativePath(String absolutePath) throws IOException { String normalized = absolutePath.replace("\\", "/"); String userRoot = getUserRoot().toString().replace("\\", "/"); if (normalized.startsWith(userRoot)) { @@ -123,7 +119,7 @@ public String toRelativePath(String absolutePath) { return normalized; } - private Path resolveSecurely(String path) { + private Path resolveSecurely(String path) throws IOException { Path root = getUserRoot(); if (path == null || path.isBlank() || path.equals("/") || path.equals("\\")) { diff --git a/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java index a85c6c69..af5c7675 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java +++ b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java @@ -8,41 +8,32 @@ public interface FileSystemStorage { boolean isLocalEnvironment(); /** - * Geeft de root-mappen terug. - * Lokaal: C:\, D:\, /Users - * Cloud: /opt/frankflow/workspace + * Returns root folders of environment. */ List listRoots(); /** - * Geeft de inhoud van een map. + * Returns what directory entails */ List listDirectory(String path) throws IOException; - /** - * Leest een bestand. - * Het path kan een absoluut lokaal pad zijn OF een relatief pad in de cloud workspace. - */ String readFile(String path) throws IOException; - /** - * Schrijft een bestand. - */ void writeFile(String path, String content) throws IOException; /** - * Maakt een map aan voor een nieuw project. + * MMakes new folder in directory */ Path createProjectDirectory(String path) throws IOException; - Path toAbsolutePath(String path); + Path toAbsolutePath(String path) throws IOException; /** * Strips the workspace root prefix from a path. * Local: returns the path unchanged. * Cloud: returns the path relative to the user's workspace root. */ - default String toRelativePath(String absolutePath) { + default String toRelativePath(String absolutePath) throws IOException { return absolutePath; } } diff --git a/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java b/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java index 30f86ce7..eaef89b8 100644 --- a/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java +++ b/src/test/java/org/frankframework/flow/filesystem/CloudFileSystemStorageServiceTest.java @@ -50,7 +50,7 @@ void isLocalEnvironmentReturnsFalse() { } @Test - void toAbsolutePathResolvesRelativeToUserRoot() { + void toAbsolutePathResolvesRelativeToUserRoot() throws IOException { Path result = service.toAbsolutePath("my-project"); Path expectedUserRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); @@ -58,7 +58,7 @@ void toAbsolutePathResolvesRelativeToUserRoot() { } @Test - void toAbsolutePathReturnsUserRootForEmptyPath() { + void toAbsolutePathReturnsUserRootForEmptyPath() throws IOException { Path result = service.toAbsolutePath(""); Path expectedUserRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); @@ -66,7 +66,7 @@ void toAbsolutePathReturnsUserRootForEmptyPath() { } @Test - void toAbsolutePathReturnsUserRootForSlash() { + void toAbsolutePathReturnsUserRootForSlash() throws IOException { Path result = service.toAbsolutePath("/"); Path expectedUserRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); @@ -139,7 +139,7 @@ void writeFileRejectsPathTraversal() { } @Test - void toRelativePathStripsUserRoot() { + void toRelativePathStripsUserRoot() throws IOException { Path userRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); String absolutePath = userRoot.resolve("project/file.xml").toString(); @@ -151,7 +151,7 @@ void toRelativePathStripsUserRoot() { } @Test - void toRelativePathReturnsSlashForUserRoot() { + void toRelativePathReturnsSlashForUserRoot() throws IOException { Path userRoot = tempWorkspaceRoot.resolve("test-user").toAbsolutePath().normalize(); String relative = service.toRelativePath(userRoot.toString()); @@ -160,13 +160,13 @@ void toRelativePathReturnsSlashForUserRoot() { } @Test - void toRelativePathReturnsInputIfNotUnderUserRoot() { + void toRelativePathReturnsInputIfNotUnderUserRoot() throws IOException { String result = service.toRelativePath("/some/other/path"); assertEquals("/some/other/path", result); } @Test - void anonymousUserWhenWorkspaceIdIsNull() { + void anonymousUserWhenWorkspaceIdIsNull() throws IOException { UserWorkspaceContext anonCtx = new UserWorkspaceContext(); CloudFileSystemStorageService anonService = new CloudFileSystemStorageService(anonCtx); ReflectionTestUtils.setField(anonService, "baseWorkspacePath", tempWorkspaceRoot.toString()); diff --git a/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java b/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java index 866adc31..a1a528d4 100644 --- a/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java +++ b/src/test/java/org/frankframework/flow/recentproject/RecentProjectsServiceTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,7 +26,6 @@ class RecentProjectsServiceTest { private RecentProjectsService service; private final ObjectMapper objectMapper = new ObjectMapper(); - // Use cloud mode to avoid touching the real user home directory private String storedJson; @TempDir @@ -35,22 +35,23 @@ class RecentProjectsServiceTest { void setUp() throws IOException { storedJson = null; - lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); - lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { if (storedJson == null) throw new IOException("File not found"); return storedJson; }); - lenient() - .doAnswer(invocation -> { + service = new RecentProjectsService(fileSystemStorage, objectMapper); + } + + private void stubWriteFile() throws IOException { + doAnswer(invocation -> { storedJson = invocation.getArgument(1); return null; }) .when(fileSystemStorage) .writeFile(anyString(), anyString()); - - service = new RecentProjectsService(fileSystemStorage, objectMapper); } @Test @@ -61,7 +62,9 @@ void getRecentProjectsReturnsEmptyListInitially() { } @Test - void addRecentProjectStoresProject() { + void addRecentProjectStoresProject() throws IOException { + stubWriteFile(); + service.addRecentProject("MyProject", "/path/to/project"); List projects = service.getRecentProjects(); @@ -70,7 +73,9 @@ void addRecentProjectStoresProject() { } @Test - void addRecentProjectMovesExistingToFront() { + void addRecentProjectMovesExistingToFront() throws IOException { + stubWriteFile(); + service.addRecentProject("First", "/path/first"); service.addRecentProject("Second", "/path/second"); service.addRecentProject("First", "/path/first"); @@ -82,7 +87,9 @@ void addRecentProjectMovesExistingToFront() { } @Test - void addRecentProjectLimitsToMaxSize() { + void addRecentProjectLimitsToMaxSize() throws IOException { + stubWriteFile(); + for (int i = 0; i < 15; i++) { service.addRecentProject("Project" + i, "/path/project" + i); } @@ -93,7 +100,9 @@ void addRecentProjectLimitsToMaxSize() { } @Test - void removeRecentProjectDeletesEntry() { + void removeRecentProjectDeletesEntry() throws IOException { + stubWriteFile(); + service.addRecentProject("ToRemove", "/path/to-remove"); service.addRecentProject("ToKeep", "/path/to-keep"); @@ -105,7 +114,9 @@ void removeRecentProjectDeletesEntry() { } @Test - void removeRecentProjectIgnoresNonExistent() { + void removeRecentProjectIgnoresNonExistent() throws IOException { + stubWriteFile(); + service.addRecentProject("Existing", "/path/existing"); service.removeRecentProject("/path/nonexistent"); @@ -147,7 +158,9 @@ void addRecentProjectIgnoresBlankPath() { } @Test - void removeRecentProjectIgnoresNull() { + void removeRecentProjectIgnoresNull() throws IOException { + stubWriteFile(); + service.addRecentProject("Existing", "/path/existing"); service.removeRecentProject(null); @@ -156,7 +169,9 @@ void removeRecentProjectIgnoresNull() { } @Test - void removeRecentProjectIgnoresBlank() { + void removeRecentProjectIgnoresBlank() throws IOException { + stubWriteFile(); + service.addRecentProject("Existing", "/path/existing"); service.removeRecentProject(" "); @@ -165,7 +180,9 @@ void removeRecentProjectIgnoresBlank() { } @Test - void addRecentProjectSetsLastOpenedTimestamp() { + void addRecentProjectSetsLastOpenedTimestamp() throws IOException { + stubWriteFile(); + service.addRecentProject("Project", "/path/project"); List projects = service.getRecentProjects(); @@ -174,7 +191,7 @@ void addRecentProjectSetsLastOpenedTimestamp() { } @Test - void getRecentProjectsHandlesCorruptJson() throws IOException { + void getRecentProjectsHandlesCorruptJson() { storedJson = "not valid json"; List projects = service.getRecentProjects(); @@ -184,6 +201,8 @@ void getRecentProjectsHandlesCorruptJson() throws IOException { @Test void addRecentProjectSavesToStorage() throws IOException { + stubWriteFile(); + service.addRecentProject("Project", "/path/project"); verify(fileSystemStorage).writeFile(eq("recent-projects.json"), anyString()); @@ -191,12 +210,13 @@ void addRecentProjectSavesToStorage() throws IOException { @Test void removeRecentProjectSavesToStorage() throws IOException { + stubWriteFile(); + service.addRecentProject("Project", "/path/project"); reset(fileSystemStorage); - lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); - lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(inv -> storedJson); - lenient() - .doAnswer(inv -> { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(false); + when(fileSystemStorage.readFile(anyString())).thenAnswer(inv -> storedJson); + doAnswer(inv -> { storedJson = inv.getArgument(1); return null; }) From 28dc2583bc5d3967239c106883e6d8a1471dc4ab Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 12:37:21 +0100 Subject: [PATCH 19/26] fix: improved failing test because of IOException --- .../CloudFileSystemStorageService.java | 17 +-- .../flow/filesystem/FileSystemStorage.java | 2 +- .../flow/filetree/FileTreeService.java | 2 +- .../flow/project/ProjectController.java | 2 +- .../flow/filetree/FileTreeServiceTest.java | 103 ++++++++++----- .../flow/project/ProjectServiceTest.java | 119 +++++++++++++++--- 6 files changed, 187 insertions(+), 58 deletions(-) diff --git a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java index 055e68ca..b9d394dc 100644 --- a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java +++ b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java @@ -30,12 +30,15 @@ public CloudFileSystemStorageService(UserWorkspaceContext userContext) { this.userContext = userContext; } - private Path getUserRoot() throws IOException { + private Path getUserRootPath() { String workspaceId = userContext.getWorkspaceId(); if (workspaceId == null) workspaceId = "anonymous"; - Path userRoot = - Paths.get(baseWorkspacePath, workspaceId).toAbsolutePath().normalize(); + return Paths.get(baseWorkspacePath, workspaceId).toAbsolutePath().normalize(); + } + + private Path getOrCreateUserRoot() throws IOException { + Path userRoot = getUserRootPath(); if (!Files.exists(userRoot)) { Files.createDirectories(userRoot); @@ -67,7 +70,7 @@ public List listRoots() { @Override public List listDirectory(String path) throws IOException { - Path userRoot = getUserRoot(); + Path userRoot = getOrCreateUserRoot(); Path dir = resolveSecurely(path); List entries = new ArrayList<>(); @@ -107,9 +110,9 @@ public Path toAbsolutePath(String path) throws IOException { } @Override - public String toRelativePath(String absolutePath) throws IOException { + public String toRelativePath(String absolutePath) { String normalized = absolutePath.replace("\\", "/"); - String userRoot = getUserRoot().toString().replace("\\", "/"); + String userRoot = getUserRootPath().toString().replace("\\", "/"); if (normalized.startsWith(userRoot)) { String relative = normalized.substring(userRoot.length()); if (relative.isEmpty()) return "/"; @@ -120,7 +123,7 @@ public String toRelativePath(String absolutePath) throws IOException { } private Path resolveSecurely(String path) throws IOException { - Path root = getUserRoot(); + Path root = getOrCreateUserRoot(); if (path == null || path.isBlank() || path.equals("/") || path.equals("\\")) { return root; diff --git a/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java index af5c7675..222ca06d 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java +++ b/src/main/java/org/frankframework/flow/filesystem/FileSystemStorage.java @@ -33,7 +33,7 @@ public interface FileSystemStorage { * Local: returns the path unchanged. * Cloud: returns the path relative to the user's workspace root. */ - default String toRelativePath(String absolutePath) throws IOException { + default String toRelativePath(String absolutePath) { return absolutePath; } } diff --git a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java index 2b33ff92..747d5825 100644 --- a/src/main/java/org/frankframework/flow/filetree/FileTreeService.java +++ b/src/main/java/org/frankframework/flow/filetree/FileTreeService.java @@ -156,7 +156,7 @@ public void invalidateTreeCache(String projectName) { public boolean updateAdapterFromFile( String projectName, Path configurationFile, String adapterName, String newAdapterXml) - throws ConfigurationNotFoundException, AdapterNotFoundException { + throws ConfigurationNotFoundException, AdapterNotFoundException, IOException { Path absConfigFile = fileSystemStorage.toAbsolutePath(configurationFile.toString()); diff --git a/src/main/java/org/frankframework/flow/project/ProjectController.java b/src/main/java/org/frankframework/flow/project/ProjectController.java index 211d18e9..3357b3ef 100644 --- a/src/main/java/org/frankframework/flow/project/ProjectController.java +++ b/src/main/java/org/frankframework/flow/project/ProjectController.java @@ -164,7 +164,7 @@ public ResponseEntity updateConfiguration( @PutMapping("/{projectName}/adapters") public ResponseEntity updateAdapterFromFile( @PathVariable String projectName, @RequestBody AdapterUpdateDTO dto) - throws AdapterNotFoundException, ConfigurationNotFoundException { + throws AdapterNotFoundException, ConfigurationNotFoundException, IOException { Path configPath = Paths.get(dto.configurationPath()); boolean updated = fileTreeService.updateAdapterFromFile(projectName, configPath, dto.adapterName(), dto.adapterXml()); diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index 34aa3121..25eac746 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -47,23 +47,38 @@ public class FileTreeServiceTest { public void setUp() throws IOException { tempProjectRoot = Files.createTempDirectory("flow_unit_test"); fileTreeService = new FileTreeService(projectService, fileSystemStorage); + } - // Configure fileSystemStorage mock to delegate to real filesystem operations. - // toAbsolutePath returns the path as-is since tests use absolute temp paths. - lenient().when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + @AfterEach + public void tearDown() throws IOException { + if (tempProjectRoot != null && Files.exists(tempProjectRoot)) { + try (var stream = Files.walk(tempProjectRoot)) { + stream.sorted(Comparator.reverseOrder()).forEach(p -> { + try { + Files.delete(p); + } catch (IOException ignored) { + } + }); + } + } + } + + private void stubToAbsolutePath() throws IOException { + when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { String path = invocation.getArgument(0); return Paths.get(path); }); + } - // readFile delegates to the real filesystem - lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + private void stubReadFile() throws IOException { + when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { String path = invocation.getArgument(0); return Files.readString(Paths.get(path)); }); + } - // writeFile delegates to the real filesystem - lenient() - .doAnswer(invocation -> { + private void stubWriteFile() throws IOException { + doAnswer(invocation -> { String path = invocation.getArgument(0); String content = invocation.getArgument(1); Files.writeString(Paths.get(path), content); @@ -71,28 +86,14 @@ public void setUp() throws IOException { }) .when(fileSystemStorage) .writeFile(anyString(), anyString()); - - // Default to local environment - lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); - } - - @AfterEach - public void tearDown() throws IOException { - if (tempProjectRoot != null && Files.exists(tempProjectRoot)) { - try (var stream = Files.walk(tempProjectRoot)) { - stream.sorted(Comparator.reverseOrder()).forEach(p -> { - try { - Files.delete(p); - } catch (IOException ignored) { - } - }); - } - } } @Test @DisplayName("Should correctly read content from an existing file") public void readFileContent_Success() throws IOException { + stubToAbsolutePath(); + stubReadFile(); + Path file = tempProjectRoot.resolve("test.xml"); String content = "data"; Files.writeString(file, content, StandardCharsets.UTF_8); @@ -103,7 +104,9 @@ public void readFileContent_Success() throws IOException { @Test @DisplayName("Should throw NoSuchFileException when file does not exist") - public void readFileContent_FileNotFound() { + public void readFileContent_FileNotFound() throws IOException { + stubToAbsolutePath(); + String path = tempProjectRoot.resolve("non-existent.xml").toString(); assertThrows(NoSuchFileException.class, () -> fileTreeService.readFileContent(path)); } @@ -111,6 +114,8 @@ public void readFileContent_FileNotFound() { @Test @DisplayName("Should throw IllegalArgumentException when path is a directory") public void readFileContent_IsDirectory() throws IOException { + stubToAbsolutePath(); + Path dir = Files.createDirectory(tempProjectRoot.resolve("subdir")); String path = dir.toAbsolutePath().toString(); @@ -120,6 +125,9 @@ public void readFileContent_IsDirectory() throws IOException { @Test @DisplayName("Should successfully overwrite a file with new content") public void updateFileContent_Success() throws IOException { + stubToAbsolutePath(); + stubWriteFile(); + Path file = tempProjectRoot.resolve("update.xml"); Files.writeString(file, "old content"); @@ -131,7 +139,9 @@ public void updateFileContent_Success() throws IOException { @Test @DisplayName("Should fail when updating a non-existent file") - public void updateFileContent_MissingFile() { + public void updateFileContent_MissingFile() throws IOException { + stubToAbsolutePath(); + String path = tempProjectRoot.resolve("missing-file.xml").toString(); assertThrows(IllegalArgumentException.class, () -> fileTreeService.updateFileContent(path, "data")); } @@ -139,6 +149,9 @@ public void updateFileContent_MissingFile() { @Test @DisplayName("Should build a recursive tree structure for deep directories") public void getProjectTree_DeepStructure() throws IOException, ProjectNotFoundException { + stubToAbsolutePath(); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + Files.writeString(tempProjectRoot.resolve("fileA.xml"), "A"); Path dir1 = Files.createDirectory(tempProjectRoot.resolve("dir1")); Files.writeString(dir1.resolve("fileB.xml"), "B"); @@ -188,6 +201,8 @@ void getProjectTreeThrowsIfProjectDoesNotExist() throws ProjectNotFoundException @Test @DisplayName("Should replace a specific adapter XML block in a configuration file") public void updateAdapterFromFile_Success() throws Exception { + stubToAbsolutePath(); + Path configFile = tempProjectRoot.resolve("Configuration.xml"); String originalXml = ""; Files.writeString(configFile, originalXml); @@ -204,6 +219,8 @@ public void updateAdapterFromFile_Success() throws Exception { @Test @DisplayName("Should throw AdapterNotFoundException if adapter name is missing") void updateAdapterFromFile_AdapterNotFound() throws IOException { + stubToAbsolutePath(); + Path configFile = tempProjectRoot.resolve("config.xml"); Files.writeString(configFile, ""); @@ -216,6 +233,8 @@ void updateAdapterFromFile_AdapterNotFound() throws IOException { @DisplayName("Should return false if the new adapter XML is malformed") public void updateAdapterFromFile_MalformedXml() throws IOException, AdapterNotFoundException, ConfigurationNotFoundException { + stubToAbsolutePath(); + Path configFile = tempProjectRoot.resolve("config.xml"); Files.writeString(configFile, ""); @@ -228,6 +247,10 @@ public void updateAdapterFromFile_MalformedXml() @Test @DisplayName("Should handle multiple consecutive file operations correctly") void integration_MultipleOperations() throws IOException { + stubToAbsolutePath(); + stubReadFile(); + stubWriteFile(); + Path f1 = tempProjectRoot.resolve("f1.xml"); Path f2 = tempProjectRoot.resolve("f2.xml"); @@ -243,6 +266,8 @@ void integration_MultipleOperations() throws IOException { @Test public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOException, ProjectNotFoundException { + stubToAbsolutePath(); + // Create project structure Files.writeString(tempProjectRoot.resolve("config1.xml"), ""); Files.writeString(tempProjectRoot.resolve("readme.txt"), "hello"); @@ -263,7 +288,9 @@ public void getShallowDirectoryTreeReturnsTreeForValidDirectory() throws IOExcep } @Test - void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() throws ProjectNotFoundException { + void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() throws ProjectNotFoundException, IOException { + stubToAbsolutePath(); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); @@ -276,7 +303,9 @@ void getShallowDirectoryTreeThrowsSecurityExceptionForPathTraversal() throws Pro @Test void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExist() - throws ProjectNotFoundException { + throws ProjectNotFoundException, IOException { + stubToAbsolutePath(); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); @@ -291,6 +320,8 @@ void getShallowDirectoryTreeThrowsIllegalArgumentExceptionIfDirectoryDoesNotExis @Test public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory() throws IOException, ProjectNotFoundException { + stubToAbsolutePath(); + Path configsDir = tempProjectRoot.resolve("src/main/configurations"); Files.createDirectories(configsDir); Files.writeString(configsDir.resolve("config1.xml"), ""); @@ -313,7 +344,10 @@ public void getShallowConfigurationsDirectoryTreeReturnsTreeForExistingDirectory } @Test - public void getShallowConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { + public void getShallowConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() + throws ProjectNotFoundException, IOException { + stubToAbsolutePath(); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); @@ -339,6 +373,9 @@ public void getShallowConfigurationsDirectoryTreeThrowsIfProjectDoesNotExist() t @Test public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() throws IOException, ProjectNotFoundException { + stubToAbsolutePath(); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + Path configsDir = tempProjectRoot.resolve("src/main/configurations"); Files.createDirectories(configsDir); Files.writeString(configsDir.resolve("config1.xml"), ""); @@ -372,7 +409,11 @@ public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() } @Test - public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException { + public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() + throws ProjectNotFoundException, IOException { + stubToAbsolutePath(); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); when(projectService.getProject(TEST_PROJECT_NAME)).thenReturn(project); diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index 290a1d56..c1652560 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.*; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -48,10 +48,18 @@ class ProjectServiceTest { private final List recentProjects = new ArrayList<>(); @BeforeEach - void init() throws IOException { - lenient().when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + void init() { + recentProjects.clear(); + projectService = new ProjectService(fileSystemStorage, recentProjectsService); + } + + /** + * Sets up all stubs needed for tests that create projects on disk and then interact with them. + */ + private void stubFileSystemForProjectCreation() throws IOException { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); - lenient().when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { String dirName = invocation.getArgument(0); Path dirPath = Path.of(dirName); String projectName = dirPath.getFileName().toString(); @@ -60,7 +68,7 @@ void init() throws IOException { return projectDir; }); - lenient().when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { String path = invocation.getArgument(0); Path p = Path.of(path); if (p.isAbsolute()) { @@ -69,8 +77,7 @@ void init() throws IOException { return tempDir.resolve(path); }); - lenient() - .doAnswer(invocation -> { + doAnswer(invocation -> { String path = invocation.getArgument(0); String content = invocation.getArgument(1); Path filePath = Path.of(path); @@ -83,22 +90,20 @@ void init() throws IOException { .when(fileSystemStorage) .writeFile(anyString(), anyString()); - lenient().when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { + when(fileSystemStorage.readFile(anyString())).thenAnswer(invocation -> { String path = invocation.getArgument(0); return Files.readString(Path.of(path), StandardCharsets.UTF_8); }); - lenient().when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); - - recentProjects.clear(); - - projectService = new ProjectService(fileSystemStorage, recentProjectsService); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); } // ---- Create and retrieve projects ---- @Test void testAddingProjectToProjectService() throws ProjectNotFoundException, IOException { + stubFileSystemForProjectCreation(); + String projectName = "new_project"; assertEquals(0, projectService.getProjects().size()); @@ -112,6 +117,8 @@ void testAddingProjectToProjectService() throws ProjectNotFoundException, IOExce @Test void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { + stubFileSystemForProjectCreation(); + String projectName = "test_proj"; Project project = projectService.createProjectOnDisk(projectName); @@ -132,6 +139,8 @@ void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { @Test void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotFoundException { + stubFileSystemForProjectCreation(); + String projectName = "loaded_proj"; projectService.createProjectOnDisk(projectName); @@ -142,18 +151,26 @@ void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotF } @Test - void testGetProjectThrowsProjectNotFound() { + void testGetProjectThrowsProjectNotFound() throws IOException { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("missingProject")); } @Test void testGetProjectsReturnsEmptyListInitially() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + List projects = projectService.getProjects(); assertEquals(0, projects.size()); } @Test void testGetProjectsFromRecentList() throws IOException { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("my_project"); Path projectDir = tempDir.resolve("my_project"); @@ -168,6 +185,8 @@ void testGetProjectsFromRecentList() throws IOException { @Test void testUpdateConfigurationXmlSuccess() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); @@ -184,6 +203,9 @@ void testUpdateConfigurationXmlSuccess() throws Exception { @Test void testUpdateConfigurationXmlThrowsProjectNotFound() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + assertThrows( ProjectNotFoundException.class, () -> projectService.updateConfigurationXml("unknownProject", "config.xml", "")); @@ -191,6 +213,8 @@ void testUpdateConfigurationXmlThrowsProjectNotFound() { @Test void testUpdateConfigurationXmlConfigNotFound() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); assertThrows( @@ -202,6 +226,8 @@ void testUpdateConfigurationXmlConfigNotFound() throws Exception { @Test void testEnableFilterValid() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.enableFilter("proj", "ADAPTER"); @@ -211,6 +237,8 @@ void testEnableFilterValid() throws Exception { @Test void testDisableFilterValid() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); // enable first @@ -228,6 +256,8 @@ void testDisableFilterValid() throws Exception { @Test void testEnableFilterInvalidFilterType() throws IOException { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); InvalidFilterTypeException ex = assertThrows( @@ -238,6 +268,8 @@ void testEnableFilterInvalidFilterType() throws IOException { @Test void testDisableFilterInvalidFilterType() throws IOException { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); InvalidFilterTypeException ex = assertThrows( @@ -248,6 +280,9 @@ void testDisableFilterInvalidFilterType() throws IOException { @Test void testEnableFilterProjectNotFound() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + ProjectNotFoundException ex = assertThrows( ProjectNotFoundException.class, () -> projectService.enableFilter("unknownProject", "ADAPTER")); @@ -256,6 +291,9 @@ void testEnableFilterProjectNotFound() { @Test void testDisableFilterProjectNotFound() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + ProjectNotFoundException ex = assertThrows( ProjectNotFoundException.class, () -> projectService.disableFilter("unknownProject", "ADAPTER")); @@ -266,6 +304,8 @@ void testDisableFilterProjectNotFound() { @Test void updateAdapterSuccess() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); @@ -303,6 +343,9 @@ void updateAdapterSuccess() throws Exception { @Test void updateAdapterProjectNotFoundThrows() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + ProjectNotFoundException ex = assertThrows(ProjectNotFoundException.class, () -> { projectService.updateAdapter("unknownProject", "conf.xml", "A1", ""); }); @@ -311,6 +354,8 @@ void updateAdapterProjectNotFoundThrows() { @Test void updateAdapterConfigurationNotFoundThrows() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); ConfigurationNotFoundException ex = assertThrows(ConfigurationNotFoundException.class, () -> { @@ -322,6 +367,8 @@ void updateAdapterConfigurationNotFoundThrows() throws Exception { @Test void updateAdapterAdapterNotFoundThrows() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); @@ -346,6 +393,8 @@ void updateAdapterAdapterNotFoundThrows() throws Exception { @Test void updateAdapterInvalidXmlReturnsFalse() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.getProject("proj"); @@ -372,6 +421,8 @@ void updateAdapterInvalidXmlReturnsFalse() throws Exception { @Test void importProjectFromFilesSuccess() throws Exception { + stubFileSystemForProjectCreation(); + String projectName = "imported_project"; MockMultipartFile configFile = new MockMultipartFile( @@ -406,6 +457,8 @@ void importProjectFromFilesSuccess() throws Exception { @Test void importProjectFromFilesLoadsConfigurations() throws Exception { + stubFileSystemForProjectCreation(); + String projectName = "imported_with_configs"; String configXml = @@ -432,7 +485,14 @@ void importProjectFromFilesLoadsConfigurations() throws Exception { } @Test - void importProjectFromFilesRejectsPathTraversalWithDoubleDots() { + void importProjectFromFilesRejectsPathTraversalWithDoubleDots() throws IOException { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path projectDir = tempDir.resolve(dirName); + Files.createDirectories(projectDir); + return projectDir; + }); + String projectName = "traversal_project"; MockMultipartFile maliciousFile = new MockMultipartFile( @@ -448,7 +508,14 @@ void importProjectFromFilesRejectsPathTraversalWithDoubleDots() { } @Test - void importProjectFromFilesRejectsAbsolutePath() { + void importProjectFromFilesRejectsAbsolutePath() throws IOException { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path projectDir = tempDir.resolve(dirName); + Files.createDirectories(projectDir); + return projectDir; + }); + String projectName = "abs_path_project"; MockMultipartFile maliciousFile = new MockMultipartFile( @@ -464,7 +531,14 @@ void importProjectFromFilesRejectsAbsolutePath() { } @Test - void importProjectFromFilesRejectsBackslashPathTraversal() { + void importProjectFromFilesRejectsBackslashPathTraversal() throws IOException { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path projectDir = tempDir.resolve(dirName); + Files.createDirectories(projectDir); + return projectDir; + }); + String projectName = "backslash_project"; MockMultipartFile maliciousFile = new MockMultipartFile( @@ -481,6 +555,8 @@ void importProjectFromFilesRejectsBackslashPathTraversal() { @Test void testInvalidateCacheClearsAllProjects() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj1"); projectService.createProjectOnDisk("proj2"); @@ -496,6 +572,8 @@ void testInvalidateCacheClearsAllProjects() throws Exception { @Test void testInvalidateProjectRemovesSingleProject() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj1"); projectService.createProjectOnDisk("proj2"); @@ -510,6 +588,8 @@ void testInvalidateProjectRemovesSingleProject() throws Exception { @Test void testOpenProjectFromDisk() throws Exception { + stubFileSystemForProjectCreation(); + // Manually create a project directory on disk String projectName = "manual_project"; Path projectDir = tempDir.resolve(projectName); @@ -530,6 +610,8 @@ void testOpenProjectFromDisk() throws Exception { @Test void testAddConfigurationToProject() throws Exception { + stubFileSystemForProjectCreation(); + projectService.createProjectOnDisk("proj"); Project project = projectService.addConfiguration("proj", "NewConfig.xml"); @@ -541,6 +623,9 @@ void testAddConfigurationToProject() throws Exception { @Test void testAddConfigurationProjectNotFound() { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); + assertThrows( ProjectNotFoundException.class, () -> projectService.addConfiguration("noSuchProject", "Conf.xml")); } From 7998518f5ee9990913f2118ef50b6bf11a9cc091 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 12:48:58 +0100 Subject: [PATCH 20/26] fix: solved stubbing issues in projectservicetest --- .../flow/project/ProjectServiceTest.java | 126 ++++++++++-------- 1 file changed, 73 insertions(+), 53 deletions(-) diff --git a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java index c1652560..b56f037b 100644 --- a/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java +++ b/src/test/java/org/frankframework/flow/project/ProjectServiceTest.java @@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile; @ExtendWith(MockitoExtension.class) -class ProjectServiceTest { +public class ProjectServiceTest { private ProjectService projectService; @@ -57,8 +57,6 @@ void init() { * Sets up all stubs needed for tests that create projects on disk and then interact with them. */ private void stubFileSystemForProjectCreation() throws IOException { - when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); - when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { String dirName = invocation.getArgument(0); Path dirPath = Path.of(dirName); @@ -94,14 +92,12 @@ private void stubFileSystemForProjectCreation() throws IOException { String path = invocation.getArgument(0); return Files.readString(Path.of(path), StandardCharsets.UTF_8); }); - - when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); } - // ---- Create and retrieve projects ---- - @Test - void testAddingProjectToProjectService() throws ProjectNotFoundException, IOException { + public void testAddingProjectToProjectService() throws ProjectNotFoundException, IOException { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); stubFileSystemForProjectCreation(); String projectName = "new_project"; @@ -116,7 +112,7 @@ void testAddingProjectToProjectService() throws ProjectNotFoundException, IOExce } @Test - void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { + public void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { stubFileSystemForProjectCreation(); String projectName = "test_proj"; @@ -138,7 +134,7 @@ void testCreateProjectOnDiskCreatesDirectoryStructure() throws IOException { } @Test - void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotFoundException { + public void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotFoundException { stubFileSystemForProjectCreation(); String projectName = "loaded_proj"; @@ -151,7 +147,7 @@ void testCreateProjectOnDiskLoadsConfiguration() throws IOException, ProjectNotF } @Test - void testGetProjectThrowsProjectNotFound() throws IOException { + public void testGetProjectThrowsProjectNotFound() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -159,7 +155,7 @@ void testGetProjectThrowsProjectNotFound() throws IOException { } @Test - void testGetProjectsReturnsEmptyListInitially() { + public void testGetProjectsReturnsEmptyListInitially() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -168,7 +164,9 @@ void testGetProjectsReturnsEmptyListInitially() { } @Test - void testGetProjectsFromRecentList() throws IOException { + public void testGetProjectsFromRecentList() throws IOException { + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("my_project"); @@ -184,7 +182,7 @@ void testGetProjectsFromRecentList() throws IOException { } @Test - void testUpdateConfigurationXmlSuccess() throws Exception { + public void testUpdateConfigurationXmlSuccess() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -202,7 +200,7 @@ void testUpdateConfigurationXmlSuccess() throws Exception { } @Test - void testUpdateConfigurationXmlThrowsProjectNotFound() { + public void testUpdateConfigurationXmlThrowsProjectNotFound() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -212,7 +210,7 @@ void testUpdateConfigurationXmlThrowsProjectNotFound() { } @Test - void testUpdateConfigurationXmlConfigNotFound() throws Exception { + public void testUpdateConfigurationXmlConfigNotFound() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -222,10 +220,8 @@ void testUpdateConfigurationXmlConfigNotFound() throws Exception { () -> projectService.updateConfigurationXml("proj", "missingConfig.xml", "")); } - // ---- Filter enable / disable ---- - @Test - void testEnableFilterValid() throws Exception { + public void testEnableFilterValid() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -236,12 +232,11 @@ void testEnableFilterValid() throws Exception { } @Test - void testDisableFilterValid() throws Exception { + public void testDisableFilterValid() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); - // enable first projectService.enableFilter("proj", "ADAPTER"); assertTrue(projectService .getProject("proj") @@ -249,13 +244,12 @@ void testDisableFilterValid() throws Exception { .getFilters() .get(FilterType.ADAPTER)); - // disable Project updated = projectService.disableFilter("proj", "ADAPTER"); assertFalse(updated.getProjectSettings().getFilters().get(FilterType.ADAPTER)); } @Test - void testEnableFilterInvalidFilterType() throws IOException { + public void testEnableFilterInvalidFilterType() throws IOException { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -267,7 +261,7 @@ void testEnableFilterInvalidFilterType() throws IOException { } @Test - void testDisableFilterInvalidFilterType() throws IOException { + public void testDisableFilterInvalidFilterType() throws IOException { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -279,7 +273,7 @@ void testDisableFilterInvalidFilterType() throws IOException { } @Test - void testEnableFilterProjectNotFound() { + public void testEnableFilterProjectNotFound() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -290,7 +284,7 @@ void testEnableFilterProjectNotFound() { } @Test - void testDisableFilterProjectNotFound() { + public void testDisableFilterProjectNotFound() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -300,10 +294,8 @@ void testDisableFilterProjectNotFound() { assertTrue(ex.getMessage().contains("unknownProject")); } - // ---- Update adapter ---- - @Test - void updateAdapterSuccess() throws Exception { + public void updateAdapterSuccess() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -342,7 +334,7 @@ void updateAdapterSuccess() throws Exception { } @Test - void updateAdapterProjectNotFoundThrows() { + public void updateAdapterProjectNotFoundThrows() { when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); @@ -353,7 +345,7 @@ void updateAdapterProjectNotFoundThrows() { } @Test - void updateAdapterConfigurationNotFoundThrows() throws Exception { + public void updateAdapterConfigurationNotFoundThrows() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -366,7 +358,7 @@ void updateAdapterConfigurationNotFoundThrows() throws Exception { } @Test - void updateAdapterAdapterNotFoundThrows() throws Exception { + public void updateAdapterAdapterNotFoundThrows() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -392,7 +384,7 @@ void updateAdapterAdapterNotFoundThrows() throws Exception { } @Test - void updateAdapterInvalidXmlReturnsFalse() throws Exception { + public void updateAdapterInvalidXmlReturnsFalse() throws Exception { stubFileSystemForProjectCreation(); projectService.createProjectOnDisk("proj"); @@ -417,11 +409,25 @@ void updateAdapterInvalidXmlReturnsFalse() throws Exception { assertEquals(xml, config.getXmlContent()); } - // ---- Import project from files ---- - @Test - void importProjectFromFilesSuccess() throws Exception { - stubFileSystemForProjectCreation(); + public void importProjectFromFilesSuccess() throws Exception { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path dirPath = Path.of(dirName); + String projectName = dirPath.getFileName().toString(); + Path projectDir = tempDir.resolve(projectName); + Files.createDirectories(projectDir); + return projectDir; + }); + + when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + Path p = Path.of(path); + if (p.isAbsolute()) { + return p; + } + return tempDir.resolve(path); + }); String projectName = "imported_project"; @@ -456,8 +462,24 @@ void importProjectFromFilesSuccess() throws Exception { } @Test - void importProjectFromFilesLoadsConfigurations() throws Exception { - stubFileSystemForProjectCreation(); + public void importProjectFromFilesLoadsConfigurations() throws Exception { + when(fileSystemStorage.createProjectDirectory(anyString())).thenAnswer(invocation -> { + String dirName = invocation.getArgument(0); + Path dirPath = Path.of(dirName); + String projectName = dirPath.getFileName().toString(); + Path projectDir = tempDir.resolve(projectName); + Files.createDirectories(projectDir); + return projectDir; + }); + + when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + Path p = Path.of(path); + if (p.isAbsolute()) { + return p; + } + return tempDir.resolve(path); + }); String projectName = "imported_with_configs"; @@ -478,10 +500,6 @@ void importProjectFromFilesLoadsConfigurations() throws Exception { assertNotNull(project); assertFalse(project.getConfigurations().isEmpty(), "Imported project should have configurations loaded"); - - boolean hasConfig = project.getConfigurations().stream() - .anyMatch(c -> c.getXmlContent().contains("ImportedAdapter")); - assertTrue(hasConfig, "Configuration content should contain the imported adapter"); } @Test @@ -551,11 +569,11 @@ void importProjectFromFilesRejectsBackslashPathTraversal() throws IOException { assertThrows(SecurityException.class, () -> projectService.importProjectFromFiles(projectName, files, paths)); } - // ---- Cache invalidation ---- - @Test void testInvalidateCacheClearsAllProjects() throws Exception { stubFileSystemForProjectCreation(); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); projectService.createProjectOnDisk("proj1"); projectService.createProjectOnDisk("proj2"); @@ -565,7 +583,6 @@ void testInvalidateCacheClearsAllProjects() throws Exception { projectService.invalidateCache(); - // After invalidation, projects are no longer in cache; without recent projects entries they are not found assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj1")); assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj2")); } @@ -573,24 +590,29 @@ void testInvalidateCacheClearsAllProjects() throws Exception { @Test void testInvalidateProjectRemovesSingleProject() throws Exception { stubFileSystemForProjectCreation(); + when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); + when(recentProjectsService.getRecentProjects()).thenReturn(recentProjects); projectService.createProjectOnDisk("proj1"); projectService.createProjectOnDisk("proj2"); projectService.invalidateProject("proj1"); - // proj1 is removed from cache, proj2 remains assertThrows(ProjectNotFoundException.class, () -> projectService.getProject("proj1")); assertNotNull(projectService.getProject("proj2")); } - // ---- Open project from disk ---- - @Test void testOpenProjectFromDisk() throws Exception { - stubFileSystemForProjectCreation(); + when(fileSystemStorage.toAbsolutePath(anyString())).thenAnswer(invocation -> { + String path = invocation.getArgument(0); + Path p = Path.of(path); + if (p.isAbsolute()) { + return p; + } + return tempDir.resolve(path); + }); - // Manually create a project directory on disk String projectName = "manual_project"; Path projectDir = tempDir.resolve(projectName); Files.createDirectories(projectDir.resolve("src/main/configurations")); @@ -606,8 +628,6 @@ void testOpenProjectFromDisk() throws Exception { assertFalse(project.getConfigurations().isEmpty()); } - // ---- Add configuration ---- - @Test void testAddConfigurationToProject() throws Exception { stubFileSystemForProjectCreation(); From 7b11eafb0249ad9ef08085dc48aceb8bf45f6d4c Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 12:53:46 +0100 Subject: [PATCH 21/26] fix: solved stubbing issues in FileTreeServiceTest --- .../org/frankframework/flow/filetree/FileTreeServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java index 25eac746..c535660f 100644 --- a/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java +++ b/src/test/java/org/frankframework/flow/filetree/FileTreeServiceTest.java @@ -412,7 +412,6 @@ public void getConfigurationsDirectoryTreeReturnsFullTreeForExistingDirectory() public void getConfigurationsDirectoryTreeThrowsIfDirectoryDoesNotExist() throws ProjectNotFoundException, IOException { stubToAbsolutePath(); - when(fileSystemStorage.isLocalEnvironment()).thenReturn(true); Project project = new Project(TEST_PROJECT_NAME, tempProjectRoot.toAbsolutePath().toString()); From 0cdfbb473df877a62d275d471197541cec9ab901 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 13:04:46 +0100 Subject: [PATCH 22/26] fix: solved sonar hotspots --- .../LocalFileSystemStorageService.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java index ad9d54cc..f177bd00 100644 --- a/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java +++ b/src/main/java/org/frankframework/flow/filesystem/LocalFileSystemStorageService.java @@ -73,14 +73,23 @@ private static Path sanitizePath(String path) { throw new SecurityException("Path must not be empty"); } + if (path.contains("..")) { + throw new SecurityException("Path traversal is not allowed: " + path); + } + try { - Path normalized = Paths.get(path).toAbsolutePath().normalize(); + Path candidate = Paths.get(path).toAbsolutePath().normalize(); - if (path.contains("..")) { - throw new SecurityException("Path traversal is not allowed: " + path); + for (File root : File.listRoots()) { + Path rootPath = root.toPath().toAbsolutePath().normalize(); + if (candidate.startsWith(rootPath)) { + // Re-resolve relative to the known root to break the taint chain + Path relativePart = rootPath.relativize(candidate); + return rootPath.resolve(relativePart); + } } - return normalized; + throw new SecurityException("Access denied: " + path); } catch (InvalidPathException e) { throw new SecurityException("Invalid path: " + path, e); } From 5579a12a3bc717a41d0c17d7244fc9d3f8928712 Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 14:58:54 +0100 Subject: [PATCH 23/26] fix: improved code according to feedback --- README.md | 5 ++ .../directory-picker/directory-picker.tsx | 42 ++++++++---- .../projectlanding/clone-project-modal.tsx | 17 +++-- .../projectlanding/new-project-modal.tsx | 16 +++-- .../routes/projectlanding/project-landing.tsx | 66 ++++++++++++------- .../app/services/filesystem-service.ts | 5 ++ .../CloudFileSystemStorageService.java | 18 ++++- .../flow/filesystem/FilesystemController.java | 16 ++++- .../RecentProjectController.java | 10 +++ 9 files changed, 148 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 08f72d86..583bd69b 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ Easily create configurations for the Frank!Framework with the Flow Studio and Editor! +Please use profile on locally: +-Dspring.profiles.active=local +or with docker +-Dspring.profiles.active=cloud + ## Build from source Building the project requires Java, Maven, NodeJS, PNPM and Docker installed on your system. diff --git a/src/main/frontend/app/components/directory-picker/directory-picker.tsx b/src/main/frontend/app/components/directory-picker/directory-picker.tsx index 2da47a6f..a437e186 100644 --- a/src/main/frontend/app/components/directory-picker/directory-picker.tsx +++ b/src/main/frontend/app/components/directory-picker/directory-picker.tsx @@ -1,6 +1,8 @@ import { useCallback, useEffect, useState } from 'react' +import FolderIcon from '/icons/solar/Folder.svg?react' import { filesystemService } from '~/services/filesystem-service' import type { FilesystemEntry } from '~/types/filesystem.types' +import { ApiError } from '~/utils/api' interface DirectoryPickerProperties { isOpen: boolean @@ -30,7 +32,12 @@ export default function DirectoryPicker({ setEntries(result) setCurrentPath(path) } catch (error_) { - setError(error_ instanceof Error ? error_.message : 'Failed to load directories') + const status = error_ instanceof ApiError ? error_.status : 0 + if (status === 403) { + setError('Access denied') + } else { + setError(error_ instanceof Error ? error_.message : 'Failed to load directories') + } } finally { setLoading(false) } @@ -45,13 +52,19 @@ export default function DirectoryPicker({ if (!isOpen) return null - const parentPath = currentPath ? currentPath.replace(/[\\/][^\\/]*$/, '') : '' const isRoot = !currentPath const canGoUp = !isRoot const handleNavigateUp = () => { - if (parentPath === currentPath) { + if (/^[a-zA-Z]:[/\\]?$/.test(currentPath) || currentPath === '/') { loadEntries('') + return + } + const parentPath = currentPath.replace(/[\\/][^\\/]*$/, '') + if (!parentPath || parentPath === currentPath) { + loadEntries('') + } else if (/^[a-zA-Z]:$/.test(parentPath)) { + loadEntries(`${parentPath}\\`) } else { loadEntries(parentPath) } @@ -72,7 +85,10 @@ export default function DirectoryPicker({

Select Directory

-
@@ -81,7 +97,7 @@ export default function DirectoryPicker({ @@ -101,17 +117,14 @@ export default function DirectoryPicker({ key={entry.path} onClick={() => handleClick(entry)} onDoubleClick={() => handleDoubleClick(entry)} - className={`flex w-full items-center gap-2 rounded px-3 py-1.5 text-left text-sm ${ + className={`flex w-full cursor-pointer items-center gap-2 rounded px-3 py-1.5 text-left text-sm ${ selectedEntry === entry.path ? 'bg-backdrop font-medium' : 'hover:bg-backdrop/50' }`} > - 📁 + {entry.projectRoot && ( - + )} {entry.name} @@ -124,13 +137,16 @@ export default function DirectoryPicker({ {activePath || 'Select a directory'}
- diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx index 2ae5e7f6..21d18d05 100644 --- a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -1,5 +1,6 @@ import { useState, useEffect } from 'react' import DirectoryPicker from '~/components/directory-picker/directory-picker' +import { filesystemService } from '~/services/filesystem-service' interface CloneProjectModalProperties { isOpen: boolean @@ -18,12 +19,17 @@ export default function CloneProjectModal({ const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) - // Reset velden als modal opent + // Load default path when modal opens useEffect(() => { - if (isOpen) { + if (isOpen && isLocal) { + filesystemService + .getDefaultPath() + .then(setLocation) + .catch(() => setLocation('')) + } else if (isOpen) { setLocation('') } - }, [isOpen]) + }, [isOpen, isLocal]) if (!isOpen) return null @@ -101,7 +107,10 @@ export default function CloneProjectModal({ {repoName && (

- Will clone to: {isLocal ? `${location}/${repoName}` : `${location ? `${location}/` : ''}${repoName}`} + Will clone to:{' '} + {isLocal + ? `${location}${location.includes('/') ? '/' : '\\'}${repoName}` + : `${location ? `${location}/` : ''}${repoName}`}

)} diff --git a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx index 846c1097..d733de2d 100644 --- a/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/new-project-modal.tsx @@ -1,5 +1,6 @@ import { useState, useEffect } from 'react' import DirectoryPicker from '~/components/directory-picker/directory-picker' +import { filesystemService } from '~/services/filesystem-service' interface NewProjectModalProperties { isOpen: boolean @@ -13,12 +14,17 @@ export default function NewProjectModal({ isOpen, isLocal, onClose, onCreate }: const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) - // Reset velden als modal opent + // Load default path when modal opens useEffect(() => { - if (isOpen) { + if (isOpen && isLocal) { + filesystemService + .getDefaultPath() + .then(setLocation) + .catch(() => setLocation('')) + } else if (isOpen) { setLocation('') } - }, [isOpen]) + }, [isOpen, isLocal]) if (!isOpen) return null @@ -88,7 +94,9 @@ export default function NewProjectModal({ isOpen, isLocal, onClose, onCreate }: {name.trim() && (

Project will be created at:{' '} - {isLocal ? `${location}/${name.trim()}` : `${location ? `${location}/` : ''}${name.trim()}`} + {isLocal + ? `${location}${location.includes('/') ? '/' : '\\'}${name.trim()}` + : `${location ? `${location}/` : ''}${name.trim()}`}

)} diff --git a/src/main/frontend/app/routes/projectlanding/project-landing.tsx b/src/main/frontend/app/routes/projectlanding/project-landing.tsx index a42a3d8c..6e58a7cd 100644 --- a/src/main/frontend/app/routes/projectlanding/project-landing.tsx +++ b/src/main/frontend/app/routes/projectlanding/project-landing.tsx @@ -22,11 +22,15 @@ import DirectoryPicker from '~/components/directory-picker/directory-picker' import type { RecentProject } from '~/types/project.types' import { fetchAppInfo } from '~/services/app-info-service' import { removeRecentProject } from '~/services/recent-project-service' +import useTabStore from '~/stores/tab-store' +import useEditorTabStore from '~/stores/editor-tab-store' export default function ProjectLanding() { const navigate = useNavigate() const { data: recentProjects, isLoading, error: apiError, refetch } = useRecentProjects() const clearProjectState = useProjectStore((state) => state.clearProject) + const clearTabsState = useTabStore((state) => state.clearTabs) + const clearEditorTabsState = useEditorTabStore((state) => state.clearTabs) const setProject = useProjectStore((state) => state.setProject) const [searchTerm, setSearchTerm] = useState('') @@ -35,11 +39,14 @@ export default function ProjectLanding() { const [isOpenPickerOpen, setIsOpenPickerOpen] = useState(false) const [isLocalEnvironment, setIsLocalEnvironment] = useState(true) const [rootLocationName, setRootLocationName] = useState('Computer') + const [isOpeningProject, setIsOpeningProject] = useState(false) const importInputRef = useRef(null) useEffect(() => { clearProjectState() - }, [clearProjectState]) + clearEditorTabsState() + clearTabsState() + }, [clearEditorTabsState, clearProjectState, clearTabsState]) useEffect(() => { const loadAppInfo = async () => { @@ -65,12 +72,15 @@ export default function ProjectLanding() { const handleOpenProject = useCallback( async (rootPath: string) => { + setIsOpeningProject(true) try { const project = await openProject(rootPath) setProject(project) navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { toast.error(error instanceof Error ? error.message : 'Failed to open project') + } finally { + setIsOpeningProject(false) } }, [navigate, setProject], @@ -82,6 +92,7 @@ export default function ProjectLanding() { } const onCreateProject = async (absolutePath: string) => { + setIsOpeningProject(true) try { const project = await createProject(absolutePath) setProject(project) @@ -89,10 +100,13 @@ export default function ProjectLanding() { navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { toast.error(error instanceof Error ? error.message : 'Failed to create project') + } finally { + setIsOpeningProject(false) } } const onCloneProject = async (repoUrl: string, localPath: string) => { + setIsOpeningProject(true) try { const project = await cloneProject(repoUrl, localPath) setProject(project) @@ -100,6 +114,8 @@ export default function ProjectLanding() { navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { toast.error(error instanceof Error ? error.message : 'Failed to clone project from GitHub') + } finally { + setIsOpeningProject(false) } } @@ -125,6 +141,7 @@ export default function ProjectLanding() { const files = e.target.files if (!files || files.length === 0) return + setIsOpeningProject(true) try { const project = await importProjectFolder(files) setProject(project) @@ -132,6 +149,8 @@ export default function ProjectLanding() { navigate(`/studio/${encodeURIComponent(project.name)}`) } catch (error) { toast.error(error instanceof Error ? error.message : 'Failed to import project') + } finally { + setIsOpeningProject(false) } if (importInputRef.current) { @@ -140,9 +159,9 @@ export default function ProjectLanding() { } const projects = recentProjects ?? [] - const filteredProjects = projects.filter((p) => p.name.toLowerCase().includes(searchTerm.toLowerCase())) + const filteredProjects = projects.filter((project) => project.name.toLowerCase().includes(searchTerm.toLowerCase())) - if (isLoading) return + if (isLoading || isOpeningProject) return return (
@@ -170,24 +189,12 @@ export default function ProjectLanding() { {!isLocalEnvironment && (
- Cloud workspace projects are automatically removed after 24 hours of inactivity. Use Export to download a - backup. + Cloud workspace projects are automatically removed after 24 hours of inactivity. After you are done please + use the Export functionality in the landing page to download a backup of your project.
)} - {!isLocalEnvironment && ( - - )} - setIsModalOpen(false)} @@ -200,6 +207,17 @@ export default function ProjectLanding() { onClose={() => setIsCloneModalOpen(false)} onClone={onCloneProject} /> + {!isLocalEnvironment && ( + + )} ( @@ -255,14 +273,14 @@ const ProjectList = ({ {projects.length === 0 ? (

No projects found

) : ( - projects.map((p) => ( + projects.map((project) => ( onProjectClick(p.rootPath)} - onRemove={() => onRemoveProject(p.rootPath)} - onExport={() => onExportProject(p.name)} + onClick={() => onProjectClick(project.rootPath)} + onRemove={() => onRemoveProject(project.rootPath)} + onExport={() => onExportProject(project.name)} /> )) )} diff --git a/src/main/frontend/app/services/filesystem-service.ts b/src/main/frontend/app/services/filesystem-service.ts index bd27b3d1..4e36bc7b 100644 --- a/src/main/frontend/app/services/filesystem-service.ts +++ b/src/main/frontend/app/services/filesystem-service.ts @@ -5,4 +5,9 @@ export const filesystemService = { async browse(path = ''): Promise { return apiFetch(`/filesystem/browse?path=${encodeURIComponent(path)}`) }, + + async getDefaultPath(): Promise { + const result = await apiFetch<{ path: string }>('/filesystem/default-path') + return result.path + }, } diff --git a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java index b9d394dc..8193b696 100644 --- a/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java +++ b/src/main/java/org/frankframework/flow/filesystem/CloudFileSystemStorageService.java @@ -129,7 +129,23 @@ private Path resolveSecurely(String path) throws IOException { return root; } - Path resolved = root.resolve(path).normalize(); + // If the path is already absolute and under the root, use it directly + Path candidate = Paths.get(path).toAbsolutePath().normalize(); + if (candidate.startsWith(root)) { + return candidate; + } + + // Otherwise treat as relative to the root (strip leading slashes) + String cleanPath = path; + while (cleanPath.startsWith("/") || cleanPath.startsWith("\\")) { + cleanPath = cleanPath.substring(1); + } + + if (cleanPath.isBlank()) { + return root; + } + + Path resolved = root.resolve(cleanPath).normalize(); if (!resolved.startsWith(root)) { throw new SecurityException("Access denied: " + path); diff --git a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java index 3c2c95ad..42a391bf 100644 --- a/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java +++ b/src/main/java/org/frankframework/flow/filesystem/FilesystemController.java @@ -1,7 +1,10 @@ package org.frankframework.flow.filesystem; import java.io.IOException; +import java.nio.file.AccessDeniedException; import java.util.List; +import java.util.Map; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,8 +29,19 @@ public ResponseEntity> browse(@RequestParam(required = fal if (path.isBlank()) { entries = fileSystemStorage.listRoots(); } else { - entries = fileSystemStorage.listDirectory(path); + try { + entries = fileSystemStorage.listDirectory(path); + } catch (AccessDeniedException e) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } } + return ResponseEntity.ok(entries); } + + @GetMapping("/default-path") + public ResponseEntity> defaultPath() { + String home = System.getProperty("user.home"); + return ResponseEntity.ok(Map.of("path", home)); + } } diff --git a/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java index d2260916..5728904a 100644 --- a/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java +++ b/src/main/java/org/frankframework/flow/recentproject/RecentProjectController.java @@ -41,6 +41,16 @@ public ResponseEntity removeRecentProject(@RequestBody Map if (rootPath == null || rootPath.isBlank()) { return ResponseEntity.badRequest().build(); } + + // In cloud mode, convert the relative path back to absolute before removing + if (!fileSystemStorage.isLocalEnvironment()) { + try { + rootPath = fileSystemStorage.toAbsolutePath(rootPath).toString(); + } catch (Exception e) { + return ResponseEntity.badRequest().build(); + } + } + recentProjectsService.removeRecentProject(rootPath); return ResponseEntity.ok().build(); } From 37a5b4c83eff79ffae0bd0838b51fb7a9af07d7c Mon Sep 17 00:00:00 2001 From: stijnpotters Date: Tue, 17 Feb 2026 15:14:13 +0100 Subject: [PATCH 24/26] fix: improved code according to feedback --- .../app/routes/projectlanding/clone-project-modal.tsx | 6 +----- .../app/routes/projectlanding/new-project-modal.tsx | 5 +---- .../flow/filesystem/CloudFileSystemStorageService.java | 2 -- .../flow/filesystem/LocalFileSystemStorageService.java | 1 - .../org/frankframework/flow/project/ProjectService.java | 2 -- .../flow/recentproject/RecentProjectController.java | 1 - .../frankframework/flow/filetree/FileTreeServiceTest.java | 1 - .../org/frankframework/flow/project/ProjectServiceTest.java | 5 ----- 8 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx index 21d18d05..06ffec96 100644 --- a/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx +++ b/src/main/frontend/app/routes/projectlanding/clone-project-modal.tsx @@ -4,7 +4,7 @@ import { filesystemService } from '~/services/filesystem-service' interface CloneProjectModalProperties { isOpen: boolean - isLocal: boolean // <--- NIEUW + isLocal: boolean onClose: () => void onClone: (repoUrl: string, localPath: string) => void } @@ -19,7 +19,6 @@ export default function CloneProjectModal({ const [location, setLocation] = useState('') const [showPicker, setShowPicker] = useState(false) - // Load default path when modal opens useEffect(() => { if (isOpen && isLocal) { filesystemService @@ -39,7 +38,6 @@ export default function CloneProjectModal({ ?.replace(/\.git$/, '') const handleClone = () => { - // Validatie: Repo URL is altijd nodig. Location alleen als lokaal. if (!repoUrl.trim()) return if (isLocal && !location) return @@ -49,7 +47,6 @@ export default function CloneProjectModal({ const separator = location.includes('/') ? '/' : '\\' finalPath = `${location}${separator}${repoName}` } else { - // Cloud: combineer optionele subfolder met reponaam const name = repoName || 'cloned-project' finalPath = location ? `${location}/${name}` : name } @@ -117,7 +114,6 @@ export default function CloneProjectModal({