scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make showStudio utility function purely functional

Browse source
This commit is contained in:
Ben Wheeler 2019-01-16 16:42:02 -05:00
parent ab82d37720
commit e9b736270f
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/views/preview/add-to-studio.jsx
View file

@ -15,7 +15,7 @@ const canRemove = (userOwnsProject, isAdmin, userIsCurator) => (
// include a given studio in the list to show in add to studio modal. // include a given studio in the list to show in add to studio modal.
// only include it if user has the ability to remove the project from this studio. // only include it if user has the ability to remove the project from this studio.
const showStudio = (consolidatedStudios, studio, currentStudioIds, userIsCurator, userOwnsProject, isAdmin) => { const showStudio = (studio, currentStudioIds, userIsCurator, userOwnsProject, isAdmin) => {
const includesProject = (currentStudioIds.indexOf(studio.id) !== -1); const includesProject = (currentStudioIds.indexOf(studio.id) !== -1);
const canAddToThisStudio = canAdd(studio, userIsCurator); const canAddToThisStudio = canAdd(studio, userIsCurator);
const canRemoveFromThisStudio = canRemove(userOwnsProject, isAdmin, userIsCurator); const canRemoveFromThisStudio = canRemove(userOwnsProject, isAdmin, userIsCurator);
@ -27,8 +27,9 @@ const showStudio = (consolidatedStudios, studio, currentStudioIds, userIsCurator
canAdd: canAddToThisStudio, canAdd: canAddToThisStudio,
canRemove: canRemoveFromThisStudio canRemove: canRemoveFromThisStudio
}); });
consolidatedStudios.push(consolidatedStudio); return consolidatedStudio;
} }
return null;
}; };
// Build consolidated curatedStudios object from all studio info. // Build consolidated curatedStudios object from all studio info.
@ -42,13 +43,19 @@ const consolidateStudiosInfo = (userOwnsProject, isAdmin, curatedStudios, projec
// for each studio the project is in, include it if user can add or remove project from it. // for each studio the project is in, include it if user can add or remove project from it.
projectStudios.forEach(projectStudio => { projectStudios.forEach(projectStudio => {
const userIsCurator = curatedStudios.some(curatedStudio => (curatedStudio.id === projectStudio.id)); const userIsCurator = curatedStudios.some(curatedStudio => (curatedStudio.id === projectStudio.id));
showStudio(consolidatedStudios, projectStudio, currentStudioIds, userIsCurator, userOwnsProject, isAdmin); const studioToShow = showStudio(projectStudio, currentStudioIds, userIsCurator, userOwnsProject, isAdmin);
if (studioToShow) {
consolidatedStudios.push(studioToShow);
}
}); });
// for each curated studio, if it was not already added to consolidatedStudios above, add it now. // for each curated studio, if it was not already added to consolidatedStudios above, add it now.
curatedStudios.forEach(curatedStudio => { curatedStudios.forEach(curatedStudio => {
if (!projectStudios.some(projectStudio => (projectStudio.id === curatedStudio.id))) { if (!projectStudios.some(projectStudio => (projectStudio.id === curatedStudio.id))) {
showStudio(consolidatedStudios, curatedStudio, currentStudioIds, true, userOwnsProject, isAdmin); const studioToShow = showStudio(curatedStudio, currentStudioIds, true, userOwnsProject, isAdmin);
if (studioToShow) {
consolidatedStudios.push(studioToShow);
}
} }
}); });