Merge branch 'series-4.1'

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
+}

.codacy.yml

@@ -1,8 +1,10 @@
 ---
 engines:
- pylint:
-   enabled: true
-   python_version: 2
+  pylint:
+    enabled: false
 exclude_paths:
-  - 'tardis/tardis_portal/static/js/lib/**'
+  - 'assets/css/jquery-ui/**'
+  - 'assets/js/lib/**'
   - 'tardis/apps/push_to/static/push-to/bootstrap/**'
+  - 'tardis/apps/push_to/static/push-to/typeahead.bundle.js'
+  - 'tardis/apps/push_to/static/push-to/angular-typeahead.js'

.dockerignore

@@ -32,3 +32,4 @@ versions.cfg
 tardis_db
 Dockerfile*
 docker*yml
+node_modules

.eslintrc

@@ -1,6 +1,13 @@
 {
-    "extends": "eslint:recommended",
-    "rules": {
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
         "camelcase": [1, {"properties": "always"}],
         "comma-spacing": [2, {"before": false, "after": true}],
         "complexity": ["error", { "max": 4 }],
@@ -21,20 +28,40 @@
         "no-shadow": [2, {"hoist": "functions"}],
         "no-use-before-define": [1],
         "object-shorthand": 0,
-        "quotes": [1, "double"],
-        "linebreak-style": [2, "unix"],
+        "quotes": [1, "double", { "allowTemplateLiterals": true }],
+        "linebreak-style": 0,
         "semi": [2, "always"],
         "space-before-blocks": [2, "always"],
         "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
         "space-infix-ops": [2, {"int32Hint": false}],
-        "strict": [0, "function"],
+        "strict": 2,
         "wrap-iife": [1]
     },
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "jquery": true
-    },
-    "globals": {
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "jquery": true
+  },
+  "overrides": [
+    {
+      "files": [
+        "assets/js/tardis_portal/facility_view/*.js"
+      ],
+      "globals": {
+        "angular": true
+      },
+      "rules": {
+        "quotes": [0, "double"],
+        "indent": 0,
+        "complexity": [
+          "error",
+          {
+            "max": 7
+          }
+        ]
+      }
     }
+  ],
+  "globals": {
+  }
 }

.eslintrc.react

@@ -0,0 +1,24 @@
+{
+    "env": {
+        "jest": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended",
+        "airbnb"
+    ],
+    "parser": "babel-eslint",
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
+    "rules": {
+        "quotes": [1, "double"],
+        "no-underscore-dangle": 0,
+        "jsx-a11y/label-has-associated-control": 0,
+        "jsx-a11y/label-has-for": 0,
+        "no-param-reassign": 0,
+        "linebreak-style": 0
+    }
+}

.gitignore

@@ -3,6 +3,7 @@
 *.egg-info/
 *.log
 *.prof
+__pycache__/
 *.pyc
 *.sqlite
 *.wsgi
@@ -23,29 +24,28 @@ docs/make.bat
 docs/pydoc
 eggs/
 node_modules/
+assets/bundles/
 parts/
 tardis/settings.py
 tardis/tardis_portal/tests/rifcs/MyTARDIS-1.xml
 var/
 versions.cfg
+webpack-stats.json
 tardis_db
 tardis/apps/*
 !tardis/apps/__init__.py
-!tardis/apps/anzsrc_codes
 !tardis/apps/deep_storage_download_mapper
 !tardis/apps/dl_mapper_df_dir_only
 !tardis/apps/equipment
 !tardis/apps/filepicker
 !tardis/apps/mx_views
 !tardis/apps/oaipmh
 !tardis/apps/openid_migration
-!tardis/apps/publication_forms
 !tardis/apps/push_to
 !tardis/apps/related_info
+!tardis/apps/s3utils
 !tardis/apps/slideshow_view
 !tardis/apps/sftp
 !tardis/apps/social_auth
-tardis/tardis_portal/filters/*
-!tardis/tardis_portal/filters/__init__.py
-!tardis/tardis_portal/filters/diffractionimage.py
-!tardis/tardis_portal/filters/jeolsem.py
+!tardis/apps/search
+

.pylintrc

@@ -80,9 +80,11 @@ disable=C0103,
     C0325,
     C0330,
     C1001,
+    E0012,
     E1101,
     I0011,
     R0201,
+    R0205,
     R0401,
     R0801,
     R0901,

.travis.yml

@@ -0,0 +1,21 @@
+dist: bionic
+sudo: required
+
+language: python
+
+python:
+  - "3.7"
+
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" libldap2-dev libmagickwand-dev libsasl2-dev libssl-dev libxml2-dev libxslt1-dev libmagic-dev python-dev python-pip zlib1g-dev libfreetype6-dev libjpeg-dev
+ - sudo apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" slapd ldap-utils
+
+# Commands to install dependencies:
+install:
+- pip install -r requirements.txt
+
+script:
+- mkdir -p var/store
+- python test.py
+- pylint tardis

Gruntfile.js

@@ -12,13 +12,31 @@
 /* ./node_modules/.bin/grunt test --verbose     */
 /************************************************/
 
+const webpackConfig = require("./test-webpack.config");
 module.exports = function(grunt) {
     grunt.initConfig({
-        qunit: {
-            all: ["js_tests/tests.html"]
+        webpack: {
+            prod: webpackConfig,
+            dev: Object.assign({watch: true}, webpackConfig)
         },
+        qunit: {
+            all: ["js_tests/tests.html"],
+            options: {
+                puppeteer: {
+                    // We need --disable-web-security to allow the JS unit
+                    // tests to refer to paths not in the same origin (CORS)
+                    // e.g. "../tardis/tardis_portal/static/js/main.js"
+                    args: [
+                        "--disable-web-security",
+                        "--no-sandbox",
+                        "--disable-setuid-sandbox"
+                    ],
+                }
+            }
+        }
     });
 
+    grunt.loadNpmTasks("grunt-webpack");
     grunt.loadNpmTasks("grunt-contrib-qunit");
     grunt.registerTask("test", ["qunit"]);
     grunt.registerTask("default", ["test"]);

README.rst

@@ -5,11 +5,14 @@ MyTardis
    :target: http://mytardis.readthedocs.org/en/develop/?badge=develop
    :alt: Documentation Status
 
-
-.. image:: https://semaphoreapp.com/api/v1/projects/5d21cc89-645b-4793-bd78-cf525a0dcce2/345561/shields_badge.svg
-   :target: https://semaphoreapp.com/mytardis/mytardis
+.. image:: https://semaphoreci.com/api/v1/mytardis/mytardis/branches/develop/badge.svg
+   :target: https://semaphoreci.com/mytardis/mytardis
    :alt: Semaphore build status
 
+.. image:: https://travis-ci.org/mytardis/mytardis.svg?branch=develop
+    :target: https://travis-ci.org/mytardis/mytardis
+    :alt: Travis CI build status
+
 .. image:: https://api.codacy.com/project/badge/Grade/c27bad18abaf443c93e58192757c2025
    :alt: Codacy Badge
    :target: https://app.codacy.com/app/mytardis/mytardis?utm_source=github.com&utm_medium=referral&utm_content=mytardis/mytardis&utm_campaign=badger
@@ -44,7 +47,7 @@ Developing for MyTardis
 -----------------------
 MyTardis is mostly written in the `Python programming language <https://www.python.org/>`_ and is built on top of the `Django web framework <https://www.djangoproject.com/>`_. A complete installation of the service also includes an `Elasticsearch <https://www.elastic.co/>`_ index, a `RabbitMQ <https://www.rabbitmq.com/>`_-based task queue, an `Nginx <http://nginx.org/>`_ server, and a `PostgreSQL <http://www.postgresql.org/>`_ database.
 
-To set up and manage these services we employ the `SaltStack <https://saltstack.com/>`_ orchestration software and cloud technologies.
+To set up and manage these services we employ the `Kubernetes <https://kubernetes.io/>`_ orchestration software and cloud technologies.
 
 `Read more... <http://www.mytardis.org/for-developers/>`_
 
@@ -102,17 +105,17 @@ The default branch on GitHub is ``develop``. This is the cutting edge
 development version. Please DO NOT use this in production, as it may have bugs
 that eat your data.
 
-The ``master`` branch is the current stable release with all the latest bugfixes
+The ``master`` branch is the current stable release with all the latest bug fixes
 included. It will move to newer versions automatically. Follow this branch
 if you want to stay up to date in a production environment.
 
 Each version has its own branch named by version number. At the time of
-writing, the latest release is ``4.0.2``, tagged from the ``series-4.0``
+writing, the latest release is ``4.1.1``, tagged from the ``series-4.1``
 branch. Follow this branch for your production installation and
 perform version upgrades manually.
 
-Each bugfix or set of fixes bumps the minor version and each new release is
-tagged, eg. ``4.0.3``. Use tagged releases if you are paranoid about changes to
+Each bug fix or set of fixes bumps the minor version and each new release is
+tagged, eg. ``4.1.2``. Use tagged releases if you are paranoid about changes to
 the code you have not tested yourself.
 
 To follow development, please see the contributing section below.

tardis/tardis_portal/static/css/default.css → assets/css/default.css

@@ -88,7 +88,6 @@ div.copylink {
 }
 
 .datafile_name {
-    font-size: 110%;
     font-weight: bold;
     word-break: break-all;
 }
@@ -124,19 +123,6 @@ div.copylink {
     text-decoration: none;
 }
 
-#login-button {
-display: inline-block;
-padding: 4px 10px 4px;
-margin: 5px 5px 6px;
-line-height: 18px;
-color: #ffffff;
-text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-#login-button:hover {
-    background-color: #2f96b4;
-}
-
 /* index page */
 .experiments .accordion-toggle .explink {
     font-size: 1.3em;
@@ -163,7 +149,24 @@ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
     width: 75%;
 }
 .experiments .accordion-inner .dataset-list-header {
-    margin-left: -30px;
+    margin-left: -15px;
+    font-style: italic;
+    font-size: 11px;
+    border: none;
+    background-color: transparent !important;
+    padding-top: 5px;
+    padding-left: 5px;
+}
+.accordion-inner .list-group {
+    padding-left: 10px;
+}
+.accordion-inner .dataset-list-item {
+  border: none;
+  background-color: transparent !important;
+  padding-left: 10px;
+  padding-right: 5px;
+  padding-top: 5px;
+  padding-bottom: 2px;
 }
 .experiments .accordion-inner .thumbnails li {
     margin-bottom: 5px;
@@ -223,9 +226,6 @@ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 .mydata .accordion-inner p {
     width: 75%;
 }
-.mydata .accordion-inner .dataset-list-header {
-    margin-left: -30px;
-}
 .mydata .accordion-inner .thumbnails li {
     margin-bottom: 5px;
     margin-top: 2px;
@@ -262,6 +262,14 @@ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 .search_result div div {
     margin-left: 1em;
 }
+.tab-pane {
+    padding: 10px;
+}
+
+.nav-tabs {
+    margin-bottom: 0;
+}
+
 /* end search */
 
 /* MyTardis has switched from Bootstrap 2.0.4 to 2.3.2 for compatibilty with
@@ -287,3 +295,29 @@ h4 small {font-size: 12px;}
 h5 {font-size: 12px;}
 h6 {font-size: 11px;color: #999999;text-transform: uppercase;}
 .page-header { margin-top: 10px; margin-bottom: 10px; }
+
+.datasets.thumbnails {
+    list-style-type: none;
+    padding-inline-start: 0;
+}
+.list-inline-item {
+    margin-left: 10px;
+    margin-top: 5px;
+}
+.list-inline-item>a {
+    margin-bottom: 0;
+}
+
+/* Padding from Bootstrap v2: */
+.accordion-heading .accordion-toggle {
+  padding: 8px 15px;
+}
+
+/* Ensure modals have vertical scrollbars if necessary */
+.modal-dialog {
+    overflow-y: initial !important
+}
+.modal-body {
+    max-height: calc(100vh - 100px);
+    overflow-y: auto;
+}