scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pass authorId and authorUsername to gui

Browse source
This commit is contained in:
Ben Wheeler 2018-11-07 12:59:16 -05:00
parent 47b7e6463c
commit 464d5f7c2d
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/views/preview/preview.jsx
View file

@ -452,6 +452,8 @@ class Preview extends React.Component {
<IntlGUI
hideIntro
assetHost={this.props.assetHost}
authorId={this.props.authorId}
authorUsername={this.props.authorUsername}
backpackOptions={this.props.backpackOptions}
basePath="/"
canCreateCopy={this.props.canCreateCopy}
@ -485,6 +487,8 @@ class Preview extends React.Component {
Preview.propTypes = {
assetHost: PropTypes.string.isRequired,
authorId: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
authorUsername: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
backpackOptions: PropTypes.shape({
host: PropTypes.string,
visible: PropTypes.bool
@ -578,12 +582,16 @@ const mapStateToProps = state => {
const isLoggedIn = state.session.status === sessionActions.Status.FETCHED &&
userPresent;
const isAdmin = isLoggedIn && state.session.session.permissions.admin;
const authorPresent = projectInfoPresent && state.preview.projectInfo.author &&
Object.keys(state.preview.projectInfo.author).length > 0;
const author = projectInfoPresent && state.preview.projectInfo.author;
const authorPresent = author && Object.keys(state.preview.projectInfo.author).length > 0;
const authorId = authorPresent && author.id && author.id.toString();
const authorUsername = authorPresent && author.username;
const userOwnsProject = isLoggedIn && authorPresent &&
state.session.session.user.id === state.preview.projectInfo.author.id;
state.session.session.user.id.toString() === authorId;
return {
authorId: authorId,
authorUsername: authorUsername,
canAddToStudio: userOwnsProject,
canCreateCopy: userOwnsProject && projectInfoPresent,
canCreateNew: isLoggedIn,
@ -598,7 +606,7 @@ const mapStateToProps = state => {
// project is editable iff logged in user is the author of the project, or
// logged in user is an admin.
isEditable: isLoggedIn &&
((authorPresent && state.preview.projectInfo.author.username === state.session.session.user.username) ||
(authorUsername === state.session.session.user.username ||
state.permissions.admin === true),
isLoggedIn: isLoggedIn,
isAdmin: isAdmin,