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

Merge pull request #2881 from LLK/hotfix/revert-comments-studios-urls

Browse source 
[develop] Hotfix/revert comments studios urls
This commit is contained in:
Benjamin Wheeler 2019-04-04 17:22:03 -04:00 committed by GitHub
commit 66df143bbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/redux/preview.js
View file

@ -462,26 +462,26 @@ module.exports.getFavedStatus = (id, username, token) => (dispatch => {
}); });
}); });
module.exports.getTopLevelComments = (id, offset, ownerUsername, isAdmin, token) => (dispatch => { module.exports.getTopLevelComments = (id, offset, isAdmin, token) => (dispatch => {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHING)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHING));
api({ api({
uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${id}/comments`, uri: `${isAdmin ? '/admin' : ''}/projects/${id}/comments`,
authentication: token ? token : null, authentication: isAdmin ? token : null,
params: {offset: offset || 0, limit: COMMENT_LIMIT} params: {offset: offset || 0, limit: COMMENT_LIMIT}
}, (err, body, res) => { }, (err, body) => {
if (err) { if (err) {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR));
dispatch(module.exports.setError(err)); dispatch(module.exports.setError(err));
return; return;
} }
if (typeof body === 'undefined' || res.statusCode >= 400) { // NotFound if (typeof body === 'undefined') {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR));
dispatch(module.exports.setError('No comment info')); dispatch(module.exports.setError('No comment info'));
return; return;
} }
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED));
dispatch(module.exports.setComments(body)); dispatch(module.exports.setComments(body));
dispatch(module.exports.getReplies(id, body.map(comment => comment.id), 0, ownerUsername, isAdmin, token)); dispatch(module.exports.getReplies(id, body.map(comment => comment.id), 0, isAdmin, token));
// If we loaded a full page of comments, assume there are more to load. // If we loaded a full page of comments, assume there are more to load.
// This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require // This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require
@ -492,18 +492,18 @@ module.exports.getTopLevelComments = (id, offset, ownerUsername, isAdmin, token)
}); });
}); });
module.exports.getCommentById = (projectId, commentId, ownerUsername, isAdmin, token) => (dispatch => { module.exports.getCommentById = (projectId, commentId, isAdmin, token) => (dispatch => {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHING)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHING));
api({ api({
uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${projectId}/comments/${commentId}`, uri: `${isAdmin ? '/admin' : ''}/projects/${projectId}/comments/${commentId}`,
authentication: token ? token : null authentication: isAdmin ? token : null
}, (err, body, res) => { }, (err, body) => {
if (err) { if (err) {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR));
dispatch(module.exports.setError(err)); dispatch(module.exports.setError(err));
return; return;
} }
if (!body || res.statusCode >= 400) { // NotFound if (!body) {
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.ERROR));
dispatch(module.exports.setError('No comment info')); dispatch(module.exports.setError('No comment info'));
return; return;
@ -511,29 +511,29 @@ module.exports.getCommentById = (projectId, commentId, ownerUsername, isAdmin, t
if (body.parent_id) { if (body.parent_id) {
// If the comment is a reply, load the parent // If the comment is a reply, load the parent
return dispatch(module.exports.getCommentById(projectId, body.parent_id, ownerUsername, isAdmin, token)); return dispatch(module.exports.getCommentById(projectId, body.parent_id, isAdmin, token));
} }
// If the comment is not a reply, show it as top level and load replies // If the comment is not a reply, show it as top level and load replies
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED));
dispatch(module.exports.setComments([body])); dispatch(module.exports.setComments([body]));
dispatch(module.exports.getReplies(projectId, [body.id], 0, ownerUsername, isAdmin, token)); dispatch(module.exports.getReplies(projectId, [body.id], 0, isAdmin, token));
}); });
}); });
module.exports.getReplies = (projectId, commentIds, offset, ownerUsername, isAdmin, token) => (dispatch => { module.exports.getReplies = (projectId, commentIds, offset, isAdmin, token) => (dispatch => {
dispatch(module.exports.setFetchStatus('replies', module.exports.Status.FETCHING)); dispatch(module.exports.setFetchStatus('replies', module.exports.Status.FETCHING));
const fetchedReplies = {}; const fetchedReplies = {};
async.eachLimit(commentIds, 10, (parentId, callback) => { async.eachLimit(commentIds, 10, (parentId, callback) => {
api({ api({
uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${projectId}/comments/${parentId}/replies`, uri: `${isAdmin ? '/admin' : ''}/projects/${projectId}/comments/${parentId}/replies`,
authentication: token ? token : null, authentication: isAdmin ? token : null,
params: {offset: offset || 0, limit: COMMENT_LIMIT} params: {offset: offset || 0, limit: COMMENT_LIMIT}
}, (err, body, res) => { }, (err, body) => {
if (err) { if (err) {
return callback(`Error fetching comment replies: ${err}`); return callback(`Error fetching comment replies: ${err}`);
} }
if (typeof body === 'undefined' || res.statusCode >= 400) { // NotFound if (typeof body === 'undefined') {
return callback('No comment reply information'); return callback('No comment reply information');
} }
fetchedReplies[parentId] = body; fetchedReplies[parentId] = body;
@ -763,11 +763,10 @@ module.exports.getRemixes = id => (dispatch => {
}); });
}); });
module.exports.getProjectStudios = (id, ownerUsername, isAdmin, token) => (dispatch => { module.exports.getProjectStudios = id => (dispatch => {
dispatch(module.exports.setFetchStatus('projectStudios', module.exports.Status.FETCHING)); dispatch(module.exports.setFetchStatus('projectStudios', module.exports.Status.FETCHING));
api({ api({
uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${id}/studios`, uri: `/projects/${id}/studios`
authentication: token ? token : null
}, (err, body, res) => { }, (err, body, res) => {
if (err) { if (err) {
dispatch(module.exports.setFetchStatus('projectStudios', module.exports.Status.ERROR)); dispatch(module.exports.setFetchStatus('projectStudios', module.exports.Status.ERROR));

40
src/views/preview/project-view.jsx
View file

@ -159,10 +159,7 @@ class Preview extends React.Component {
if (typeof this.props.projectInfo.id === 'undefined') { if (typeof this.props.projectInfo.id === 'undefined') {
this.initCounts(0, 0); this.initCounts(0, 0);
} else { } else {
const token = this.props.user ? this.props.user.token : null;
this.initCounts(this.props.projectInfo.stats.favorites, this.props.projectInfo.stats.loves); this.initCounts(this.props.projectInfo.stats.favorites, this.props.projectInfo.stats.loves);
this.props.getProjectStudios(this.props.projectInfo.id,
this.props.authorUsername, this.props.isAdmin, token);
if (this.props.projectInfo.remix.parent !== null) { if (this.props.projectInfo.remix.parent !== null) {
this.props.getParentInfo(this.props.projectInfo.remix.parent); this.props.getParentInfo(this.props.projectInfo.remix.parent);
} }
@ -171,13 +168,6 @@ class Preview extends React.Component {
) { ) {
this.props.getOriginalInfo(this.props.projectInfo.remix.root); this.props.getOriginalInfo(this.props.projectInfo.remix.root);
} }
if (this.state.singleCommentId) {
this.props.getCommentById(this.state.projectId, this.state.singleCommentId,
this.props.authorUsername, this.props.isAdmin, token);
} else {
this.props.getTopLevelComments(this.state.projectId, this.props.comments.length,
this.props.authorUsername, this.props.isAdmin, token);
}
} }
} }
if (this.props.faved !== prevProps.faved || this.props.loved !== prevProps.loved) { if (this.props.faved !== prevProps.faved || this.props.loved !== prevProps.loved) {
@ -216,14 +206,28 @@ class Preview extends React.Component {
if (this.props.userPresent) { if (this.props.userPresent) {
const username = this.props.user.username; const username = this.props.user.username;
const token = this.props.user.token; const token = this.props.user.token;
if (this.state.singleCommentId) {
this.props.getCommentById(this.state.projectId, this.state.singleCommentId,
this.props.isAdmin, token);
} else {
this.props.getTopLevelComments(this.state.projectId, this.props.comments.length,
this.props.isAdmin, token);
}
this.props.getProjectInfo(this.state.projectId, token); this.props.getProjectInfo(this.state.projectId, token);
this.props.getRemixes(this.state.projectId, token); this.props.getRemixes(this.state.projectId, token);
this.props.getProjectStudios(this.state.projectId, token);
this.props.getCuratedStudios(username); this.props.getCuratedStudios(username);
this.props.getFavedStatus(this.state.projectId, username, token); this.props.getFavedStatus(this.state.projectId, username, token);
this.props.getLovedStatus(this.state.projectId, username, token); this.props.getLovedStatus(this.state.projectId, username, token);
} else { } else {
if (this.state.singleCommentId) {
this.props.getCommentById(this.state.projectId, this.state.singleCommentId);
} else {
this.props.getTopLevelComments(this.state.projectId, this.props.comments.length);
}
this.props.getProjectInfo(this.state.projectId); this.props.getProjectInfo(this.state.projectId);
this.props.getRemixes(this.state.projectId); this.props.getRemixes(this.state.projectId);
this.props.getProjectStudios(this.state.projectId);
} }
} }
setScreenFromOrientation () { setScreenFromOrientation () {
@ -976,8 +980,8 @@ const mapDispatchToProps = dispatch => ({
getRemixes: id => { getRemixes: id => {
dispatch(previewActions.getRemixes(id)); dispatch(previewActions.getRemixes(id));
}, },
getProjectStudios: (id, ownerUsername, isAdmin, token) => { getProjectStudios: id => {
dispatch(previewActions.getProjectStudios(id, ownerUsername, isAdmin, token)); dispatch(previewActions.getProjectStudios(id));
}, },
getCuratedStudios: (username, token) => { getCuratedStudios: (username, token) => {
dispatch(previewActions.getCuratedStudios(username, token)); dispatch(previewActions.getCuratedStudios(username, token));
@ -989,14 +993,14 @@ const mapDispatchToProps = dispatch => ({
dispatch(previewActions.leaveStudio(studioId, id, token)); dispatch(previewActions.leaveStudio(studioId, id, token));
} }
}, },
getTopLevelComments: (id, offset, ownerUsername, isAdmin, token) => { getTopLevelComments: (id, offset, isAdmin, token) => {
dispatch(previewActions.getTopLevelComments(id, offset, ownerUsername, isAdmin, token)); dispatch(previewActions.getTopLevelComments(id, offset, isAdmin, token));
}, },
getCommentById: (projectId, commentId, ownerUsername, isAdmin, token) => { getCommentById: (projectId, commentId, isAdmin, token) => {
dispatch(previewActions.getCommentById(projectId, commentId, ownerUsername, isAdmin, token)); dispatch(previewActions.getCommentById(projectId, commentId, isAdmin, token));
}, },
getMoreReplies: (projectId, commentId, offset, ownerUsername, isAdmin, token) => { getMoreReplies: (projectId, commentId, offset, isAdmin, token) => {
dispatch(previewActions.getReplies(projectId, [commentId], offset, ownerUsername, isAdmin, token)); dispatch(previewActions.getReplies(projectId, [commentId], offset, isAdmin, token));
}, },
getFavedStatus: (id, username, token) => { getFavedStatus: (id, username, token) => {
dispatch(previewActions.getFavedStatus(id, username, token)); dispatch(previewActions.getFavedStatus(id, username, token));