fix angular table

daiquiri/core/static/core/js/table.js

@@ -9,13 +9,13 @@ angular.module('core')
         scope: {
             'rowsUrl': '@',
             'columnsUrl': '@',
-            'fileBaseUrl': '@',
+            'filesUrl': '@',
             'params': '=',
             'pageSizes': '='
         },
         link: function(scope, element, attrs) {
             scope.table = TableService;
-            scope.table.init(scope.rowsUrl, scope.columnsUrl, scope.fileBaseUrl, scope.params, scope.pageSizes);
+            scope.table.init(scope.rowsUrl, scope.columnsUrl, scope.filesUrl, scope.params, scope.pageSizes);
 
             // refresh the tooltips everytime a new set of columns is fetched
             scope.$watch(function() {
@@ -104,7 +104,7 @@ angular.module('core')
         modal: {},
     };
 
-    service.init = function(rows_url, columns_url, file_base_url, params, page_sizes) {
+    service.init = function(rows_url, columns_url, files_url, params, page_sizes) {
         service.ready = false;
 
         // set up resources
@@ -116,8 +116,8 @@ angular.module('core')
         }
 
         // setup file base url
-        if (angular.isDefined(file_base_url)) {
-            service.file_base_url = baseurl + file_base_url
+        if (angular.isDefined(files_url)) {
+            service.file_base_url = baseurl + files_url + '?search=';
         }
 
         // add params from the dom to service.params

daiquiri/files/tests/test_views.py

@@ -1,12 +1,9 @@
-import os
-
-from django.conf import settings
 from django.test import TestCase
 
 from test_generator.views import TestViewMixin
 
 
-class ServeViewTestCase(TestCase):
+class FilesViewTestCase(TestCase):
 
     fixtures = (
         'auth.json',
@@ -21,7 +18,7 @@ class ServeViewTestCase(TestCase):
     )
 
 
-class InternalFileTests(TestViewMixin, ServeViewTestCase):
+class InternalFileTests(TestViewMixin, FilesViewTestCase):
 
     url_names = {
         'list_view': 'files:file'
@@ -35,11 +32,11 @@ class InternalFileTests(TestViewMixin, ServeViewTestCase):
 
     def _test_get(self, username):
         self.assert_list_view(username, kwargs={
-            'file_path': 'www/'
+            'file_path': 'html/'
         })
 
 
-class PrivateFileTests(TestViewMixin, ServeViewTestCase):
+class PrivateFileTests(TestViewMixin, FilesViewTestCase):
 
     url_names = {
         'list_view': 'files:file'

daiquiri/files/tests/test_viewsets.py

@@ -3,220 +3,52 @@
 from test_generator.viewsets import TestViewsetMixin
 
 
-class ServeTestCase(TestCase):
+class FilesViewsetTestCase(TestCase):
 
     fixtures = (
         'auth.json',
-        'metadata.json',
-        'jobs.json',
-        'queryjobs.json'
+        'files.json'
     )
 
     users = (
         ('admin', 'admin'),
+        ('manager', 'manager'),
         ('user', 'user'),
         ('anonymous', None),
     )
 
-    status_map = {
-        'list_viewset': {
-            'admin': 200, 'user': 403, 'anonymous': 403
-        },
-        'retrieve_viewset': {
-            'admin': 200, 'user': 403, 'anonymous': 403
-        },
-        'create_viewset': {
-            'admin': 201, 'user': 403, 'anonymous': 403
-        },
-        'update_viewset': {
-            'admin': 200, 'user': 403, 'anonymous': 403
-        },
-        'delete_viewset': {
-            'admin': 204, 'user': 403, 'anonymous': 403
-        },
-        'discover_viewset': {
-            'admin': 200, 'user': 403, 'anonymous': 403
-        },
-        'management_viewset': {
-            'admin': 200, 'user': 403, 'anonymous': 403
-        },
-        'user_viewset': {
-            'admin': 200, 'user': 200, 'anonymous': 200
-        }
-    }
 
-
-class PublicRowTests(TestViewsetMixin, ServeTestCase):
+class InternalFileTests(TestViewsetMixin, FilesViewsetTestCase):
 
     url_names = {
-        'viewset': 'serve:row'
+        'viewset': 'files:file'
     }
 
     status_map = {
         'list_viewset': {
-            'admin': 200, 'user': 200, 'anonymous': 200
+            'admin': 200, 'manager': 200, 'user': 200, 'anonymous': 404
         }
     }
 
     def _test_list_viewset(self, username):
         self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_obs',
-            'table': 'stars'
+            'search': 'index.html',
         })
 
 
-class InternalRowTests(TestViewsetMixin, ServeTestCase):
+class PrivateFileTests(TestViewsetMixin, FilesViewsetTestCase):
 
     url_names = {
-        'viewset': 'serve:row'
+        'viewset': 'files:file'
     }
 
     status_map = {
         'list_viewset': {
-            'admin': 200, 'user': 200, 'anonymous': 404
+            'admin': 404, 'manager': 200, 'user': 404, 'anonymous': 404
         }
     }
 
     def _test_list_viewset(self, username):
         self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_sim',
-            'table': 'particles'
-        })
-
-
-class UserRowTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:row'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 404, 'user': 200, 'anonymous': 404
-        }
-    }
-
-    def _test_list_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_user_user',
-            'table': 'test'
-        })
-
-
-class NotFoundRowTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:row'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 404, 'user': 404, 'anonymous': 404
-        }
-    }
-
-    def _test_non_existing_database_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'non_existing',
-            'table': 'stars'
-        })
-
-    def _test_non_existing_table_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_obs',
-            'table': 'non_existing'
-        })
-
-    def _test_non_existing_user_table_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_user_user',
-            'table': 'non_existing'
-        })
-
-
-class PublicColumnTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:column'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 200, 'user': 200, 'anonymous': 200
-        }
-    }
-
-    def _test_list_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_obs',
-            'table': 'stars'
-        })
-
-
-class InternalColumnTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:column'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 200, 'user': 200, 'anonymous': 404
-        }
-    }
-
-    def _test_list_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_sim',
-            'table': 'particles'
-        })
-
-
-class UserColumnTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:column'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 404, 'user': 200, 'anonymous': 404
-        }
-    }
-
-    def _test_list_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_user_user',
-            'table': 'test'
-        })
-
-
-class NotFoundColumnTests(TestViewsetMixin, ServeTestCase):
-
-    url_names = {
-        'viewset': 'serve:column'
-    }
-
-    status_map = {
-        'list_viewset': {
-            'admin': 404, 'user': 404, 'anonymous': 404
-        }
-    }
-
-    def _test_non_existing_database_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'non_existing',
-            'table': 'stars'
-        })
-
-    def _test_non_existing_table_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_data_obs',
-            'table': 'non_existing'
-        })
-
-    def _test_non_existing_user_table_viewset(self, username):
-        self.assert_list_viewset(username, query_params={
-            'database': 'daiquiri_user_user',
-            'table': 'non_existing'
+            'search': 'image_00.jpg',
         })

daiquiri/files/utils.py

@@ -13,7 +13,11 @@ def get_file(user, file_path):
 
     results = set()
     for directory in directories:
-        absolute_file_path = os.path.join(directory.path, file_path)
+        # normalize the file path so that /a/b/c and b/c/d/e become /a/b/c and d/e
+        normalized_file_path = normalize_file_path(directory.path, file_path)
+
+        # join directory_path and file_path so that it becomes /a/b/c/d/e
+        absolute_file_path = os.path.join(directory.path, normalized_file_path)
 
         # check if absolute_file_path is actually a file
         if os.path.isfile(absolute_file_path):
@@ -40,7 +44,7 @@ def search_file(user, file_path):
 
             # join directory_path and file_path so that it becomes /a/b/c/d/e
             absolute_file_path = os.path.join(directory_path, normalized_file_path)
-            print(os.path.isfile(absolute_file_path))
+
             # check if absolute_file_path is actually a file
             if os.path.isfile(absolute_file_path):
                 results.add(absolute_file_path)

daiquiri/query/static/query/js/services/query.js

@@ -178,7 +178,7 @@ app.factory('QueryService', ['$resource', '$injector', '$q', '$filter', 'Polling
         service.form = null;
         service.fetchJob(job).then(function() {
             if (service.job.phase == 'COMPLETED') {
-                service.table = TableService.init('serve/api/rows/', 'serve/api/columns/', 'serve/file/', {
+                service.table = TableService.init('serve/api/rows/', 'serve/api/columns/', 'files/api/files/', {
                     database: service.job.database_name,
                     table: service.job.table_name
                 });

daiquiri/serve/templates/serve/table.html

@@ -33,7 +33,7 @@ <h1>{{ database }}.{{ table }}</h1>
     <div daiquiri-table
         data-rows-url="serve/api/rows/"
         data-columns-url="serve/api/columns/"
-        data-file-base-url="serve/file/"
+        data-files-url="files/api/files/"
         data-params="{database: '{{ database }}', table: '{{ table }}'}">
     </div>