From 583f0ae8ffeb74dc0bfaa3f17f65fa6b07626475 Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Tue, 19 Sep 2017 17:26:05 -0700 Subject: [PATCH] removes unused dataset routes datasets.name, datasets.name.subpage and controller: datasets.name.subpage --- .../app/controllers/datasets/name/subpage.js | 6 -- wherehows-web/app/router.js | 12 --- wherehows-web/app/routes/datasets/name.js | 34 ------- .../app/routes/datasets/name/subpage.js | 88 ------------------- wherehows-web/app/templates/datasets/name.hbs | 1 - .../app/templates/datasets/name/subpage.hbs | 1 - 6 files changed, 142 deletions(-) delete mode 100644 wherehows-web/app/controllers/datasets/name/subpage.js delete mode 100644 wherehows-web/app/routes/datasets/name.js delete mode 100644 wherehows-web/app/routes/datasets/name/subpage.js delete mode 100644 wherehows-web/app/templates/datasets/name.hbs delete mode 100644 wherehows-web/app/templates/datasets/name/subpage.hbs diff --git a/wherehows-web/app/controllers/datasets/name/subpage.js b/wherehows-web/app/controllers/datasets/name/subpage.js deleted file mode 100644 index 8887d20191..0000000000 --- a/wherehows-web/app/controllers/datasets/name/subpage.js +++ /dev/null @@ -1,6 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - queryParams: ['urn'], - urn: null -}); diff --git a/wherehows-web/app/router.js b/wherehows-web/app/router.js index bf9e19cc6e..e001d3982e 100644 --- a/wherehows-web/app/router.js +++ b/wherehows-web/app/router.js @@ -59,18 +59,6 @@ AppRouter.map(function() { this.route('dataset', { path: '/:dataset_id' }); - - this.route( - 'name', - { - path: '/name/:name' - }, - function() { - this.route('subpage', { - path: '/page/:page' - }); - } - ); }); this.route('search'); this.route('metrics', function() { diff --git a/wherehows-web/app/routes/datasets/name.js b/wherehows-web/app/routes/datasets/name.js deleted file mode 100644 index 9222311076..0000000000 --- a/wherehows-web/app/routes/datasets/name.js +++ /dev/null @@ -1,34 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - controllerName: 'datasets', - - setupController: function (controller, model) { - controller.set('currentName', model.name); - }, - - actions: { - getDatasets: function () { - var listUrl = '/api/v1/list/datasets'; - - $.get(listUrl, function (data) { - if (data && data.status == "ok") { - // renderDatasetListView(data.nodes); - } - }); - - var url = '/api/v1/datasets?size=10&page=' + this.controller.get('model.data.page'); - currentTab = 'Datasets'; - - updateActiveTab(); - - $.get(url, data => { - if (data && data.status == "ok") { - this.controller.set('model', data); - this.controller.set('urn', null); - this.controller.set('detailview', false); - } - }); - } - } -}); diff --git a/wherehows-web/app/routes/datasets/name/subpage.js b/wherehows-web/app/routes/datasets/name/subpage.js deleted file mode 100644 index b719efed0d..0000000000 --- a/wherehows-web/app/routes/datasets/name/subpage.js +++ /dev/null @@ -1,88 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - // maintains backwards compatibility with legacy code - // TODO: [DSS-6122] refactor so this may not be required - controllerName: 'datasets', - - setupController: function (controller, param) { - if (!this.controller) - return; - - var listUrl = 'api/v1/list/datasets?urn=' + param.urn; - var addSlash = false; - if (param.urn && (param.urn[param.urn.length - 1] != '/')) { - addSlash = true; - } - if (addSlash) { - listUrl += '/'; - } - $.get(listUrl, function (data) { - if (data && data.status == "ok") { - // renderDatasetListView(data.nodes); - } - }); - var url = 'api/v1/datasets?size=10&page=' + param.page + '&urn=' + param.urn; - if (addSlash) { - url += '/'; - } - currentTab = 'Datasets'; - updateActiveTab(); - var breadcrumbs = [{"title": "DATASETS_ROOT", "urn": "page/1"}]; - var urn = param.urn.replace("://", ""); - var b = urn.split('/'); - for (var i = 0; i < b.length; i++) { - if (i === 0) { - breadcrumbs.push({ - title: b[i], - urn: "name/" + b[i] + "/page/1?urn=" + b[i] + ':///' - }) - } else { - var urn = b.slice(0, (i + 1)).join('/'); - breadcrumbs.push({ - title: b[i], - urn: "name/" + b[i] + "/page/1?urn=" + param.urn.split('/').splice(0, i + 3).join('/') - }) - } - } - var watcherEndpoint = "/api/v1/urn/watch?urn=" + param.urn; - if (addSlash) { - watcherEndpoint += '/'; - } - $.get(watcherEndpoint, data => { - if (data.id && data.id !== 0) { - this.controller.set('urnWatched', true) - this.controller.set('urnWatchedId', data.id) - } else { - this.controller.set('urnWatched', false) - this.controller.set('urnWatchedId', 0) - } - }); - - $.get(url, data => { - if (data && data.status == "ok") { - this.controller.set('model', data); - this.controller.set('urn', param.urn); - this.controller.set('breadcrumbs', breadcrumbs); - this.controller.set('detailview', false); - } - }); - }, - actions: { - getDatasets: function () { - var url = 'api/v1/datasets?size=10&page=' + - this.controller.get('model.data.page') + - '&urn=' + - this.controller.get('urn'); - currentTab = 'Datasets'; - updateActiveTab(); - $.get(url, data => { - if (data && data.status == "ok") { - this.controller.set('model', data); - this.controller.set('urn', this.controller.get('urn')); - this.controller.set('detailview', false); - } - }); - } - } -}); diff --git a/wherehows-web/app/templates/datasets/name.hbs b/wherehows-web/app/templates/datasets/name.hbs deleted file mode 100644 index c24cd68950..0000000000 --- a/wherehows-web/app/templates/datasets/name.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}} diff --git a/wherehows-web/app/templates/datasets/name/subpage.hbs b/wherehows-web/app/templates/datasets/name/subpage.hbs deleted file mode 100644 index c24cd68950..0000000000 --- a/wherehows-web/app/templates/datasets/name/subpage.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}}