Merge pull request #976 from UniversityOfHelsinkiCS/trunk

Release afterparty
UniversityOfHelsinkiCS · Jun 4, 2019 · f17ce53 · f17ce53
2 parents 3dc67b7 + 9c2a270
commit f17ce53
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/services/oodikone2-frontend/src/components/SortableTable/index.jsx b/services/oodikone2-frontend/src/components/SortableTable/index.jsx
@@ -97,7 +97,7 @@ SortableTable.propTypes = {
   getRowKey: func.isRequired,
   getRowProps: func,
   columns: arrayOf(shape({
-    key: string,
+    key: string.isRequired,
     title: oneOfType([element, string]),
     headerProps: shape({}),
     getRowVal: func,

diff --git a/services/oodikone2-frontend/src/components/StudyProgramme/StudyProgrammeSelector/index.jsx b/services/oodikone2-frontend/src/components/StudyProgramme/StudyProgrammeSelector/index.jsx
@@ -34,12 +34,12 @@ class StudyProgrammeSelector extends Component {
       {
         key: 'name',
         title: 'name',
-        getRowContent: prog => getTextIn(prog.name, language)
+        getRowVal: prog => getTextIn(prog.name, language)
       },
       {
         key: 'code',
         title: 'code',
-        getRowContent: prog => prog.code
+        getRowVal: prog => prog.code
       }
     ]
     if (studyprogrammes == null) {

diff --git a/services/oodikone2-frontend/src/components/StudyProgramme/ThroughputTable/index.jsx b/services/oodikone2-frontend/src/components/StudyProgramme/ThroughputTable/index.jsx
@@ -89,11 +89,11 @@ const ThroughputTable = ({ history, throughput, thesis, loading, error, studypro
             <Table.HeaderCell >Graduated overall</Table.HeaderCell>
             <Table.HeaderCell >Graduated in time</Table.HeaderCell>
             {renderCountries ? countries.map(country => <Table.HeaderCell key={country} content={country} />) : null}
-            <Table.HeaderCell content=">= 30" />
-            <Table.HeaderCell content=">= 60" />
-            <Table.HeaderCell content=">= 90" />
-            <Table.HeaderCell content=">= 120" />
-            <Table.HeaderCell content=">= 150" />
+            <Table.HeaderCell content="≥ 30" />
+            <Table.HeaderCell content="≥ 60" />
+            <Table.HeaderCell content="≥ 90" />
+            <Table.HeaderCell content="≥ 120" />
+            <Table.HeaderCell content="≥ 150" />
             {thesisTypes.includes('MASTER') && (
               <Table.HeaderCell content="Master" />
             )}

diff --git a/services/oodikone2-frontend/src/redux/students.js b/services/oodikone2-frontend/src/redux/students.js
@@ -39,13 +39,15 @@ const reducer = (state = { data: [] }, action) => {
         pending: false,
         error: true,
         selected: state.selected,
+        lastSearch: state.lastSearch,
         data: state.data
       }
     case 'FIND_STUDENTS_SUCCESS':
       return {
         pending: false,
         error: false,
         selected: state.selected,
+        lastSearch: state.lastSearch,
         data: state.lastSearch === action.query ?
           [...state.data.filter(student => student.fetched), ...action.response] :
           state.data
@@ -55,6 +57,7 @@ const reducer = (state = { data: [] }, action) => {
         pending: false,
         error: false,
         selected: action.response.studentNumber,
+        lastSearch: state.lastSearch,
         data: [...state.data.filter(student =>
           student.studentNumber !== action.response.studentNumber),
         { ...action.response, ...{ fetched: true } }