Merge pull request #197 from uc-cdis/chore/router-upgrade

Chore/router upgrade

.eslintrc.js

@@ -36,6 +36,8 @@ module.exports = {
         // see https://github.com/clayne11/eslint-import-resolver-meteor/issues/17
         // - seems to affect Codacy :-(
         "import/extensions": ["off", "never"],
-        "react/jsx-indent": "off"
-    }
+        "react/jsx-indent": "off",
+        "react/forbid-prop-types": "off",
+        "react/prefer-stateless-function": "off",
+    },
 };

Jenkinsfile

@@ -0,0 +1,34 @@
+#!groovy
+
+pipeline {
+  agent any
+
+  stages {
+    stage('FetchCode') {
+      steps {
+        checkout scm
+      }
+    }
+    stage('k8sDeploy') {
+        steps {
+            echo "GIT_BRANCH is $env.GIT_BRANCH"
+            echo "GIT_COMMIT is $env.GIT_COMMIT"
+            script {
+                def helper = new uchicago.cdis.KubeHelper(this);
+                helper.deployBranch("portal-service");
+            }
+        }
+    }
+  }
+  post {
+    success {
+      slackSend color: 'good', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline succeeded"
+    }
+    failure {
+      slackSend color: 'bad', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline failed"
+    }
+    unstable {
+      slackSend color: 'bad', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline unstable"
+    }
+  }
+}

package.json

@@ -16,7 +16,7 @@
     "file-saver": "^1.3.3",
     "graphiql": "^0.11.5",
     "graphql": "^0.8.2",
-    "history": "^2.1.2",
+    "history": "^4.7.2",
     "ignore-loader": "^0.1.2",
     "isomorphic-fetch": "^2.2.1",
     "material-design-icons": "^3.0.1",
@@ -30,14 +30,12 @@
     "react": "^15.6.2",
     "react-ace": "^4.1.6",
     "react-dom": "^15.6.2",
-    "react-form": "^1.2.7",
+    "react-form": "^2.12.1",
     "react-highlight": "^0.10.0",
-    "react-redux": "^5.0.0",
-    "react-relay": "^1.3.0",
+    "react-redux": "^5.0.6",
+    "react-relay": "^1.4.1",
     "react-remarkable": "^1.1.1",
-    "react-router": "^2.8.0",
-    "react-router-redux": "^4.0.0",
-    "react-router-relay": "^0.14.0",
+    "react-router-dom": "^4.2.2",
     "react-select": "^1.0.0-rc.7",
     "react-tap-event-plugin": "^2.0.1",
     "recharts": "^1.0.0-apha.5",