fix : error page commune

BaseAdresseNationale · Jan 19, 2024 · e4d0ebf · e4d0ebf
1 parent c81a203
commit e4d0ebf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/components/communes/bals-item.tsx b/components/communes/bals-item.tsx
@@ -13,19 +13,9 @@ export const BalsItem = (
   item: BaseLocaleType,
   actions: Record<string, (item: BaseLocaleType) => void>
 ) => {
-  const { _id, nom, status, sync, _created, _updated } = item;
-  const [computedStatus, setComputedStatus] = useState<StatusInterface | null>(
-    null
-  );
-
-  useEffect(() => {
-    async function initStatus() {
-      const habilitationIsValid = await getBaseLocaleIsHabilitationValid(_id);
-      setComputedStatus(computeStatus(status, sync, habilitationIsValid));
-    }
+  const { _id, nom, status, sync, _created, _updated, habilitationIsValid } = item;
 
-    void initStatus();
-  }, [_id, status, sync]);
+  const computedStatus = computeStatus(status, sync, habilitationIsValid)
 
   return (
     <tr key={_id}>

diff --git a/pages/communes/[code].tsx b/pages/communes/[code].tsx
@@ -8,14 +8,20 @@ import {getCommune} from '@/lib/cog'
 
 import {ModalAlert} from '@/components/modal-alerte'
 import {getAllRevisionByCommune} from '@/lib/api-depot'
-import {searchBasesLocales, removeBaseLocale} from '@/lib/api-mes-adresses'
+import {searchBasesLocales, removeBaseLocale, getBaseLocaleIsHabilitationValid} from '@/lib/api-mes-adresses'
 import {getRevisionsByCommune} from '@/lib/api-moissonneur-bal'
 
 import {EditableList} from '@/components/editable-list'
 import {RevisionItemApiDepot} from '@/components/communes/revisions-item-api-depot'
 import {RevisionItemMoissoneur} from '@/components/communes/revisions-item-moissoneur'
 import {BalsItem} from '@/components/communes/bals-item'
 
+const getBasesLocalesIsHabilitationValid = async (bals: BaseLocaleType[]) => {
+  for (const bal of bals) {
+    bal.habilitationIsValid = await getBaseLocaleIsHabilitationValid(bal._id)
+  }
+}
+
 type CommuneSourcePageProps = {
   code: string;
   balsPage: PageType<BaseLocaleType>;
@@ -24,7 +30,7 @@ type CommuneSourcePageProps = {
 const CommuneSource = (
   {code, balsPage}: CommuneSourcePageProps,
 ) => {
-  const [bals, setBals] = useState(balsPage.results)
+  const [bals, setBals] = useState<BaseLocaleType[]>(balsPage.results)
   const [initialRevisionsApiDepot, setInitialRevisionsApiDepot] = useState<RevisionApiDepotType[]>([])
   const [initialRevisionsMoissonneur, setInitialRevisionsMoissonneur] = useState<RevisionMoissoneurType[]>([])
   const [balToDeleted, setBalToDeleted] = useState(null)
@@ -61,6 +67,7 @@ const CommuneSource = (
 
   const fetchBals = useCallback(async (commune: string) => {
     const res = await searchBasesLocales({commune, page: pageMesAdresses.current, limit: pageMesAdresses.limit})
+    await getBasesLocalesIsHabilitationValid(res.results)
     setBals(res.results)
   }, [pageMesAdresses])
 
@@ -152,7 +159,8 @@ const CommuneSource = (
 
 export async function getServerSideProps({params}) {
   const {code} = params
-  const balsPage = await searchBasesLocales({commune: code, page: 1, limit: 5})
+  const balsPage = await searchBasesLocales({commune: code, page: 1, limit: 10})
+  await getBasesLocalesIsHabilitationValid(balsPage.results)
   return {props: {code, balsPage}}
 }
 

diff --git a/types/mes-adresses.ts b/types/mes-adresses.ts
@@ -14,4 +14,5 @@ export type BaseLocaleType = {
   _created?: string;
   _updated?: string;
   _deleted?: string;
+  habilitationIsValid?: boolean;
 }