Merge branch 'dev' into 'main'

Dev

See merge request !261

src/i18n/de.ts

@@ -136,7 +136,7 @@ export default {
       },
       specific: {
         title: "Ein Fehler ist aufgetreten",
-        body: "Es ist ein Fehler aufgetreten {error}. Bitte versuchen Sie es erneut. Falls der Fehler weiterhin auftritt, wenden Sie sich bitte an Ihre Organization.",
+        body: "Es ist ein Fehler aufgetreten {error}. Bitte versuchen Sie es erneut. Falls der Fehler weiterhin auftritt, wenden Sie sich bitte an Ihre Organization und geben Sie die folgende Fehler-ID an: {errorId}.",
       },
     },
   },

src/i18n/en.ts

@@ -134,7 +134,7 @@ export default {
       },
       specific: {
         title: "An error occurred",
-        body: "An error occurred {error}. Please try again. If the error persists, please contact your organization.",
+        body: "Something went wrong {error}. Please try again. If the issue persists, contact your organization and provide the following Error ID: {errorId}.",
       },
     },
   },

src/modules/project/data/defaultOrganizations.ts

@@ -2,43 +2,43 @@ import type { OrganizationDto } from "@coscine/api-client/dist/types/Coscine.Api
 
 export const defaultOrganizations: OrganizationDto[] = [
   {
-    name: "FH Aachen",
-    rorUri: "https://ror.org/04tqgg260",
+    displayName: "FH Aachen",
+    uri: "https://ror.org/04tqgg260",
   },
   {
-    name: "Karlsruhe Institute of Technology",
-    rorUri: "https://ror.org/04t3en479",
+    displayName: "Karlsruhe Institute of Technology",
+    uri: "https://ror.org/04t3en479",
   },
   {
-    name: "RWTH Aachen University",
-    rorUri: "https://ror.org/04xfq0f34",
+    displayName: "RWTH Aachen University",
+    uri: "https://ror.org/04xfq0f34",
   },
   {
-    name: "Technical University of Munich",
-    rorUri: "https://ror.org/02kkvpp62",
+    displayName: "Technical University of Munich",
+    uri: "https://ror.org/02kkvpp62",
   },
   {
-    name: "TU Darmstadt",
-    rorUri: "https://ror.org/05n911h24",
+    displayName: "TU Darmstadt",
+    uri: "https://ror.org/05n911h24",
   },
   {
-    name: "TU Dortmund University",
-    rorUri: "https://ror.org/01k97gp34",
+    displayName: "TU Dortmund University",
+    uri: "https://ror.org/01k97gp34",
   },
   {
-    name: "Universitätsklinikum Aachen",
-    rorUri: "https://ror.org/02gm5zw39",
+    displayName: "Universitätsklinikum Aachen",
+    uri: "https://ror.org/02gm5zw39",
   },
   {
-    name: "University of Cologne",
-    rorUri: "https://ror.org/00rcxh774",
+    displayName: "University of Cologne",
+    uri: "https://ror.org/00rcxh774",
   },
   {
-    name: "University of Duisburg-Essen",
-    rorUri: "https://ror.org/04mz5ra38",
+    displayName: "University of Duisburg-Essen",
+    uri: "https://ror.org/04mz5ra38",
   },
   {
-    name: "University of Münster",
-    rorUri: "https://ror.org/00pd74e08",
+    displayName: "University of Münster",
+    uri: "https://ror.org/00pd74e08",
   },
 ];

src/store/notification.ts

 import { defineStore } from "pinia";
-import { NotificationState, NotificationToast } from "./types";
+import { type CoscineErrorResponse, NotificationState, NotificationToast } from "./types";
 import i18n from "@/plugins/vue-i18n";
 import { getReasonPhrase } from "http-status-codes";
 import type { AxiosError } from "axios";
@@ -44,12 +44,15 @@ export const useNotificationStore = defineStore({
     postApiErrorNotification(error: AxiosError) {
       let notification: NotificationToast;
       if (error.response) {
+        const coscineErrorResponse = error.response.data as CoscineErrorResponse;
+
         // The request was made and the server responded with a status code that falls out of the range of 2xx
         const notificationBody = i18n
           .t("toast.apiError.specific.body", {
             error: `(${error.response.status}: ${getReasonPhrase(
               error.response.status
             )})`,
+            errorId: coscineErrorResponse.data.errorId ?? "",
           })
           .toString();
         notification = {

src/store/types.ts

@@ -42,3 +42,13 @@ export interface NotificationState {
   */
   notificationQueue: NotificationToast[];
 }
+
+export interface CoscineErrorResponse {
+  data: {
+    status: number;
+    instance: string;
+    errorId: string;
+  };
+  statusCode: number;
+  isSuccess: boolean;
+}