From bedcf9dd083e7f28f3c783406720cfccbdcd922e Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 6 Jul 2021 17:24:03 +0530
Subject: [PATCH] feature(ui) - fixes

---
 frontend/app/components/Client/Sites/NewSiteForm.js | 13 +++++++++----
 frontend/app/components/Header/SiteDropdown.js      |  6 +-----
 frontend/tsconfig.json                              |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/app/components/Client/Sites/NewSiteForm.js b/frontend/app/components/Client/Sites/NewSiteForm.js
index dfb8087fe..a9306048c 100644
--- a/frontend/app/components/Client/Sites/NewSiteForm.js
+++ b/frontend/app/components/Client/Sites/NewSiteForm.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { Input, Button, Label } from 'UI';
 import { save, edit, update , fetchList } from 'Duck/site';
-import { pushNewSite } from 'Duck/user';
+import { pushNewSite, setSiteId } from 'Duck/user';
 import styles from './siteForm.css';
 
 @connect(state => ({
@@ -14,7 +14,8 @@ import styles from './siteForm.css';
 	edit,
 	update,
 	pushNewSite,
-	fetchList
+	fetchList,
+  setSiteId
 })
 export default class NewSiteForm extends React.PureComponent {
 	state = {
@@ -34,8 +35,12 @@ export default class NewSiteForm extends React.PureComponent {
 			})
 		} else {
 			this.props.save(this.props.site).then(() => {
-				const { sites } = this.props;
-				this.props.onClose(null, sites.last())
+				const { sites } = this.props;        
+        const site = sites.last();
+
+        this.props.pushNewSite(site)
+        this.props.setSiteId(site.id)
+				this.props.onClose(null, site)
 			});
 		}
 	}
diff --git a/frontend/app/components/Header/SiteDropdown.js b/frontend/app/components/Header/SiteDropdown.js
index bb8e1a29a..f1d7bb907 100644
--- a/frontend/app/components/Header/SiteDropdown.js
+++ b/frontend/app/components/Header/SiteDropdown.js
@@ -23,11 +23,7 @@ export default class SiteDropdown extends React.PureComponent {
   state = { showProductModal: false }
 
   closeModal = (e, newSite) => {
-    this.setState({ showProductModal: false })
-    if (newSite) {
-      this.props.pushNewSite(newSite)
-      this.props.setSiteId(newSite.id)
-    }
+    this.setState({ showProductModal: false })    
   };
 
   newSite = () => {
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 7129fe449..b5d3a9688 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,6 +15,7 @@
     "baseUrl": ".",
     "paths": { // TODO: one-source truth
       "App": ["./app"],
+      "App/*": ["./app/*"],
       "Types": ["./app/types" ],
       "Types/*": ["./app/types/*"], // Sublime hack
       "UI": ["./app/components/ui"],