Revert "[Tableau de bord & brief] Ajout du bouton et du feature flag"

.env.dev.defaults

@@ -96,7 +96,6 @@ FRONTEND_MISSION_FORM_AUTO_UPDATE=true
 FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED=true
 FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED=true
 FRONTEND_REPORTING_FORM_AUTO_UPDATE=true
-FRONTEND_DASHBOARD_ENABLED=true
 
 ################################################################################
 # Version

.env.infra.example

@@ -95,7 +95,6 @@ FRONTEND_MISSION_FORM_AUTO_UPDATE=
 FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED=
 FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED=
 FRONTEND_REPORTING_FORM_AUTO_UPDATE=
-FRONTEND_DASHBOARD_ENABLED=
 
 ################################################################################
 # Version

.env.test.defaults

@@ -89,7 +89,6 @@ FRONTEND_MISSION_FORM_AUTO_UPDATE=true
 FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED=true
 FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED=true
 FRONTEND_REPORTING_FORM_AUTO_UPDATE=true
-FRONTEND_DASHBOARD_ENABLED=true
 
 ################################################################################
 # Version

docker-compose.yml

@@ -20,7 +20,6 @@ services:
       - FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED=${FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED}
       - FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED=${FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED}
       - FRONTEND_REPORTING_FORM_AUTO_UPDATE=${FRONTEND_REPORTING_FORM_AUTO_UPDATE}
-      - FRONTEND_DASHBOARD_ENABLED=${FRONTEND_DASHBOARD_ENABLED}
       - FRONTEND_OIDC_AUTHORITY=${MONITORENV_OIDC_ISSUER_URI}
       - FRONTEND_OIDC_CLIENT_ID=${MONITORENV_OIDC_CLIENT_ID}
       - FRONTEND_OIDC_ENABLED=${MONITORENV_OIDC_ENABLED}

frontend/.env.frontend.example

@@ -35,7 +35,6 @@ FRONTEND_MISSION_FORM_AUTO_UPDATE=
 FRONTEND_MISSION_FORM_AUTO_SAVE_ENABLED=
 FRONTEND_REPORTING_FORM_AUTO_SAVE_ENABLED=
 FRONTEND_REPORTING_FORM_AUTO_UPDATE=
-FRONTEND_DASHBOARD_ENABLED=
 
 ################################################################################
 # Version

frontend/cypress/support/e2e.ts

@@ -47,6 +47,8 @@ beforeEach(() => {
   // so that we can detect when the browser app is running in Cypress.
   // https://docs.cypress.io/faq/questions/using-cypress-faq#How-do-I-preserve-cookies--localStorage-in-between-my-tests
   cy.session('cypress', () => {
-    window.localStorage.setItem('IS_CYPRESS', 'true')
+    cy.window().then(window => {
+      window.localStorage.setItem('IS_CYPRESS', 'true')
+    })
   })
 })

frontend/package.json

@@ -25,14 +25,14 @@
     "test:unit:watch": "npm run test:unit -- --watch"
   },
   "dependencies": {
-    "@mtes-mct/monitor-ui": "22.1.0",
+    "@mtes-mct/monitor-ui": "21.2.0",
     "@reduxjs/toolkit": "2.0.0",
     "@rsuite/responsive-nav": "5.0.2",
     "@sentry/browser": "7.73.0",
     "@sentry/react": "7.73.0",
     "@sentry/tracing": "7.114.0",
     "@svgr/webpack": "8.1.0",
-    "@tanstack/react-table": "8.20.5",
+    "@tanstack/react-table": "8.20.1",
     "@tanstack/react-virtual": "beta",
     "classnames": "2.5.1",
     "dayjs": "1.11.12",

frontend/src/components/style.ts

@@ -1,4 +1,3 @@
-import { Button, MapMenuDialog } from '@mtes-mct/monitor-ui'
 import styled from 'styled-components'
 
 export const Italic = styled.div`
@@ -8,22 +7,3 @@ export const Italic = styled.div`
 export const Bold = styled.span`
   font-weight: 700;
 `
-
-export const StyledMapMenuDialogContainer = styled(MapMenuDialog.Container)`
-  position: absolute;
-  transform: translateX(-100%);
-  margin-left: -6px;
-  display: block;
-`
-
-// TODO delete when Monitor-ui component have good padding
-export const DialogButton = styled(Button)`
-  padding: 4px 12px;
-`
-
-export const DialogSeparator = styled.div`
-  height: 1px;
-  border-top: 1px solid ${p => p.theme.color.gainsboro};
-  margin-left: -12px;
-  margin-right: -12px;
-`

frontend/src/domain/entities/map/constants.ts

@@ -48,7 +48,9 @@ export enum MapToolType {
   FILTERS = 'FILTERS',
   INTEREST_POINT = 'INTEREST_POINT',
   MEASUREMENT = 'MEASUREMENT',
-  MEASUREMENT_MENU = 'MEASUREMENT_MENU'
+  MEASUREMENT_MENU = 'MEASUREMENT_MENU',
+  VESSEL_LABELS = 'VESSEL_LABELS',
+  VESSEL_VISIBILITY = 'VESSEL_VISIBILITY'
 }
 
 export enum OLGeometryType {

frontend/src/domain/shared_slices/Global.ts

@@ -1,7 +1,6 @@
 // TODO This slice should disappear in favor of `features/MainWindow/slice.ts` and "Map" feature should have its own slice.
 // TODO "Map" feature should have its own slice where we would transfer the related `display...` props.
 
-import { isDashboardEnabled } from '@features/Dashboard/utils'
 import { createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit'
 
 import type { MapToolType } from '../entities/map/constants'
@@ -43,7 +42,6 @@ type GlobalStateType = {
   displayLocateOnMap: boolean
   displayMeasurement: boolean
   displayInterestPoint: boolean
-  displayDashboard: boolean
   displaySearchSemaphoreButton: boolean
   displayReportingsButton: boolean
   displayRightMenuControlUnitListButton: boolean
@@ -78,8 +76,6 @@ type GlobalStateType = {
 
   displayStationLayer: boolean
 
-  isDashboardDialogVisible: boolean
-
   isLayersSidebarVisible: boolean
 
   isMapToolVisible?: MapToolType
@@ -101,7 +97,6 @@ const initialState: GlobalStateType = {
   displayLocateOnMap: true,
   displayMeasurement: true,
   displayInterestPoint: true,
-  displayDashboard: true && isDashboardEnabled(),
   displaySearchSemaphoreButton: true,
   displayReportingsButton: true,
   displayRightMenuControlUnitListButton: true,
@@ -140,8 +135,6 @@ const initialState: GlobalStateType = {
 
   displayStationLayer: false,
 
-  isDashboardDialogVisible: false,
-
   isMapToolVisible: undefined,
 
   healthcheckTextWarning: undefined,
@@ -171,7 +164,6 @@ const globalSlice = createSlice({
       state.isSearchSemaphoreVisible = false
       state.isSearchMissionsVisible = false
       state.isMapToolVisible = undefined
-      state.isDashboardDialogVisible = false
     },
 
     removeOverlayStroke(state) {

frontend/src/env.d.ts

@@ -2,7 +2,6 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
-  readonly FRONTEND_DASHBOARD_ENABLED: string
   readonly FRONTEND_GEOSERVER_NAMESPACE: string
   readonly FRONTEND_GEOSERVER_REMOTE_URL: string
   readonly FRONTEND_GOOGLEMAPS_API_KEY: string

frontend/src/features/Account/components/Account.tsx

@@ -1,11 +1,14 @@
-import { StyledMapMenuDialogContainer } from '@components/style'
 import { MenuWithCloseButton } from '@features/commonStyles/map/MenuWithCloseButton'
+import { ButtonWrapper } from '@features/MainWindow/components/RightMenu/ButtonWrapper'
 import { useAppDispatch } from '@hooks/useAppDispatch'
 import { useAppSelector } from '@hooks/useAppSelector'
 import { Accent, Button, Icon, MapMenuDialog, Size } from '@mtes-mct/monitor-ui'
 import { getOIDCConfig } from 'auth/getOIDCConfig'
 import { globalActions } from 'domain/shared_slices/Global'
 import { useAuth } from 'react-oidc-context'
+import styled from 'styled-components'
+
+const MARGIN_TOP = 388
 
 export function Account() {
   const dispatch = useAppDispatch()
@@ -27,9 +30,9 @@ export function Account() {
   }
 
   return (
-    <>
+    <ButtonWrapper topPosition={MARGIN_TOP}>
       {isAccountVisible && (
-        <StyledMapMenuDialogContainer>
+        <StyledContainer>
           <MapMenuDialog.Header>
             <MapMenuDialog.Title>Déconnexion</MapMenuDialog.Title>
           </MapMenuDialog.Header>
@@ -43,7 +46,7 @@ export function Account() {
               </Button>
             </MapMenuDialog.Footer>
           )}
-        </StyledMapMenuDialogContainer>
+        </StyledContainer>
       )}
 
       <MenuWithCloseButton.ButtonOnMap
@@ -54,6 +57,10 @@ export function Account() {
         size={Size.LARGE}
         title="Mon compte"
       />
-    </>
+    </ButtonWrapper>
   )
 }
+
+const StyledContainer = styled(MapMenuDialog.Container)`
+  margin-right: unset;
+`

frontend/src/features/ControlUnit/components/ControlUnitListDialog/index.tsx

@@ -1,4 +1,3 @@
-import { StyledMapMenuDialogContainer } from '@components/style'
 import { Accent, Icon, MapMenuDialog } from '@mtes-mct/monitor-ui'
 import { useCallback, useMemo } from 'react'
 
@@ -47,7 +46,7 @@ export function ControlUnitListDialog({ onClose }: ControlUnitListDialogProps) {
   }, [dispatch, displayBaseLayer])
 
   return (
-    <StyledMapMenuDialogContainer style={{ height: 480 }}>
+    <MapMenuDialog.Container style={{ height: 480 }}>
       <MapMenuDialog.Header>
         <MapMenuDialog.CloseButton Icon={Icon.Close} onClick={onClose} />
         <MapMenuDialog.Title>Unités de contrôle</MapMenuDialog.Title>
@@ -64,6 +63,11 @@ export function ControlUnitListDialog({ onClose }: ControlUnitListDialogProps) {
         {filteredControlUnits &&
           filteredControlUnits.map(controlUnit => <Item key={controlUnit.id} controlUnit={controlUnit} />)}
       </MapMenuDialog.Body>
-    </StyledMapMenuDialogContainer>
+      {/* <MapMenuDialog.Footer>
+        <Button accent={Accent.SECONDARY} Icon={Icon.Expand} isFullWidth onClick={noop}>
+          Voir la vue détaillée des unités
+        </Button>
+      </MapMenuDialog.Footer> */}
+    </MapMenuDialog.Container>
   )
 }