Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix infinite loop in withFullPolicy HOC #6531

Merged
merged 1 commit into from
Nov 30, 2021
Merged

Fix infinite loop in withFullPolicy HOC #6531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/pages/workspace/withFullPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import _ from 'underscore';
import lodashGet from 'lodash/get';
import React from 'react';
import PropTypes from 'prop-types';
import Str from 'expensify-common/lib/str';
import {withOnyx} from 'react-native-onyx';
import {useNavigationState} from '@react-navigation/native';
import CONST from '../../CONST';
import getComponentDisplayName from '../../libs/getComponentDisplayName';
import * as Policy from '../../libs/actions/Policy';
import ONYXKEYS from '../../ONYXKEYS';

let previousRoute = '';
let previousRouteName = '';
let previousRoutePolicyID = '';

/**
* @param {Object} route
Expand All @@ -19,6 +21,19 @@ function getPolicyIDFromRoute(route) {
return lodashGet(route, 'params.policyID', '');
}

/**
* @param {String} routeName
* @param {String} policyID
* @returns {Boolean}
*/
function isPreviousRouteInSameWorkspace(routeName, policyID) {
return (
Str.startsWith(routeName, 'Workspace')
&& Str.startsWith(previousRouteName, 'Workspace')
&& policyID === previousRoutePolicyID
);
}

const fullPolicyPropTypes = {
/** The full policy object for the current route (as opposed to the policy summary object) */
policy: PropTypes.shape({
Expand Down Expand Up @@ -74,11 +89,12 @@ export default function (WrappedComponent) {
const currentRoute = _.last(useNavigationState(state => state.routes || []));
const policyID = getPolicyIDFromRoute(currentRoute);

if (_.isString(policyID) && !previousRoute.includes(policyID)) {
if (_.isString(policyID) && !_.isEmpty(policyID) && !isPreviousRouteInSameWorkspace(currentRoute.name, policyID)) {
Policy.loadFullPolicy(policyID);
}

previousRoute = lodashGet(currentRoute, 'path', '');
previousRouteName = currentRoute.name;
previousRoutePolicyID = policyID;

const rest = _.omit(props, ['forwardedRef', 'policy']);
return (
Expand Down