bram requests xoxo

SELab-2 · May 20, 2024 · 815aa3d · 815aa3d
1 parent dc66f0d
commit 815aa3d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/frontend/src/components/RequirementsInput.vue b/frontend/src/components/RequirementsInput.vue
@@ -66,13 +66,9 @@ const addRequirement = () => {
 };
 
 watchEffect(() => {
-    console.log("Current props value:", props.modelValue);
     internalRequirements.value = [...props.modelValue];
 });
 
-const updateRequirements = () => {
-    emit("update:modelValue", [...internalRequirements.value]);
-};
 const validateRequirement = (value) => {
     if (!value) {
         return t("project.required"); // Check if the input is empty

diff --git a/frontend/src/components/project/DisplayTestFiles.vue b/frontend/src/components/project/DisplayTestFiles.vue
@@ -1,6 +1,6 @@
 <template>
     <v-card class="file-display-container" outlined>
-        <v-card-title> Project Files </v-card-title>
+        <v-card-title>{{ $t("project.testfiles") }}</v-card-title>
         <v-card-text>
             <v-treeview v-model="tree" :items="treeItems" activatable hoverable open-on-click>
                 <template v-slot:prepend="{ item }">

diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
@@ -33,6 +33,7 @@ export default {
         new_submission: "Submit new",
         status_submission: "Submission is: {status}",
         no_submission_files: "No submissions found",
+        files_disclaimer: "For info on the usage of testfiles please visit our",
     },
     submission: {
         status: "Submission status:",
@@ -79,6 +80,8 @@ export default {
         forbidden: "Forbidden",
         invalid_format:
             "Please enter a valid file type, including the extension (e.g., 'image.png')",
+        files_will_be_overwritten: "By uploading another file current files will be overwritten.",
+        testfiles: "Testfiles",
     },
     navigation: {
         home: "Home",

diff --git a/frontend/src/queries/Project.ts b/frontend/src/queries/Project.ts
@@ -117,7 +117,6 @@ export function useUpdateProjectMutation(): UseMutationReturnType<
 }
 
 export function useProjectFilesQuery(projectId: number): UseQueryReturnType<File[], Error> {
-    console.log("projectid" + projectId);
     return useQuery<File[], Error>({
         queryKey: projectFilesQueryKey(projectId),
         queryFn: () => fetchProjectFiles(projectId),

diff --git a/frontend/src/views/CreateProjectView.vue b/frontend/src/views/CreateProjectView.vue
@@ -71,10 +71,19 @@
         <v-row>
             <v-col cols="12">
                 <div v-if="isEditMode" class="file-upload-disclaimer">
-                    <v-alert class="custom-alert" dense text>
+                    <v-alert
+                        v-if="filesData && filesData.length > 0"
+                        class="custom-alert"
+                        dense
+                        text
+                    >
+                        {{ $t("project.files_will_be_overwritten") }}
+                    </v-alert>
+                    <v-alert v-else class="custom-alert" dense text>
                         {{ $t("project.no_files") }}
                     </v-alert>
                 </div>
+
                 <FilesInput v-model="files" />
             </v-col>
             <v-col cols="12">
@@ -275,7 +284,6 @@ async function submitForm() {
         } else {
             await createProject(projectData);
         }
-        handleFiles(projectData.project_id);
         navigateToProject(projectData.project_id);
     } catch (error) {
         console.error("Error during project or group creation or file upload:", error);
@@ -303,13 +311,15 @@ async function updateProject(projectData) {
         projectId: projectId.value,
         projectData,
     });
+    handleFiles(projectId.value);
     setSuccessAlert("Project updated successfully.");
 }
 
 async function createProject(projectData) {
     const createdProjectId = await createProjectMutation.mutateAsync(projectData);
     projectData.project_id = createdProjectId;
     await handleGroupCreation(createdProjectId);
+    handleFiles(projectData.project_id);
     setSuccessAlert("Project created successfully.");
 }