chore: page assistance retirée

mission-apprentissage · Jul 22, 2022 · 5907549 · 5907549
1 parent beca24e
commit 5907549
Show file tree

Hide file tree

Showing 12 changed files with 475 additions and 579 deletions.
diff --git a/.infra/ansible/roles/setup/files/cerfa/.overrides/pentest/docker-compose.env.yml b/.infra/ansible/roles/setup/files/cerfa/.overrides/pentest/docker-compose.env.yml
@@ -45,7 +45,6 @@ services:
           - NEXT_PUBLIC_BASE_URL=https://contrat-pentest.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_BASE_HOST=contrat-pentest.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_METABASE_URL=https://contrat-pentest.apprentissage.beta.gouv.fr
-          - NEXT_PUBLIC_METABASE_SECRET_KEY={{ vault[env_type].NEXT_PUBLIC_METABASE_SECRET_KEY }}
 
   metabase:
     environment:

diff --git a/.infra/ansible/roles/setup/files/cerfa/.overrides/production/docker-compose.env.yml b/.infra/ansible/roles/setup/files/cerfa/.overrides/production/docker-compose.env.yml
@@ -48,7 +48,6 @@ services:
           - NEXT_PUBLIC_BASE_URL=https://contrat.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_BASE_HOST=contrat.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_METABASE_URL=https://contrat.apprentissage.beta.gouv.fr
-          - NEXT_PUBLIC_METABASE_SECRET_KEY={{ vault[env_type].NEXT_PUBLIC_METABASE_SECRET_KEY }}
 
   metabase:
     environment:

diff --git a/.infra/ansible/roles/setup/files/cerfa/.overrides/recette/docker-compose.env.yml b/.infra/ansible/roles/setup/files/cerfa/.overrides/recette/docker-compose.env.yml
@@ -45,7 +45,6 @@ services:
           - NEXT_PUBLIC_BASE_URL=https://contrat-recette.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_BASE_HOST=contrat-recette.apprentissage.beta.gouv.fr
           - NEXT_PUBLIC_METABASE_URL=https://contrat-recette.apprentissage.beta.gouv.fr
-          - NEXT_PUBLIC_METABASE_SECRET_KEY={{ vault[env_type].NEXT_PUBLIC_METABASE_SECRET_KEY }}
 
   metabase:
     environment:

diff --git a/.infra/ansible/roles/setup/vars/main/vault.yml b/.infra/ansible/roles/setup/vars/main/vault.yml
diff --git a/.infra/cegedim/pdigi/env-recette-cegedim.yaml.j2 b/.infra/cegedim/pdigi/env-recette-cegedim.yaml.j2
@@ -45,7 +45,6 @@ services:
       - NEXT_PUBLIC_BASE_URL=https://{{ hostname }}
       - NEXT_PUBLIC_BASE_HOST={{ hostname }}
       - NEXT_PUBLIC_METABASE_URL=https://{{ hostname }}
-      - NEXT_PUBLIC_METABASE_SECRET_KEY={{ vault.NEXT_PUBLIC_METABASE_SECRET_KEY }}
 
   metabase:
     image: metabase/metabase:v0.42.0

diff --git a/.infra/cegedim/pdigi/env-recette-klee.yaml.j2 b/.infra/cegedim/pdigi/env-recette-klee.yaml.j2
@@ -45,7 +45,6 @@ services:
       - NEXT_PUBLIC_BASE_URL=https://{{ hostname }}
       - NEXT_PUBLIC_BASE_HOST={{ hostname }}
       - NEXT_PUBLIC_METABASE_URL=https://{{ hostname }}
-      - NEXT_PUBLIC_METABASE_SECRET_KEY={{ vault.NEXT_PUBLIC_METABASE_SECRET_KEY }}
 
   metabase:
     image: metabase/metabase:v0.42.0

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -21,7 +21,6 @@ services:
         - NEXT_PUBLIC_BASE_URL=http://localhost
         - NEXT_PUBLIC_BASE_HOST=localhost
         - NEXT_PUBLIC_METABASE_URL=https://contrat.apprentissage.beta.gouv.fr/
-        - NEXT_PUBLIC_METABASE_SECRET_KEY=
         - SKIP_PREFLIGHT_CHECK=true
 
   server:

diff --git a/ui/.env.example b/ui/.env.example
@@ -2,5 +2,4 @@ NEXT_PUBLIC_ENV=dev
 NEXT_PUBLIC_BASE_URL=http://localhost
 NEXT_PUBLIC_BASE_HOST=localhost
 NEXT_PUBLIC_METABASE_URL=https://contrat.apprentissage.beta.gouv.fr/
-NEXT_PUBLIC_METABASE_SECRET_KEY=secret
-SKIP_PREFLIGHT_CHECK=true
+SKIP_PREFLIGHT_CHECK=true
diff --git a/ui/Dockerfile b/ui/Dockerfile
@@ -21,12 +21,10 @@ ARG NEXT_PUBLIC_ENV
 ARG NEXT_PUBLIC_BASE_URL
 ARG NEXT_PUBLIC_BASE_HOST
 ARG NEXT_PUBLIC_METABASE_URL
-ARG NEXT_PUBLIC_METABASE_SECRET_KEY
 ENV NEXT_PUBLIC_ENV=$NEXT_PUBLIC_ENV
 ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ENV NEXT_PUBLIC_BASE_HOST=$NEXT_PUBLIC_BASE_HOST
 ENV NEXT_PUBLIC_METABASE_URL=$NEXT_PUBLIC_METABASE_URL
-ENV NEXT_PUBLIC_METABASE_SECRET_KEY=$NEXT_PUBLIC_METABASE_SECRET_KEY
 
 RUN yarn build
 
@@ -60,13 +58,11 @@ ARG NEXT_PUBLIC_ENV
 ARG NEXT_PUBLIC_BASE_URL
 ARG NEXT_PUBLIC_BASE_HOST
 ARG NEXT_PUBLIC_METABASE_URL
-ARG NEXT_PUBLIC_METABASE_SECRET_KEY
 ENV NEXT_PUBLIC_ENV=$NEXT_PUBLIC_ENV
 ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ENV NEXT_PUBLIC_BASE_HOST=$NEXT_PUBLIC_BASE_HOST
 ENV NEXT_PUBLIC_METABASE_URL=$NEXT_PUBLIC_METABASE_URL
-ENV NEXT_PUBLIC_METABASE_SECRET_KEY=$NEXT_PUBLIC_METABASE_SECRET_KEY
 
 ENV PORT 3000
 
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]
diff --git a/ui/Dockerfile.dev b/ui/Dockerfile.dev
@@ -7,12 +7,10 @@ ARG NEXT_PUBLIC_ENV
 ARG NEXT_PUBLIC_BASE_URL
 ARG NEXT_PUBLIC_BASE_HOST
 ARG NEXT_PUBLIC_METABASE_URL
-ARG NEXT_PUBLIC_METABASE_SECRET_KEY
 ENV NEXT_PUBLIC_ENV=$NEXT_PUBLIC_ENV
 ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ENV NEXT_PUBLIC_BASE_HOST=$NEXT_PUBLIC_BASE_HOST
 ENV NEXT_PUBLIC_METABASE_URL=$NEXT_PUBLIC_METABASE_URL
-ENV NEXT_PUBLIC_METABASE_SECRET_KEY=$NEXT_PUBLIC_METABASE_SECRET_KEY
 
 EXPOSE 3000
 CMD yarn docker-dev
diff --git a/ui/components/Layout/components/Footer.jsx b/ui/components/Layout/components/Footer.jsx
@@ -84,9 +84,6 @@ const Footer = () => {
               <ListItem _after={{ content: "'|'", marginLeft: "0.5rem", marginRight: "0.5rem" }}>
                 <Link href={"/cookies"}>Gestion des cookies</Link>
               </ListItem>
-              <ListItem _after={{ content: "'|'", marginLeft: "0.5rem", marginRight: "0.5rem" }}>
-                <Link href={"/stats"}>Statistiques</Link>
-              </ListItem>
               <ListItem _after={{ content: "'|'", marginLeft: "0.5rem", marginRight: "0.5rem" }}>
                 <Link href={"/assistance"}>Assistance</Link>
               </ListItem>

diff --git a/ui/pages/stats.jsx b/ui/pages/stats.jsx