fix: shared report permissions (#38)

betagouv · Sep 27, 2024 · d18720c · d18720c
1 parent 727a222
commit d18720c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/packages/backend/src/features/mail.ts b/packages/backend/src/features/mail.ts
@@ -28,8 +28,7 @@ export const sendReportMail = ({
     text: `Bonjour,
 vous trouverez ci-joint le compte-rendu de notre rendez-vous.
 
-Ce compte-rendu est un nouveau dispositif en phase de développement pour but d’aider l’usager
-dans sa démarche. Aidez-nous à l’améliorer en répondant à ce questionnaire anonyme de moins d’une minute : https://adtk8x51mbw.eu.typeform.com/to/LHrKhXkd
+Ce compte-rendu est un nouveau dispositif en phase de développement pour but d’aider l’usager dans sa démarche. Aidez-nous à l’améliorer en répondant à ce questionnaire anonyme de moins d’une minute : https://adtk8x51mbw.eu.typeform.com/to/LHrKhXkd
 
 Cordialement`,
     attachments: [

diff --git a/packages/frontend/index.html b/packages/frontend/index.html
@@ -15,6 +15,7 @@
   <body>
     <div id="root"></div>
     <script src="/env.js"></script>
+    <script src="/version.js"></script>
     <script type="module">
       const matomoUrl = import.meta.env.PROD ? window.ENV.VITE_MATOMO_URL : import.meta.env.VITE_MATOMO_URL;
 

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cr-vif/frontend",
   "private": true,
-  "version": "1.0.0",
+  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,6 +10,7 @@
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "pnpm env:gen && vite preview --host",
     "env:gen": "vite-node ./scripts/createEnvFile.ts",
+    "version": "vite-node ./scripts/setVersion.ts",
     "prepare": "pnpm dsfr && panda codegen",
     "dsfr": "copy-dsfr-to-public && pnpm panda-ds",
     "icons": "only-include-used-icons",

diff --git a/packages/frontend/scripts/createEnvFile.ts b/packages/frontend/scripts/createEnvFile.ts
@@ -10,6 +10,7 @@ export const createEnvFile = async () => {
     .map(([key, value]) => `${key}: "${value}"`)
     .join(",\n");
 
+
   const contentJs = `window.ENV = { ${values} };`;
 
   await fs.writeFile("./dist/env.js", contentJs);

diff --git a/packages/frontend/scripts/setVersion.ts b/packages/frontend/scripts/setVersion.ts
@@ -0,0 +1,11 @@
+import pjson from '../package.json';
+import fs from "node:fs/promises";
+
+const version = pjson.version + "." + Math.floor(Date.now() / 1000).toString(16);
+
+const setVersion = async () => {
+    const contentJs = `window.APP_VERSION = "${version}";`;
+    await fs.writeFile("./dist/version.js", contentJs);
+}
+
+setVersion();
diff --git a/packages/frontend/src/envVars.ts b/packages/frontend/src/envVars.ts
@@ -11,5 +11,6 @@ export const ENV = envSchema.parse(isDev ? import.meta.env : window.ENV);
 declare global {
   interface Window {
     ENV: typeof ENV;
+    APP_VERSION?: string;
   }
 }
diff --git a/packages/frontend/src/features/menu/MenuTitle.tsx b/packages/frontend/src/features/menu/MenuTitle.tsx
@@ -24,6 +24,7 @@ export const MenuTitle = ({
       alignItems="center"
       w="100%"
       py={{ base: "16px", lg: "30px" }}
+      pl={{ base: undefined, lg: "16px" }}
       // mt={{ base: "0", lg: "48px" }}
       // mb={{ base: "16px", lg: "48px" }}
       bgColor="white"

diff --git a/packages/frontend/src/routes/__root.tsx b/packages/frontend/src/routes/__root.tsx
@@ -1,6 +1,6 @@
 import { ReportSearch } from "#components/ReportSearch.js";
 import { css } from "#styled-system/css";
-import { Box, Flex, Stack } from "#styled-system/jsx";
+import { Box, Flex, Stack, styled } from "#styled-system/jsx";
 import Badge from "@codegouvfr/react-dsfr/Badge";
 import Button from "@codegouvfr/react-dsfr/Button";
 import Footer from "@codegouvfr/react-dsfr/Footer";
@@ -139,3 +139,11 @@ const Layout = ({ children }: PropsWithChildren) => {
     </Flex>
   );
 };
+
+const VersionDisplay = () => {
+  const version = window.APP_VERSION;
+
+  if (!version) return null;
+
+  return <styled.div>Version {version}</styled.div>;
+};