Merge branch 'staging'

dataesr · Jan 13, 2025 · 0a47896 · 0a47896
2 parents 2207b2c + df1e2b1
commit 0a47896
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 67 deletions.
diff --git a/client/src/layout/footer.tsx b/client/src/layout/footer.tsx
@@ -17,7 +17,7 @@ export default function MainFooter() {
       <FooterBody>
         <Logo
           splitCharacter="|"
-          text="Ministère|de l'enseignement|supérieur|et de la recherche"
+          text="Ministère|chargé|de l'enseignement|supérieur|et de la recherche"
         />
         <Link
           className="fr-footer__content-link"

diff --git a/client/src/layout/header.tsx b/client/src/layout/header.tsx
@@ -74,7 +74,7 @@ const Header: React.FC = () => {
       <HeaderWrapper>
         <Logo
           splitCharacter="|"
-          text="Ministère|de l'enseignement|supérieur|et de la recherche"
+          text="Ministère|chargé|de l'enseignement|supérieur|et de la recherche"
         />
         <Service
           name="Le Guichet numérique"

diff --git a/client/src/pages/contact-contributionbyobject-page/components/message-preview.tsx b/client/src/pages/contact-contributionbyobject-page/components/message-preview.tsx
@@ -37,32 +37,19 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
           <Col>
             {data?.objectId && (
               <Text size="sm">
-                ID de l'objet concerné: <strong>{data.objectId}</strong>
-                <CopyButton
-                  text={data.objectId}
-                  copiedText={copiedText}
-                  onCopy={copyToClipboard}
-                />
+                ID de l'objet concerné:{" "}
+                <strong>{data.objectId?.length > 50 ? data.objectId.slice(0, 47) + "..." : data.objectId}</strong>
+                <CopyButton text={data.objectId} copiedText={copiedText} onCopy={copyToClipboard} />
               </Text>
             )}
             <Text size="sm">
               Nom: {data?.name ? <strong>{data.name}</strong> : "non renseigné"}
-              {data?.name && (
-                <CopyButton
-                  text={data.name}
-                  copiedText={copiedText}
-                  onCopy={copyToClipboard}
-                />
-              )}
+              {data?.name && <CopyButton text={data.name} copiedText={copiedText} onCopy={copyToClipboard} />}
             </Text>
             {data?.email && (
               <Text size="sm">
                 Email: <strong>{data?.email}</strong>
-                <CopyButton
-                  text={data.email}
-                  copiedText={copiedText}
-                  onCopy={copyToClipboard}
-                />
+                <CopyButton text={data.email} copiedText={copiedText} onCopy={copyToClipboard} />
               </Text>
             )}
           </Col>
@@ -73,13 +60,8 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
                   {Object.entries(data.extra).map(([key, value]) => (
                     <div key={key}>
                       <Text size="sm">
-                        {capitalizeFirstLetter(key)}:{" "}
-                        <strong>{value as string}</strong>
-                        <CopyButton
-                          text={value as string}
-                          copiedText={copiedText}
-                          onCopy={copyToClipboard}
-                        />
+                        {capitalizeFirstLetter(key)}: <strong>{value as string}</strong>
+                        <CopyButton text={value as string} copiedText={copiedText} onCopy={copyToClipboard} />
                       </Text>
                     </div>
                   ))}
@@ -93,8 +75,7 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
             <Text size="sm">
               Traité par :{" "}
               <strong>
-                {data.team[0]} le{" "}
-                {new Date(data.treated_at).toLocaleDateString()} à{" "}
+                {data.team[0]} le {new Date(data.treated_at).toLocaleDateString()} à{" "}
                 {new Date(data.treated_at).toLocaleTimeString()}
               </strong>
             </Text>
@@ -103,14 +84,11 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
         <Col>
           {data?.comment && (
             <Text size="sm">
-              Commentaire ({data.team ? data.team[0] : ""}){" "}
-              <strong>: {data.comment}</strong>
+              Commentaire ({data.team ? data.team[0] : ""}) <strong>: {data.comment}</strong>
             </Text>
           )}
         </Col>
-        {["structures", "publications", "persons"].includes(
-          data?.objectType
-        ) && (
+        {["structures", "publications", "persons", "network"].includes(data?.objectType) && (
           <Row>
             {data.objectType === "structures" && (
               <>
@@ -124,11 +102,7 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
                   </Link>
                 </Col>
                 <Col>
-                  <Link
-                    size="sm"
-                    target="_blank"
-                    href={`http://185.161.45.213/ui/organizations/${data.objectId}`}
-                  >
+                  <Link size="sm" target="_blank" href={`http://185.161.45.213/ui/organizations/${data.objectId}`}>
                     Sur dataESR
                   </Link>
                 </Col>
@@ -144,11 +118,7 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
                   Sur scanR
                 </Link>
                 <br />
-                <Link
-                  size="sm"
-                  target="_blank"
-                  href={`http://185.161.45.213/ui/publications/${data.objectId}`}
-                >
+                <Link size="sm" target="_blank" href={`http://185.161.45.213/ui/publications/${data.objectId}`}>
                   Sur dataESR
                 </Link>
               </>
@@ -163,24 +133,26 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
                   Sur scanR
                 </Link>
                 <br />
-                <Link
-                  size="sm"
-                  target="_blank"
-                  href={`http://185.161.45.213/ui/persons/${data.objectId}`}
-                >
+                <Link size="sm" target="_blank" href={`http://185.161.45.213/ui/persons/${data.objectId}`}>
                   Sur dataESR
                 </Link>
               </>
             )}
+            {data.objectType === "network" && (
+              <Link
+                size="sm"
+                target="_blank"
+                href={`https://scanr.enseignementsup-recherche.gouv.fr/networks?${data.objectId}`}
+              >
+                Sur scanR
+              </Link>
+            )}
           </Row>
         )}
       </Container>
       <Row className={contributorMessageClassName}>
         <Text className="fr-mt-3w">
-          <HighlightedMessage
-            message={data?.message}
-            highlightedQuery={highlightedQuery}
-          />
+          <HighlightedMessage message={data?.message} highlightedQuery={highlightedQuery} />
         </Text>
         <EditModal
           refetch={refetch}
@@ -192,12 +164,10 @@ const MessagePreview: React.FC<MessagePreviewProps> = ({
         />
       </Row>
       <Row className="fr-mb-5w fr-mt-3w">
-        <Button onClick={() => setShowModal(true)}>
-          Éditer la contribution
-        </Button>
+        <Button onClick={() => setShowModal(true)}>Éditer la contribution</Button>
       </Row>
     </>
-  );
+  )
 };
 
 export default MessagePreview;
diff --git a/client/src/utils/index.tsx b/client/src/utils/index.tsx
@@ -16,6 +16,9 @@ export const BadgeColor = ({ type }) => {
     case "patent":
       badgeColor = "green-tilleul-verveine";
       break;
+    case "network":
+      badgeColor = "orange-terre-battue";
+      break;
     default:
       badgeColor = "purple-glycine";
   }
@@ -78,7 +81,9 @@ export const TypeLabel = ({ type }) => {
     case "projects":
       typeLabel = "Projets";
       break;
-
+    case "network":
+      typeLabel = "Network";
+      break;
     default:
       typeLabel = "";
   }
@@ -103,7 +108,9 @@ export const typeIcon = ({ icon }) => {
     case "projects":
       typeIcon = "recycle-fill";
       break;
-
+    case "network":
+      typeIcon = "git-branch-line";
+      break;
     default:
       typeIcon = "";
   }

diff --git a/server/routes/contacts/get:id/index.ts → server/routes/contacts/get_id/index.ts b/server/routes/contacts/get:id/index.ts → server/routes/contacts/get_id/index.ts
@@ -1,5 +1,5 @@
 import Elysia, { Static } from "elysia";
-import { contactSchema } from "../../../schemas/get:id/contactSchema";
+import { contactSchema } from "../../../schemas/get_id/contactSchema";
 import db from "../../../libs/mongo";
 import { ObjectId } from "mongodb";
 import { errorSchema } from "../../../schemas/errors/errorSchema";

diff --git a/server/routes/contacts/index.ts b/server/routes/contacts/index.ts
@@ -1,5 +1,5 @@
 import getContactRoutes from "./get";
-import getContactByIdRoutes from "./get:id";
+import getContactByIdRoutes from "./get_id";
 import postContactRoutes from "./post";
 import contactPutRoutes from "./patch";
 

diff --git a/.../contributionObjectRoutes/get:id/index.ts → .../contributionObjectRoutes/get_id/index.ts b/.../contributionObjectRoutes/get:id/index.ts → .../contributionObjectRoutes/get_id/index.ts
@@ -1,7 +1,7 @@
 import Elysia, { Static, t } from "elysia";
 import db from "../../../libs/mongo";
 import { ObjectId } from "mongodb";
-import { contactSchema } from "../../../schemas/get:id/contactSchema";
+import { contactSchema } from "../../../schemas/get_id/contactSchema";
 
 type contributionObjectType = Static<typeof contactSchema>;
 

diff --git a/server/routes/contributionObjectRoutes/index.ts b/server/routes/contributionObjectRoutes/index.ts
@@ -1,5 +1,5 @@
 import getContributionObjectRoutes from "./get";
-import getContributionObjectByIdRoutes from "./get:id";
+import getContributionObjectByIdRoutes from "./get_id";
 import postContributionObjectRoutes from "./post";
 import contributionObjectPutRoutes from "./patch";
 

diff --git a/server/routes/productions/get:id/index.ts → server/routes/productions/get_id/index.ts b/server/routes/productions/get:id/index.ts → server/routes/productions/get_id/index.ts
diff --git a/server/routes/productions/index.ts b/server/routes/productions/index.ts
@@ -1,5 +1,5 @@
 import getProductionsRoutes from "./get";
-import getProductionByIdRoutes from "./get:id";
+import getProductionByIdRoutes from "./get_id";
 import postProductionRoutes from "./post";
 import productionsPutRoutes from "./patch";
 

diff --git a/server/routes/remove-user/get:id/index.ts → server/routes/remove-user/get_id/index.ts b/server/routes/remove-user/get:id/index.ts → server/routes/remove-user/get_id/index.ts
diff --git a/server/routes/remove-user/index.ts b/server/routes/remove-user/index.ts
@@ -1,5 +1,5 @@
 import getRemoveUserRoutes from "./get";
-import getRemoveUserByIdRoutes from "./get:id";
+import getRemoveUserByIdRoutes from "./get_id";
 import postRemoveUserRoutes from "./post";
 import removeUserPutRoutes from "./patch";
 

diff --git a/...r/routes/update-user-data/get:id/index.ts → ...r/routes/update-user-data/get_id/index.ts b/...r/routes/update-user-data/get:id/index.ts → ...r/routes/update-user-data/get_id/index.ts
diff --git a/server/routes/update-user-data/index.ts b/server/routes/update-user-data/index.ts
@@ -1,5 +1,5 @@
 import getUpdateUserDataRoutes from "./get";
-import getUpdateUserDataByIdRoutes from "./get:id";
+import getUpdateUserDataByIdRoutes from "./get_id";
 import postUpdateUserDataRoutes from "./post";
 import updateUserDataPutRoutes from "./patch";
 

diff --git a/server/schemas/get:id/contactSchema.ts → server/schemas/get_id/contactSchema.ts b/server/schemas/get:id/contactSchema.ts → server/schemas/get_id/contactSchema.ts
diff --git a/server/schemas/post/contributionByObject.ts b/server/schemas/post/contributionByObject.ts
@@ -13,8 +13,9 @@ export const postContributionObjectSchema = t.Object(
       publications: "publications",
       project: "project",
       patent: "patent",
+      network: "network",
     }),
     extra: t.Optional(t.Record(t.String(), t.String())),
   },
   { additionalProperties: false }
-);
+)