chore: merge & toast example

SELab-2 · May 23, 2024 · 11c7d69 · 11c7d69
1 parent 5c2fe8a
commit 11c7d69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/frontend/src/composables/services/course.service.ts b/frontend/src/composables/services/course.service.ts
@@ -1,13 +1,11 @@
 import { Course } from '@/types/Course.ts';
 import { type Ref, ref } from 'vue';
 import { endpoints } from '@/config/endpoints.ts';
-import { i18n } from '@/config/i18n.ts';
 import { get, getList, create, patch, deleteId, getPaginatedList } from '@/composables/services/helpers.ts';
 import { type Response } from '@/types/Response.ts';
 import { type CoursePaginatorResponse } from '@/types/filter/Paginator.ts';
 import { type Filter } from '@/types/filter/Filter.ts';
 import { type User } from '@/types/users/User.ts';
-import { useMessagesStore } from '@/store/messages.store.ts';
 
 interface CoursesState {
     pagination: Ref<CoursePaginatorResponse | null>;
@@ -95,8 +93,6 @@ export function useCourses(): CoursesState {
     }
 
     async function createCourse(courseData: Course, selfProcessError: boolean = true): Promise<void> {
-        const { t } = i18n.global;
-        const { addSuccessMessage } = useMessagesStore();
         const endpoint = endpoints.courses.index;
         await create<Course>(
             endpoint,
@@ -114,10 +110,6 @@ export function useCourses(): CoursesState {
             undefined,
             selfProcessError,
         );
-        addSuccessMessage(
-            t('toasts.messages.success'),
-            t('toasts.messages.courses.create.success', [course.value?.name]),
-        );
     }
 
     async function updateCourse(courseData: Course, selfProcessError: boolean = true): Promise<void> {

diff --git a/frontend/src/composables/services/group.service.ts b/frontend/src/composables/services/group.service.ts
@@ -65,7 +65,7 @@ export function useGroup(): GroupState {
                     score: groupData.score,
                 },
                 response,
-                selfProcessError
+                selfProcessError,
             );
         }
     }

diff --git a/frontend/src/composables/services/project.service.ts b/frontend/src/composables/services/project.service.ts
@@ -1,4 +1,4 @@
-import { Project, type ProjectJSON } from '@/types/Project';
+import { Project } from '@/types/Project';
 import { type Ref, ref } from 'vue';
 import { endpoints } from '@/config/endpoints.ts';
 import { i18n } from '@/config/i18n.ts';
@@ -52,7 +52,7 @@ export function useProject(): ProjectState {
 
     async function getProjectsByTeacher(teacherId: string, selfProcessError: boolean = true): Promise<void> {
         const endpoint = endpoints.projects.byTeacher.replace('{teacherId}', teacherId);
-        await getList<Project>(endpoint, projects, Project.fromJSON);
+        await getList<Project>(endpoint, projects, Project.fromJSON, selfProcessError);
     }
 
     async function getProjectsByCourseAndDeadline(

diff --git a/frontend/src/views/courses/CreateCourseView.vue b/frontend/src/views/courses/CreateCourseView.vue
@@ -9,9 +9,11 @@ import { useFaculty } from '@/composables/services/faculty.service.ts';
 import { type Course } from '@/types/Course.ts';
 import { useCourses } from '@/composables/services/course.service.ts';
 import { useRouter } from 'vue-router';
+import { useMessagesStore } from '@/store/messages.store.ts';
 
 /* Composable injections */
 const { t } = useI18n();
+const { addSuccessMessage } = useMessagesStore();
 const { push } = useRouter();
 const { faculties, getFaculties } = useFaculty();
 const { createCourse } = useCourses();
@@ -25,8 +27,13 @@ const loading = ref(true);
  * @param course
  */
 async function saveCourse(course: Course): Promise<void> {
-    await createCourse(course);
-    await push({ name: 'dashboard' });
+    try {
+        await createCourse(course);
+        addSuccessMessage(t('toasts.messages.success'), t('toasts.messages.courses.create.success', [course.name]));
+        await push({ name: 'dashboard' });
+    } catch (error: any) {
+        // TODO error message
+    }
 }
 
 /** Load the data */