Move studio info request to top level

src/views/studio/studio-info.jsx

@@ -10,15 +10,11 @@ import StudioStats from './studio-stats.jsx';
 import StudioTitle from './studio-title.jsx';
 
 import {selectIsLoggedIn} from '../../redux/session';
-import {getInfo, getRoles} from '../../redux/studio';
+import {getRoles} from '../../redux/studio';
 
 const StudioInfo = ({
-    isLoggedIn, onLoadInfo, onLoadRoles
+    isLoggedIn, onLoadRoles
 }) => {
-    useEffect(() => { // Load studio info after first render
-        onLoadInfo();
-    }, []);
-
     useEffect(() => { // Load roles info once the user is logged in is available
         if (isLoggedIn) onLoadRoles();
     }, [isLoggedIn]);
@@ -43,7 +39,6 @@ const StudioInfo = ({
 
 StudioInfo.propTypes = {
     isLoggedIn: PropTypes.bool,
-    onLoadInfo: PropTypes.func,
     onLoadRoles: PropTypes.func
 };
 
@@ -52,7 +47,6 @@ export default connect(
         isLoggedIn: selectIsLoggedIn(state)
     }),
     {
-        onLoadInfo: getInfo,
         onLoadRoles: getRoles
     }
 )(StudioInfo);

src/views/studio/studio.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {
     BrowserRouter as Router,
     Switch,
@@ -34,20 +34,25 @@ import {
     userProjects
 } from './lib/redux-modules';
 
-const {getInitialState, studioReducer, selectStudioLoadFailed} = require('../../redux/studio');
+const {getInitialState, studioReducer, selectStudioLoadFailed, getInfo} = require('../../redux/studio');
 const {studioReportReducer} = require('../../redux/studio-report');
 const {commentsReducer} = require('../../redux/comments');
 const {studioMutationsReducer} = require('../../redux/studio-mutations');
 
 import './studio.scss';
-import {selectMuteStatus} from '../../redux/session.js';
+import {selectIsAdmin, selectMuteStatus} from '../../redux/session.js';
 import {formatRelativeTime} from '../../lib/format-time.js';
 import CommentingStatus from '../../components/commenting-status/commenting-status.jsx';
 import {FormattedMessage} from 'react-intl';
 import {selectShowCuratorMuteError} from '../../redux/studio-permissions.js';
 
-const StudioShell = ({showCuratorMuteError, muteExpiresAtMs, studioLoadFailed}) => {
+const StudioShell = ({isAdmin, showCuratorMuteError, muteExpiresAtMs, studioLoadFailed, onLoadInfo}) => {
     const match = useRouteMatch();
+
+    useEffect(() => {
+        onLoadInfo();
+    }, [isAdmin]); // Reload any time isAdmin changes to allow admins to view deleted studios
+
     return (
         studioLoadFailed ?
             <NotAvailable /> :
@@ -101,17 +106,23 @@ const StudioShell = ({showCuratorMuteError, muteExpiresAtMs, studioLoadFailed})
 };
 
 StudioShell.propTypes = {
+    isAdmin: PropTypes.bool,
     showCuratorMuteError: PropTypes.bool,
     muteExpiresAtMs: PropTypes.number,
-    studioLoadFailed: PropTypes.bool
+    studioLoadFailed: PropTypes.bool,
+    onLoadInfo: PropTypes.func
 };
 
 const ConnectedStudioShell = connect(
     state => ({
         showCuratorMuteError: selectShowCuratorMuteError(state),
         studioLoadFailed: selectStudioLoadFailed(state),
-        muteExpiresAtMs: (selectMuteStatus(state).muteExpiresAt * 1000 || 0)
+        muteExpiresAtMs: (selectMuteStatus(state).muteExpiresAt * 1000 || 0),
+        isAdmin: selectIsAdmin(state)
     }),
+    {
+        onLoadInfo: getInfo
+    }
 )(StudioShell);
 
 render(