Merge remote-tracking branch 'origin/main' into 131-min-194-display-user-grouped-overlays

CHANGELOG

@@ -14,6 +14,13 @@ minerva-front (19.0.0~alpha.0) stable; urgency=medium
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 18 Oct 2024 13:00:00 +0200
 
+minerva-front (18.1.1) stable; urgency=medium
+  * Bug fix: styling of notes reset only for a href (#334)
+  * Bug fix: disable searching for chemicals in projects without disease (#347)
+  * Bug fix: public overlays were not sorted (#349)
+
+-- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 04 Feb 2025 16:00:00 +0200
+
 minerva-front (18.1.0) stable; urgency=medium
   * Small improvement: support for links that should be opened immediately
     (#342)
@@ -22,7 +29,6 @@ minerva-front (18.1.0) stable; urgency=medium
   * Bug fix: submap download did not download selected map (#337)
   * Bug fix: styling of notes contains original styling for links (#344)
 
-
 -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 30 Jan 2025 15:00:00 +0200
 
 minerva-front (18.0.7) stable; urgency=medium

src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.test.tsx

@@ -14,6 +14,8 @@ import {
   MODEL_ELEMENT_LINKING_TO_SUBMAP,
   MODEL_ELEMENTS_SEARCH_INITIAL_STATE_MOCK,
 } from '@/redux/modelElements/modelElements.mock';
+import { projectFixture } from '@/models/fixtures/projectFixture';
+import { PROJECT_STATE_INITIAL_MOCK } from '@/redux/project/project.mock';
 import { BioEntityDrawer } from './BioEntityDrawer.component';
 
 const renderComponent = (
@@ -261,6 +263,13 @@ describe('BioEntityDrawer - component', () => {
 
     it('should fetch chemicals on chemicals for target click', () => {
       const { store } = renderComponent({
+        ...INITIAL_STORE_STATE_MOCK,
+        project: {
+          data: projectFixture,
+          loading: 'succeeded',
+          error: { message: '', name: '' },
+          projectId: projectFixture.projectId,
+        },
         modelElements: {
           data: {
             0: {
@@ -311,6 +320,10 @@ describe('BioEntityDrawer - component', () => {
             chemicals: {},
           },
         },
+        project: {
+          ...PROJECT_STATE_INITIAL_MOCK,
+          data: projectFixture,
+        },
       });
 
       const button = screen.getByText('Drugs for target', { exact: false });

src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx

@@ -18,6 +18,8 @@ import {
   currentDrawerModelElementRelatedSubmapSelector,
   currentDrawerModelElementSelector,
 } from '@/redux/modelElements/modelElements.selector';
+import { projectDataSelector } from '@/redux/project/project.selectors';
+import { showToast } from '@/utils/showToast';
 import { CollapsibleSection } from '../ExportDrawer/CollapsibleSection';
 import { AssociatedSubmap } from './AssociatedSubmap';
 import { ChemicalsList } from './ChemicalsList';
@@ -32,8 +34,18 @@ export const BioEntityDrawer = (): React.ReactNode => {
   const commentsData = useAppSelector(currentDrawerElementCommentsSelector);
   const relatedSubmap = useAppSelector(currentDrawerModelElementRelatedSubmapSelector);
   const currentTargetId = modelElement?.id ? `${TARGET_PREFIX}:${modelElement.id}` : '';
+
+  const project = useAppSelector(projectDataSelector);
+
   const fetchChemicalsForTarget = (): void => {
-    dispatch(getChemicalsForBioEntityDrawerTarget(currentTargetId));
+    if (project === undefined || project.disease === null || project.disease === undefined) {
+      showToast({
+        type: 'info',
+        message: `Project disease not defined. Only projects with defined disease have chemical search available`,
+      });
+    } else {
+      dispatch(getChemicalsForBioEntityDrawerTarget(currentTargetId));
+    }
   };
   const compartmentName = useAppSelector(state =>
     compartmentNameByIdSelector(state, modelElement?.compartment),
@@ -74,7 +86,7 @@ export const BioEntityDrawer = (): React.ReactNode => {
           </div>
         )}
         {modelElement.notes && (
-          <span className="visited:text-purple-600 text-blue-600 underline hover:text-blue-800">
+          <span className="[&_a]:text-blue-600 [&_a]:underline [&_a]:hover:text-blue-800">
             <hr className="border-b border-b-divide" />
             <div
               className="mt-2 text-sm font-normal"

src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysGroup/UserOverlaysGroup.component.tsx

@@ -67,7 +67,7 @@ export const UserOverlaysGroup = ({
                 sideMenu={
                   groupId && (
                     <button onClick={openEditGroup} type="button" className="mr-2">
-                      <Icon name="edit-image" />
+                      <Icon name="pencil" />
                     </button>
                   )
                 }

src/models/disease.ts

-import { z } from 'zod';
-
-export const disease = z.object({
-  id: z.number().int().positive(),
-  link: z.string().nullable(),
-  type: z.string(),
-  resource: z.string(),
-  annotatorClassName: z.string(),
-});

src/models/generators/diseaseGenerator.ts

 // eslint-disable-next-line import/no-extraneous-dependencies
 import { createFixture, Generator } from 'zod-fixture';
-import { disease } from '@/models/disease';
 import { ZOD_SEED } from '@/constants';
 import { ZodNullable } from 'zod';
+import { referenceSchema } from '@/models/referenceSchema';
 
 export const diseaseGenerator = Generator({
   schema: ZodNullable,
@@ -11,7 +11,7 @@ export const diseaseGenerator = Generator({
     return context.path.at(-1) === 'disease';
   },
   output: () =>
-    createFixture(disease, {
+    createFixture(referenceSchema, {
       seed: ZOD_SEED,
       array: { min: 2, max: 2 },
     }),

src/models/projectSchema.ts

 import { z } from 'zod';
 import { licenseSchema } from '@/models/licenseSchema';
-import { disease } from './disease';
+import { referenceSchema } from '@/models/referenceSchema';
 import { organism } from './organism';
 import { overviewImageView } from './overviewImageView';
 
 export const projectSchema = z.object({
   id: z.number().int().nonnegative(),
   version: z.string(),
-  disease: disease.nullable(),
+  disease: referenceSchema.nullable(),
   diseaseName: z.string().nullable(),
   organism: organism.nullable(),
   organismName: z.string().nullable(),

src/redux/overlays/overlays.thunks.ts

@@ -44,7 +44,9 @@ export const getAllPublicOverlaysByProjectId = createAsyncThunk<MapOverlay[], st
         pageableSchema(mapOverlaySchema),
       );
 
-      return isDataValid ? response.data.content : [];
+      return isDataValid
+        ? response.data.content.sort((overlayA, overlayB) => overlayA.order - overlayB.order)
+        : [];
     } catch (error) {
       return Promise.reject(getError({ error, prefix: OVERLAYS_FETCHING_ERROR_PREFIX }));
     }

src/shared/Toast/Toast.component.tsx

@@ -2,23 +2,32 @@ import { twMerge } from 'tailwind-merge';
 import { Icon } from '../Icon';
 
 type ToastArgs = {
-  type: 'success' | 'error';
+  type: 'success' | 'error' | 'info';
   message: string;
   onDismiss: () => void;
 };
 
+const textColors = {
+  error: 'text-red-500',
+  success: 'text-green-500',
+  info: 'text-blue-500',
+};
+
+const bgColors = {
+  error: 'before:bg-red-500',
+  success: 'before:bg-green-500',
+  info: 'before:bg-blue-500',
+};
+
 export const Toast = ({ type, message, onDismiss }: ToastArgs): React.ReactNode => (
   <div
     className={twMerge(
       'flex h-[76px] w-[700px] items-center rounded-l rounded-r-lg bg-white p-4 drop-shadow before:absolute before:inset-y-0 before:left-0 before:block before:w-1 before:rounded-l-lg before:content-[""]',
-      type === 'error' ? 'before:bg-red-500' : 'before:bg-green-500',
+      bgColors[type],
     )}
   >
     <p
-      className={twMerge(
-        'h-full overflow-y-auto text-base font-bold',
-        type === 'error' ? 'text-red-500' : 'text-green-500',
-      )}
+      className={twMerge('h-full overflow-y-auto text-base font-bold', textColors[type])}
       dangerouslySetInnerHTML={{ __html: message }}
     />
 

src/utils/showToast.tsx

@@ -4,7 +4,7 @@ import { Toast } from '@/shared/Toast';
 const DEFAULT_DURATION_MS = 5000;
 
 type ShowToastArgs = {
-  type: 'success' | 'error';
+  type: 'success' | 'error' | 'info';
   message: string;
   duration?: number;
 };