Merge remote-tracking branch 'origin/development' into...

Merge remote-tracking branch 'origin/development' into 254-min-321-form-for-reporting-errors-in-minerva

src/redux/store.ts

@@ -23,6 +23,7 @@ import {
   TypedStartListening,
   configureStore,
 } from '@reduxjs/toolkit';
+import commentReducer from '@/redux/comment/comment.slice';
 import compartmentPathwaysReducer from './compartmentPathways/compartmentPathways.slice';
 import entityNumberReducer from './entityNumber/entityNumber.slice';
 import exportReducer from './export/export.slice';
@@ -40,6 +41,7 @@ export const reducers = {
   drugs: drugsReducer,
   chemicals: chemicalsReducer,
   bioEntity: bioEntityReducer,
+  comment: commentReducer,
   drawer: drawerReducer,
   modal: modalReducer,
   map: mapReducer,

src/types/comment.ts

+import { Comment } from './models';
+import { PinType } from './pin';
+
+export interface CommentWithPinType extends Comment {
+  pinType: PinType;
+}

src/types/models.ts

@@ -61,6 +61,7 @@ import { targetSchema } from '@/models/targetSchema';
 import { targetSearchNameResult } from '@/models/targetSearchNameResult';
 import { userPrivilegeSchema } from '@/models/userPrivilegesSchema';
 import { z } from 'zod';
+import { commentSchema } from '@/models/commentSchema';
 import { userSchema } from '@/models/userSchema';
 import { javaStacktraceSchema } from '@/models/javaStacktraceSchema';
 
@@ -122,3 +123,4 @@ export type MarkerLine = z.infer<typeof markerLineSchema>;
 export type MarkerWithPosition = z.infer<typeof markerWithPositionSchema>;
 export type Marker = z.infer<typeof markerSchema>;
 export type JavaStacktrace = z.infer<typeof javaStacktraceSchema>;
+export type Comment = z.infer<typeof commentSchema>;

src/types/pin.ts

-export type PinType = 'chemicals' | 'drugs' | 'bioEntity';
+export type PinType = 'chemicals' | 'drugs' | 'bioEntity' | 'comment';

src/utils/validateDataUsingZodSchema.ts

@@ -8,7 +8,7 @@ export const validateDataUsingZodSchema: IsApiResponseValid = (data, schema: Zod
   if (validationResults.success === false) {
     // TODO - probably need to rething way of handling parsing errors, for now let's leave it to console.log
     // eslint-disable-next-line no-console
-    console.error('Error on parsing data', validationResults.error);
+    console.error('Error on parsing data', validationResults.error.message);
   }
 
   return validationResults.success;