Merge pull request #1002 from UniversityOfHelsinkiCS/trunk

how to do migrations 101
UniversityOfHelsinkiCS · Jun 11, 2019 · d1b52ce · d1b52ce
2 parents f9b123a + d90b19b
commit d1b52ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.../backend/oodikone2-backend/src/database/migrations_kone/20190606_01_delete_legacy_tags.js b/.../backend/oodikone2-backend/src/database/migrations_kone/20190606_01_delete_legacy_tags.js
@@ -0,0 +1,8 @@
+module.exports = {
+  up: async (queryInterface) => {
+    await queryInterface.dropTable('tag')
+    await queryInterface.dropTable('tag_student')
+  },
+  down: async () => {
+  }
+}
diff --git a/...igrations_kone/20190606_01_create_tags.js → ...igrations_kone/20190606_02_create_tags.js b/...igrations_kone/20190606_01_create_tags.js → ...igrations_kone/20190606_02_create_tags.js
diff --git a/...s_kone/20190606_02_create_student_tags.js → ...s_kone/20190606_03_create_student_tags.js b/...s_kone/20190606_02_create_student_tags.js → ...s_kone/20190606_03_create_student_tags.js
diff --git a/services/oodikone2-frontend/src/components/SortableTable/index.jsx b/services/oodikone2-frontend/src/components/SortableTable/index.jsx
@@ -135,14 +135,15 @@ SortableTable.propTypes = {
   data: arrayOf(shape({})).isRequired,
   defaultdescending: bool,
   defaultsortkey: string,
-  collapsingHeaders: bool.isRequired
+  collapsingHeaders: bool
 }
 
 SortableTable.defaultProps = {
   tableProps: undefined,
   getRowProps: undefined,
   defaultdescending: false,
-  defaultsortkey: null
+  defaultsortkey: null,
+  collapsingHeaders: false
 }
 
 export default SortableTable