2024-11-04 - external-recips page

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java

@@ -152,19 +152,21 @@ public void sendNewRequestEmail(FeedbackRequest storedRequest) {
         MemberProfile requestee = memberProfileServices.getById(storedRequest.getRequesteeId());
         String senderName = MemberProfileUtils.getFullName(creator);
         UUID recipientOrExternalRecipientId;
-        String reviewerFirstName, reviewerEmail;
+        String reviewerFirstName, reviewerEmail, urlFeedbackSubmit;
 
         if (storedRequest.getExternalRecipientId() != null) {
             recipientOrExternalRecipientId = storedRequest.getExternalRecipientId();
             reviewerExternalRecipient = feedbackExternalRecipientServices.getById(recipientOrExternalRecipientId);
             reviewerFirstName = reviewerExternalRecipient.getFirstName();
             reviewerEmail = reviewerExternalRecipient.getEmail();
+            urlFeedbackSubmit = "/feedback/submitForExternalRecipient?request=";
         } else {
             recipientOrExternalRecipientId = storedRequest.getRecipientId();
             reviewerMemberProfile = memberProfileServices.getById(recipientOrExternalRecipientId);
             recipientOrExternalRecipientId = storedRequest.getRecipientId();
             reviewerFirstName = reviewerMemberProfile.getFirstName();
             reviewerEmail = reviewerMemberProfile.getWorkEmail();
+            urlFeedbackSubmit = "/feedback/submit?request=";
         }
 
         String newContent = String.format(
@@ -177,7 +179,7 @@ public void sendNewRequestEmail(FeedbackRequest storedRequest) {
                                                   storedRequest.getDueDate().getMonth(),
                                                   storedRequest.getDueDate().getDayOfMonth(),
                                                   storedRequest.getDueDate().getYear()),
-                                String.format("%s/feedback/submit?request=%s",
+                                String.format("%s" + urlFeedbackSubmit + "%s",
                                               webURL, storedRequest.getId().toString())
         );
         emailSender.sendEmail(

web-ui/src/components/feedback_external_recipient_selector/FeedbackExternalRecipientSelector.jsx

@@ -95,11 +95,8 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
           fromQuery !== undefined
       ) {
         let profileCopy = profiles;
-        console.log("FeedbackExternalRecipientSelector, bindFromURL, profiles: ", profiles);
-        console.log("FeedbackExternalRecipientSelector, bindFromURL, fromQuery: ", fromQuery);
         if (typeof fromQuery === 'string') {
           let newProfile = { id: fromQuery };
-          console.log("FeedbackExternalRecipientSelector, bindFromURL, newProfile: ", newProfile);
           if (profiles.filter(member => member.id === newProfile.id).length === 0) {
             profileCopy.push(newProfile);
           }
@@ -137,7 +134,6 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
             });
           });
           let newProfiles = filteredProfileCopy.concat(res);
-          console.log("FeedbackExternalRecipientSelector, getExternalRecipientsForSelector, newProfiles: ", newProfiles);
           setProfiles(newProfiles);
         }
       });
@@ -146,8 +142,6 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
   ;
 
   const cardClickHandler = id => {
-    console.log("FeedbackExternalRecipientSelector, cardClickHandler, id: ", id);
-    console.log("FeedbackExternalRecipientSelector, cardClickHandler, fromQuery: ", fromQuery);
     if (!Array.isArray(fromQuery)) {
       fromQuery = fromQuery ? [fromQuery] : [];
     }

web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.jsx

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, {useContext, useEffect, useRef, useState} from 'react';
 import { styled } from '@mui/material/styles';
 import Typography from '@mui/material/Typography';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
@@ -47,11 +47,16 @@ const FeedbackRequestConfirmation = () => {
   const forQuery = query.for?.toString();
   const fromQuery = query.from?.toString();
   const sendQuery = query.send?.toString();
+  const templateQuery = query.template?.toString();
   const requestee = selectProfile(state, forQuery);
   let recipientInfo = getRecipientNames();
   let sendDate = dateUtils.parse(sendQuery, 'MM/dd/yyyy', new Date());
 
   function getRecipientNames() {
+
+    console.log("FeedbackRequestConfirmation, getRecipientNames(), query: ", query);
+
+
     if (fromQuery !== undefined) {
       let fromArray = fromQuery.split(',');
       let recipientProfiles = [];
@@ -85,7 +90,10 @@ const FeedbackRequestConfirmation = () => {
         <b>Sent to: </b>
         {recipientInfo?.map(
           (member, index) =>
-            `${selectProfile(state, member)?.name}${index === recipientInfo.length - 1 ? '' : ', '}`
+            `
+            ${selectProfile(state, member)?.name} - id: ${member} - templateQuery: ${templateQuery}
+            ${index === recipientInfo.length - 1 ? '' : ', '}
+            `
         )}
       </Typography>
       <Link style={{ marginTop: '4em', textDecoration: 'none' }} to="/">

web-ui/src/pages/FeedbackRequestPage.jsx

@@ -32,8 +32,7 @@ import { getFeedbackTemplate, softDeleteAdHocTemplates } from '../api/feedbackte
 
 import './FeedbackRequestPage.css';
 import FeedbackRequestForExternalRecipientPage from "./FeedbackRequestForExternalRecipientPage.jsx";
-import FeedbackExternalRecipientSelector
-  from "../components/feedback_external_recipient_selector/FeedbackExternalRecipientSelector.jsx";
+import FeedbackExternalRecipientSelector from "../components/feedback_external_recipient_selector/FeedbackExternalRecipientSelector.jsx";
 
 const dateUtils = new DateFnsUtils();
 const PREFIX = 'FeedbackRequestPage';
@@ -393,8 +392,6 @@ const FeedbackRequestPage = () => {
         });
         return { isValid: false, templateIsForExternalRecipientParam: false };
       } else {
-        // Set additionalData based on the res.payload.data content
-        const additionalData = templateResponse.someField; // Replace with the actual data you want to return
         return { isValid: true, templateIsForExternalRecipientParam: templateResponse.isForExternalRecipient };
       }
     }