Upgrade django storage. (#2571)

* Upgrade django storage. * Remove post-css library, unused. (#2574) * Update user/file facet/columns per user request. (#2577) * Remove post-css library, unused. * Update user/file facet/columns per user request. * Remove typo , * Fix typo, double quotes. * Remove space. * Add cell_type to facets. * Fix unit test. * Add missing facets. * Fix cypress test. * Revert to 1.6.0 due to django 1.9 support.
refinery-platform · Feb 9, 2018 · b4f2b3f · b4f2b3f
1 parent 3921537
commit b4f2b3f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 38 deletions.
diff --git a/deployment/aws-config/config.yaml.template b/deployment/aws-config/config.yaml.template
@@ -64,7 +64,7 @@ REFINERY_GOOGLE_ANALYTICS_ID: ""
 
 REFINERY_URL_SCHEME: "http"
 
-USER_FILES_COLUMNS: "filename,organism,technology,antibody,date,genotype,experimenter"
+USER_FILES_COLUMNS: "sample_name,local_path,filetype,organism,technology,genotype,cell_type,antibody,experimenter,date_submitted"
 
 # == Rarely changed ==
 

diff --git a/refinery/config/config.json.erb b/refinery/config/config.json.erb
@@ -130,6 +130,6 @@
   "TOKEN_DURATION": 3,
   "USE_I18N": true,
   "USE_L10N": true,
-  "USER_FILES_COLUMNS": "filename,organism,technology,antibody,date,genotype,experimenter",
-  "USER_FILES_FACETS": "organism,technology,antibody,genotype,experimenter"
+  "USER_FILES_COLUMNS": "sample_name,local_path,filetype,organism,technology,genotype,cell_type,antibody,experimenter,date_submitted",
+  "USER_FILES_FACETS": "filetype,organism,technology,genotype,cell_type,antibody,experimenter"
 }
diff --git a/refinery/ui/Gruntfile.js b/refinery/ui/Gruntfile.js
@@ -129,35 +129,6 @@ module.exports = function (grunt) {
   };
 
   grunt.initConfig({
-    /*
-     * Add vendor prefixes to out CSS to ensure better browser support.
-     */
-    postcss: {
-      options: {
-        processors: [
-          require('autoprefixer')({ browsers: [
-            '> 5%',
-            'last 2 versions',
-            'Firefox ESR',
-            'Explorer >= 10',
-            'iOS >= 6',
-            'Opera >= 12',
-            'Safari >= 6'
-          ] })
-        ]
-      },
-      styles: {
-        files: [
-          {
-            expand: true,
-            cwd: '<%= cfg.basePath.ui.src %>/styles',
-            src: ['**/*.css'],
-            dest: '<%= cfg.basePath.ui.tmp %>/styles'
-          }
-        ]
-      }
-    },
-
     /*
      * Read configs from `config.json`. Separating scripts and configs help
      * to keep things readable.
@@ -851,7 +822,6 @@ module.exports = function (grunt) {
     'clean:uiCompile',
     'clean:staticCompile',
     'less:compile',
-    'postcss',
     // IMPORTANT:
     // `concat-by-feature:compile` has to be called before `ngAnnotate` because
     // it adds features to the `ngAnnotate` task.

diff --git a/refinery/ui/cypress/integration/anonymous/not_logged_in_spec.js b/refinery/ui/cypress/integration/anonymous/not_logged_in_spec.js
@@ -56,7 +56,6 @@ describe('Not logged in', function() {
     cy.visit('/');
     cy.visible_btn('List').click();
 
-    cy.visible('Filename');
     cy.visible('Organism');
     cy.visible('Technology');
     cy.visible('Antibody');

diff --git a/refinery/ui/package.json b/refinery/ui/package.json
@@ -38,7 +38,6 @@
     "grunt-karma": "1.0.0",
     "grunt-newer": "1.2.0",
     "grunt-ng-annotate": "2.0.1",
-    "grunt-postcss": "0.8.0",
     "hasbin": "1.1.1",
     "isbinaryfile": "3.0.0",
     "jasmine-core": "2.3.4",

diff --git a/refinery/user_files_manager/tests.py b/refinery/user_files_manager/tests.py
@@ -112,14 +112,18 @@ def test_generate_solr_params_for_user(self):
         query = generate_solr_params_for_user(QueryDict({}), user.id)
         self.assertEqual(str(query).split('&'), [
                          'fq=assay_uuid%3A%28{}%29'.format(assay_uuid),
+                         'facet.field=filetype_Characteristics_generic_s',
+                         'facet.field=filetype_Factor_Value_generic_s',
                          'facet.field=organism_Characteristics_generic_s',
                          'facet.field=organism_Factor_Value_generic_s',
                          'facet.field=technology_Characteristics_generic_s',
                          'facet.field=technology_Factor_Value_generic_s',
-                         'facet.field=antibody_Characteristics_generic_s',
-                         'facet.field=antibody_Factor_Value_generic_s',
                          'facet.field=genotype_Characteristics_generic_s',
                          'facet.field=genotype_Factor_Value_generic_s',
+                         'facet.field=cell_type_Characteristics_generic_s',
+                         'facet.field=cell_type_Factor_Value_generic_s',
+                         'facet.field=antibody_Characteristics_generic_s',
+                         'facet.field=antibody_Factor_Value_generic_s',
                          'facet.field=experimenter_Characteristics_generic_s',
                          'facet.field=experimenter_Factor_Value_generic_s',
                          'fl=%2A_generic_s'

diff --git a/requirements.txt b/requirements.txt
@@ -29,7 +29,7 @@ django-resumable==0.1b0
 djangorestframework==3.3.3
 djangorestframework-recursive==0.1.1
 django-rest-swagger==0.3.4
-django-storages==1.5.0
+django-storages==1.6.0
 django-supervisor==0.3.1
 django-tastypie==0.12.2
 djangular==0.3.0b1