Feat/dict version (#188)

* fix(ReduxProjectSubmission): customHeaders (#170) not custom_headers * test(DataModelGraph): more DataModelGraph tests * test(DataDictionary): toggle-button test * fix(DataModelGraph/utils.test): new test data * fix(security-policy): allow blob: sources For Ace-editor worker in particular. Only Chrome supports 'worker-src' directive. * test(Submission): introduce SubitTSV tests * style(ReduxUserProfile.test.jsx): rename file * test(UserProfile): extend UserProfile test suite * chore(package.json): prune d3 depends, up versions * style(Homepage): eslint fixes * test(utils): add predictFileType test * test(Submission,UserProfile): clarifying comments control flow in some asynchronous UX-event tests is not readily apparent * chore(Submission): enhance submission feedback * break down submission counts by type on success * extract errors on failure * show note on timeout * fix(SubmitTSV.test): sync tests with code changes Introduction of SubmissionResult component required tweak of SubmitTSV.test due to DOM changes * fix(align): fix align right file size * fix(codacy): codacy * fix(codacy): fix with eslint * chore(style): fix style on data page * chore(eslint): autofix * fix(indent): disable jsx-indent - disagree with indent * chore(body-bg): make full height bg work * chore(Footer): add dictionaryVersion prop * feat(version): Update for dictionary version fetching * fix(apiPath): import apipath * feat(portal): Add portal version * fix(bugs): squash! * Update actions.js * fix(lint): clean up
uc-cdis · Nov 2, 2017 · 2bb3965 · 2bb3965
1 parent 331def1
commit 2bb3965
Show file tree

Hide file tree

Showing 53 changed files with 4,008 additions and 5,160 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -36,5 +36,6 @@ 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"
     }
 };
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,9 @@ ARG BASENAME
 RUN mkdir -p /data-portal 
 COPY . /data-portal
 WORKDIR /data-portal
-RUN cp src/img/$APP-favicon.ico src/img/favicon.ico; \
+RUN COMMIT=`git rev-parse HEAD` && echo "export const portalCommit = \"${COMMIT}\";" >src/versions.js \
+    && VERSION=`git describe --always --tags` && echo "export const portalVersion =\"${VERSION}\";" >>src/versions.js \
+    && cp src/img/$APP-favicon.ico src/img/favicon.ico; \
     /bin/rm -rf node_modules \
     && npm install \
     && npm run relay \

diff --git a/dev.html b/dev.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' data: https://www.google-analytics.com; script-src 'self' 'unsafe-eval' https://www.google-analytics.com localhost; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; img-src 'self' data: https://www.google-analytics.com; script-src 'self' 'unsafe-eval' https://www.google-analytics.com localhost;  worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com">
     <meta name="viewport" content="width=device-width" />
 
     <link rel="stylesheet" type="text/css" media="all" href="/src/css/bootstrap.min.css">