[derived-versions][xs]: fixed redirects for derived versions of tabul…

…ar resources * after changes in the backend (assembler) paths for derived versions of resources have changed. This commit addresses fixes for those changes so frontend works as expected.
datopian · Sep 18, 2017 · 3be7ce0 · 3be7ce0
1 parent cb52f85
commit 3be7ce0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/routes/index.js b/routes/index.js
@@ -279,7 +279,7 @@ module.exports = function () {
       resource = resource.alternates.find(res => extension.substring(1) === res.format)
     }
 
-    res.redirect(`${normalizedDp.path}/${resource.path}`)
+    res.redirect(`${resource.path}`)
   })
 
   router.get('/search', async (req, res) => {

diff --git a/tests/fixtures/demo-package/datapackage.json b/tests/fixtures/demo-package/datapackage.json
@@ -35,7 +35,7 @@
       "hash": "b0503f17cecc447d595aa9a7f0f4455b",
       "mediatype": "text/csv",
       "name": "demo-resource_csv",
-      "path": "data/csv/data/demo-resource.csv",
+      "path": "http://localhost:4000/admin/demo-package:demo-resource_csv/data/demo-resource_csv.csv",
       "rowcount": 651,
       "schema": {
         "fields": [
@@ -90,7 +90,7 @@
       "hash": "e68e179acaa858b500a02ab80512efcd",
       "mediatype": "text/csv",
       "name": "demo-resource_json",
-      "path": "data/json/data/demo-resource.json",
+      "path": "http://localhost:4000/admin/demo-package:demo-resource_json/data/demo-resource_json.json",
       "rowcount": 651,
       "schema": {
         "fields": [

diff --git a/tests/routes.test.js b/tests/routes.test.js
@@ -164,19 +164,19 @@ test('Downloading a resource by name or index works for csv and json', async t =
   let res = await request(app)
     .get('/admin/demo-package/r/demo-resource.csv')
   t.is(res.statusCode, 302)
-  t.true(res.header.location.includes('/latest/data/csv/data/demo-resource.csv'))
+  t.true(res.header.location.includes('data/demo-resource_csv.csv'))
   res = await request(app)
     .get('/admin/demo-package/r/demo-resource.json')
   t.is(res.statusCode, 302)
-  t.true(res.header.location.includes('/latest/data/json/data/demo-resource.json'))
+  t.true(res.header.location.includes('data/demo-resource_json.json'))
   res = await request(app)
     .get('/admin/demo-package/r/0.csv')
   t.is(res.statusCode, 302)
-  t.true(res.header.location.includes('/latest/data/csv/data/demo-resource.csv'))
+  t.true(res.header.location.includes('data/demo-resource_csv.csv'))
   res = await request(app)
     .get('/admin/demo-package/r/0.json')
   t.is(res.statusCode, 302)
-  t.true(res.header.location.includes('/latest/data/json/data/demo-resource.json'))
+  t.true(res.header.location.includes('data/demo-resource_json.json'))
 })
 
 test('Redirects to old.datahub.io', async t => {