2024-11-21 - feedback confirmation page

Author: Luch76

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

@@ -133,7 +133,7 @@ export const deleteFeedbackRequestById = async (id, cookie) => {
 
 export const getFeedbackRequestById = async (id, cookie) => {
   return resolve({
-    url: `${feedbackRequestURL}/${id}`,
+    url: `${feedbackRequestURL}${id}`,
     headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
   });
 };

web-ui-external-feedback/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.jsx

@@ -36,7 +36,6 @@ const FeedbackSubmitConfirmation = props => {
   const location = useLocation();
   const query = queryString.parse(location?.search);
   const csrf = selectCsrfToken(state);
-  const currentUserId = selectCurrentUser(state)?.id;
   const requestQuery = query.request?.toString();
   const [feedbackRequest, setFeedbackRequest] = useState(null);
   const feedbackRequestFetched = useRef(false);
@@ -45,7 +44,7 @@ const FeedbackSubmitConfirmation = props => {
 
   useEffect(() => {
     async function getFeedbackRequest(cookie) {
-      if (!currentUserId || !cookie || feedbackRequestFetched.current) {
+      if (!cookie || feedbackRequestFetched.current) {
         return null;
       }
 
@@ -59,24 +58,22 @@ const FeedbackSubmitConfirmation = props => {
         : null;
     }
 
-    if (csrf && currentUserId && requestQuery && !feedbackRequestFetched.current) {
+    if (csrf && requestQuery && !feedbackRequestFetched.current) {
       getFeedbackRequest(csrf).then(request => {
         if (request) {
           setFeedbackRequest(request);
         }
       });
     }
-  }, [csrf, currentUserId, requestQuery]);
+  }, [csrf, requestQuery]);
 
   useEffect(() => {
-    console.log("FeedbackSubmitConfirmation, useEffect[feedbackRequest, state], feedbackRequest: ", feedbackRequest);
-
     if (feedbackRequest) {
       feedbackRequestFetched.current = true;
     }
 
     if (feedbackRequestFetched.current) {
-      getRequesteeForFeedbackRequest(feedbackRequest?.requesteeId, csrf).then(response => {
+      getRequesteeForFeedbackRequest(feedbackRequest?.id, csrf).then(response => {
         if (response.payload && response.payload.data && !response.error) {
           setRequestee(response.payload.data);
         }

web-ui-external-feedback/src/components/feedback_submit_form/FeedbackSubmitForm.jsx

@@ -143,7 +143,7 @@ const FeedbackSubmitForm = ({
         updateRequestSubmit().then(res => {
           setIsSubmitting(false);
           if (res && res.payload && res.payload.data && !res.error) {
-            history.push(`/externalFeedback/submit/confirmation/?request=${requestId}`);
+            history.push(`/externalFeedback/confirmation?request=${requestId}`);
           } else {
             dispatch({
               type: UPDATE_TOAST,

web-ui-external-feedback/src/components/routes/Routes.jsx

@@ -12,7 +12,7 @@ export default function Routes() {
       <Route path="/externalFeedback/submit">
         <FeedbackSubmitPage />
       </Route>
-        <Route exact path="/externalFeedback/submit/confirmation">
+        <Route path="/externalFeedback/confirmation">
             <FeedbackSubmitConfirmation />
         </Route>
     </Switch>