Skip to content

Add beta check to Workspaces page #4259

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

Merged
johnmlee101 merged 3 commits into from
Jul 28, 2021
Merged

Add beta check to Workspaces page #4259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea3c03c
Add beta check to Workspaces page
Jul 27, 2021
63ed060
Add beta check to people page as well
Jul 27, 2021
0313208
style fixes
Jul 28, 2021
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
13 changes: 13 additions & 0 deletions src/pages/workspace/WorkspaceCardPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@ import themeDefault from '../../styles/themes/default';
import ROUTES from '../../ROUTES';
import CONFIG from '../../CONFIG';
import CONST from '../../CONST';
import Permissions from '../../libs/Permissions';
import HeroCardWebImage from '../../../assets/images/cascading-cards-web.svg';
import HeroCardMobileImage from '../../../assets/images/cascading-cards-mobile.svg';

const propTypes = {
/* Onyx Props */

/** Beta features list */
betas: PropTypes.arrayOf(PropTypes.string).isRequired,

/** The details about the user that is signed in */
user: PropTypes.shape({
/** Whether or not the user has public domain */
Expand Down Expand Up @@ -65,6 +69,7 @@ const publicLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.ADD_SECONDARY_LOGI
const manageCardLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.MANAGE_CARDS_URL;

const WorkspaceCardPage = ({
betas,
user,
translate,
isSmallScreenWidth,
Expand Down Expand Up @@ -92,6 +97,11 @@ const WorkspaceCardPage = ({
}
};

if (!Permissions.canUseFreePlan(betas)) {
console.debug('Not showing workspace card page because user is not on free plan beta');
return <Navigation.DismissModal />;
}

return (
<ScreenWrapper style={[styles.defaultModalContainer]}>
<HeaderWithCloseButton
Expand Down Expand Up @@ -193,5 +203,8 @@ export default compose(
reimbursementAccount: {
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
},
betas: {
key: ONYXKEYS.BETAS,
},
}),
)(WorkspaceCardPage);
11 changes: 11 additions & 0 deletions src/pages/workspace/WorkspacePeoplePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import Text from '../../components/Text';
import ROUTES from '../../ROUTES';
import ConfirmModal from '../../components/ConfirmModal';
import personalDetailsPropType from '../personalDetailsPropType';
import Permissions from '../../libs/Permissions';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
import OptionRow from '../home/sidebar/OptionRow';

Expand All @@ -29,6 +30,9 @@ const propTypes = {

...windowDimensionsPropTypes,

/** List of betas */
betas: PropTypes.arrayOf(PropTypes.string).isRequired,

/** The personal details of the person who is logged in */
personalDetails: personalDetailsPropType.isRequired,

Expand Down Expand Up @@ -204,6 +208,10 @@ class WorkspacePeoplePage extends React.Component {
}

render() {
if (!Permissions.canUseFreePlan(this.props.betas)) {
console.debug('Not showing workspace people page because user is not on free plan beta');
return <Navigation.DismissModal />;
}
const policyEmployeeList = lodashGet(this.props, 'policy.employeeList', []);
const data = _.chain(policyEmployeeList)
.map(email => this.props.personalDetails[email])
Expand Down Expand Up @@ -285,5 +293,8 @@ export default compose(
session: {
key: ONYXKEYS.SESSION,
},
betas: {
key: ONYXKEYS.BETAS,
},
}),
)(WorkspacePeoplePage);