2024-11-18 - cleanup submit page for ext-recip

Author: Luch76

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

@@ -2,6 +2,7 @@
 
 import com.objectcomputing.checkins.exceptions.BadArgException;
 import com.objectcomputing.checkins.security.ImpersonationController;
+import com.objectcomputing.checkins.services.feedback_answer.question_and_answer.QuestionAndAnswerServices;
 import com.objectcomputing.checkins.services.feedback_external_recipient.FeedbackExternalRecipientServices;
 import com.objectcomputing.checkins.services.memberprofile.*;
 import io.micronaut.core.annotation.Nullable;
@@ -41,11 +42,13 @@ public class FeedbackRequestExternalRecipientController {
     private static final Logger LOG = LoggerFactory.getLogger(FeedbackRequestExternalRecipientController.class);
     private static final Base64.Encoder base64Encoder = Base64.getUrlEncoder();
     private final MemberProfileServices memberProfileServices;
+    private final QuestionAndAnswerServices questionAndAnswerServices;
 
-    public FeedbackRequestExternalRecipientController(FeedbackRequestServices feedbackRequestServices, FeedbackExternalRecipientServices feedbackExternalRecipientServices, MemberProfileServices memberProfileServices) {
+    public FeedbackRequestExternalRecipientController(FeedbackRequestServices feedbackRequestServices, FeedbackExternalRecipientServices feedbackExternalRecipientServices, MemberProfileServices memberProfileServices, QuestionAndAnswerServices questionAndAnswerServices) {
         this.feedbackReqServices = feedbackRequestServices;
         this.feedbackExternalRecipientServices = feedbackExternalRecipientServices;
         this.memberProfileServices = memberProfileServices;
+        this.questionAndAnswerServices = questionAndAnswerServices;
     }
 
     /**
@@ -219,4 +222,13 @@ public HttpResponse<MemberProfileResponseDTO> getRequesterForFeedbackRequest(UUI
                 .headers(headers -> headers.location(location(memberProfile.getId())));
     }
 
+    @Get("/getAllQuestionsAndAnswers/{requestId}")
+    public List<QuestionAndAnswerServices.Tuple> getAllQuestionsAndAnswers(@Nullable UUID requestId) {
+        FeedbackRequest feedbackRequest = feedbackReqServices.getById(requestId);
+        if (feedbackRequest.getExternalRecipientId() == null) {
+            throw new BadArgException("This feedback request is not for an external recipient");
+        }
+        return questionAndAnswerServices.getAllQuestionsAndAnswers(requestId);
+    }
+
 }

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/template_question/TemplateQuestionServicesImpl.java

@@ -170,4 +170,5 @@ public boolean getIsPermitted(UUID templateQuestionId) {
 
         return (currentUserId != null || (feedbackTemplate.isPresent() && feedbackTemplate.get().getIsForExternalRecipient() != null && feedbackTemplate.get().getIsForExternalRecipient() == true));
     }
+
 }

web-ui-external-feedback/src/api/feedbackanswer.js

@@ -2,7 +2,7 @@ import { resolve } from './api.js';
 import { chain } from 'lodash';
 
 const feedbackAnswerUrl = '/services/feedback/answers';
-const questionsAndAnswersUrl = '/services/feedback/questions-and-answers';
+const questionsAndAnswersUrl = '/questions-and-answers';
 
 export const createFeedbackAnswer = async (feedbackAnswer, cookie) => {
   return resolve({
@@ -36,7 +36,7 @@ export const getAnswersFromRequest = async (feedbackRequestId, cookie) => {
 
 export const getQuestionAndAnswer = async (requestId, cookie) => {
   return resolve({
-    url: `${questionsAndAnswersUrl}/${requestId}`,
+    url: `/getAllQuestionsAndAnswers/${requestId}`,
     headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
   });
 };

web-ui-external-feedback/src/pages/FeedbackSubmitPage.jsx

@@ -121,31 +121,23 @@ const FeedbackSubmitPage = () => {
 
   useEffect(() => {
     const fetchDataRequestee = async () => {
-      // Your initialization logic here
-      console.log('Page loaded');
-      // Invoke getRequesteeForFeedbackRequest and assign result to a const-variable
-      const requesteeData = await getRequesteeForFeedbackRequest(feedbackRequest?.id, csrf);
-      console.log("FeedbackSubmitPage, useEffect[feedbackRequest, selfReviewRequest, state], requesteeData: ", requesteeData);
-    };
-
-    fetchDataRequestee();
-  }, [csrf, feedbackRequest, state])
-  ;
-
-  useEffect(() => {
-    console.log('Page loaded 02');
       if (feedbackRequest) {
         feedbackRequestFetched.current = true;
       }
-
       if (feedbackRequestFetched.current) {
-        const requesteeProfile = selectProfile(
-            state,
-            feedbackRequest?.requesteeId
-        );
-        setRequestee(requesteeProfile);
+        const res = await getRequesteeForFeedbackRequest(feedbackRequest?.id, csrf);
+        const requesteeData = res.payload && res.payload.data && res.payload.status === 200 && !res.error
+            ? res.payload.data
+            : null
+        ;
+        console.log("FeedbackSubmitPage, useEffect[feedbackRequest, selfReviewRequest, state], requesteeData: ", requesteeData);
+        setRequestee(requesteeData)
       }
-  }, [feedbackRequest, selfReviewRequest, state]);
+    };
+
+    fetchDataRequestee();
+  }, [csrf, feedbackRequest, state])
+  ;
 
   return (
       <Root className="feedback-submit-page">
@@ -163,7 +155,9 @@ const FeedbackSubmitPage = () => {
             <>
               {feedbackRequest &&
                   (showTips ? (
-                      <FeedbackSubmissionTips onNextClick={() => setShowTips(false)} />
+                      <FeedbackSubmissionTips onNextClick={() =>
+                          setShowTips(false)
+                      } />
                   ) : (
                       <FeedbackSubmitForm
                           requesteeName={requestee?.name}