Merge pull request #13 from UniversityOfHelsinkiCS/hide-printed-for-m…

…eetings Hide PrintedForMeetings col for students, minor refactor
UniversityOfHelsinkiCS · Mar 19, 2024 · c87d633 · c87d633
2 parents 91a075f + c36ff4d
commit c87d633
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /data
-**/grappa_pgdata
+**/grappa_pgdata
+.env
diff --git a/frontend/src/containers/Thesis/ThesisList.js b/frontend/src/containers/Thesis/ThesisList.js
@@ -5,6 +5,7 @@ import { thesisType, agreementType, attachmentType, councilmeetingType } from '.
 import LoadingIndicator from '../LoadingIndicator/index'
 // import { makeGetFormatTheses } from '../../selectors/thesisList'
 import ThesisListRow from './components/ThesisListRow'
+import { eThesisRoles, printedForMeetingRoles } from '../../util/constants'
 
 export class ThesisList extends Component {
     constructor(props) {
@@ -131,7 +132,7 @@ export class ThesisList extends Component {
     }
 
     render() {
-        const { canSeeEthesis } = this.props
+        const { canSeeEthesis, canSeePrintedForMeeting } = this.props
 
         return (
             <div>
@@ -162,7 +163,7 @@ export class ThesisList extends Component {
                             <th>Scheduled council meeting</th>
                             <th>Checked by author</th>
                             <th>No pending graders</th>
-                            <th>Printed for meeting <i className="question circle outline icon" style={{ cursor: 'pointer' }} onClick={() => this.setState({ showInfo: true })} /> </th>
+                            {canSeePrintedForMeeting ? <th>Printed for meeting <i className="question circle outline icon" style={{ cursor: 'pointer' }} onClick={() => this.setState({ showInfo: true })} /> </th> : null}
                             {canSeeEthesis ? <th>Published in E-Thesis</th> : null}
                         </tr>
                     </thead>
@@ -210,7 +211,14 @@ const mapStateToProps = state => ({
     // theses: state.theses,
     agreements: state.agreements,
     attachments: state.attachments,
-    canSeeEthesis: ((state.user || {}).roles || []).find(role => role.role === 'manager' || role.role === 'print_person' || role.role === 'resp_professor')
+    canSeePrintedForMeeting: Boolean(
+        ((state.user || {}).roles || [])
+            .find(role => printedForMeetingRoles.includes(role.role)
+            )),
+    canSeeEthesis: Boolean(
+        ((state.user || {}).roles || [])
+            .find(role => eThesisRoles.includes(role.role))
+    )
 })
 
 export default connect(mapStateToProps)(ThesisList)
diff --git a/frontend/src/containers/Thesis/components/ThesisListRow.js b/frontend/src/containers/Thesis/components/ThesisListRow.js
@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom'
 import { thesisType, councilmeetingType } from '../../../util/types'
 import { formatDisplayDate } from '../../../util/common'
 import InEthesisIcon from './InEthesisIcon'
+import { eThesisRoles, printedForMeetingRoles } from '../../../util/constants'
 
 const renderStatusIcons = field =>
     (field ? <Icon color="green" name="checkmark" /> : <Icon color="red" name="remove" />)
@@ -23,7 +24,7 @@ const getAuthorName = (thesis) => {
 // This is a pretty basic check and could be improved.
 const checkGraders = graders => graders.filter(grader => grader.roleRequestId).length < 1
 
-const ThesisListRow = ({ councilmeeting, thesis, showButtons, selectable, toggleThesis, selectedThesesIds, canSeeEthesis }) => {
+const ThesisListRow = ({ councilmeeting, thesis, showButtons, selectable, toggleThesis, selectedThesesIds, canSeeEthesis, canSeePrintedForMeeting }) => {
     const authorName = getAuthorName(thesis)
     return (
         <tr>
@@ -43,7 +44,7 @@ const ThesisListRow = ({ councilmeeting, thesis, showButtons, selectable, toggle
             <td>{councilmeeting ? formatDisplayDate(councilmeeting.date) : null}</td>
             <td>{renderStatusIcons(!authorName.some(author => author.includes('@')))}</td>
             <td>{renderStatusIcons(checkGraders(thesis.graders))}</td>
-            <td>{renderStatusIcons(thesis.printDone)}</td>
+            {canSeePrintedForMeeting ? <td>{renderStatusIcons(thesis.printDone)}</td> : null}
             {canSeeEthesis ? <td><InEthesisIcon authors={thesis.authors} title={thesis.title} /></td> : null}
         </tr>
     )
@@ -59,7 +60,11 @@ ThesisListRow.propTypes = {
 }
 
 const mapStateToProps = state => ({
-    canSeeEthesis: ((state.user || {}).roles || []).find(role => role.role === 'manager' || role.role === 'print_person' || role.role === 'resp_professor')
+    canSeePrintedForMeeting: Boolean(
+        ((state.user || {}).roles || [])
+            .find(role => printedForMeetingRoles.includes(role.role)
+            )),
+    canSeeEthesis: ((state.user || {}).roles || []).find(role => eThesisRoles.includes(role.role))
 })
 
 export default connect(mapStateToProps)(ThesisListRow)
diff --git a/frontend/src/util/constants.js b/frontend/src/util/constants.js
@@ -1,2 +1,12 @@
-export const TOKEN_NAME = 'token'
-export const DEV_USER = 'devUser'
+export const TOKEN_NAME = "token"
+export const DEV_USER = "devUser"
+
+export const printedForMeetingRoles = [
+  "admin",
+  "manager",
+  "print_person",
+  "resp_professor",
+  "grader",
+  "supervisor",
+]
+export const eThesisRoles = ["manager", "print_person", "resp_professor"]