From 5edd8c542e83850d264dc7423bdd386fb80d5e51 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Tue, 25 Oct 2022 14:26:30 +0100 Subject: [PATCH 1/9] add errors to workspace creation --- src/libs/actions/Policy.js | 15 ++++++--- src/pages/settings/InitialSettingsPage.js | 37 ++++++++++++++--------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 1df9a904ea20..8cd4f5101b48 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -659,6 +659,15 @@ function clearDeleteWorkspaceError(policyID) { }); } +/** + * Removes the workspace after failure to create. + * + * @param {String} policyID + */ +function removeWorkspace(policyID) { + Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, null); +} + /** * Generate a policy name based on an email and policy list. * @param {String} [email] the email to base the workspace name on. If not passed, will use the logged in user's email instead @@ -842,11 +851,6 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false) { }, }], failureData: [{ - onyxMethod: CONST.ONYX.METHOD.SET, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: null, - }, - { onyxMethod: CONST.ONYX.METHOD.SET, key: `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`, value: null, @@ -949,4 +953,5 @@ export { createWorkspace, openWorkspaceMembersPage, openWorkspaceInvitePage, + removeWorkspace, }; diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 564fc2d0b717..d29484a9502b 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -108,6 +108,11 @@ function dismissWorkspaceError(policyID, pendingAction) { Policy.clearDeleteWorkspaceError(policyID); return; } + + if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) { + Policy.removeWorkspace(policyID); + return; + } throw new Error('Not implemented'); } @@ -185,21 +190,23 @@ class InitialSettingsPage extends React.Component { getMenuItemsList() { const menuItems = _.chain(this.props.policies) .filter(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN) - .map(policy => ({ - title: policy.name, - icon: policy.avatar ? policy.avatar : Expensicons.Building, - iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, - action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), - iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], - iconFill: themeColors.iconReversed, - fallbackIcon: Expensicons.FallbackWorkspaceAvatar, - brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), - pendingAction: policy.pendingAction, - isPolicy: true, - errors: policy.errors, - dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction), - disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - })) + .map(policy => { + return { + title: policy.name, + icon: policy.avatar ? policy.avatar : Expensicons.Building, + iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, + action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), + iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], + iconFill: themeColors.iconReversed, + fallbackIcon: Expensicons.FallbackWorkspaceAvatar, + brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), + pendingAction: policy.pendingAction, + isPolicy: true, + errors: policy.errors, + dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction), + disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + } + }) .sortBy(policy => policy.title) .value(); menuItems.push(...this.getDefaultMenuItems()); From f07b9fc77708b899af978cbbe6bd3bc461c3d4d7 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Tue, 25 Oct 2022 14:29:16 +0100 Subject: [PATCH 2/9] reformat policy mapping --- src/pages/settings/InitialSettingsPage.js | 32 +++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index d29484a9502b..4bcb14881006 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -190,23 +190,21 @@ class InitialSettingsPage extends React.Component { getMenuItemsList() { const menuItems = _.chain(this.props.policies) .filter(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN) - .map(policy => { - return { - title: policy.name, - icon: policy.avatar ? policy.avatar : Expensicons.Building, - iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, - action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), - iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], - iconFill: themeColors.iconReversed, - fallbackIcon: Expensicons.FallbackWorkspaceAvatar, - brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), - pendingAction: policy.pendingAction, - isPolicy: true, - errors: policy.errors, - dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction), - disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - } - }) + .map(policy => ({ + title: policy.name, + icon: policy.avatar ? policy.avatar : Expensicons.Building, + iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, + action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), + iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], + iconFill: themeColors.iconReversed, + fallbackIcon: Expensicons.FallbackWorkspaceAvatar, + brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), + pendingAction: policy.pendingAction, + isPolicy: true, + errors: policy.errors, + dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction), + disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + })) .sortBy(policy => policy.title) .value(); menuItems.push(...this.getDefaultMenuItems()); From 8c7395a5254b8c55366c10f39fe6427c3f5ad685 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Thu, 27 Oct 2022 17:47:43 +0100 Subject: [PATCH 3/9] address issues with error on creation --- src/pages/workspace/WorkspaceInitialPage.js | 25 ++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index fbaf9289979d..4c6a6d0d1790 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -49,6 +49,8 @@ class WorkspaceInitialPage extends React.Component { this.openEditor = this.openEditor.bind(this); this.toggleDeleteModal = this.toggleDeleteModal.bind(this); this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this); + this.disabled = this.disabled.bind(this); + this.dismissError = this.dismissError.bind(this); this.state = { isDeleteModalOpen: false, @@ -80,6 +82,18 @@ class WorkspaceInitialPage extends React.Component { Navigation.navigate(ROUTES.SETTINGS); } + /** + * @returns {Boolean} + */ + disabled() { + return Boolean(this.props.policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && this.props.policy.errors); + } + + dismissError() { + Navigation.navigate(ROUTES.SETTINGS); + Policy.removeWorkspace(this.props.policy.id); + } + render() { const policy = this.props.policy; const hasMembersError = PolicyUtils.hasPolicyMemberError(this.props.policyMemberList); @@ -163,11 +177,17 @@ class WorkspaceInitialPage extends React.Component { styles.justifyContentBetween, ]} > - + this.dismissError()} + errors={this.props.policy.errors} + errorRowStyles={[styles.ph6, styles.pv2]} + > @@ -192,6 +212,7 @@ class WorkspaceInitialPage extends React.Component { {!_.isEmpty(this.props.policy.name) && ( ( Date: Fri, 28 Oct 2022 11:36:05 +0100 Subject: [PATCH 4/9] apply suggestions --- src/pages/workspace/WorkspaceInitialPage.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 4c6a6d0d1790..9e267370c503 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -49,7 +49,7 @@ class WorkspaceInitialPage extends React.Component { this.openEditor = this.openEditor.bind(this); this.toggleDeleteModal = this.toggleDeleteModal.bind(this); this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this); - this.disabled = this.disabled.bind(this); + this.hasPolicyCreationError = this.hasPolicyCreationError.bind(this); this.dismissError = this.dismissError.bind(this); this.state = { @@ -85,7 +85,7 @@ class WorkspaceInitialPage extends React.Component { /** * @returns {Boolean} */ - disabled() { + hasPolicyCreationError() { return Boolean(this.props.policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && this.props.policy.errors); } @@ -179,7 +179,7 @@ class WorkspaceInitialPage extends React.Component { > this.dismissError()} + onClose={this.dismissError} errors={this.props.policy.errors} errorRowStyles={[styles.ph6, styles.pv2]} > @@ -187,7 +187,7 @@ class WorkspaceInitialPage extends React.Component { @@ -212,7 +212,7 @@ class WorkspaceInitialPage extends React.Component { {!_.isEmpty(this.props.policy.name) && ( ( Date: Fri, 28 Oct 2022 12:16:50 +0100 Subject: [PATCH 5/9] include RBR on workspace list --- src/libs/PolicyUtils.js | 2 +- src/pages/workspace/WorkspacesListPage.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libs/PolicyUtils.js b/src/libs/PolicyUtils.js index 3def54c19f98..40f54f284847 100644 --- a/src/libs/PolicyUtils.js +++ b/src/libs/PolicyUtils.js @@ -48,7 +48,7 @@ function hasCustomUnitsError(policy) { */ function getPolicyBrickRoadIndicatorStatus(policy, policyMembers) { const policyMemberList = lodashGet(policyMembers, `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policy.id}`, {}); - if (hasPolicyMemberError(policyMemberList) || hasCustomUnitsError(policy)) { + if (hasPolicyMemberError(policyMemberList) || hasCustomUnitsError(policy) || hasPolicyError(policy)) { return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR; } return ''; diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index 6419e4fe3505..edeff46fafe6 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -124,7 +124,6 @@ class WorkspacesListPage extends Component { iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, - brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), pendingAction: policy.pendingAction, isPolicy: true, errors: policy.errors, From 09fdaefb465f8fbd73d026ddbe2886c585994105 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Fri, 28 Oct 2022 12:17:17 +0100 Subject: [PATCH 6/9] include RBR --- src/pages/workspace/WorkspacesListPage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index edeff46fafe6..6419e4fe3505 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -124,6 +124,7 @@ class WorkspacesListPage extends Component { iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, + brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), pendingAction: policy.pendingAction, isPolicy: true, errors: policy.errors, From 38b34a4579893f39d21eb4d76819727b05cbb4b7 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Fri, 28 Oct 2022 15:47:40 +0100 Subject: [PATCH 7/9] remove RBR on workspace list item on workspace lists page --- src/pages/workspace/WorkspacesListPage.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index 6419e4fe3505..fbe62a9a1e13 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -15,10 +15,8 @@ import OfflineWithFeedback from '../../components/OfflineWithFeedback'; import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; import * as Expensicons from '../../components/Icon/Expensicons'; import themeColors from '../../styles/themes/default'; -import * as PolicyUtils from '../../libs/PolicyUtils'; import MenuItem from '../../components/MenuItem'; import * as Policy from '../../libs/actions/Policy'; -import policyMemberPropType from '../policyMemberPropType'; import Permissions from '../../libs/Permissions'; import Button from '../../components/Button'; import FixedFooter from '../../components/FixedFooter'; @@ -45,9 +43,6 @@ const propTypes = { pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)), })), - /** List of policy members */ - policyMembers: PropTypes.objectOf(policyMemberPropType), - /** The user's wallet account */ userWallet: PropTypes.shape({ /** The user's current wallet balance */ @@ -124,7 +119,6 @@ class WorkspacesListPage extends Component { iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, - brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), pendingAction: policy.pendingAction, isPolicy: true, errors: policy.errors, @@ -213,9 +207,6 @@ export default compose( policies: { key: ONYXKEYS.COLLECTION.POLICY, }, - policyMembers: { - key: ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST, - }, userWallet: { key: ONYXKEYS.USER_WALLET, }, From 6be3ef21c9bcf160812933a2edc4f43f7231fb9a Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Fri, 28 Oct 2022 16:03:05 +0100 Subject: [PATCH 8/9] remove unused default prop --- src/pages/workspace/WorkspacesListPage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index fbe62a9a1e13..d30117cc4b32 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -57,7 +57,6 @@ const propTypes = { const defaultProps = { policies: {}, - policyMembers: {}, userWallet: { currentBalance: 0, }, From d0408fb94790ebdf1ac701ac3f85005da6205e73 Mon Sep 17 00:00:00 2001 From: Justice Arthur Date: Fri, 28 Oct 2022 16:33:52 +0100 Subject: [PATCH 9/9] add RBR --- src/pages/workspace/WorkspacesListPage.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index d30117cc4b32..577d01599b02 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -15,8 +15,10 @@ import OfflineWithFeedback from '../../components/OfflineWithFeedback'; import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; import * as Expensicons from '../../components/Icon/Expensicons'; import themeColors from '../../styles/themes/default'; +import * as PolicyUtils from '../../libs/PolicyUtils'; import MenuItem from '../../components/MenuItem'; import * as Policy from '../../libs/actions/Policy'; +import policyMemberPropType from '../policyMemberPropType'; import Permissions from '../../libs/Permissions'; import Button from '../../components/Button'; import FixedFooter from '../../components/FixedFooter'; @@ -43,6 +45,9 @@ const propTypes = { pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)), })), + /** List of policy members */ + policyMembers: PropTypes.objectOf(policyMemberPropType), + /** The user's wallet account */ userWallet: PropTypes.shape({ /** The user's current wallet balance */ @@ -57,6 +62,7 @@ const propTypes = { const defaultProps = { policies: {}, + policyMembers: {}, userWallet: { currentBalance: 0, }, @@ -118,9 +124,9 @@ class WorkspacesListPage extends Component { iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, + brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), pendingAction: policy.pendingAction, isPolicy: true, - errors: policy.errors, dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction), disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, })) @@ -206,6 +212,9 @@ export default compose( policies: { key: ONYXKEYS.COLLECTION.POLICY, }, + policyMembers: { + key: ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST, + }, userWallet: { key: ONYXKEYS.USER_WALLET, },