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

m2ms · Mar 29, 2021 · 14351d5 · 14351d5
2 parents f75cc65 + 07fdbbc
commit 14351d5
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 20 deletions.
diff --git a/js/components/header/discourseErrorModal.js b/js/components/header/discourseErrorModal.js
@@ -0,0 +1,44 @@
+import React, { memo } from 'react';
+import Modal from '../common/Modal';
+import { Grid, Typography, Button } from '@material-ui/core';
+import { useDispatch } from 'react-redux';
+import { setOpenDiscourseErrorModal } from '../../reducers/api/actions';
+
+export const DiscourseErrorModal = memo(({ openModal }) => {
+  const dispatch = useDispatch();
+
+  const closeModal = () => {
+    dispatch(setOpenDiscourseErrorModal(false));
+  };
+
+  return (
+    <Modal
+      open={openModal}
+      onClose={() => {
+        closeModal();
+      }}
+    >
+      <Grid container direction="column">
+        <Grid item>
+          <Typography variant="h3">DISCOURSE ERROR!</Typography>
+        </Grid>
+        <Grid item>
+          <Typography variant="body1">
+            Most likely there already is topic with same name as is this project name.
+          </Typography>
+        </Grid>
+      </Grid>
+      <Grid container justify="flex-end">
+        {' '}
+        <Button
+          color="primary"
+          onClick={() => {
+            closeModal();
+          }}
+        >
+          Close
+        </Button>
+      </Grid>
+    </Modal>
+  );
+});
diff --git a/js/components/header/index.js b/js/components/header/index.js
@@ -40,7 +40,6 @@ import { DJANGO_CONTEXT } from '../../utils/djangoContext';
 // import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
 import { useHistory } from 'react-router-dom';
 import { IssueReport } from '../userFeedback/issueReport';
-import { IdeaReport } from '../userFeedback/ideaReport';
 import { FundersModal } from '../funders/fundersModal';
 import { TrackingModal } from '../tracking/trackingModal';
 // eslint-disable-next-line import/extensions
@@ -50,6 +49,8 @@ import { useSelector, useDispatch } from 'react-redux';
 import { setCurrentTargetLink } from '../target/redux/actions';
 import { generateDiscourseTargetURL, getExistingPost } from '../../utils/discourse';
 import { setCurrentProjectDiscourseLink } from '../projects/redux/actions';
+import { DiscourseErrorModal } from './discourseErrorModal';
+import { setOpenDiscourseErrorModal } from '../../reducers/api/actions';
 
 const useStyles = makeStyles(theme => ({
   padding: {
@@ -113,6 +114,8 @@ export default memo(
     const targetDiscourseLink = useSelector(state => state.targetReducers.currentTargetLink);
     const projectDiscourseLink = useSelector(state => state.projectReducers.currentProjectDiscourseLink);
 
+    const openDiscourseError = useSelector(state => state.apiReducers.open_discourse_error_modal);
+
     const discourseAvailable = isDiscourseAvailable();
     const targetDiscourseVisible = targetDiscourseLink && discourseAvailable;
     const projectDiscourseVisible = discourseAvailable && projectDiscourseLink;
@@ -128,7 +131,10 @@ export default memo(
               dispatch(setCurrentTargetLink(url));
             }
           })
-          .catch(err => console.log(err));
+          .catch(err => {
+            console.log(err);
+            dispatch(setOpenDiscourseErrorModal(true));
+          });
       }
     }, [targetDiscourseLinks, targetId, dispatch, targetName]);
 
@@ -137,12 +143,17 @@ export default memo(
         if (targetDiscourseLinks && targetDiscourseLinks[currentProject.projectID]) {
           dispatch(setCurrentProjectDiscourseLink(targetDiscourseLinks[currentProject.projectID]));
         } else if (currentProject.title && targetName) {
-          getExistingPost(currentProject.title).then(response => {
-            const url = response.data['Post url'];
-            if (url) {
-              dispatch(setCurrentProjectDiscourseLink(url));
-            }
-          });
+          getExistingPost(currentProject.title)
+            .then(response => {
+              const url = response.data['Post url'];
+              if (url) {
+                dispatch(setCurrentProjectDiscourseLink(url));
+              }
+            })
+            .catch(err => {
+              console.log(err);
+              dispatch(setOpenDiscourseErrorModal(true));
+            });
         }
       }
     }, [currentProject, targetDiscourseLinks, dispatch, targetName]);
@@ -362,6 +373,7 @@ export default memo(
         </AppBar>
         <FundersModal openModal={openFunders} onModalClose={() => setOpenFunders(false)} />
         <TrackingModal openModal={openTrackingModal} onModalClose={() => setOpenTrackingModal(false)} />
+        <DiscourseErrorModal openModal={openDiscourseError} />
         <Drawer
           anchor="left"
           open={openMenu}

diff --git a/js/components/projects/index.js b/js/components/projects/index.js
@@ -27,6 +27,7 @@ import { ProjectModal } from './projectModal';
 import { loadListOfAllProjects, removeProject, searchInProjects } from './redux/dispatchActions';
 import { DJANGO_CONTEXT } from '../../utils/djangoContext';
 import { isDiscourseAvailable, getExistingPost } from '../../utils/discourse';
+import { setOpenDiscourseErrorModal } from '../../reducers/api/actions';
 
 const useStyles = makeStyles(theme => ({
   table: {
@@ -79,12 +80,17 @@ export const Projects = memo(({}) => {
     if (isDiscourseAvailable()) {
       listOfProjects.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage).forEach(project => {
         if (!projectDiscourseLinks.hasOwnProperty(project.id)) {
-          getExistingPost(project.name).then(response => {
-            if (response.data['Post url']) {
-              projectDiscourseLinks[project.id] = response.data['Post url'];
-              dispatch(setProjectDiscourseLinks(projectDiscourseLinks));
-            }
-          });
+          getExistingPost(project.name)
+            .then(response => {
+              if (response.data['Post url']) {
+                projectDiscourseLinks[project.id] = response.data['Post url'];
+                dispatch(setProjectDiscourseLinks(projectDiscourseLinks));
+              }
+            })
+            .catch(err => {
+              console.log(err);
+              dispatch(setOpenDiscourseErrorModal(true));
+            });
         }
       });
     }

diff --git a/js/components/projects/redux/dispatchActions.js b/js/components/projects/redux/dispatchActions.js
@@ -23,6 +23,7 @@ import { DJANGO_CONTEXT } from '../../../utils/djangoContext';
 import { sendInitTrackingActionByProjectId } from '../../../reducers/tracking/dispatchActions';
 import { resetTrackingState } from '../../../reducers/tracking/actions';
 import { createProjectPost } from '../../../utils/discourse';
+import { setOpenDiscourseErrorModal } from '../../../reducers/api/actions';
 
 import moment from 'moment';
 import { resetNglTrackingState } from '../../../reducers/nglTracking/dispatchActions';
@@ -278,9 +279,14 @@ export const createProjectFromSnapshotDialog = data => dispatch => {
 };
 
 export const createProjectDiscoursePost = (projectName, targetName, msg, tags) => (dispatch, getState) => {
-  return createProjectPost(projectName, targetName, msg, tags).then(response => {
-    dispatch(setCurrentProjectDiscourseLink(response.data['Post url']));
-  });
+  return createProjectPost(projectName, targetName, msg, tags)
+    .then(response => {
+      dispatch(setCurrentProjectDiscourseLink(response.data['Post url']));
+    })
+    .catch(err => {
+      console.log(err);
+      dispatch(setOpenDiscourseErrorModal(true));
+    });
 };
 
 export const createProject = ({ title, description, target, author, tags }) => dispatch => {

diff --git a/js/components/target/targetList.js b/js/components/target/targetList.js
@@ -10,6 +10,7 @@ import { Link } from 'react-router-dom';
 import { URLS } from '../routes/constants';
 import { isDiscourseAvailable, generateDiscourseTargetURL } from '../../utils/discourse';
 import { setTargetDiscourseLinks } from './redux/actions';
+import { setOpenDiscourseErrorModal } from '../../reducers/api/actions';
 
 export const TargetList = memo(() => {
   const dispatch = useDispatch();
@@ -28,6 +29,7 @@ export const TargetList = memo(() => {
             })
             .catch(err => {
               console.log(err);
+              dispatch(setOpenDiscourseErrorModal(true));
             });
         }
       });

diff --git a/js/reducers/api/actions.js b/js/reducers/api/actions.js
@@ -3,6 +3,10 @@
  */
 import { constants } from './constants';
 
+export const setOpenDiscourseErrorModal = open => {
+  return { type: constants.SET_OPEN_DISCOURSE_ERROR_MODAL, payload: open };
+};
+
 export const setTargetIdList = function(input_json) {
   return {
     type: constants.SET_TARGET_ID_LIST,

diff --git a/js/reducers/api/apiReducers.js b/js/reducers/api/apiReducers.js
@@ -38,7 +38,8 @@ export const INITIAL_STATE = {
   sessionTitle: undefined,
   user_id: undefined,
   direct_access: {},
-  direct_access_processed: false
+  direct_access_processed: false,
+  open_discourse_error_modal: false
 };
 
 export const RESET_TARGET_STATE = {
@@ -70,12 +71,16 @@ export const RESET_TARGET_STATE = {
   sessionIdList: [],
   sessionTitle: undefined,
   user_id: undefined,
-  direct_access: {}
+  direct_access: {},
+  open_discourse_error_modal: false
   // direct_access_processed: false
 };
 
 export default function apiReducers(state = INITIAL_STATE, action = {}) {
   switch (action.type) {
+    case constants.SET_OPEN_DISCOURSE_ERROR_MODAL:
+      return Object.assign({}, state, { open_discourse_error_modal: action.payload });
+
     case constants.SET_TARGET_ID_LIST:
       return Object.assign({}, state, {
         target_id_list: action.target_id_list

diff --git a/js/reducers/api/constants.js b/js/reducers/api/constants.js
@@ -30,5 +30,6 @@ export const constants = {
   RELOAD_API_STATE: prefix + 'RELOAD_API_STATE',
   RESET_TARGET_STATE: prefix + 'RESET_TARGET_STATE',
   SET_DIRECT_ACCESS: prefix + 'SET_DIRECT_ACCESS',
-  SET_DIRECT_ACCESS_PROCESSED: prefix + 'SET_DIRECT_ACCESS_PROCESSED'
+  SET_DIRECT_ACCESS_PROCESSED: prefix + 'SET_DIRECT_ACCESS_PROCESSED',
+  SET_OPEN_DISCOURSE_ERROR_MODAL: prefix + 'SET_OPEN_DISCOURSE_ERROR_MODAL'
 };