Merge pull request #1078 from UniversityOfHelsinkiCS/trunk

UVANJ MK;.
UniversityOfHelsinkiCS · Jul 5, 2019 · 12e945d · 12e945d
2 parents f358d17 + b11e508
commit 12e945d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,5 @@
     "cypress": "^3.2.0",
     "husky": "^1.3.1"
   },
-  "dependencies": {
-    "umzug": "^2.2.0"
-  }
+  "dependencies": {}
 }
diff --git a/services/backend/updater_writer/database/connection.js b/services/backend/updater_writer/database/connection.js
@@ -1,4 +1,6 @@
 const Sequelize = require('sequelize')
+const Umzug = require('umzug')
+
 const conf = require('../conf-backend')
 
 const sequelize = new Sequelize(conf.DB_URL, {

diff --git a/services/backend/updater_writer/package-lock.json b/services/backend/updater_writer/package-lock.json
diff --git a/services/backend/updater_writer/package.json b/services/backend/updater_writer/package.json
@@ -19,6 +19,7 @@
     "node-nats-streaming": "^0.2.2",
     "nodemon": "^1.19.0",
     "pg": "^7.10.0",
-    "sequelize": "^5.8.5"
+    "sequelize": "^5.8.5",
+    "umzug": "^2.2.0"
   }
 }
diff --git a/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx b/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx
@@ -17,15 +17,17 @@ const CourseTable = ({ courses, onSelectCourse, hidden, title, emptyListText, ma
   )
 
   const toCourseRow = course => (
-    <Table.Row style={{ cursor: 'pointer' }} key={course.code} onClick={() => (course.min_attainment_date || mandatory ? onSelectCourse(course) : null)} >
-      <Table.Cell width={10}>
+    // kinda hax solution for the problem, after fetching course course is array of selected course code letters
+    <Table.Row style={{ cursor: 'pointer' }} key={course.code ? course.code : course[0]} onClick={() => (course.min_attainment_date || mandatory ? onSelectCourse(course) : null)} >
+      <Table.Cell key={course.code} width={10}>
         <div>{course.name}</div>
         <div>{getActiveYears(course)}</div>
       </Table.Cell>
       <Table.Cell content={course.code} />
     </Table.Row>
   )
 
+
   return (
     !hidden && (
       <Segment basic style={{ padding: '0' }} >