Pre-release tasks

cggh · Oct 18, 2016 · d54d8d8 · d54d8d8
1 parent 2b42a0e
commit d54d8d8
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 189 deletions.
diff --git a/documentation/importdata/importsettings/datatable_properties.rst b/documentation/importdata/importsettings/datatable_properties.rst
@@ -39,30 +39,36 @@ externalUrl
   For example: ``http://www.ebi.ac.uk/ena/data/view/{value}``.
 
 isCategorical
-  *Boolean.* Instructs Panoptes to treat the property as a categorical variable.
+  *Boolean.* Set automatically for columns with <50 distinct entries, unless set here. Instructs Panoptes to treat the property as a categorical variable.
   For example, a combo box with the possible states is automatically shown in queries for this property.
-  Categorical properties are automatically indexed.
+.
 
-categoryColors
-  *Block.* Specifies display colours for the categorical states of this property.
+valueColours
+  *Block.* Specifies display colours for specific values of this property.
   Each key in the block links a possible value of the property to a color (example: ``Accepted: rgb(0,192,0)``).
   The special value ``_other_`` can be used to specify a color for all other property values that are not listed explicitly.
 
+valueDescriptions
+  *Block.* Specifies descriptions for specific values of this property which will displayed next to it under an info icon..
+
+valueDisplays
+  *Block.* Specifies display html for specific values of this property. The html will replace this value when it is displayed.
+
 defaultWidth
-  *Value.* Sets the deafult column width in pixels.(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32']).
+  *Value.* Sets the deafult column width in pixels.(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32', 'Date']).
 
 showBar
   *Boolean.* Draws a bar in the background of the table, indicating the value.
-  Requires *minVal* & *maxVal* to be defined.(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32']).
+  Requires *minVal* & *maxVal* to be defined.(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32', 'Date']).
 
 minVal
-  *Value.* For *Value* types, upper extent of scale(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32']).
+  *Value.* Set automatically from data unless overridden. For *Value* types, upper extent of scale(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32', 'Date']).
 
 maxVal
-  *Value.* For *Value* types, lower extent of scale(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32']).
+  *Value.* Set automatically from data unless overridden. For *Value* types, lower extent of scale(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32', 'Date']).
 
 decimDigits
-  *Value.* For *Value* types, specifies the number of decimal digits used to display the value(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32']).
+  *Value.* For *Value* types, specifies the number of decimal digits used to display the value(only applies if *dataType* is ['Float', 'Double', 'Int8', 'Int16', 'Int32', 'Date']).
 
 index
   *Boolean.*  Default:False.  If set, instructs Panoptes to create an index for this property in the relational database.

diff --git a/scripts/publish-tag.sh b/scripts/publish-tag.sh
@@ -23,11 +23,11 @@ bash scripts/generateDocs.sh
 git rm -fr webapp/dist || true
 cd webapp
 npm run build
-cd ..
-git add -u
-git add webapp/dist/* || true
-echo $1
-git commit -m "Pre-release tasks" || true #Might fail due to no changes
-git push origin master
-echo git tag -a $1 -m "$1"
-git push --tags
+#cd ..
+#git add -u
+#git add webapp/dist/* || true
+#echo $1
+#git commit -m "Pre-release tasks" || true #Might fail due to no changes
+#git push origin master
+#echo git tag -a $1 -m "$1"
+#git push --tags
diff --git a/webapp/dist/panoptes/index.html b/webapp/dist/panoptes/index.html
@@ -3,7 +3,6 @@
 <head>
   <meta charset="UTF-8">
   <title>Panoptes</title>
-  <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,700italic' rel='stylesheet' type='text/css'>
   <style>
     body {
       margin: 0;
@@ -71,11 +70,14 @@
       -webkit-box-align: center;
           -ms-flex-align: center;
               align-items: center;
+      -webkit-box-orient: vertical;
+      -webkit-box-direction: normal;
+      flex-direction: column;
       height: 100%;
       width: 100%;
       background-color: rgb(255, 255, 255);
     }
-    .non-js-spinner div {
+    .non-js-spinner .logo {
       height: 50%;
       width: 50%;
       opacity: 0.5;
@@ -86,6 +88,15 @@
       background-position: center;
       background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTA2MCAxMTEwIj4KPGNpcmNsZSBjeD0iNTMwIiBjeT0iNTU1IiByPSIzODUiIGZpbGw9IiM3ODc4NzgiLz4KPGNpcmNsZSBjeD0iNTMwIiBjeT0iNTU1IiByPSIzMjUiIGZpbGw9IndoaXRlIi8+CjxjaXJjbGUgY3g9Ijc0MCIgY3k9IjgyNSIgcj0iMTE1IiBmaWxsPSIjNzg3ODc4Ii8+CjxjaXJjbGUgY3g9IjY3NSIgY3k9IjE5MSIgcj0iMTkwIiBmaWxsPSIjNzg3ODc4Ii8+CjxjaXJjbGUgY3g9IjY3NSIgY3k9IjE5MSIgcj0iMTUwIiBmaWxsPSJsaWdodGdyZXkiLz4KPGNpcmNsZSBjeD0iMTcwIiBjeT0iNTU1IiByPSIxNzIiIGZpbGw9IiM3ODc4NzgiLz4KPGNpcmNsZSBjeD0iMTcwIiBjeT0iNTU1IiByPSIxNDUiIGZpbGw9IiNGRkZGRkYiLz4KPGNpcmNsZSBjeD0iMTcwIiBjeT0iNTU1IiByPSIxMTUiIGZpbGw9ImxpZ2h0Z3JleSIvPgo8Y2lyY2xlIGN4PSI3NDAiIGN5PSI4MjUiIHI9IjkwIiBmaWxsPSJsaWdodGdyZXkiLz4KPGNpcmNsZSBjeD0iNTMwIiBjeT0iNTU1IiByPSIyOTAiIGZpbGw9IiM3ODc4NzgiLz4KPGNpcmNsZSBjeD0iNTMwIiBjeT0iNTU1IiByPSI4MCIgZmlsbD0id2hpdGUiLz4KPGNpcmNsZSBjeD0iMTcwIiBjeT0iNTU1IiByPSI2MCIgZmlsbD0iIzc4Nzg3OCIvPgo8Y2lyY2xlIGN4PSI2NzUiIGN5PSIxOTEiIHI9Ijc3IiBmaWxsPSIjNzg3ODc4Ii8+CjxjaXJjbGUgY3g9Ijc0MCIgY3k9IjgyNSIgcj0iNDUiIGZpbGw9IiM3ODc4NzgiLz4KPC9zdmc+Cg==");
     }
+    .error-text {
+      font-style: italic;
+      padding-top: 15px;
+    }
+    body {
+      font-family: 'Roboto', sans-serif;
+      color: rgb(36, 36, 36);
+      font-size: 14px;
+    }
   </style>
 </head>
 <body id="body">
@@ -95,10 +106,11 @@
   document.getElementById('body').removeChild(document.getElementById('JSwarning'))
 </script>
 <div id="main" class="main">
-  <div
-    class="non-js-spinner">
-    <div />
+  <div class="non-js-spinner">
+    <div class="logo"></div>
+    <div class="error-text">Loading panoptes...</div>
   </div>
 </div>
-<script type="text/javascript" src="/panoptes/panoptes.js?c54134b86a209a06aaaf"></script><script type="text/javascript" src="/panoptes/babel.js?c54134b86a209a06aaaf"></script></body>
+<script type="text/javascript" src="/panoptes/panoptes.js?bb01d248c062758e8a59"></script><script type="text/javascript" src="/panoptes/babel.js?bb01d248c062758e8a59"></script></body>
+<link href='http://fonts.googleapis.com/css?family=Roboto:400,700,700italic' rel='stylesheet' type='text/css'>
 </html>
diff --git a/webapp/dist/panoptes/panoptes.js b/webapp/dist/panoptes/panoptes.js
diff --git a/webapp/package.json b/webapp/package.json
@@ -5,29 +5,29 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "autoprefixer": "^6.4.1",
-    "babel-core": "^6.14.0",
+    "autoprefixer": "^6.5.1",
+    "babel-core": "^6.17.0",
     "babel-eslint": "^7.0.0",
     "babel-loader": "^6.2.5",
-    "babel-preset-es2015": "^6.14.0",
-    "babel-preset-react": "^6.11.1",
-    "babel-preset-stage-1": "^6.13.0",
+    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-1": "^6.16.0",
     "css-loader": "^0.25.0",
-    "eslint": "^3.7.1",
-    "eslint-plugin-react": "^6.2.0",
+    "eslint": "^3.8.1",
+    "eslint-plugin-react": "^6.4.1",
     "file-loader": "^0.9.0",
     "gulp": "^3.9.1",
     "gulp-util": "^3.0.7",
     "html-webpack-plugin": "^2.22.0",
-    "node-sass": "^3.9.3",
-    "postcss-loader": "^0.13.0",
-    "react-hot-loader": "^3.0.0-beta.3",
-    "require-dir": "^0.3.0",
+    "node-sass": "^3.10.1",
+    "postcss-loader": "^1.0.0",
+    "react-hot-loader": "^3.0.0-beta.6",
+    "require-dir": "^0.3.1",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.2",
-    "webpack-dev-server": "^1.15.1"
+    "webpack-dev-server": "^1.16.2"
   },
   "scripts": {
     "dev": "gulp --type dev",
@@ -49,54 +49,53 @@
     ]
   },
   "dependencies": {
-    "babel-polyfill": "^6.13.0",
+    "babel-polyfill": "^6.16.0",
     "bloody-offset": "0.0.0",
     "classnames": "^2.2.5",
     "color": "^0.11.3",
-    "console-polyfill": "^0.2.2",
+    "console-polyfill": "^0.2.3",
     "d3": "^3.5.17",
     "datastream": "^1.0.0",
-    "esprima": "^3.0.0",
+    "esprima": "^3.1.0",
     "fixed-data-table": "^0.6.3",
     "fluxxor": "^1.7.3",
-    "google-map-react": "^0.19.0",
     "handlebars": "^4.0.5",
-    "history": "^4.0.0-1",
+    "history": "^4.3.0",
     "html-to-react": "git+https://github.com/benjeffery/html-to-react.git",
     "immutable": "^3.8.1",
     "javascript-detect-element-resize": "git+https://github.com/sdecima/javascript-detect-element-resize.git",
     "jsx-to-string": "^0.2.16",
     "keymirror": "^0.1.1",
-    "leaflet": "^1.0.0-rc.3",
+    "leaflet": "^1.0.1",
     "leaflet-loading": "git+https://github.com/benjeffery/Leaflet.loading.git",
     "leaflet-providers": "^1.1.15",
-    "lodash": "^4.15.0",
+    "lodash": "^4.16.4",
     "lz-string": "git+https://github.com/benjeffery/lz-string.git",
-    "material-ui": "^0.15.4",
+    "material-ui": "^0.16.0",
     "performance-now": "^0.2.0",
     "q": "^1.4.1",
     "qajax": "^1.3.0",
     "raf": "^3.3.0",
     "rc-tooltip": "^3.4.2",
-    "react": "^15.3.0",
-    "react-addons-create-fragment": "^15.3.0",
+    "react": "^15.3.2",
+    "react-addons-create-fragment": "^15.3.2",
     "react-addons-perf": "^15.3.2",
-    "react-addons-transition-group": "^15.3.0",
-    "react-addons-update": "^15.3.0",
+    "react-addons-transition-group": "^15.3.2",
+    "react-addons-update": "^15.3.2",
     "react-display-name": "^0.2.0",
-    "react-dom": "^15.3.0",
-    "react-draggable": "^2.2.1",
+    "react-dom": "^15.3.2",
+    "react-draggable": "^2.2.2",
     "react-hammerjs": "^0.5.0",
     "react-highlighter": "^0.3.3",
     "react-hotkeys": "^0.9.0",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-render-mixin": "^0.9.7",
     "react-leaflet": "^1.0.0-rc.1",
-    "react-motion": "^0.4.4",
+    "react-motion": "^0.4.5",
     "react-notification-system": "^0.2.10",
     "react-phylocanvas": "0.0.2",
-    "react-plotlyjs": "^0.3.5",
-    "react-resizable": "^1.4.2",
+    "react-plotlyjs": "^0.3.7",
+    "react-resizable": "^1.4.5",
     "react-sidebar": "^2.2.1",
     "react-tap-event-plugin": "^1.0.0",
     "repeat-string": "^1.5.4",