Merge pull request #2729 from objectcomputing/release/0.8

Release v0.8.5

Author: mkimberlin

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.4"
+version "0.8.5"
 group "com.objectcomputing.checkins"
 
 repositories {

web-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "private": true,
   "type": "module",
   "dependencies": {

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>