[Tech] changes after code review

MTES-MCT · Sep 18, 2024 · ee02668 · ee02668
1 parent 94b1106
commit ee02668
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 88 deletions.
diff --git a/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/vigilanceArea/ImageEntity.kt b/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/vigilanceArea/ImageEntity.kt
@@ -1,8 +1,5 @@
 package fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea
 
-import kotlinx.serialization.Serializable
-
-@Serializable
 data class ImageEntity(
     val id: Int? = null,
     val vigilanceAreaId: Int? = null,

diff --git a/...ntities/vigilanceArea/ImageInputEntity.kt → ...ff/inputs/vigilanceArea/ImageDataInput.kt b/...ntities/vigilanceArea/ImageInputEntity.kt → ...ff/inputs/vigilanceArea/ImageDataInput.kt
@@ -1,9 +1,9 @@
-package fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea
+package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.vigilanceArea
 
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ImageInputEntity(
+data class ImageDataInput(
     val id: Int? = null,
     val vigilanceAreaId: Int? = null,
     val name: String,

diff --git a/...monitorenv/infrastructure/api/adapters/bff/inputs/vigilanceArea/VigilanceAreaDataInput.kt b/...monitorenv/infrastructure/api/adapters/bff/inputs/vigilanceArea/VigilanceAreaDataInput.kt
@@ -18,7 +18,7 @@ data class VigilanceAreaDataInput(
     val geom: MultiPolygon? = null,
     val isArchived: Boolean,
     val isDraft: Boolean,
-    val images: List<ImageInputEntity>? = listOf(),
+    val images: List<ImageDataInput>? = listOf(),
     val links: List<LinkEntity>? = null,
     val linkedAMPs: List<Int>? = listOf(),
     val linkedRegulatoryAreas: List<Int>? = listOf(),
@@ -44,8 +44,9 @@ data class VigilanceAreaDataInput(
             isArchived = this.isArchived,
             isDeleted = false,
             isDraft = this.isDraft,
-            images = this.images?.map { image ->
-                return@map ImageEntity(
+            images =
+            this.images?.map { image ->
+                ImageEntity(
                     id = image.id,
                     vigilanceAreaId = image.vigilanceAreaId,
                     name = image.name,

diff --git a/...lin/fr/gouv/cacem/monitorenv/domain/use_cases/vigilanceArea/GetVigilanceAreaByIdUTests.kt b/...lin/fr/gouv/cacem/monitorenv/domain/use_cases/vigilanceArea/GetVigilanceAreaByIdUTests.kt
@@ -14,7 +14,7 @@ class GetVigilanceAreaByIdUTests {
     @Test
     fun `execute should return vigilance area entity`() {
         val vigilanceAreaId = 3
-        val expectedEntity = VigilanceAreaFixture.aArchivedVigilanceAreaEntity()
+        val expectedEntity = VigilanceAreaFixture.anArchivedVigilanceAreaEntity()
 
         given(vigilanceAreaRepository.findById(vigilanceAreaId)).willReturn(expectedEntity)
 

diff --git a/.../fr/gouv/cacem/monitorenv/domain/use_cases/vigilanceArea/fixtures/VigilanceAreaFixture.kt b/.../fr/gouv/cacem/monitorenv/domain/use_cases/vigilanceArea/fixtures/VigilanceAreaFixture.kt
@@ -42,7 +42,8 @@ class VigilanceAreaFixture {
                 endingCondition = null,
                 endingOccurrenceDate = null,
                 endingOccurrencesNumber = 2,
-                images = listOf(
+                images =
+                listOf(
                     ImageEntity(
                         name = "image1.jpg",
                         content = byteArrayOf(1, 2, 3),
@@ -61,9 +62,16 @@ class VigilanceAreaFixture {
                 isArchived = false,
                 isDeleted = false,
                 isDraft = true,
-                links = listOf(
-                    LinkEntity(linkUrl = "http://example.com/link1", linkText = "Link 1"),
-                    LinkEntity(linkUrl = "http://example.com/link2", linkText = "Link 2"),
+                links =
+                listOf(
+                    LinkEntity(
+                        linkUrl = "http://example.com/link1",
+                        linkText = "Link 1",
+                    ),
+                    LinkEntity(
+                        linkUrl = "http://example.com/link2",
+                        linkText = "Link 2",
+                    ),
                 ),
                 linkedAMPs = listOf(1, 2),
                 linkedRegulatoryAreas = listOf(1, 2),
@@ -75,7 +83,7 @@ class VigilanceAreaFixture {
             )
         }
 
-        fun aArchivedVigilanceAreaEntity(): VigilanceAreaEntity {
+        fun anArchivedVigilanceAreaEntity(): VigilanceAreaEntity {
             return VigilanceAreaEntity(
                 id = 3,
                 comments = "Basic area comments",

diff --git a/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/VigilanceAreasITests.kt b/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/VigilanceAreasITests.kt
@@ -8,6 +8,7 @@ import fr.gouv.cacem.monitorenv.domain.use_cases.vigilanceArea.CreateOrUpdateVig
 import fr.gouv.cacem.monitorenv.domain.use_cases.vigilanceArea.DeleteVigilanceArea
 import fr.gouv.cacem.monitorenv.domain.use_cases.vigilanceArea.GetVigilanceAreaById
 import fr.gouv.cacem.monitorenv.domain.use_cases.vigilanceArea.GetVigilanceAreas
+import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.vigilanceArea.ImageDataInput
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.vigilanceArea.VigilanceAreaDataInput
 import fr.gouv.cacem.monitorenv.infrastructure.api.endpoints.bff.v1.VigilanceAreas
 import org.hamcrest.Matchers.equalTo
@@ -229,13 +230,13 @@ class VigilanceAreasITests {
                 endDatePeriod = ZonedDateTime.parse("2024-08-08T23:59:59Z"),
                 geom = polygon,
                 images = listOf(
-                    ImageInputEntity(
+                    ImageDataInput(
                         name = "image1.jpg",
                         content = "AQID",
                         mimeType = "image/jpeg",
                         size = 1024,
                     ),
-                    ImageInputEntity(
+                    ImageDataInput(
                         name = "image2.png",
                         content = "BAUG",
                         mimeType = "image/png",

diff --git a/frontend/src/features/InterestPoint/components/InterestPointMapButton.tsx b/frontend/src/features/InterestPoint/components/InterestPointMapButton.tsx
@@ -44,7 +44,7 @@ export function InterestPointMapButton() {
     close()
   }, [dispatch, close])
 
-  useEscapeKey(cancel)
+  useEscapeKey({ onEscape: cancel })
 
   const toggleInterestPointMenu = useCallback(() => {
     if (!isOpen) {

diff --git a/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/ImageViewer.tsx b/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/ImageViewer.tsx
@@ -1,5 +1,6 @@
+import { useEscapeKey } from '@hooks/useEscapeKey'
 import { Accent, Icon, IconButton, THEME } from '@mtes-mct/monitor-ui'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 import styled from 'styled-components'
 
 interface ImageViewerProps {
@@ -22,34 +23,15 @@ export function ImageViewer({ currentIndex, images, onClose }: ImageViewerProps)
     [images.length, localCurrentIndex]
   )
 
-  const handleKeyDown = useCallback(
-    (event: any) => {
-      if (event.key === 'Escape') {
-        onClose()
-      }
-
-      if (event.key === 'ArrowLeft') {
-        changeImage(-1)
-      }
-
-      if (event.key === 'ArrowRight') {
-        changeImage(1)
-      }
-    },
-    [onClose, changeImage]
-  )
-
-  useEffect(() => {
-    document.addEventListener('keydown', handleKeyDown)
-
-    return () => {
-      document.removeEventListener('keydown', handleKeyDown)
-    }
-  }, [handleKeyDown])
+  useEscapeKey({
+    onArrowLeft: () => changeImage(-1),
+    onArrowRight: () => changeImage(1),
+    onEscape: () => onClose()
+  })
 
   return (
     <>
-      <Wrapper onKeyDown={handleKeyDown}>
+      <Wrapper>
         <CloseButton>
           <IconButton
             accent={Accent.TERTIARY}

diff --git a/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/PhotoUploader.tsx b/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/PhotoUploader.tsx
@@ -85,7 +85,7 @@ export function PhotoUploaderWithRef(_, ref) {
               error(err) {
                 reject(err)
               },
-              quality: 0.4,
+              quality: 0.3,
               async success(result) {
                 try {
                   const base64Image = await getBase64(result)
@@ -99,6 +99,7 @@ export function PhotoUploaderWithRef(_, ref) {
                   }
                   const compressedImageForFront = {
                     image: base64Image,
+                    name: file.name,
                     orientation:
                       naturalWidth > naturalHeight
                         ? VigilanceArea.Orientation.LANDSCAPE
@@ -177,19 +178,20 @@ export function PhotoUploaderWithRef(_, ref) {
       <PreviewList>
         {imagesList &&
           imagesList.map((image, index) => (
-            <PreviewImagesContainer key={Math.random()}>
-              <img
-                alt="vigilance_area"
-                aria-hidden="true"
-                height="82px"
-                onClick={() => openImageViewer(index)}
-                src={image?.image}
-                width={
-                  image?.orientation === VigilanceArea.Orientation.LANDSCAPE
-                    ? IMAGES_WIDTH_LANDSCAPE
-                    : IMAGES_WIDTH_PORTRAIT
-                }
-              />
+            // eslint-disable-next-line react/no-array-index-key
+            <PreviewImagesContainer key={index}>
+              <StyledImageButton onClick={() => openImageViewer(index)} type="button">
+                <img
+                  alt={`${values.name}-${image.name}`}
+                  height="82px"
+                  src={image?.image}
+                  width={
+                    image?.orientation === VigilanceArea.Orientation.LANDSCAPE
+                      ? IMAGES_WIDTH_LANDSCAPE
+                      : IMAGES_WIDTH_PORTRAIT
+                  }
+                />
+              </StyledImageButton>
               <StyledButton
                 accent={Accent.SECONDARY}
                 Icon={Icon.Delete}
@@ -212,12 +214,29 @@ export function PhotoUploaderWithRef(_, ref) {
 
 export const PhotoUploader = forwardRef(PhotoUploaderWithRef)
 
-const PreviewList = styled.div`
+const PreviewList = styled.ul`
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
+  list-style-type: none;
   margin-top: 10px;
+  padding: 0px;
+`
+
+const PreviewImagesContainer = styled.li`
+  position: relative;
+  > img {
+    object-fit: cover;
+  }
 `
+
+const StyledImageButton = styled.button`
+  cursor: zoom-in;
+  background: none;
+  border: none;
+  padding: 0px;
+`
+
 const StyledButton = styled(Button)`
   background-color: ${p => p.theme.color.white};
   bottom: 4px;
@@ -228,16 +247,10 @@ const StyledButton = styled(Button)`
     margin-right: 0px !important;
   }
 `
+
 const Text = styled.p<{ $hasError: boolean }>`
   color: ${p => (p.$hasError ? p.theme.color.maximumRed : p.theme.color.slateGray)};
   font-style: italic;
   margin-bottom: 4px;
   margin-top: 4px;
 `
-
-const PreviewImagesContainer = styled.div`
-  position: relative;
-  > img {
-    cursor: zoom-in;
-  }
-`
diff --git a/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/VigilanceAreaPanel.tsx b/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/VigilanceAreaPanel.tsx
@@ -16,7 +16,7 @@ import { AMPList } from './AddAMPs/AMPList'
 import { RegulatoryAreas } from './AddRegulatoryAreas/RegulatoryAreas'
 import { ImageViewer } from './ImageViewer'
 import { PublishedSchema } from './Schema'
-import { DeleteButton, FooterContainer, FooterRightButtons } from './style'
+import { DeleteButton, FooterContainer, FooterRightButtons, StyledImageButton } from './style'
 import { getImages } from './utils'
 
 const EMPTY_VALUE = '--'
@@ -184,19 +184,19 @@ export function VigilanceAreaPanel({ vigilanceArea }: { vigilanceArea: Vigilance
         {imagesList.length > 0 && (
           <ImageContainer>
             {imagesList.map((image, index) => (
-              <img
-                key={Math.random()}
-                alt="vigilance_area"
-                aria-hidden="true"
-                height="82px"
-                onClick={() => openImageViewer(index)}
-                src={image?.image}
-                width={
-                  image?.orientation === VigilanceArea.Orientation.LANDSCAPE
-                    ? IMAGES_WIDTH_LANDSCAPE
-                    : IMAGES_WIDTH_PORTRAIT
-                }
-              />
+              // eslint-disable-next-line react/no-array-index-key
+              <StyledImageButton key={index} onClick={() => openImageViewer(index)} type="button">
+                <img
+                  alt={`${values.name}-${image.name}`}
+                  height="82px"
+                  src={image?.image}
+                  width={
+                    image?.orientation === VigilanceArea.Orientation.LANDSCAPE
+                      ? IMAGES_WIDTH_LANDSCAPE
+                      : IMAGES_WIDTH_PORTRAIT
+                  }
+                />
+              </StyledImageButton>
             ))}
           </ImageContainer>
         )}
@@ -285,7 +285,7 @@ const ImageContainer = styled.div`
   padding: 16px;
   border-bottom: 1px solid ${p => p.theme.color.lightGray};
   > img {
-    cursor: zoom-in;
+    object-fit: cover;
   }
 `
 

diff --git a/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/style.ts b/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/style.ts
@@ -53,3 +53,9 @@ export const ValidateButton = styled(Button)`
     border: 1px ${p => p.theme.color.mediumSeaGreen} solid;
   }
 `
+export const StyledImageButton = styled.button`
+  cursor: zoom-in;
+  background: none;
+  border: none;
+  padding: 0px;
+`
diff --git a/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/utils.ts b/frontend/src/features/VigilanceArea/components/VigilanceAreaForm/utils.ts
@@ -38,6 +38,7 @@ export async function getImages(images: VigilanceArea.ImagePropsForApi[]) {
 
         return {
           image: base64Image,
+          name: image.name,
           orientation:
             naturalWidth > naturalHeight ? VigilanceArea.Orientation.LANDSCAPE : VigilanceArea.Orientation.PORTRAIT
         }

diff --git a/frontend/src/features/VigilanceArea/types.ts b/frontend/src/features/VigilanceArea/types.ts
@@ -93,6 +93,7 @@ export namespace VigilanceArea {
   export type ImageForFrontProps = {
     id?: string
     image: string
+    name: string
     orientation: Orientation
   }
 

diff --git a/frontend/src/features/map/tools/measurements/MeasurementMapButton.tsx b/frontend/src/features/map/tools/measurements/MeasurementMapButton.tsx
@@ -31,9 +31,11 @@ export function MeasurementMapButton() {
     dispatch(globalActions.setIsMapToolVisible(undefined))
   })
 
-  useEscapeKey(() => {
-    dispatch(setMeasurementTypeToAdd(undefined))
-    dispatch(globalActions.setIsMapToolVisible(undefined))
+  useEscapeKey({
+    onEscape: () => {
+      dispatch(setMeasurementTypeToAdd(undefined))
+      dispatch(globalActions.setIsMapToolVisible(undefined))
+    }
   })
 
   useEffect(() => {

diff --git a/frontend/src/hooks/useEscapeKey.ts b/frontend/src/hooks/useEscapeKey.ts
@@ -1,17 +1,30 @@
 import { useEffect } from 'react'
 
-export const useEscapeKey = (onEscape?: () => void) => {
+type UseEscapeKeyProps = {
+  onArrowLeft?: () => void
+  onArrowRight?: () => void
+  onEscape?: () => void
+}
+export const useEscapeKey = ({ onArrowLeft, onArrowRight, onEscape }: UseEscapeKeyProps) => {
   useEffect(() => {
-    const escapeFromKeyboard = event => {
+    const handleKeyDown = event => {
       if (event.key === 'Escape' && onEscape) {
         onEscape()
       }
+
+      if (event.key === 'ArrowLeft' && onArrowLeft) {
+        onArrowLeft()
+      }
+
+      if (event.key === 'ArrowRight' && onArrowRight) {
+        onArrowRight()
+      }
     }
 
-    document.addEventListener('keydown', escapeFromKeyboard, false)
+    document.addEventListener('keydown', handleKeyDown, false)
 
     return () => {
-      document.removeEventListener('keydown', escapeFromKeyboard, false)
+      document.removeEventListener('keydown', handleKeyDown, false)
     }
-  }, [onEscape])
+  }, [onEscape, onArrowLeft, onArrowRight])
 }