diff --git a/wherehows-web/app/router.js b/wherehows-web/app/router.js index 07e89109e1..bf9e19cc6e 100644 --- a/wherehows-web/app/router.js +++ b/wherehows-web/app/router.js @@ -56,10 +56,6 @@ AppRouter.map(function() { path: '/*wildcard' }); this.route('datasets', function() { - this.route('page', { - path: '/page/:page' - }); - this.route('dataset', { path: '/:dataset_id' }); diff --git a/wherehows-web/app/routes/datasets.js b/wherehows-web/app/routes/datasets.js index 94c43c0a1a..a5f4fc560e 100644 --- a/wherehows-web/app/routes/datasets.js +++ b/wherehows-web/app/routes/datasets.js @@ -1,30 +1,6 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; +const { Route } = Ember; -const listURL = '/api/v1/list/datasets`'; -const datasetsPageBaseURL = '/api/v1/datasets?size=10&page='; - -export default Ember.Route.extend(AuthenticatedRouteMixin, { - actions: { - getDatasets: function () { - const datasetsPageURL = `${datasetsPageBaseURL}${this.controller.get('model.data.page')}`; - - Ember.$.get(listURL, function (data) { - if (data && data.status == "ok") { - // renderDatasetListView(data.nodes); - } - }); - - currentTab = 'Datasets'; - updateActiveTab(); - Ember.$.get(datasetsPageURL, data => { - if (data && data.status == "ok") { - this.controller.set('model', data); - this.controller.set('urn', null); - this.controller.set('detailview', false); - } - }); - } - } -}); \ No newline at end of file +export default Route.extend(AuthenticatedRouteMixin); diff --git a/wherehows-web/app/routes/datasets/page.js b/wherehows-web/app/routes/datasets/page.js deleted file mode 100644 index 854e01226c..0000000000 --- a/wherehows-web/app/routes/datasets/page.js +++ /dev/null @@ -1,16 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -import route from 'ember-redux/route'; -import { lazyRequestPagedDatasets } from 'wherehows-web/actions/datasets'; - -const { - Route -} = Ember; - -// TODO: DSS-6581 Create URL retrieval module -const datasetsPageBaseURL = '/api/v1/datasets?size=10&page='; -const DatasetsPageRoute = Route.extend(AuthenticatedRouteMixin); - -export default route({ - model: (dispatch, { page = 1 }) => dispatch(lazyRequestPagedDatasets({ baseURL, page })) -})(DatasetsPageRoute); diff --git a/wherehows-web/app/templates/datasets.hbs b/wherehows-web/app/templates/datasets.hbs index 6c71e0f7ea..3d9e5c942a 100644 --- a/wherehows-web/app/templates/datasets.hbs +++ b/wherehows-web/app/templates/datasets.hbs @@ -1,41 +1,3 @@