feat: fix selection (1) - Ref gestion-de-projet#1603

src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx

@@ -72,8 +72,7 @@ const PopulationCard: React.FC<populationCardPropsType> = (props) => {
 
   const _onSubmit = async (updatedSelection: ScopeTreeRow[] | null) => {
     if (updatedSelection === null && !executiveUnits) return
-    updatedSelection = filterScopeTree(updatedSelection ?? [])
-    updatedSelection = updatedSelection.map((selectedPopulations: ScopeTreeRow) => ({
+    updatedSelection = (updatedSelection ?? []).map((selectedPopulations: ScopeTreeRow) => ({
       ...selectedPopulations,
       subItems: []
     }))

src/components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel.tsx

@@ -28,12 +28,6 @@ const PopulationRightPanel: React.FC<PopulationRightPanelProps> = (props) => {
   const [_selectedPopulation, _setSelectedPopulation] = useState<ScopeTreeRow[]>(selectedPopulation)
   const [searchInput, setSearchInput] = useState('')
 
-  // useEffect(() => {
-  //   _setSelectedPopulation(
-  //     selectedPopulation !== null ? (selectedPopulation?.filter((elem) => elem !== undefined) as ScopeTreeRow[]) : []
-  //   )
-  // }, [open]) // eslint-disable-line
-
   /**
    * Render
    */

src/views/Scope/Scope.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import clsx from 'clsx'
 
@@ -12,7 +12,6 @@ import ScopeSearchBar from 'components/Inputs/ScopeSearchBar/ScopeSearchBar'
 
 import { useAppDispatch, useAppSelector } from 'state'
 import { closeAllOpenedPopulation } from 'state/scope'
-import { filterScopeTree } from 'utils/scopeTree'
 
 import useStyles from './styles'
 
@@ -35,8 +34,6 @@ const Scope = () => {
   const trimItems = () => {
     let _selectedItems = selectedItems ? selectedItems : []
 
-    _selectedItems = filterScopeTree(_selectedItems)
-
     const perimetresIds = _selectedItems.map((_selected) => _selected.cohort_id ?? null)
     navigate(`/perimeters?${perimetresIds}`)
   }