Merge pull request #547 from mission-apprentissage/fix/intention-rs

fix(intentions): mise à jour de la rs par défaut
mission-apprentissage · Jan 23, 2025 · bfa140d · bfa140d
2 parents 9f64c00 + 7bf6757
commit bfa140d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/ui/app/(wrapped)/intentions/perdir/saisie/new/page.tsx b/ui/app/(wrapped)/intentions/perdir/saisie/new/page.tsx
@@ -3,25 +3,30 @@
 import { CampagneStatutEnum } from "shared/enum/campagneStatutEnum";
 
 import { client } from "@/api.client";
+import { IntentionSpinner } from "@/app/(wrapped)/intentions/perdir/saisie/components/IntentionSpinner";
 import { IntentionForm } from "@/app/(wrapped)/intentions/perdir/saisie/intentionForm/IntentionForm";
 import { IntentionFilesProvider } from "@/app/(wrapped)/intentions/perdir/saisie/intentionForm/observationsSection/filesSection/filesContext";
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 // eslint-disable-next-line import/no-anonymous-default-export, react/display-name
 export default () => {
-  const { data: defaultCampagne } = client.ref("[GET]/campagne/expe/default").useQuery({});
+  const { data: defaultCampagne, isLoading } = client.ref("[GET]/campagne/expe/default").useQuery({});
 
   return (
     <GuardPermission permission="intentions-perdir/ecriture">
       <IntentionFilesProvider>
-        <IntentionForm
-          disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
-          defaultValues={{
-            campagneId: defaultCampagne?.id,
-          }}
-          formMetadata={{}}
-          campagne={defaultCampagne}
-        />
+        {isLoading && <IntentionSpinner />}
+        {!isLoading && defaultCampagne && (
+          <IntentionForm
+            disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
+            defaultValues={{
+              campagneId: defaultCampagne?.id,
+              rentreeScolaire: defaultCampagne?.annee ? Number.parseInt(defaultCampagne?.annee) + 1 : undefined,
+            }}
+            formMetadata={{}}
+            campagne={defaultCampagne}
+          />
+        )}
       </IntentionFilesProvider>
     </GuardPermission>
   );