Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1. Install dependencies only when needed
FROM node:18-alpine AS deps
FROM node:20-alpine AS deps

WORKDIR /app

Expand Down Expand Up @@ -35,6 +35,7 @@ COPY --from=builder /app/public ./public
COPY --from=builder /app/.next ./.next
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/package.json ./package.json
COPY --from=builder /app/next.config.ts ./

# Expose the port Next.js runs on
EXPOSE 3000
Expand Down
14 changes: 14 additions & 0 deletions apps/frontend/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ import type { NextConfig } from "next";

const nextConfig: NextConfig = {
/* config options here */
experimental: {
serverActions: {
bodySizeLimit: '100mb',
},
},

async rewrites() {
return [
{
source: '/api/:path*',
destination: 'http://backend:8000/api/:path*' // Routes traffic safely inside the Docker network
}
];
}
};

export default nextConfig;
5 changes: 1 addition & 4 deletions apps/frontend/src/app/_home/UploadButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import { cn } from "@/lib/utils";
import { UploadDataType, UploadModalityType } from "@/enums";
import { Upload as UploadIcon } from "lucide-react";
import { useAppContext } from "@/providers/AppProvider";
import { findNiftiFile, findRelevantFiles } from "@/utils";
import { getReport } from "@/services/apiReport";
import { toast } from "sonner";
import { useRouter } from "next/navigation";
import { IAllRelevantFilesType } from "@/types";
import { handleBidsUpload, handleDicomUpload } from "./uploadHandlers";

type TUploadDataOptions = (typeof UploadDataType)[keyof typeof UploadDataType];
Expand Down Expand Up @@ -62,7 +59,7 @@ const UploadButtons = () => {
setApiData(data);
if (
data.missing_required_parameters &&
data.missing_required_parameters.length > 0
Number(data.missing_required_parameters.length) > 0
) {
toast.info(
"Report generated with missing parameters. Please provide the missing values."
Expand Down
139 changes: 66 additions & 73 deletions apps/frontend/src/app/_home/uploadHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const handleDicomUpload = async ({
setIsLoading: (v: boolean) => void;
activeModalityTypeOption: UploadModalityType;
}) => {
setIsLoading(true);
try {
if (!files || files.length === 0) return;

const filesArray = Array.from(files);

// DICOM files: .dcm, .img, or no extension
Expand All @@ -25,29 +25,28 @@ const handleDicomUpload = async ({
!file.name.includes(".")
);

const formData = new FormData();

dicomFiles.forEach((file) => {
formData.append("dcm_files", file);
});

formData.append("modality", activeModalityTypeOption);

const data = await getReport(formData, UploadDataType.DICOM.toLowerCase());

setIsLoading(false);

return data;
// PRE-FLIGHT VALIDATION: Fail fast if no valid files exist
if (dicomFiles.length === 0) {
toast.error("No valid DICOM files found in the selected folder. Please ensure the folder contains .dcm or .img files.");
return;
}

} catch (error) {
setIsLoading(true);
try {
const formData = new FormData();
dicomFiles.forEach((file) => formData.append("dcm_files", file));
formData.append("modality", activeModalityTypeOption);

setIsLoading(false);
toast.error(
`An unexpected error occurred during upload, please try again. Error: ${error}`
);
const data = await getReport(formData, UploadDataType.DICOM.toLowerCase());
setIsLoading(false);
return data;

} catch (error) {
console.error("Upload error:", error);
setIsLoading(false);
toast.error(`Upload failed. Please check your network connection and try again.`);
}
}
}

const handleBidsUpload = async ({
files,
Expand All @@ -61,70 +60,64 @@ const handleBidsUpload = async ({
files: FileList;
setIsLoading: (v: boolean) => void;
setUploadedFiles: (files: IAllRelevantFilesType) => void;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setUploadConfig: (config: any) => void;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setUpdatedJsonContent: (content: any) => void;
setUpdatedJsonFilename: (filename: string) => void;
activeModalityTypeOption: UploadModalityType;
}) => {
setIsLoading(true);
if (!files || files.length === 0) return;

try {
const filesArray = Array.from(files);

const niftiFile = findNiftiFile(filesArray);
const aslRelevantFiles = findRelevantFiles(filesArray);

const allRelevantFiles: IAllRelevantFilesType = {
nifti_file: niftiFile,
asl_files: aslRelevantFiles,
dicom_files: [],
};

const formData = new FormData();

if (niftiFile) {
formData.append("nifti_file", niftiFile);
// PRE-FLIGHT VALIDATION: Prevent empty backend requests
if (!niftiFile && aslRelevantFiles.length === 0) {
toast.error("No valid BIDS format files found. Please check your dataset.");
return;
}

filesArray.forEach((file) => {
if (file.name.endsWith(".dcm")) {
formData.append("dcm_files", file);
allRelevantFiles.dicom_files.push(file);
}
});

aslRelevantFiles.forEach((file) => {
formData.append("files", file);
formData.append("filenames", file.name);
});

setUploadedFiles(allRelevantFiles);

setUploadConfig({
modalityType: activeModalityTypeOption,
fileType: UploadDataType.BIDS,
});

setUpdatedJsonContent(null);
setUpdatedJsonFilename('');

formData.append("modality", activeModalityTypeOption);

const data = await getReport(formData, UploadDataType.BIDS.toLowerCase());

setIsLoading(false);

return data;

} catch (error) {
setIsLoading(false);
toast.error(
`An unexpected error occurred during upload, please try again. Error: ${error}`
);
}
setIsLoading(true);
try {
const allRelevantFiles: IAllRelevantFilesType = {
nifti_file: niftiFile,
asl_files: aslRelevantFiles,
dicom_files: [],
};

const formData = new FormData();
if (niftiFile) formData.append("nifti_file", niftiFile);

filesArray.forEach((file) => {
if (file.name.endsWith(".dcm")) {
formData.append("dcm_files", file);
allRelevantFiles.dicom_files.push(file);
}
});

aslRelevantFiles.forEach((file) => {
formData.append("files", file);
formData.append("filenames", file.name);
});

setUploadedFiles(allRelevantFiles);
setUploadConfig({ modalityType: activeModalityTypeOption, fileType: UploadDataType.BIDS });
setUpdatedJsonContent(null);
setUpdatedJsonFilename('');
formData.append("modality", activeModalityTypeOption);

const data = await getReport(formData, UploadDataType.BIDS.toLowerCase());
setIsLoading(false);
return data;

} catch (error) {
console.error("Upload error:", error);
setIsLoading(false);
toast.error(`Upload failed. Please check your network connection and try again.`);
}
}

export {
handleDicomUpload,
handleBidsUpload
}
export { handleDicomUpload, handleBidsUpload }
2 changes: 1 addition & 1 deletion apps/frontend/src/services/apiReport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import axios from 'axios';
import {IReportApiResponse} from '@/types';


const API_BASE_URL = `${process.env.NEXT_PUBLIC_API_BASE_URL}/report`;
const API_BASE_URL = `/api/report`;

const client = axios.create({
baseURL: API_BASE_URL,
Expand Down