🔀 Intégration de commit de la v3.11 (#1367)

MTES-MCT · Oct 20, 2023 · 6f8b93b · 6f8b93b
2 parents 09f92ab + 177b514
commit 6f8b93b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/views/components/UI/organisms/UserNavigation.tsx b/src/views/components/UI/organisms/UserNavigation.tsx
@@ -65,7 +65,13 @@ const MenuAdmin = (currentPage?: string) => (
     >
       Projets
     </Header.MenuItem>
-    <DropdownMenu buttonChildren={'Demandes'}>
+    <Header.MenuItem
+      href={routes.ADMIN_LIST_REQUESTS}
+      {...(currentPage === 'list-requests' && { isCurrent: true })}
+    >
+      Demandes
+    </Header.MenuItem>
+    {/* <DropdownMenu buttonChildren={'Demandes'}>
       <DropdownMenu.DropdownItem
         href={routes.ADMIN_LIST_REQUESTS}
         {...(currentPage === 'list-requests' && { isCurrent: true })}
@@ -78,7 +84,7 @@ const MenuAdmin = (currentPage?: string) => (
       >
         Abandons avec recandidature
       </DropdownMenu.DropdownItem>
-    </DropdownMenu>
+    </DropdownMenu> */}
     <DropdownMenu buttonChildren={'Imports'}>
       <DropdownMenu.DropdownItem
         href={routes.IMPORT_PROJECTS}
@@ -235,7 +241,13 @@ const MenuDreal = (currentPage?: string) => (
     >
       Projets
     </Header.MenuItem>
-    <DropdownMenu buttonChildren={'Demandes'}>
+    <Header.MenuItem
+      href={routes.ADMIN_LIST_REQUESTS}
+      {...(currentPage === 'list-requests' && { isCurrent: true })}
+    >
+      Demandes
+    </Header.MenuItem>
+    {/* <DropdownMenu buttonChildren={'Demandes'}>
       <DropdownMenu.DropdownItem
         href={routes.ADMIN_LIST_REQUESTS}
         {...(currentPage === 'list-requests' && { isCurrent: true })}
@@ -248,7 +260,7 @@ const MenuDreal = (currentPage?: string) => (
       >
         Abandons avec recandidature
       </DropdownMenu.DropdownItem>
-    </DropdownMenu>
+    </DropdownMenu> */}
     <Header.MenuItem
       href={routes.ADMIN_GARANTIES_FINANCIERES}
       {...(currentPage === 'list-garanties-financieres' && { isCurrent: true })}

diff --git a/src/views/pages/abandon/DemanderAbandonPage.tsx b/src/views/pages/abandon/DemanderAbandonPage.tsx
@@ -21,8 +21,6 @@ import {
   Form,
   ChampsObligatoiresLégende,
   LabelDescription,
-  Checkbox,
-  AlertBox,
 } from '../../components';
 import { hydrateOnClient } from '../../helpers';
 
@@ -105,7 +103,7 @@ export const DemanderAbandon = ({ request, project, appelOffre }: DemanderAbando
               <Input type="file" name="file" id="file" />
             </div>
 
-            {appelOffre.periode.abandonAvecRecandidature && (
+            {/* {appelOffre.periode.abandonAvecRecandidature && (
               <>
                 <AlertBox>
                   <div className="font-bold">Demande d'abandon avec recandidature</div>
@@ -144,7 +142,7 @@ export const DemanderAbandon = ({ request, project, appelOffre }: DemanderAbando
                   </Checkbox>
                 </AlertBox>
               </>
-            )}
+            )} */}
 
             <div className="mx-auto flex flex-col md:flex-row gap-4 items-center mt-4">
               <PrimaryButton type="submit" id="submit">