Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

m2ms · Apr 20, 2021 · c303cd4 · c303cd4
2 parents 3fa6576 + 15ba22f
commit c303cd4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/js/components/projects/addProjectDetail/index.js b/js/components/projects/addProjectDetail/index.js
@@ -34,7 +34,7 @@ const useStyles = makeStyles(theme => ({
 export const AddProjectDetail = memo(({ handleCloseModal }) => {
   const classes = useStyles();
   const [state, setState] = useState();
-  const [createDiscourse, setCreateDiscourse] = useState(true);
+  let [createDiscourse, setCreateDiscourse] = useState(true);
 
   const dispatch = useDispatch();
   const targetId = useSelector(state => state.apiReducers.target_on);
@@ -47,6 +47,8 @@ export const AddProjectDetail = memo(({ handleCloseModal }) => {
   const discourseAvailable = isDiscourseAvailable();
   const dicourseUserAvailable = isDiscourseUserAvailable();
 
+  createDiscourse &= dicourseUserAvailable;
+
   const validateProjectName = async value => {
     let error;
     // console.log(`Project title validating and value is: ${value}`);
@@ -209,12 +211,12 @@ export const AddProjectDetail = memo(({ handleCloseModal }) => {
             </Grid>
             <Grid container justify="flex-end" direction="row">
               <Grid item>
-                <Button color="secondary" disabled={isProjectModalLoading} onClick={handleCloseModal}>
+                <Button color="secondary" disabled={isProjectModalLoading || isSubmitting} onClick={handleCloseModal}>
                   Cancel
                 </Button>
               </Grid>
               <Grid item>
-                <Button color="primary" onClick={submitForm} loading={isProjectModalLoading}>
+                <Button color="primary" onClick={submitForm} disabled={isSubmitting} loading={isProjectModalLoading}>
                   Create
                 </Button>
               </Grid>

diff --git a/js/components/projects/projectModal/index.js b/js/components/projects/projectModal/index.js
@@ -56,10 +56,11 @@ const useStyles = makeStyles(theme => ({
 export const ProjectModal = memo(({}) => {
   const classes = useStyles();
   const [state, setState] = useState();
-  const [createDiscourse, setCreateDiscourse] = useState(true);
+  let [createDiscourse, setCreateDiscourse] = useState(true);
   let history = useHistory();
 
   const dicourseUserAvailable = isDiscourseUserAvailable();
+  createDiscourse &= dicourseUserAvailable;
 
   const dispatch = useDispatch();
   const isProjectModalOpen = useSelector(state => state.projectReducers.isProjectModalOpen);
@@ -405,12 +406,12 @@ export const ProjectModal = memo(({}) => {
             </Grid>
             <Grid container justify="flex-end" direction="row">
               <Grid item>
-                <Button color="secondary" disabled={isProjectModalLoading} onClick={handleCloseModal}>
+                <Button color="secondary" disabled={isProjectModalLoading || isSubmitting} onClick={handleCloseModal}>
                   Cancel
                 </Button>
               </Grid>
               <Grid item>
-                <Button color="primary" onClick={submitForm} loading={isProjectModalLoading}>
+                <Button color="primary" onClick={submitForm} disabled={isSubmitting} loading={isProjectModalLoading}>
                   Create
                 </Button>
               </Grid>

diff --git a/js/components/snapshot/modals/newSnapshotForm.js b/js/components/snapshot/modals/newSnapshotForm.js
@@ -42,10 +42,11 @@ export const NewSnapshotForm = memo(({ handleCloseModal }) => {
   const dispatch = useDispatch();
   const { nglViewList } = useContext(NglContext);
   const [overwriteSnapshot, setoverwriteSnapshot] = useState(false);
-  const [createDiscourse, setCreateDiscourse] = useState(true);
+  let [createDiscourse, setCreateDiscourse] = useState(true);
 
   const discourseAvailable = isDiscourseAvailable();
   const dicourseUserAvailable = isDiscourseUserAvailable();
+  createDiscourse &= dicourseUserAvailable;
 
   const currentSnapshot = useSelector(state => state.projectReducers.currentSnapshot);
   const currentProject = useSelector(state => state.projectReducers.currentProject);