From e73312c0d200d3c5379238fd9acb79addc2d6056 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Thu, 13 May 2021 13:21:54 -0400
Subject: [PATCH] Show students filter for educators viewing a classroom studio

---
 src/views/studio/l10n.json                    |  1 +
 src/views/studio/lib/user-projects-actions.js | 38 +++++++++++++------
 .../studio/modals/user-projects-modal.jsx     | 18 +++++++--
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/views/studio/l10n.json b/src/views/studio/l10n.json
index c35e84f35..f63f53a24 100644
--- a/src/views/studio/l10n.json
+++ b/src/views/studio/l10n.json
@@ -38,6 +38,7 @@
     "studio.sharedFilter": "Shared",
     "studio.favoritedFilter": "Favorited",
     "studio.recentFilter": "Recent",
+    "studio.studentsFilter": "Students",
     
     "studio.activityAddProjectToStudio": "{profileLink} added the project {projectLink}",
     "studio.activityRemoveProjectStudio": "{profileLink} removed the project {projectLink}",
diff --git a/src/views/studio/lib/user-projects-actions.js b/src/views/studio/lib/user-projects-actions.js
index b932ef206..6c568a421 100644
--- a/src/views/studio/lib/user-projects-actions.js
+++ b/src/views/studio/lib/user-projects-actions.js
@@ -1,6 +1,7 @@
 import keyMirror from 'keymirror';
 import api from '../../../lib/api';
-import {selectUsername} from '../../../redux/session';
+import {selectToken, selectUsername} from '../../../redux/session';
+import {selectClassroomId} from '../../../redux/studio';
 import {userProjects, projects} from './redux-modules';
 
 const Errors = keyMirror({
@@ -12,13 +13,25 @@ const Errors = keyMirror({
 const Filters = keyMirror({
     SHARED: null,
     FAVORITED: null,
-    RECENT: null
+    RECENT: null,
+    STUDENTS: null
 });
 
-const Uris = {
-    [Filters.SHARED]: username => `/users/${username}/projects`,
-    [Filters.FAVORITED]: username => `/users/${username}/favorites`,
-    [Filters.RECENT]: username => `/users/${username}/recent`
+const Endpoints = {
+    [Filters.SHARED]: state => ({
+        uri: `/users/${selectUsername(state)}/projects`
+    }),
+    [Filters.FAVORITED]: state => ({
+        uri: `/users/${selectUsername(state)}/favorites`
+    }),
+    [Filters.RECENT]: state => ({
+        uri: `/users/${selectUsername(state)}/projects/recentlyviewed`,
+        authentication: selectToken(state)
+    }),
+    [Filters.STUDENTS]: state => ({
+        uri: `/classrooms/${selectClassroomId(state)}/projects`,
+        authentication: selectToken(state)
+    })
 };
 
 const normalizeError = (err, body, res) => {
@@ -30,14 +43,17 @@ const normalizeError = (err, body, res) => {
 
 const loadUserProjects = type => ((dispatch, getState) => {
     const state = getState();
-    const username = selectUsername(state);
     const projectCount = userProjects.selector(state).items.length;
     const projectsPerPage = 20;
+    const opts = {
+        ...Endpoints[type](state),
+        params: {
+            limit: projectsPerPage,
+            offset: projectCount
+        }
+    };
     dispatch(userProjects.actions.loading());
-    api({
-        uri: Uris[type](username),
-        params: {limit: projectsPerPage, offset: projectCount}
-    }, (err, body, res) => {
+    api(opts, (err, body, res) => {
         const error = normalizeError(err, body, res);
         if (error) return dispatch(userProjects.actions.error(error));
         const moreToLoad = body.length === projectsPerPage;
diff --git a/src/views/studio/modals/user-projects-modal.jsx b/src/views/studio/modals/user-projects-modal.jsx
index cf6c57051..446e3dd76 100644
--- a/src/views/studio/modals/user-projects-modal.jsx
+++ b/src/views/studio/modals/user-projects-modal.jsx
@@ -5,6 +5,7 @@ import {connect} from 'react-redux';
 import classNames from 'classnames';
 import {FormattedMessage} from 'react-intl';
 
+import {selectClassroomId} from '../../../redux/studio';
 import {addProject, removeProject} from '../lib/studio-project-actions';
 import {userProjects} from '../lib/redux-modules';
 import {Filters, loadUserProjects, clearUserProjects} from '../lib/user-projects-actions';
@@ -16,10 +17,11 @@ import SubNavigation from '../../../components/subnavigation/subnavigation.jsx';
 import UserProjectsTile from './user-projects-tile.jsx';
 
 import './user-projects-modal.scss';
+import {selectIsEducator} from '../../../redux/session';
 
 const UserProjectsModal = ({
-    items, error, loading, moreToLoad, onLoadMore, onClear,
-    onAdd, onRemove, onRequestClose
+    items, error, loading, moreToLoad, showStudentsFilter,
+    onLoadMore, onClear, onAdd, onRemove, onRequestClose
 }) => {
     const [filter, setFilter] = useState(Filters.SHARED);
 
@@ -60,6 +62,14 @@ const UserProjectsModal = ({
                 >
                     <FormattedMessage id="studio.recentFilter" />
                 </li>
+                {showStudentsFilter &&
+                    <li
+                        className={classNames({active: filter === Filters.STUDENTS})}
+                        onClick={() => setFilter(Filters.STUDENTS)}
+                    >
+                        <FormattedMessage id="studio.studentsFilter" />
+                    </li>
+                }
             </SubNavigation>
             <ModalInnerContent className="user-projects-modal-content">
                 {error && <div>Error loading {filter}: {error}</div>}
@@ -91,6 +101,7 @@ const UserProjectsModal = ({
 };
 
 UserProjectsModal.propTypes = {
+    showStudentsFilter: PropTypes.bool,
     items: PropTypes.arrayOf(PropTypes.shape({
         id: PropTypes.id,
         image: PropTypes.string,
@@ -108,7 +119,8 @@ UserProjectsModal.propTypes = {
 };
 
 const mapStateToProps = state => ({
-    ...userProjects.selector(state)
+    ...userProjects.selector(state),
+    showStudentsFilter: selectIsEducator(state) && selectClassroomId(state)
 });
 
 const mapDispatchToProps = ({