user/files -> files; Not sure about csv (#2007)

refinery-platform · Aug 18, 2017 · c2e7c2d · c2e7c2d
1 parent afc5e93
commit c2e7c2d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/refinery/ui/source/js/dashboard/views/launch-pad.html b/refinery/ui/source/js/dashboard/views/launch-pad.html
@@ -89,7 +89,7 @@ <h3>
             <div>
               <span>
                 <a
-                  href="/user/files/"
+                  href="/files/"
                   class="no-underline btn">
                   <i class="fa fa-list"></i> List
                 </a>

diff --git a/refinery/ui/source/js/user-file-browser/ctrls/user-file-browser-files-ctrl.js b/refinery/ui/source/js/user-file-browser/ctrls/user-file-browser-files-ctrl.js
@@ -30,7 +30,7 @@
       gridOptionsService.data = userFileBrowserFactory.createData(solr.nodes);
       promise.resolve();
     }, function () {
-      $log.error('/user/files/ request failed');
+      $log.error('/files/ request failed');
       promise.reject();
     });
 
@@ -55,7 +55,7 @@
           gridOptionsService.data = userFileBrowserFactory.createData(solr.nodes);
           promise.resolve();
         }, function () {
-          $log.error('/user/files/ request failed');
+          $log.error('/files/ request failed');
           promise.reject();
         });
       }
@@ -65,7 +65,7 @@
     vm.fileBrowserFilterQuery = function () {
       var params = {};
       Object.keys(userFileFiltersService).forEach(function (key) {
-        // TODO: The set of filters on /user/files does not match the filters on /data_sets2.
+        // TODO: The set of filters on /files does not match the filters on /data_sets2.
         // TODO: I don't know whether a given filter is under "Characteristics" or something else.
         // TODO: The target page doesn't load right now, even with the query,
         // TODO:     and switching between tabs loses the query.

diff --git a/refinery/ui/source/js/user-file-browser/ctrls/user-file-browser-filters-ctrl.js b/refinery/ui/source/js/user-file-browser/ctrls/user-file-browser-filters-ctrl.js
@@ -49,7 +49,7 @@
         gridOptionsService.data = userFileBrowserFactory.createData(solr.nodes);
         promise.resolve();
       }, function () {
-        $log.error('/user/files/ request failed');
+        $log.error('/files/ request failed');
         promise.reject();
       });
     };
@@ -61,7 +61,7 @@
           userFileBrowserFactory.createFilters(solr.facet_field_counts);
       promise.resolve();
     }, function () {
-      $log.error('/user/files/ request failed');
+      $log.error('/files/ request failed');
       promise.reject();
     });
   }

diff --git a/refinery/ui/source/js/user-file-browser/services/user-file.js b/refinery/ui/source/js/user-file-browser/services/user-file.js
@@ -21,7 +21,7 @@
     var characterSuffix = '_Characteristics_generic_s';
     var factorSuffix = '_Factor_Value_generic_s';
     var userFile = $resource(
-      settings.appRoot + settings.refineryApiV2 + '/user/files/',
+      settings.appRoot + settings.refineryApiV2 + '/files/',
       {},
       {
         query: {

diff --git a/refinery/ui/source/js/user-file-browser/services/user-file.spec.js b/refinery/ui/source/js/user-file-browser/services/user-file.spec.js
@@ -160,7 +160,7 @@
             .expectGET(
                 settings.appRoot +
                 settings.refineryApiV2 +
-                '/user/files/?fq=&limit=100&sort='
+                '/files/?fq=&limit=100&sort='
             ).respond(200, fakeResponse);
       });
     });

diff --git a/refinery/ui/source/js/user-file-browser/views/user-file-browser.html b/refinery/ui/source/js/user-file-browser/views/user-file-browser.html
@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="col-lg-10 col-md-10 col-sm-9" id="main-area">
-        <div><a href="/user/files.csv"><i class="fa fa-arrow-circle-o-down"></i> Download as CSV</a></div>
+        <div><a href="/files_download"><i class="fa fa-arrow-circle-o-down"></i> Download as CSV</a></div>
         <div class="m-r-1">
         <!-- Bootstrap col classes are using the window width, not our inner div.
              #table-filter has a margin-left, so do something similar on the other side -->

diff --git a/refinery/user_files_manager/tests.py b/refinery/user_files_manager/tests.py
@@ -24,7 +24,7 @@ class UserFilesAPITests(APITestCase):
     def setUp(self):
         self.factory = APIRequestFactory()
         self.view = UserFiles.as_view()
-        self.url_root = '/api/v2/user/files/'
+        self.url_root = '/api/v2/files/'
         self.user = get_anonymous_user()
 
     def test_get(self):
@@ -45,7 +45,7 @@ def test_get(self):
         response = requests.get(
             urljoin(
                 self.live_server_url,
-                'user/files/'
+                'files/'
             )
         )
         self.assertIn("All Files", response.content)

diff --git a/refinery/user_files_manager/urls.py b/refinery/user_files_manager/urls.py
@@ -6,11 +6,11 @@
 
 user_files_router = DefaultRouter()
 user_files_router.urls.extend([
-    url(r'^user/files/$', UserFiles.as_view())  # Rooted under /api/v2
+    url(r'^files/$', UserFiles.as_view())  # Rooted under /api/v2
 ])
-user_files_url = url(r'^user/files/$',
+user_files_url = url(r'^files/$',
                      'user_files_manager.views.user_files',
                      name="user_files")
-user_files_csv_url = url(r'^user/files.csv$',
+user_files_csv_url = url(r'^files_download$',
                          'user_files_manager.views.user_files_csv',
                          name="user_files_csv")