From a78b0d1b7959c6b9321181a63722294e520c89f3 Mon Sep 17 00:00:00 2001 From: esakemp Date: Fri, 5 Jul 2019 11:55:27 +0300 Subject: [PATCH 1/3] fix warning in coursetable --- .../src/components/CourseStatistics/CourseTable/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx b/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx index d1e11e467b..8fa41dc604 100644 --- a/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx +++ b/services/oodikone2-frontend/src/components/CourseStatistics/CourseTable/index.jsx @@ -17,8 +17,9 @@ const CourseTable = ({ courses, onSelectCourse, hidden, title, emptyListText, ma ) const toCourseRow = course => ( - (course.min_attainment_date || mandatory ? onSelectCourse(course) : null)} > - + // kinda hax solution for the problem, after fetching course course is array of selected course code letters + (course.min_attainment_date || mandatory ? onSelectCourse(course) : null)} > +
{course.name}
{getActiveYears(course)}
 @@ -26,6 +27,7 @@ const CourseTable = ({ courses, onSelectCourse, hidden, title, emptyListText, ma ) + return ( !hidden && ( From 64b3ac47d636ae845b928e502e761a9480e7e95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4kinen=20Sasu=20S?= Date: Fri, 5 Jul 2019 12:16:11 +0300 Subject: [PATCH 2/3] improt mzung --- services/backend/updater_writer/database/connection.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/backend/updater_writer/database/connection.js b/services/backend/updater_writer/database/connection.js index c491794a91..cc9ea130cb 100644 --- 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, { From b11e508e007668998190171cbabd5058e52907c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4kinen=20Sasu=20S?= Date: Fri, 5 Jul 2019 12:35:38 +0300 Subject: [PATCH 3/3] umzugvittu --- package-lock.json | 35 ------------------- package.json | 4 +-- .../backend/updater_writer/package-lock.json | 28 +++++++++++++++ services/backend/updater_writer/package.json | 3 +- 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index a95cbddaef..d0a5b3c483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -128,15 +128,6 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -431,11 +422,6 @@ } } }, - "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -1747,11 +1733,6 @@ "util-deprecate": "~1.0.1" } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - }, "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", @@ -2097,22 +2078,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "umzug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.2.0.tgz", - "integrity": "sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==", - "requires": { - "babel-runtime": "^6.23.0", - "bluebird": "^3.5.3" - }, - "dependencies": { - "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" - } - } - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", diff --git a/package.json b/package.json index 3fceab20de..0ac6ceecb9 100644 --- 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/package-lock.json b/services/backend/updater_writer/package-lock.json index af836ed763..a02a51233c 100644 --- a/services/backend/updater_writer/package-lock.json +++ b/services/backend/updater_writer/package-lock.json @@ -676,6 +676,15 @@ "babel-plugin-jest-hoist": "^24.6.0" } }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -1049,6 +1058,11 @@ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, + "core-js": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", + "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -4160,6 +4174,11 @@ "util.promisify": "^1.0.0" } }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", @@ -4986,6 +5005,15 @@ } } }, + "umzug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.2.0.tgz", + "integrity": "sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==", + "requires": { + "babel-runtime": "^6.23.0", + "bluebird": "^3.5.3" + } + }, "undefsafe": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz", diff --git a/services/backend/updater_writer/package.json b/services/backend/updater_writer/package.json index f7089fa9e5..1e1710129f 100644 --- 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" } }