[No QA] Only load full policies one-by-one as needed

src/libs/API.js

@@ -474,11 +474,13 @@ function GetIOUReport(parameters) {
 
 /**
  * @returns {Promise}
+ * @param {Array<String>} policyIDList
  */
-function GetPolicyList() {
+function GetPolicyList(policyIDList = []) {
     const commandName = 'Get';
     const parameters = {
         returnValueList: 'policyList',
+        policyIDList,
     };
     return Network.post(commandName, parameters);
 }

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -52,7 +52,6 @@ import {
     SettingsModalStackNavigator,
     EnablePaymentsStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
-    WorkspaceInviteModalStackNavigator,
     RequestCallModalStackNavigator,
     ReportDetailsModalStackNavigator,
 } from './ModalStackNavigators';
@@ -355,12 +354,6 @@ class AuthScreens extends React.Component {
                     component={AddPersonalBankAccountModalStackNavigator}
                     listeners={modalScreenListeners}
                 />
-                <RootStack.Screen
-                    name="WorkspaceInvite"
-                    options={modalScreenOptions}
-                    component={WorkspaceInviteModalStackNavigator}
-                    listeners={modalScreenListeners}
-                />
                 <RootStack.Screen
                     name="RequestCall"
                     options={modalScreenOptions}

src/libs/Navigation/AppNavigator/ModalStackNavigators.js

@@ -10,7 +10,7 @@ import IOURequestPage from '../../../pages/iou/IOURequestPage';
 import IOUBillPage from '../../../pages/iou/IOUBillPage';
 import IOUSendPage from '../../../pages/iou/IOUSendPage';
 import IOUDetailsModal from '../../../pages/iou/IOUDetailsModal';
-import SettingsInitialPage from '../../../pages/settings/InitialPage';
+import SettingsInitialPage from '../../../pages/settings/InitialSettingsPage';
 import SettingsProfilePage from '../../../pages/settings/Profile/ProfilePage';
 import SettingsPreferencesPage from '../../../pages/settings/PreferencesPage';
 import SettingsAboutPage from '../../../pages/settings/AboutPage';
@@ -55,9 +55,7 @@ function createModalStackNavigator(screens) {
     const ModalStackNavigator = createStackNavigator();
     return () => (
         <ModalStackNavigator.Navigator
-            screenOptions={{
-                ...defaultSubRouteOptions,
-            }}
+            screenOptions={defaultSubRouteOptions}
         >
             {_.map(screens, screen => (
                 <ModalStackNavigator.Screen
@@ -220,6 +218,10 @@ const SettingsModalStackNavigator = createModalStackNavigator([
         Component: WorkspaceBankAccountPage,
         name: 'Workspace_BankAccount',
     },
+    {
+        Component: WorkspaceInvitePage,
+        name: 'Workspace_Invite',
+    },
     {
         Component: ReimbursementAccountPage,
         name: 'ReimbursementAccount',
@@ -242,11 +244,6 @@ const ReimbursementAccountModalStackNavigator = createModalStackNavigator([{
     name: 'ReimbursementAccount_Root',
 }]);
 
-const WorkspaceInviteModalStackNavigator = createModalStackNavigator([{
-    Component: WorkspaceInvitePage,
-    name: 'WorkspaceInvite_Root',
-}]);
-
 const RequestCallModalStackNavigator = createModalStackNavigator([{
     Component: RequestCallPage,
     name: 'RequestCall_Root',
@@ -267,6 +264,5 @@ export {
     EnablePaymentsStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
     ReimbursementAccountModalStackNavigator,
-    WorkspaceInviteModalStackNavigator,
     RequestCallModalStackNavigator,
 };

src/libs/Navigation/Navigation.js

@@ -126,7 +126,7 @@ function navigate(route = ROUTES.HOME) {
 /**
  * Dismisses a screen presented modally and returns us back to the previous view.
  *
- * @param {Boolean} shouldOpenDrawer
+ * @param {Boolean} [shouldOpenDrawer]
  */
 function dismissModal(shouldOpenDrawer = false) {
     if (!navigationRef.isReady()) {

src/libs/Navigation/linkingConfig.js

@@ -98,6 +98,9 @@ export default {
                         path: ROUTES.WORKSPACE_BANK_ACCOUNT,
                         exact: true,
                     },
+                    Workspace_Invite: {
+                        path: ROUTES.WORKSPACE_INVITE,
+                    },
                     ReimbursementAccount: {
                         path: ROUTES.BANK_ACCOUNT,
                         exact: true,
@@ -169,11 +172,6 @@ export default {
                     IOU_Enable_Payments: ROUTES.IOU_ENABLE_PAYMENTS,
                 },
             },
-            WorkspaceInvite: {
-                screens: {
-                    WorkspaceInvite_Root: ROUTES.WORKSPACE_INVITE,
-                },
-            },
             RequestCall: {
                 screens: {
                     RequestCall_Root: ROUTES.REQUEST_CALL,

src/libs/actions/Policy.js

@@ -41,40 +41,29 @@ function getSimplifiedEmployeeList(employeeList) {
  * Takes a full policy that is returned from the policyList and simplifies it so we are only storing
  * the pieces of data that we need to in Onyx
  *
- * @param {Object} fullPolicy
- * @param {String} fullPolicy.id
- * @param {String} fullPolicy.name
- * @param {String} fullPolicy.role
- * @param {String} fullPolicy.type
- * @param {String} fullPolicy.outputCurrency
- * @param {Object} fullPolicy.value.employeeList
- * @param {String} [fullPolicy.value.avatarURL]
+ * @param {Object} fullPolicyOrPolicySummary
+ * @param {String} fullPolicyOrPolicySummary.id
+ * @param {String} fullPolicyOrPolicySummary.name
+ * @param {String} fullPolicyOrPolicySummary.role
+ * @param {String} fullPolicyOrPolicySummary.type
+ * @param {String} fullPolicyOrPolicySummary.outputCurrency
+ * @param {String} [fullPolicyOrPolicySummary.value.avatarURL]
+ * @param {Object} [fullPolicyOrPolicySummary.value.employeeList]
  * @returns {Object}
  */
-function getSimplifiedPolicyObject(fullPolicy) {
+function getSimplifiedPolicyObject(fullPolicyOrPolicySummary) {
     return {
-        id: fullPolicy.id,
-        name: fullPolicy.name,
-        role: fullPolicy.role,
-        type: fullPolicy.type,
-        owner: fullPolicy.owner,
-        outputCurrency: fullPolicy.outputCurrency,
-        employeeList: getSimplifiedEmployeeList(lodashGet(fullPolicy, 'value.employeeList')),
-        avatarURL: lodashGet(fullPolicy, 'value.avatarURL', ''),
+        id: fullPolicyOrPolicySummary.id,
+        name: fullPolicyOrPolicySummary.name,
+        role: fullPolicyOrPolicySummary.role,
+        type: fullPolicyOrPolicySummary.type,
+        owner: fullPolicyOrPolicySummary.owner,
+        outputCurrency: fullPolicyOrPolicySummary.outputCurrency,
+        avatarURL: fullPolicyOrPolicySummary.avatarURL || '',
+        employeeList: getSimplifiedEmployeeList(lodashGet(fullPolicyOrPolicySummary, 'value.employeeList')),
     };
 }
 
-/**
- * @param {Array<Object>} policyList
- * @returns {Object}
- */
-function transformPolicyListToOnyxCollection(policyList) {
-    return _.reduce(policyList, (memo, policy) => ({
-        ...memo,
-        [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: getSimplifiedPolicyObject(policy),
-    }), {});
-}
-
 /**
  * Used to update ALL of the policies at once. If a policy is present locally, but not in the policies object passed here it will be removed.
  * @param {Object} policyCollection - object of policy key and partial policy object
@@ -159,21 +148,31 @@ function getPolicyList(shouldCreateNewPolicy = false) {
         })
         .then((data) => {
             if (data.jsonCode === 200) {
-                const policyDataToStore = transformPolicyListToOnyxCollection(data.policySummaryList || []);
+                const policyDataToStore = _.reduce(data.policySummaryList, (memo, policy) => ({
+                    ...memo,
+                    [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: getSimplifiedPolicyObject(policy),
+                }), {});
                 updateAllPolicies(policyDataToStore);
             }
 
             if (shouldCreateNewPolicy) {
                 Navigation.dismissModal();
                 Navigation.navigate(newPolicyID ? ROUTES.getWorkspaceInitialRoute(newPolicyID) : ROUTES.HOME);
             }
+        });
+}
 
-            return API.GetPolicyList();
-        })
+/**
+ * @param {String} policyID
+ */
+function loadFullPolicy(policyID) {
+    API.GetPolicyList([policyID])
         .then((data) => {
             if (data.jsonCode === 200) {
-                const policyDataToStore = transformPolicyListToOnyxCollection(data.policyList || []);
-                updateAllPolicies(policyDataToStore);
+                const policy = data.policyList[0] || {};
+                if (policy.id) {
+                    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, getSimplifiedPolicyObject(policy));
+                }
             }
         });
 }
@@ -356,6 +355,7 @@ function hideWorkspaceAlertMessage(policyID) {
 
 export {
     getPolicyList,
+    loadFullPolicy,
     removeMembers,
     invite,
     isAdminOfFreePolicy,

src/pages/workspace/WorkspaceBankAccountPage.js

@@ -16,6 +16,7 @@ import ROUTES from '../../ROUTES';
 import reimbursementAccountPropTypes from '../ReimbursementAccount/reimbursementAccountPropTypes';
 import WorkspaceSection from './WorkspaceSection';
 import WorkspaceResetBankAccountModal from './WorkspaceResetBankAccountModal';
+import withFullPolicy from './withFullPolicy';
 
 const propTypes = {
     /** ACH data for the withdrawal account actively being set up */
@@ -125,6 +126,7 @@ WorkspaceBankAccountPage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withFullPolicy,
     withOnyx({
         reimbursementAccount: {
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,

src/pages/workspace/WorkspaceInitialPage.js

@@ -32,6 +32,7 @@ import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
 import Avatar from '../../components/Avatar';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
+import withFullPolicy from './withFullPolicy';
 
 const propTypes = {
     /** Whether the current screen is focused. */
@@ -206,6 +207,7 @@ export default compose(
     withLocalize,
     withWindowDimensions,
     withNavigationFocus,
+    withFullPolicy,
     withOnyx({
         policy: {
             key: (props) => {

src/pages/workspace/WorkspaceInvitePage.js

@@ -21,6 +21,7 @@ import CONST, {EXPENSIFY_EMAILS} from '../../CONST';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import {openExternalLink} from '../../libs/actions/Link';
 import Text from '../../components/Text';
+import withFullPolicy from './withFullPolicy';
 
 const personalDetailsPropTypes = PropTypes.shape({
     /** The login of the person (either email or phone number) */
@@ -350,6 +351,7 @@ WorkspaceInvitePage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withFullPolicy,
     withOnyx({
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,

src/pages/workspace/WorkspaceMembersPage.js

@@ -27,6 +27,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/
 import OptionRow from '../home/sidebar/OptionRow';
 import CheckboxWithTooltip from '../../components/CheckboxWithTooltip';
 import Hoverable from '../../components/Hoverable';
+import withFullPolicy from './withFullPolicy';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -72,6 +73,7 @@ class WorkspaceMembersPage extends React.Component {
         };
 
         this.renderItem = this.renderItem.bind(this);
+        this.inviteUser = this.inviteUser.bind(this);
         this.addUser = this.addUser.bind(this);
         this.removeUser = this.removeUser.bind(this);
         this.askForConfirmationToRemove = this.askForConfirmationToRemove.bind(this);
@@ -284,7 +286,7 @@ class WorkspaceMembersPage extends React.Component {
                             small
                             success
                             text={this.props.translate('common.invite')}
-                            onPress={() => this.inviteUser()}
+                            onPress={this.inviteUser}
                         />
                         <Button
                             small
@@ -328,6 +330,7 @@ WorkspaceMembersPage.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withWindowDimensions,
+    withFullPolicy,
     withOnyx({
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,

src/pages/workspace/WorkspaceSettingsPage.js

@@ -25,6 +25,7 @@ import ExpensiTextInput from '../../components/ExpensiTextInput';
 import FixedFooter from '../../components/FixedFooter';
 import WorkspacePageWithSections from './WorkspacePageWithSections';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
+import withFullPolicy from './withFullPolicy';
 
 const propTypes = {
     /** List of betas */
@@ -200,6 +201,7 @@ WorkspaceSettingsPage.propTypes = propTypes;
 WorkspaceSettingsPage.defaultProps = defaultProps;
 
 export default compose(
+    withFullPolicy,
     withOnyx({
         betas: {
             key: ONYXKEYS.BETAS,

src/pages/workspace/bills/WorkspaceBillsPage.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import compose from '../../../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
+import withFullPolicy from '../withFullPolicy';
 import WorkspaceBillsNoVBAView from './WorkspaceBillsNoVBAView';
 import WorkspaceBillsVBAView from './WorkspaceBillsVBAView';
 import WorkspacePageWithSections from '../WorkspacePageWithSections';
@@ -37,4 +39,7 @@ const WorkspaceBillsPage = ({translate, route}) => (
 
 WorkspaceBillsPage.propTypes = propTypes;
 WorkspaceBillsPage.displayName = 'WorkspaceBillsPage';
-export default withLocalize(WorkspaceBillsPage);
+export default compose(
+    withLocalize,
+    withFullPolicy,
+)(WorkspaceBillsPage);

src/pages/workspace/card/WorkspaceCardPage.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import compose from '../../../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
+import withFullPolicy from '../withFullPolicy';
 import WorkspaceCardNoVBAView from './WorkspaceCardNoVBAView';
 import WorkspaceCardVBANoECardView from './WorkspaceCardVBANoECardView';
 import WorkspaceCardVBAWithECardView from './WorkspaceCardVBAWithECardView';
@@ -45,4 +47,7 @@ const WorkspaceCardPage = ({translate, route}) => (
 WorkspaceCardPage.propTypes = propTypes;
 WorkspaceCardPage.displayName = 'WorkspaceCardPage';
 
-export default withLocalize(WorkspaceCardPage);
+export default compose(
+    withLocalize,
+    withFullPolicy,
+)(WorkspaceCardPage);

src/pages/workspace/invoices/WorkspaceInvoicesPage.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import compose from '../../../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
+import withFullPolicy from '../withFullPolicy';
 import WorkspacePageWithSections from '../WorkspacePageWithSections';
 import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView';
 import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView';
@@ -38,4 +40,7 @@ const WorkspaceInvoicesPage = ({translate, route}) => (
 WorkspaceInvoicesPage.propTypes = propTypes;
 WorkspaceInvoicesPage.displayName = 'WorkspaceInvoicesPage';
 
-export default withLocalize(WorkspaceInvoicesPage);
+export default compose(
+    withLocalize,
+    withFullPolicy,
+)(WorkspaceInvoicesPage);

src/pages/workspace/reimburse/WorkspaceReimbursePage.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import compose from '../../../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
+import withFullPolicy from '../withFullPolicy';
 import WorkspaceReimburseNoVBAView from './WorkspaceReimburseNoVBAView';
 import WorkspaceReimburseVBAView from './WorkspaceReimburseVBAView';
 import WorkspacePageWithSections from '../WorkspacePageWithSections';
@@ -38,4 +40,7 @@ const WorkspaceReimbursePage = ({translate, route}) => (
 WorkspaceReimbursePage.propTypes = propTypes;
 WorkspaceReimbursePage.displayName = 'WorkspaceReimbursePage';
 
-export default withLocalize(WorkspaceReimbursePage);
+export default compose(
+    withLocalize,
+    withFullPolicy,
+)(WorkspaceReimbursePage);