Merge pull request #3763 from Expensify/marcaaron-navToWorkspace

Fix up workspace routes
Expensify · Jun 29, 2021 · 5cde3ca · 5cde3ca
2 parents 1bfa5d2 + 52b9cbe
commit 5cde3ca
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 13 deletions.
diff --git a/src/ROUTES.js b/src/ROUTES.js
@@ -51,10 +51,10 @@ export default {
     VALIDATE_LOGIN: 'v',
     VALIDATE_LOGIN_WITH_VALIDATE_CODE: 'v/:accountID/:validateCode',
     ENABLE_PAYMENTS: 'enable-payments',
-    WORKSPACE: 'workspace',
     WORKSPACE_NEW: 'workspace/new',
-    WORKSPACE_CARD: 'workspace/card',
-    getWorkspaceRoute: policyID => `workspace/${policyID}`,
+    WORKSPACE_CARD: ':policyID/card',
+    WORKSPACE: 'workspace',
+    getWorkspaceCardRoute: policyID => `workspace/${policyID}/card`,
     WORKSPACE_INVITE: 'workspace/:policyID/invite',
     getWorkspaceInviteRoute: policyID => `workspace/${policyID}/invite`,
     REQUEST_CALL: 'request-call',

diff --git a/src/libs/Navigation/AppNavigator/WorkspaceSettingsDrawerNavigator.js b/src/libs/Navigation/AppNavigator/WorkspaceSettingsDrawerNavigator.js
@@ -7,7 +7,8 @@ import WorkspaceSidebar from '../../../pages/workspace/WorkspaceSidebar';
 
 const WorkspaceSettingsDrawerNavigator = () => (
     <BaseDrawerNavigator
-        drawerContent={() => <WorkspaceSidebar />}
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        drawerContent={props => <WorkspaceSidebar {...props} />}
         screens={[
             {
                 name: 'WorkspaceCard',

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
@@ -43,7 +43,7 @@ function goBack() {
  * @param {String} route
  */
 function navigate(route = ROUTES.HOME) {
-    if (route === ROUTES.HOME || route === ROUTES.WORKSPACE) {
+    if (route === ROUTES.HOME) {
         if (isLoggedIn) {
             openDrawer();
             return;

diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
@@ -136,8 +136,8 @@ export default {
             },
 
             WorkspaceSettings: {
+                path: ROUTES.WORKSPACE,
                 screens: {
-                    Workspace_Root: ROUTES.WORKSPACE,
                     WorkspaceCard: ROUTES.WORKSPACE_CARD,
                 },
             },

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -155,8 +155,10 @@ function create(name) {
                 id: response.policyID,
                 type: response.policy.type,
                 name: response.policy.name,
+                role: CONST.POLICY.ROLE.ADMIN,
             });
-            Navigation.navigate(ROUTES.getWorkspaceRoute(response.policyID));
+            Navigation.dismissModal();
+            Navigation.navigate(ROUTES.getWorkspaceCardRoute(response.policyID));
         });
 }
 

diff --git a/src/pages/settings/InitialPage.js b/src/pages/settings/InitialPage.js
@@ -130,7 +130,7 @@ const InitialSettingsPage = ({
         .map(policy => ({
             title: policy.name,
             icon: Building,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceRoute(policy.ID)),
+            action: () => Navigation.navigate(ROUTES.getWorkspaceCardRoute(policy.id)),
             iconStyles: [styles.createMenuIconEmphasized],
             iconFill: themeColors.iconReversed,
         }))

diff --git a/src/pages/workspace/WorkspaceCardPage.js b/src/pages/workspace/WorkspaceCardPage.js
@@ -72,7 +72,7 @@ const WorkspaceCardPage = ({
             <HeaderWithCloseButton
                 title={translate('workspace.common.card')}
                 onCloseButtonPress={() => Navigation.dismissModal()}
-                onBackButtonPress={() => Navigation.navigate(ROUTES.WORKSPACE)}
+                onBackButtonPress={() => Navigation.goBack()}
                 shouldShowBackButton={isSmallScreenWidth}
             />
             <ScrollView style={[styles.settingsPageBackground]} bounces={false}>

diff --git a/src/pages/workspace/WorkspaceSidebar.js b/src/pages/workspace/WorkspaceSidebar.js
@@ -1,5 +1,9 @@
+import _ from 'underscore';
 import React from 'react';
 import {View, ScrollView} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import PropTypes from 'prop-types';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import styles from '../../styles/styles';
@@ -18,21 +22,35 @@ import Icon from '../../components/Icon';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
 import compose from '../../libs/compose';
+import ONYXKEYS from '../../ONYXKEYS';
 
 const propTypes = {
+    /** Policy for the current route */
+    policy: PropTypes.shape({
+        /** ID of the policy */
+        id: PropTypes.string,
+
+        /** Name of the policy */
+        name: PropTypes.string,
+    }),
+
     ...withLocalizePropTypes,
     ...windowDimensionsPropTypes,
 };
 
-const WorkspaceSidebar = ({translate, isSmallScreenWidth}) => {
+const defaultProps = {
+    policy: {},
+};
+
+const WorkspaceSidebar = ({translate, isSmallScreenWidth, policy}) => {
     const menuItems = [
         {
             translationKey: 'workspace.common.card',
             icon: ExpensifyCard,
             action: () => {
-                Navigation.navigate(ROUTES.WORKSPACE_CARD);
+                Navigation.navigate(ROUTES.getWorkspaceCardRoute(policy.id));
             },
-            isActive: Navigation.isActive(ROUTES.WORKSPACE_CARD),
+            isActive: Navigation.isActive(ROUTES.getWorkspaceCardRoute(policy.id)),
         },
         {
             translationKey: 'common.people',
@@ -42,6 +60,10 @@ const WorkspaceSidebar = ({translate, isSmallScreenWidth}) => {
         },
     ];
 
+    if (_.isEmpty(policy)) {
+        return null;
+    }
+
     return (
         <ScreenWrapper style={[!isSmallScreenWidth ? styles.borderRight : {}]}>
             <ScrollView
@@ -86,7 +108,7 @@ const WorkspaceSidebar = ({translate, isSmallScreenWidth}) => {
                                     styles.mb6,
                                 ]}
                             >
-                                Borton Enterprises
+                                {policy.name}
                             </Text>
                         </View>
                     </View>
@@ -109,9 +131,19 @@ const WorkspaceSidebar = ({translate, isSmallScreenWidth}) => {
 };
 
 WorkspaceSidebar.propTypes = propTypes;
+WorkspaceSidebar.defaultProps = defaultProps;
 WorkspaceSidebar.displayName = 'WorkspaceSidebar';
 
 export default compose(
     withLocalize,
     withWindowDimensions,
+    withOnyx({
+        policy: {
+            key: (props) => {
+                const state = props.navigation.getState();
+                const policyID = lodashGet(state, ['routes', 0, 'params', 'policyID']);
+                return `${ONYXKEYS.COLLECTION.POLICY}${policyID}`;
+            },
+        },
+    }),
 )(WorkspaceSidebar);