Merge branch 'main' of gitlab-research.centralesupelec.fr:resa/github

GitOrigin-RevId: 02c25de406990768e3545cb3a566ef85c7eac7d2
CentraleSupelec · Sep 11, 2023 · 5dcdc21 · 5dcdc21
1 parent 3580e32
commit 5dcdc21
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 54 deletions.
diff --git a/back/src/config/config.js b/back/src/config/config.js
@@ -27,8 +27,8 @@ module.exports = {
     secret: secrets.jwtSecret,
   },
   cypher: {
-    salt: secrets.cypherSalt,
-    tokenSecret: secrets.tokenSalt,
+    salt: secrets.cypher.salt,
+    tokenSecret: secrets.cypher.tokenSecret,
   },
   smtp: {
     host: secrets.smtp.host,

diff --git a/back/src/webservice/search.js b/back/src/webservice/search.js
@@ -4,7 +4,6 @@ const { promisify } = require("util");
 const _ = require("lodash");
 const kleur = require("kleur");
 // src
-const { CAMPUS_SACLAY } = require("../config/constants");
 const config = require("./translatorConfig").room;
 const wsEventStapler = require("./eventStapler");
 const roomParser = require("./utils/roomParser");
@@ -157,10 +156,6 @@ async function getAvailableRooms(
         room.allowBookings ||
         (!room.allowBookings && room.belongsTo.length > 0),
     )
-    .filter(
-      (room) =>
-        (diffInHours > 2 && room.campus !== CAMPUS_SACLAY) || diffInHours <= 2,
-    )
     .map((room) => ({
       ...room,
       videoProviders: room.videoProviders.map((vp) => vp.label),

diff --git a/back/src/webservice/translatorConfig/translatorConfig-dev.json b/back/src/webservice/translatorConfig/translatorConfig-dev.json
@@ -72,6 +72,9 @@
       "CodPro": "45",
       "ValPro": {
         "102": "TP numérique",
+        "199": "TP Automatisme",
+        "205": "TP Electronique",
+        "198": "Bureau",
         "27": "Amphithéâtre",
         "28": "Auditorium",
         "100": "Enseignement",

diff --git a/back/src/webservice/translatorConfig/translatorConfig-prod.json b/back/src/webservice/translatorConfig/translatorConfig-prod.json
@@ -72,6 +72,9 @@
       "CodPro": "45",
       "ValPro": {
         "102": "TP numérique",
+        "199": "TP Automatisme",
+        "205": "TP Electronique",
+        "198": "Bureau",
         "27": "Amphithéâtre",
         "28": "Auditorium",
         "100": "Enseignement",

diff --git a/front/src/components/scenes/Search/Filters/index.js b/front/src/components/scenes/Search/Filters/index.js
@@ -1,14 +1,14 @@
 // lib
-import React from "react";
-import PropTypes from "prop-types";
-import throttle from "lodash/throttle";
+import React from 'react';
+import PropTypes from 'prop-types';
+import throttle from 'lodash/throttle';
 // src
-import { CAMPUSES, BUILDINGS } from "config";
-import Checkbox from "components/partials/Checkbox";
-import roomTypes from "reducers/search/roomTypes.data";
-import SearchBar from "./SearchBar";
-import TypeSelector from "./TypeSelector";
-import CapacitySelector from "./CapacitySelector";
+import { CAMPUSES, BUILDINGS } from 'config';
+import Checkbox from 'components/partials/Checkbox';
+import roomTypes from 'reducers/search/roomTypes.data';
+import SearchBar from './SearchBar';
+import TypeSelector from './TypeSelector';
+import CapacitySelector from './CapacitySelector';
 
 class Filters extends React.Component {
   static propTypes = {
@@ -102,7 +102,6 @@ class Filters extends React.Component {
                 name={c}
               />
             ))}
-            <div>Bâtiments :</div>
             {BUILDINGS.map((b) => (
               <Checkbox
                 key={b}

diff --git a/front/src/components/scenes/Search/RoomBookModal/ConfirmBooking/index.js b/front/src/components/scenes/Search/RoomBookModal/ConfirmBooking/index.js
@@ -1,16 +1,18 @@
 // lib
-import React, { useState, useEffect, useCallback } from "react";
-import PropTypes from "prop-types";
-import OptionalImage from "react-image";
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import OptionalImage from 'react-image';
 // src
-import config from "config";
-import ConfirmModal from "components/partials/Modals/ConfirmModal";
-import EventList from "components/partials/EventList";
-import BookingSummary from "components/partials/BookingSummary";
-import EventNameInput from "./EventNameInput";
-import VideoProviderInput from "./VideoProviderInput";
+import config from 'config';
+import ConfirmModal from 'components/partials/Modals/ConfirmModal';
+import EventList from 'components/partials/EventList';
+import BookingSummary from 'components/partials/BookingSummary';
+import EventNameInput from './EventNameInput';
+import VideoProviderInput from './VideoProviderInput';
 
-const imageExtension = "jpg";
+const { CAMPUS_SACLAY } = require('../../../../../config/index');
+
+const imageExtension = 'jpg';
 
 const ConfirmBooking = ({
   room,
@@ -27,15 +29,15 @@ const ConfirmBooking = ({
 }) => {
   const [tooLongTimes, setTooLongTimes] = useState(false);
 
-  const checkTimeCoherence = useCallback(() => {
-    const diffTime = endTime - startTime;
-
+  const checkTimeCoherence = () => {
     setTooLongTimes(false);
-
-    if (diffTime / 3600000 > 2) {
-      setTooLongTimes(true);
+    if (room.campus === CAMPUS_SACLAY) {
+      const diffTime = endTime - startTime;
+      if (diffTime / 3600000 > 2) {
+        setTooLongTimes(true);
+      }
     }
-  }, [endTime, startTime]);
+  };
 
   useEffect(() => {
     // Appel de la méthode checkTimeCoherence lors du montage du composant
@@ -67,6 +69,14 @@ const ConfirmBooking = ({
         ATTENTION, cette salle sera décloisonnée
       </div>
     ) : null,
+    tooLongTimes === true ? (
+      <div className="alert alert-danger" role="alert">
+        Pour un créneau supérieur à 2h, contacter{' '}
+        <a href="mailto:[email protected]">
+          [email protected]
+        </a>
+      </div>
+    ) : null,
     <EventNameInput
       available={room.available}
       eventName={eventName}
@@ -87,25 +97,21 @@ const ConfirmBooking = ({
   ];
 
   return (
-    <ConfirmModal
-      title={`Réservation de ${room.name}`}
-      body={body}
-      confirmButtonText={
-        <span>
-          Confirmer
-          <span className="d-none d-sm-inline"> la réservation</span>
-        </span>
-      }
-      confirmButtonFunction={!tooLongTimes ? confirmBooking : null}
-      showConfirmButton={room.available && !tooLongTimes}
-      cancelActionText={
-        tooLongTimes
-          ? "Le créneau demandé est de 2h max pour Paris Saclay"
-          : room.available
-          ? "Annuler"
-          : "OK"
-      }
-    />
+    <>
+      <ConfirmModal
+        title={`Réservation de ${room.name}`}
+        body={body}
+        confirmButtonText={
+          <span>
+            Confirmer
+            <span className="d-none d-sm-inline"> la réservation</span>
+          </span>
+        }
+        confirmButtonFunction={confirmBooking}
+        showConfirmButton={room.available && !tooLongTimes}
+        cancelActionText={room.available ? 'Annuler' : 'OK'}
+      />
+    </>
   );
 };
 

diff --git a/front/src/config/index.js b/front/src/config/index.js
@@ -26,6 +26,7 @@ const loginQuery = querystring.stringify({
 
 export const loginRequest = `${config.cas.loginUrl}?${loginQuery}`;
 export const CAMPUSES = ['Saclay', 'Metz', 'Rennes'];
-export const BUILDINGS = ["Lumen"];
+export const CAMPUS_SACLAY = 'Saclay';
+export const BUILDINGS = ['Lumen'];
 
 export default config;
diff --git a/front/src/reducers/search/roomTypes.data.js b/front/src/reducers/search/roomTypes.data.js
@@ -11,6 +11,14 @@ const roomTypes = [
     value: 'TP numérique',
     fullName: 'TP numériques',
   },
+  {
+    value: 'TP Automatisme',
+    fullName: 'TP Automatisme',
+  },
+  {
+    value: 'TP Electronique',
+    fullName: 'TP Electronique',
+  },
   {
     value: 'Plateau projet',
     fullName: 'Espaces projets',