From 219591007c692cdcf48395ae21ce1472bcb42e1c Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 26 Jul 2023 12:17:58 +0100 Subject: [PATCH 1/4] Use the PolicyUtils is policy admin method --- src/libs/actions/Policy.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 4aad99832762..e327b6fe772d 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -160,16 +160,6 @@ function isAdminOfFreePolicy(policies) { return _.some(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN); } -/** - * Is the user the owner of the given policy? - * - * @param {Object} policy - * @returns {Boolean} - */ -function isPolicyOwner(policy) { - return _.keys(loginList).includes(policy.owner); -} - /** * Check if the user has any active free policies (aka workspaces) * @@ -1130,5 +1120,4 @@ export { openWorkspaceInvitePage, removeWorkspace, setWorkspaceInviteMembersDraft, - isPolicyOwner, }; From 25b83ac8fd6932d0fc8e68a9dd6baae629a85a88 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 26 Jul 2023 12:22:21 +0100 Subject: [PATCH 2/4] Add PolicyUtils import --- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 4 ++-- src/pages/workspace/WorkspaceInitialPage.js | 2 +- src/pages/workspace/WorkspaceInviteMessagePage.js | 3 ++- src/pages/workspace/WorkspaceInvitePage.js | 2 +- src/pages/workspace/WorkspaceMembersPage.js | 2 +- src/pages/workspace/WorkspacePageWithSections.js | 3 +-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js index a07018ece1a9..2706f667a374 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js @@ -32,7 +32,7 @@ import * as ReimbursementAccountProps from './reimbursementAccountPropTypes'; import reimbursementAccountDraftPropTypes from './ReimbursementAccountDraftPropTypes'; import withPolicy from '../workspace/withPolicy'; import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView'; -import * as Policy from '../../libs/actions/Policy'; +import * as PolicyUtils from '../../libs/PolicyUtils'; const propTypes = { /** Plaid SDK token to use to initialize the widget */ @@ -332,7 +332,7 @@ class ReimbursementAccountPage extends React.Component { const policyName = lodashGet(this.props.policy, 'name'); const policyID = lodashGet(this.props.route.params, 'policyID'); - if (_.isEmpty(this.props.policy) || !Policy.isPolicyOwner(this.props.policy)) { + if (_.isEmpty(this.props.policy) || !PolicyUtils.isPolicyAdmin(this.props.policy)) { return ( ( Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} - shouldShow={_.isEmpty(props.policy) || !Policy.isPolicyOwner(props.policy)} + shouldShow={_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)} subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'} > Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js index b397009cafa3..4208f32e2172 100644 --- a/src/pages/workspace/WorkspaceInvitePage.js +++ b/src/pages/workspace/WorkspaceInvitePage.js @@ -272,7 +272,7 @@ class WorkspaceInvitePage extends React.Component { const sections = didScreenTransitionEnd ? this.getSections() : []; return ( Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 2563a469f1d7..ea56c632a49b 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -405,7 +405,7 @@ function WorkspaceMembersPage(props) { > {({safeAreaPaddingBottomStyle}) => ( Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > diff --git a/src/pages/workspace/WorkspacePageWithSections.js b/src/pages/workspace/WorkspacePageWithSections.js index 31ed7eeb93a5..3a1b95798c42 100644 --- a/src/pages/workspace/WorkspacePageWithSections.js +++ b/src/pages/workspace/WorkspacePageWithSections.js @@ -6,7 +6,6 @@ import lodashGet from 'lodash/get'; import _ from 'underscore'; import styles from '../../styles/styles'; import Navigation from '../../libs/Navigation/Navigation'; -import * as Policy from '../../libs/actions/Policy'; import compose from '../../libs/compose'; import ROUTES from '../../ROUTES'; import HeaderWithBackButton from '../../components/HeaderWithBackButton'; @@ -105,7 +104,7 @@ function WorkspacePageWithSections({backButtonRoute, children, footer, guidesCal > Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} - shouldShow={_.isEmpty(policy) || !Policy.isPolicyOwner(policy)} + shouldShow={_.isEmpty(policy) || !PolicyUtils.isPolicyAdmin(policy)} subtitleKey={_.isEmpty(policy) ? undefined : 'workspace.common.notAuthorized'} > Date: Wed, 26 Jul 2023 12:47:57 +0100 Subject: [PATCH 3/4] One more policyutils import --- src/pages/workspace/WorkspacePageWithSections.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/WorkspacePageWithSections.js b/src/pages/workspace/WorkspacePageWithSections.js index 3a1b95798c42..398f650729d1 100644 --- a/src/pages/workspace/WorkspacePageWithSections.js +++ b/src/pages/workspace/WorkspacePageWithSections.js @@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx'; import lodashGet from 'lodash/get'; import _ from 'underscore'; import styles from '../../styles/styles'; +import * as PolicyUtils from '../../libs/PolicyUtils'; import Navigation from '../../libs/Navigation/Navigation'; import compose from '../../libs/compose'; import ROUTES from '../../ROUTES'; From 21ef3fa7936279ea13c12bda3a1c5f7264609d4f Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 26 Jul 2023 13:03:41 +0100 Subject: [PATCH 4/4] Remove unused variable --- src/libs/actions/Policy.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 2791b44198a6..81bb39f15333 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -65,12 +65,6 @@ Onyx.connect({ callback: (val) => (allPersonalDetails = val), }); -let loginList; -Onyx.connect({ - key: ONYXKEYS.LOGIN_LIST, - callback: (val) => (loginList = val), -}); - /** * Stores in Onyx the policy ID of the last workspace that was accessed by the user * @param {String|null} policyID