Merge 7a4ce73 into 707b92a

thewca · Nov 13, 2020 · baa13d5 · baa13d5
2 parents 707b92a + 7a4ce73
commit baa13d5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/tnoodle-ui/src/main/components/EntryInterface.jsx b/tnoodle-ui/src/main/components/EntryInterface.jsx
@@ -11,6 +11,7 @@ import { FaEye, FaEyeSlash } from "react-icons/fa";
 const mapStateToProps = (store) => ({
     editingDisabled: store.editingDisabled,
     competitionName: store.wcif.name,
+    generatingScrambles: store.generatingScrambles,
 });
 
 const mapDispatchToProps = {
@@ -97,6 +98,7 @@ const EntryInterface = connect(
                                 type={this.state.showPassword ? "" : "password"}
                                 onChange={this.handlePasswordChange}
                                 value={this.state.password}
+                                disabled={this.props.generatingScrambles}
                             />
                             <div
                                 className="input-group-prepend"

diff --git a/tnoodle-ui/src/main/components/EventPicker.jsx b/tnoodle-ui/src/main/components/EventPicker.jsx
@@ -181,6 +181,9 @@ const EventPicker = connect(
                                         }
                                         min={1}
                                         required
+                                        disabled={
+                                            this.props.generatingScrambles
+                                        }
                                     />
                                 </td>
                             </tr>

diff --git a/tnoodle-ui/src/main/components/FmcTranslationsDetail.jsx b/tnoodle-ui/src/main/components/FmcTranslationsDetail.jsx
@@ -15,6 +15,7 @@ const TRANSLATIONS_PER_LINE = 3;
 const mapStateToProps = (store) => ({
     translations: store.translations,
     suggestedFmcTranslations: store.suggestedFmcTranslations,
+    generatingScrambles: store.generatingScrambles,
 });
 
 const mapDispatchToProps = {
@@ -84,13 +85,15 @@ const FmcTranslationsDetail = connect(
                                 type="button"
                                 className="btn btn-outline-secondary"
                                 onClick={this.selectAllTranslations}
+                                disabled={this.props.generatingScrambles}
                             >
                                 Select All
                             </button>
                             <button
                                 type="button"
                                 className="btn btn-outline-secondary"
                                 onClick={this.selectNoneTranslation}
+                                disabled={this.props.generatingScrambles}
                             >
                                 Select None
                             </button>
@@ -100,6 +103,7 @@ const FmcTranslationsDetail = connect(
                                     className="btn btn-outline-secondary"
                                     onClick={this.selectSuggestedTranslations}
                                     title="This selection is based on competitor's nationalities."
+                                    disabled={this.props.generatingScrambles}
                                 >
                                     Select Suggested
                                 </button>
@@ -135,6 +139,11 @@ const FmcTranslationsDetail = connect(
                                                                 </th>
                                                                 <th>
                                                                     <input
+                                                                        disabled={
+                                                                            this
+                                                                                .props
+                                                                                .generatingScrambles
+                                                                        }
                                                                         type="checkbox"
                                                                         id={
                                                                             checkboxId
@@ -186,6 +195,7 @@ const FmcTranslationsDetail = connect(
                                 type="button"
                                 className="btn btn-primary"
                                 onClick={this.toggleTranslations}
+                                disabled={this.props.generatingScrambles}
                             >
                                 Translations
                             </button>

diff --git a/tnoodle-ui/src/main/components/Main.jsx b/tnoodle-ui/src/main/components/Main.jsx
@@ -64,7 +64,6 @@ const Main = connect(
         };
 
         generateZip = () => {
-            // If user navigates during generation proccess, we still get the correct name
             this.setState({
                 ...this.state,
                 competitionNameFileZip: this.props.wcif.name,

diff --git a/tnoodle-ui/src/main/components/MbldDetail.jsx b/tnoodle-ui/src/main/components/MbldDetail.jsx
@@ -6,6 +6,7 @@ import { updateMbld, updateFileZipBlob } from "../redux/ActionCreators";
 const mapStateToProps = (store) => ({
     mbld: store.mbld,
     bestMbldAttempt: store.bestMbldAttempt,
+    generatingScrambles: store.generatingScrambles,
 });
 
 const mapDispatchToProps = {
@@ -61,6 +62,7 @@ const MbldDetail = connect(
                                 }
                                 min={MBLD_MIN}
                                 required
+                                disabled={this.props.generatingScrambles}
                             />
                         </td>
                     </tr>

diff --git a/tnoodle-ui/src/main/components/SideBar.jsx b/tnoodle-ui/src/main/components/SideBar.jsx
@@ -35,6 +35,7 @@ const mapStateToProps = (store) => ({
     me: store.me,
     competitions: store.competitions,
     cachedObjects: store.cachedObjects,
+    generatingScrambles: store.generatingScrambles,
 });
 
 const mapDispatchToProps = {
@@ -282,6 +283,7 @@ const SideBar = connect(
                         type="button"
                         className="btn btn-primary btn-lg btn-block btn-outline-light"
                         onClick={isLogged() ? logOut : logIn}
+                        disabled={this.props.generatingScrambles}
                     >
                         {isLogged() ? "Log Out" : "Log In"}
                     </button>
@@ -353,6 +355,9 @@ const SideBar = connect(
                                         type="button"
                                         className={`btn btn-primary btn-lg btn-block btn-outline-light mb-${this.margin}`}
                                         onClick={this.handleManualSelection}
+                                        disabled={
+                                            this.props.generatingScrambles
+                                        }
                                     >
                                         Manual Selection
                                     </button>
@@ -365,6 +370,10 @@ const SideBar = connect(
                                             <button
                                                 type="button"
                                                 className="btn btn-primary btn-lg btn-block m-1"
+                                                disabled={
+                                                    this.props
+                                                        .generatingScrambles
+                                                }
                                                 onClick={(_) =>
                                                     this.handleCompetitionSelection(
                                                         competition.id