fix: mpc refresh (#2322)

SocialGouv · Jul 22, 2024 · 25beaae · 25beaae
1 parent 9a48ff2
commit 25beaae
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 32 deletions.
diff --git a/packages/app/src/api/core-domain/infra/auth/config.ts b/packages/app/src/api/core-domain/infra/auth/config.ts
@@ -190,6 +190,11 @@ export const authConfig: AuthOptions = {
 
       return token;
     },
+
+    async redirect({ url, baseUrl }) {
+      logger.info(`Redirect called with URL: ${url} and Base URL: ${baseUrl}`);
+      return url.startsWith(baseUrl) ? url : baseUrl;
+    },
     // expose data from jwt to front
     session({ session, token }) {
       session.user = token.user;

diff --git a/packages/app/src/app/(consultation)/index-egapro/recherche/page.tsx b/packages/app/src/app/(consultation)/index-egapro/recherche/page.tsx
@@ -71,7 +71,7 @@ const Recherche = withSearchParamsValidation(getDeclarationStatsInputSchema)(asy
           </GridCol>
         </Grid>
       </Container>
-      <Box className={cx(fr.cx("fr-pb-6w", "fr-pt-4w"), "bg-dsfr-alt-grey")}>
+      <Box className={cx(fr.cx("fr-pb-6w", "fr-pt-4w"))}>
         {!searchParamsError && (
           <Suspense>
             {isLandingPage ? (

diff --git a/packages/app/src/app/(consultation)/representation-equilibree/recherche/page.tsx b/packages/app/src/app/(consultation)/representation-equilibree/recherche/page.tsx
@@ -57,7 +57,7 @@ export default withSearchParamsValidation(searchRepresentationEquilibreeDTOSchem
           </GridCol>
         </Grid>
       </Container>
-      <Box className={cx(fr.cx("fr-pb-6w", "fr-pt-4w"), "bg-dsfr-alt-grey")}>
+      <Box className={cx(fr.cx("fr-pb-6w", "fr-pt-4w"))}>
         <Container as="section">
           <Grid haveGutters align="center">
             <GridCol sm={12} md={10} xl={8}>

diff --git a/.../src/app/(default)/index-egapro/objectifs-mesures/[siren]/[year]/ObjectifsMesuresForm.tsx b/.../src/app/(default)/index-egapro/objectifs-mesures/[siren]/[year]/ObjectifsMesuresForm.tsx
@@ -350,7 +350,8 @@ export function buildHelpersObjectifsMesures(declaration?: DeclarationOpmcDTO) {
 
 export const isEditable = (declaration?: DeclarationOpmcDTO) =>
   declaration?.["declaration-existante"].date
-    ? isBefore(new Date(), add(new Date(declaration?.["declaration-existante"].date), { years: 1 }))
+    ? !declaration?.opmc?.datePublicationObjectifs ||
+      isBefore(new Date(), add(new Date(declaration?.["declaration-existante"].date), { years: 1 }))
     : false;
 
 type Props = {

diff --git a/packages/app/src/app/(default)/login/MonCompteProLogin.tsx b/packages/app/src/app/(default)/login/MonCompteProLogin.tsx
@@ -12,7 +12,7 @@ export const MonCompteProLogin = ({ callbackUrl }: MonCompteProLoginProps) => (
     <MonCompteProButton
       onClick={e => {
         e.preventDefault();
-        signIn("moncomptepro", { callbackUrl });
+        signIn("moncomptepro", { callbackUrl, redirect: true });
       }}
     />
     <Link href="/aide-moncomptepro" target="_blank">

diff --git a/packages/app/src/app/(default)/mon-espace/mes-declarations/IndexList.tsx b/packages/app/src/app/(default)/mon-espace/mes-declarations/IndexList.tsx
@@ -42,9 +42,9 @@ const getDeclarationOpmcStatus = (declaration?: DeclarationOpmcDTO) => {
 
   try {
     objectifsMesuresSchema.parse(initialValuesObjectifsMesures);
-    if (isFrozenDeclarationForOPMC(declaration)) return declarationOpmcStatus.NOT_MODIFIABLE_CORRECT;
+    // if (isFrozenDeclarationForOPMC(declaration)) return declarationOpmcStatus.NOT_MODIFIABLE_CORRECT;
   } catch (e) {
-    if (isFrozenDeclarationForOPMC(declaration)) return declarationOpmcStatus.NOT_MODIFIABLE_INCORRECT;
+    //if (isFrozenDeclarationForOPMC(declaration)) return declarationOpmcStatus.NOT_MODIFIABLE_INCORRECT;
     return declarationOpmcStatus.TO_COMPLETE;
   }
   return declarationOpmcStatus.COMPLETED;

diff --git a/packages/app/src/app/(default)/mon-espace/mes-declarations/page.tsx b/packages/app/src/app/(default)/mon-espace/mes-declarations/page.tsx
@@ -1,5 +1,6 @@
 import { authConfig } from "@api/core-domain/infra/auth/config";
 import Alert from "@codegouvfr/react-dsfr/Alert";
+import { config } from "@common/config";
 import { type DeclarationDTO } from "@common/core-domain/dtos/DeclarationDTO";
 import { type DeclarationOpmcDTO } from "@common/core-domain/dtos/DeclarationOpmcDTO";
 import { type RepresentationEquilibreeDTO } from "@common/core-domain/dtos/RepresentationEquilibreeDTO";
@@ -71,7 +72,14 @@ const MesDeclarationsPage = async ({ searchParams }: NextServerPageProps<never,
           <p>
             <br />
             Vous souhaitez rattacher votre adresse mail à un autre Siren,{" "}
-            <Link href="https://app.moncomptepro.beta.gouv.fr/manage-organizations">cliquez ici</Link>
+            <Link
+              target="_blank"
+              href={`https://app${
+                config.api.security.moncomptepro.appTest ? "-sandbox" : ""
+              }.moncomptepro.beta.gouv.fr/manage-organizations`}
+            >
+              cliquez ici
+            </Link>
           </p>
         </Box>
       </MessageProvider>
@@ -114,7 +122,14 @@ const MesDeclarationsPage = async ({ searchParams }: NextServerPageProps<never,
         <p>
           <br />
           Vous souhaitez rattacher votre adresse mail à un autre Siren,{" "}
-          <Link href="https://app.moncomptepro.beta.gouv.fr/manage-organizations">cliquez ici</Link>
+          <Link
+            target="_blank"
+            href={`https://app${
+              config.api.security.moncomptepro.appTest ? "-sandbox" : ""
+            }.moncomptepro.beta.gouv.fr/manage-organizations`}
+          >
+            cliquez ici
+          </Link>
         </p>
       </Box>
       <Box mt="10w">

diff --git a/packages/app/src/app/(default)/mon-espace/mes-entreprises/SelectSiren.tsx b/packages/app/src/app/(default)/mon-espace/mes-entreprises/SelectSiren.tsx
@@ -1,10 +1,12 @@
 "use client";
 
 import { fr } from "@codegouvfr/react-dsfr";
+import { Button } from "@codegouvfr/react-dsfr/Button";
 import { Select } from "@codegouvfr/react-dsfr/Select";
-import { Grid, GridCol } from "@design-system";
+import { Grid, GridCol, Icon } from "@design-system";
 import { getCompany } from "@globalActions/company";
 import { useRouter } from "next/navigation";
+import { signIn } from "next-auth/react";
 import { useEffect, useState } from "react";
 
 export const SelectSiren = ({ sirenList, loadedSiren }: { loadedSiren?: string; sirenList: string[] }) => {
@@ -22,26 +24,34 @@ export const SelectSiren = ({ sirenList, loadedSiren }: { loadedSiren?: string;
   }, [currentSiren, router, loadedSiren]);
 
   return (
-    <Grid>
-      <GridCol sm={3}>
-        <Select
-          label="SIREN"
-          nativeSelectProps={{ onChange: event => setCurrentSiren(event.target.value), value: currentSiren }}
-        >
-          <option value="">Sélectionner un siren</option>
-          {sirenList.map((value, key) => (
-            <option key={`siren-${key}`} value={value}>
-              {value}
-            </option>
-          ))}
-        </Select>
-      </GridCol>
-      <GridCol sm={9}>
-        <div className={fr.cx("fr-pt-10v", "fr-pl-2v")}>
-          <span className={fr.cx("fr-icon-building-line", "fr-pr-2v")} aria-hidden="true"></span>
-          <span>{selectedCompanyName}</span>
-        </div>
-      </GridCol>
-    </Grid>
+    <>
+      <Grid>
+        <GridCol sm={3}>
+          <Select
+            label="SIREN"
+            nativeSelectProps={{ onChange: event => setCurrentSiren(event.target.value), value: currentSiren }}
+          >
+            <option value="">Sélectionner un siren</option>
+            {sirenList.map((value, key) => (
+              <option key={`siren-${key}`} value={value}>
+                {value}
+              </option>
+            ))}
+          </Select>
+        </GridCol>
+        <GridCol sm={6}>
+          <div className={fr.cx("fr-pt-10v", "fr-pl-2v")}>
+            <span className={fr.cx("fr-icon-building-line", "fr-pr-2v")} aria-hidden="true"></span>
+            <span>{selectedCompanyName}</span>
+          </div>
+        </GridCol>
+      </Grid>
+      <div className={fr.cx("fr-pt-2v")}>
+        <Button onClick={() => signIn("moncomptepro", { redirect: true })}>
+          <Icon icon="fr-icon-refresh-line" />
+          Rafraichir MCP
+        </Button>
+      </div>
+    </>
   );
 };
diff --git a/packages/app/src/app/(default)/mon-espace/mes-entreprises/page.tsx b/packages/app/src/app/(default)/mon-espace/mes-entreprises/page.tsx
@@ -97,7 +97,14 @@ const MesEntreprisesPage = async ({ searchParams }: NextServerPageProps<never, "
             <p>
               <br />
               Vous souhaitez rattacher votre adresse mail à un autre Siren,{" "}
-              <Link href="https://app.moncomptepro.beta.gouv.fr/manage-organizations">cliquez ici</Link>
+              <Link
+                target="_blank"
+                href={`https://app${
+                  config.api.security.moncomptepro.appTest ? "-sandbox" : ""
+                }.moncomptepro.beta.gouv.fr/manage-organizations`}
+              >
+                cliquez ici
+              </Link>
             </p>
           </Box>
           {typeof selectedSiren === "string" && (
@@ -122,7 +129,14 @@ const MesEntreprisesPage = async ({ searchParams }: NextServerPageProps<never, "
               <p>
                 <br />
                 Vous souhaitez rattacher votre adresse mail à un autre Siren,{" "}
-                <Link href="https://app.moncomptepro.beta.gouv.fr/manage-organizations">cliquez ici</Link>
+                <Link
+                  target="_blank"
+                  href={`https://app${
+                    config.api.security.moncomptepro.appTest ? "-sandbox" : ""
+                  }.moncomptepro.beta.gouv.fr/manage-organizations`}
+                >
+                  cliquez ici
+                </Link>
               </p>
             </Box>
             <Box mt="4w">Le siren fournit est invalide.</Box>