Merge branch 'TMSS-2950-Front-End-Only-Fix-Calender-View' into 'master'

Resolve TMSS-2950 "Front end only fix calender view"

Closes TMSS-2950

See merge request !1339

SAS/TMSS/deploy/tmss/nginx/default.conf

@@ -24,10 +24,10 @@ server {
     }
 
 location /acc/ {
-    rewrite ^/acc/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /build/index.html break;
+    rewrite ^/acc/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-acceptance/build/index.html break;
 
     location ~ ^/acc/(static/|manifest\.json|favicon\.ico) {
-        rewrite ^/acc/(.*)$ /build/$1 break;
+        rewrite ^/acc/(.*)$ /tmss-frontend-web-acceptance/build/$1 break;
     }
 
     proxy_pass http://monitor.control.lofar:9000/tmss-frontend-web-acceptance/;

SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js

 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Redirect } from 'react-router-dom'
-import { Dropdown } from 'primereact/dropdown';
 import { InputText } from 'primereact/inputtext';
 import { InputTextarea } from 'primereact/inputtextarea';
 

SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/toolbar/filters.helper.js

@@ -223,6 +223,8 @@ export function getReservationItem(reservation, index, displayDate) {
     const currentGroup = moment(reservation.start_time).format(UIConstants.CALENDAR_GROUP_FORMAT)
     const currentGrouping = moment(reservation.start_time).format(UIConstants.CALENDAR_DEFAULTDATE_FORMAT)
 
+    let project = reservation.projects_ids?.join(", ") 
+    
     let timeLineRow = {
         id: reservation.id + "~" + index,
         reservationId: reservation.id,
@@ -230,7 +232,7 @@ export function getReservationItem(reservation, index, displayDate) {
         end_time: endTime,
         group: currentGroup,
         name: reservation.name,
-        project: reservation.project_id,
+        project: project,
         reservation_start_time : moment(reservation.start_time),
         type: 'RESERVATION',
         activity_type: `${type}${reservation.project_id ? (" - " + reservation.project_id) : ""}`,
@@ -259,9 +261,6 @@ export function getReservationItem(reservation, index, displayDate) {
     timeLineRow.project_task_group = timeLineRow.project + '#' + currentGrouping ; // we do not have tasks, but we need to be visible.
     timeLineRow.stationsgroups = stations.stationsgroups;
     timeLineRow.groupingSuffix = '#' + currentGrouping;
-
-
-
     return timeLineRow;
 }