Merge pull request #2239 from kids-first/dev

🐛 Fix regressions : can't create project from selection file modal
kids-first · Jan 13, 2020 · a1b1b4a · a1b1b4a
2 parents d79ca43 + 2619f7c
commit a1b1b4a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kf-portal-ui",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "private": true,
   "dependencies": {
     "@kfarranger/components": "^1.4.4",

diff --git a/src/components/cavatica/CavaticaAddProject.js b/src/components/cavatica/CavaticaAddProject.js
@@ -45,12 +45,12 @@ class CavaticaAddProject extends Component {
 
     try {
       this.setState({ isSaveButtonDisabled: true });
-      const { id } = await saveProject({
+      const project = await saveProject({
         projectName,
         selectedBillingGroup,
         billingGroups,
       });
-      setSelectedProject(id);
+      setSelectedProject(project);
       onSuccess();
       this.setState({
         projectName: '',
@@ -134,7 +134,7 @@ class CavaticaAddProject extends Component {
     } else if (!addingProject) {
       return (
         <Row className="cavaticaAddProject-container">
-          <WhiteButton className="createButton" onClick={this.onWhiteButtonClick}>
+          <WhiteButton className="createButton" onClick={this.onCreateButtonClick}>
             <PlusIcon className="addIcon" width="12px" height="12px" />
             Create a project
           </WhiteButton>{' '}

diff --git a/src/components/cavatica/CavaticaProjects.js b/src/components/cavatica/CavaticaProjects.js
@@ -114,7 +114,10 @@ const CavaticaProjects = ({
       </div>
       <div className="footer">
         <CavaticaAddProject
-          setSelectedProject={setSelectedProject}
+          setSelectedProject={p => {
+              setSelectedProject(p.id);
+              onSelectProject(p);
+          }}
           onSuccess={() => {
             getCavaticaProjects().then(projects => {
               setProjectList(projects);

diff --git a/src/components/cavatica/CavaticaSuccessToast.js b/src/components/cavatica/CavaticaSuccessToast.js
@@ -13,7 +13,7 @@ export const SuccessToastComponent = ({ selectedProjectData }) => (
       <div style={{ color: theme.secondary, marginBottom: '20px' }}>{selectedProjectData.name}</div>
       <ExternalLink
         style={{ fontSize: '14px' }}
-        href={`${cavaticaWebRoot}/u/${selectedProjectData.id}`}
+        href={`${cavaticaWebRoot}u/${selectedProjectData.id}`}
       >
         Open project in Cavatica
         <RightArrows fill={theme.primary} width="10px" style={{ marginLeft: '4px' }} />