Merge pull request #539 from Chia-Network/develop

Hydrate main with develop
Chia-Network · Mar 11, 2022 · 8210d05 · 8210d05
2 parents eb1639d + ef403ce
commit 8210d05
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 55 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "climate-warehouse",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": true,
   "author": "Chia Network Inc. <hello@chia.net>",
   "homepage": "./",

diff --git a/src/components/blocks/LeftNav.js b/src/components/blocks/LeftNav.js
@@ -71,7 +71,6 @@ const StyledTitleContainer = styled('div')`
 `;
 
 const LeftNav = withTheme(({ children }) => {
-  const [location, setLocation] = useState(false);
   const [confirmCreateOrgIsVisible, setConfirmCreateOrgIsVisible] =
     useState(false);
   const [createOrgIsVisible, setCreateOrgIsVisible] = useState(false);
@@ -95,9 +94,9 @@ const LeftNav = withTheme(({ children }) => {
     return () => clearTimeout(intervalId);
   }, [myOrgIsNotCreated, myOrgIsCreatedButNotSubscribed, createOrgIsVisible]);
 
-  useEffect(() => {
-    setLocation(window.location.pathname.split(/_(.+)/)[1]);
-  }, [window.location]);
+  const isUnitsPage = window.location.pathname.includes('/units');
+  const isProjectsPage = window.location.pathname.includes('/projects');
+  const isMyRegistryPage = window.location.search.includes('myRegistry=true');
 
   return (
     <Container>
@@ -109,23 +108,17 @@ const LeftNav = withTheme(({ children }) => {
           </ButtonText>
         </StyledTitleContainer>
         <MenuItem
-          selected={location === 'projects'}
+          selected={isProjectsPage && !isMyRegistryPage}
           to="/projects"
-          onClick={() => {
-            dispatch(resetRefreshPrompt);
-            setLocation('projects');
-          }}
+          onClick={() => dispatch(resetRefreshPrompt)}
         >
           <FormattedMessage id="projects-list" />
         </MenuItem>
         <div></div>
         <MenuItem
-          selected={location === 'units'}
+          selected={isUnitsPage && !isMyRegistryPage}
           to="/units"
-          onClick={() => {
-            dispatch(resetRefreshPrompt);
-            setLocation('units');
-          }}
+          onClick={() => dispatch(resetRefreshPrompt)}
         >
           <FormattedMessage id="units-list" />
         </MenuItem>
@@ -140,23 +133,17 @@ const LeftNav = withTheme(({ children }) => {
             {!myOrgIsNotCreated && !myOrgIsCreatedButNotSubscribed && (
               <>
                 <MenuItem
-                  selected={location === 'my-projects'}
+                  selected={isProjectsPage && isMyRegistryPage}
                   to={`/projects?orgUid=${myOrgUid}&myRegistry=true`}
-                  onClick={() => {
-                    dispatch(resetRefreshPrompt);
-                    setLocation('my-projects');
-                  }}
+                  onClick={() => dispatch(resetRefreshPrompt)}
                 >
                   <FormattedMessage id="my-projects" />
                 </MenuItem>
                 <div></div>
                 <MenuItem
-                  selected={location === 'my-units'}
+                  selected={isUnitsPage && isMyRegistryPage}
                   to={`/units?orgUid=${myOrgUid}&myRegistry=true`}
-                  onClick={() => {
-                    dispatch(resetRefreshPrompt);
-                    setLocation('my-units');
-                  }}
+                  onClick={() => dispatch(resetRefreshPrompt)}
                 >
                   <FormattedMessage id="my-units" />
                 </MenuItem>

diff --git a/src/components/layout/UpdateRefreshContainer.js b/src/components/layout/UpdateRefreshContainer.js
diff --git a/src/components/layout/index.js b/src/components/layout/index.js
@@ -6,4 +6,3 @@ export * from './TabPanel';
 export * from './Tabs';
 export * from './FormContainers';
 export * from './SocketStatusContainer';
-export * from './UpdateRefreshContainer';
diff --git a/src/index.js b/src/index.js
@@ -9,6 +9,7 @@ import './index.css';
 
 import App from './App';
 import store from './store';
+import { saveCurrentUrlToStorage } from './navigation';
 
 // Allows the app to reload in a platform agnostic way (either in browser or electron)
 const RefreshWrapper = () => {
@@ -20,6 +21,7 @@ const RefreshWrapper = () => {
   }, [appStore.refresh]);
 
   if (appStore.refresh) {
+    saveCurrentUrlToStorage();
     return null;
   }
 

diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js
@@ -6,9 +6,8 @@ import { Route, Redirect } from 'react-router-dom';
 import { IndeterminateProgressOverlay, Dashboard } from '../components/';
 import { NotificationContainer } from 'react-notifications';
 
-import { history, reloadCurrentUrlFromStorage } from './';
 import { signOut } from '../store/actions/app';
-
+import { history } from './';
 import * as Pages from '../pages';
 
 import { createNotification } from '../utils/notificationUtils';
@@ -21,6 +20,7 @@ import {
 } from '../components';
 import { setPendingError, setNotificationMessage } from '../store/actions/app';
 import { getOrganizationData } from '../store/actions/climateWarehouseActions';
+import { reloadCurrentUrlFromStorage } from './history';
 
 const AppNavigator = () => {
   const intl = useIntl();

diff --git a/src/store/actions/socket.js b/src/store/actions/socket.js
@@ -3,7 +3,6 @@ import socketIO from 'socket.io-client';
 import { messageTypes } from '../../utils/message-types';
 import { keyMirror } from '../store-functions';
 import { getStagingData } from './climateWarehouseActions';
-import { saveCurrentUrlToStorage } from '../../navigation/history';
 import { refreshApp } from './app';
 import { NotificationManager } from 'react-notifications';
 import constants from '../../constants';
@@ -28,12 +27,9 @@ let interval;
 const notifyRefresh = _.debounce(dispatch => {
   NotificationManager.info(
     'Click Here To Refresh.',
-    'The data that is viewed may be out of date, and a refresh is reccomended',
+    'The data that is viewed may be out of date, and a refresh is recommended',
     20000,
-    () => {
-      saveCurrentUrlToStorage();
-      dispatch(refreshApp());
-    },
+    () => dispatch(refreshApp(true)),
     true,
   );
 }, 5000);