global: small fixes

Signed-off-by: Dinos Kousidis <[email protected]>
ekoi · Jan 17, 2018 · 91c95bb · 91c95bb
1 parent 80f64fc
commit 91c95bb
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 44 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/b2share/modules/files/ext.py b/b2share/modules/files/ext.py
@@ -26,7 +26,6 @@
 from __future__ import absolute_import, print_function
 
 from .cli import files as files_cmd
-# from .views import blueprint
 
 
 class B2ShareFiles(object):
@@ -41,7 +40,6 @@ def init_app(self, app):
         """Flask application initialization."""
         self.init_config(app)
         app.cli.add_command(files_cmd)
-        # app.register_blueprint(blueprint)
         app.extensions['b2share-files'] = self
 
     def init_config(self, app):

diff --git a/b2share/modules/files/storage.py b/b2share/modules/files/storage.py
@@ -29,7 +29,7 @@
 
 
 class B2ShareFileStorage(PyFSFileStorage):
-    """Base class for B2Share file storage interface to files."""
+    """Class for B2Share file storage interface to files."""
     def send_file(self, filename, mimetype=None, restricted=True,
                   checksum=None, trusted=False, chunk_size=None):
         """Redirect to the actual pid of the file."""

diff --git a/tests/b2share_unit_tests/files/test_b2share_storage.py b/tests/b2share_unit_tests/files/test_b2share_storage.py
@@ -1,13 +1,3 @@
-# create new storage class for invenio-files-rest
-# which disables almost everything but redirects when getting a file
-# (send_file)
-
-# create the FileInstance with the planted PID
-# - and the required ObjectVersion
-
-# then add the REST API enable the blueprints
-# - > access it and see if it redirects
-
 # -*- coding: utf-8 -*-
 #
 # This file is part of EUDAT B2Share.

diff --git a/webui/src/components/editfiles.jsx b/webui/src/components/editfiles.jsx
@@ -522,12 +522,9 @@ export const EditFiles = React.createClass({
         var external_pids = metadata.external_pids;
         for(var i=0; i < this.props.files.length; i++){
             var _file = this.props.files[i];
-            console.log('_file:', _file);
             if(Boolean(external_pids)){
                 for(var j=0; j < external_pids.length; j++){
                     var external_pid = external_pids[j];
-                    console.log('file key match: ', _file.key);
-                    console.log('external_pid key match: ', external_pid.key);
                     if(_file.key == external_pid.key){
                         _file.b2safe = true;
                     }
@@ -697,7 +694,6 @@ export const FileRecordRow = React.createClass({
     render() {
         let file = this.props.file;
         file = file.toJS ? file.toJS() : file;
-        // const downloads = this.state.downloads[file.key || file.name] || 0;
         const allowDetails = file.checksum || file.ePIC_PID;
         const stateMark = allowDetails ? (this.state.open ? "down":"right") : "";
 

diff --git a/webui/src/components/editrecord.jsx b/webui/src/components/editrecord.jsx
@@ -391,7 +391,7 @@ const EditRecord = React.createClass({
         const plugins = schema.getIn(['b2share', 'plugins']);
 
         function renderBigFieldTree([pid, pschema]) {
-             const datapath = schemaID ? ['community_specific', schemaID, pid] : [pid];
+            const datapath = schemaID ? ['community_specific', schemaID, pid] : [pid];
             const f = this.renderFieldTree(pid, pschema, datapath);
             if (!f) {
                 return false;

diff --git a/webui/src/data/server.js b/webui/src/data/server.js
@@ -889,25 +889,6 @@ class ServerCache {
         });
     }
 
-    // Get the number of downloads for each file
-    getFileStatistics(bucketID, successFn) {
-        var data = {
-            "fileDownloads": {
-                "stat": "bucket-file-download-total",
-                "params": {
-                    "bucket_id": bucketID,
-                }
-            }
-        };
-        ajaxPost({
-            url: apiUrls.statistics(),
-            params: data,
-            successFn: response => {
-                successFn(response.fileDownloads);
-            },
-        });
-    }
-
     getB2HandlePidInfo(file_pid, successFn){
         ajaxGet({
             url: apiUrls.b2handle_pid_info(file_pid),