Merge pull request #2728 from objectcomputing/bugfix-2727/multiple-feedback-request-submission

Bugfix 2727/multiple feedback request submission

Author: mkimberlin

server/src/main/resources/db/dev/R__Load_testing_data.sql

@@ -1291,12 +1291,12 @@ VALUES
 INSERT INTO review_periods
 (id, name, review_status, review_template_id, self_review_template_id, launch_date, self_review_close_date, close_date, period_start_date, period_end_date)
 VALUES
-    ('12345678-e29c-4cf4-9ea4-6baa09405c57', 'Review Period 1', 'PLANNING', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', '2024-09-01 06:00:00', '2024-09-02 06:00:00', '2024-09-03 06:00:00', '2024-01-01 06:00:00', '2024-08-31 06:00:00');
+    ('12345678-e29c-4cf4-9ea4-6baa09405c57', 'Review Period 1', 'PLANNING', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', CURRENT_DATE + TIME '06:00:00', CURRENT_DATE + INTERVAL '1' DAY + TIME '06:00:00', CURRENT_DATE + INTERVAL '2' DAY + TIME '06:00:00', date_trunc('year', CURRENT_DATE) + TIME '06:00:00', CURRENT_DATE + INTERVAL '-1' DAY + TIME '06:00:00');
 
 INSERT INTO review_periods
 (id, name, review_status, review_template_id, self_review_template_id, launch_date, self_review_close_date, close_date, period_start_date, period_end_date)
 VALUES
-    ('12345678-e29c-4cf4-9ea4-6baa09405c58', 'Review Period 2', 'PLANNING', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', '2024-09-10 06:00:00', '2024-09-11 06:00:00', '2024-09-12 06:00:00', '2024-01-01 06:00:00', '2024-08-31 06:00:00');
+    ('12345678-e29c-4cf4-9ea4-6baa09405c58', 'Review Period 2', 'PLANNING', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', CURRENT_DATE + TIME '06:00:00', CURRENT_DATE + INTERVAL '1' DAY + TIME '06:00:00', CURRENT_DATE + INTERVAL '2' DAY + TIME '06:00:00', date_trunc('year', CURRENT_DATE) + TIME '06:00:00', CURRENT_DATE + INTERVAL '-1' DAY + TIME '06:00:00');
 
 INSERT INTO review_periods
 (id, name, review_status, review_template_id, self_review_template_id, launch_date, self_review_close_date, close_date, period_start_date, period_end_date)

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

@@ -78,6 +78,7 @@ const FeedbackSubmitForm = ({
   const { state, dispatch } = useContext(AppContext);
   const csrf = selectCsrfToken(state);
   const [isLoading, setIsLoading] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const [isReviewing, setIsReviewing] = useState(reviewOnly);
   const history = useHistory();
   const [questionAnswerPairs, setQuestionAnswerPairs] = useState([]);
@@ -117,6 +118,7 @@ const FeedbackSubmitForm = ({
   }
 
   const onSubmitHandler = () => {
+    setIsSubmitting(true);
     updateAllAnswersSubmit()
       .then(res => {
         for (let i = 0; i < res.length; ++i) {
@@ -135,9 +137,11 @@ const FeedbackSubmitForm = ({
       })
       .then(resTwo => {
         if (resTwo === false) {
+          setIsSubmitting(false);
           return;
         }
         updateRequestSubmit().then(res => {
+          setIsSubmitting(false);
           if (res && res.payload && res.payload.data && !res.error) {
             history.push(`/feedback/submit/confirmation/?request=${requestId}`);
           } else {
@@ -225,7 +229,7 @@ const FeedbackSubmitForm = ({
             <React.Fragment>
               <Button
                 className={classes.coloredButton}
-                disabled={isLoading}
+                disabled={isLoading || isSubmitting}
                 onClick={() => setIsReviewing(false)}
                 variant="contained"
                 color="secondary"
@@ -234,7 +238,7 @@ const FeedbackSubmitForm = ({
               </Button>
               <Button
                 className={classes.button}
-                disabled={isLoading}
+                disabled={isLoading || isSubmitting}
                 onClick={onSubmitHandler}
                 variant="contained"
                 color="primary"

web-ui/src/components/reviews/periods/ReviewPeriods.jsx

@@ -389,11 +389,14 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => {
         ) : periods.length > 0 ? (
           periods
             .sort((a, b) => {
+              const aName = (a.name || '');
               return a.reviewStatus === b.reviewStatus
-                ? (a.name || '').localeCompare(b.name)
+                ? aName.localeCompare(b.name)
                 : a.reviewStatus === ReviewStatus.OPEN
                   ? -1
-                  : 1;
+                  : (b.reviewStatus === ReviewStatus.OPEN
+                    ? 1
+                    : aName.localeCompare(b.name));
             })
             .map((period) => (
               <div>