mirror of
https://github.com/datahub-project/datahub.git
synced 2025-10-14 18:38:27 +00:00
deletes unused datasets.page route. deletes unused datasets route action. removes non-detailview markup from datasets template
This commit is contained in:
parent
80d493938e
commit
dd5cd6e7e2
@ -56,10 +56,6 @@ AppRouter.map(function() {
|
|||||||
path: '/*wildcard'
|
path: '/*wildcard'
|
||||||
});
|
});
|
||||||
this.route('datasets', function() {
|
this.route('datasets', function() {
|
||||||
this.route('page', {
|
|
||||||
path: '/page/:page'
|
|
||||||
});
|
|
||||||
|
|
||||||
this.route('dataset', {
|
this.route('dataset', {
|
||||||
path: '/:dataset_id'
|
path: '/:dataset_id'
|
||||||
});
|
});
|
||||||
|
@ -1,30 +1,6 @@
|
|||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
|
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
|
||||||
|
|
||||||
|
const { Route } = Ember;
|
||||||
|
|
||||||
const listURL = '/api/v1/list/datasets`';
|
export default Route.extend(AuthenticatedRouteMixin);
|
||||||
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);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
@ -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);
|
|
@ -1,41 +1,3 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
{{#unless detailview}}
|
|
||||||
<div class="search-pagination">
|
|
||||||
<ul class="pager">
|
|
||||||
{{#unless first}}
|
|
||||||
<li class="previous">
|
|
||||||
{{#if urn}}
|
|
||||||
{{#link-to 'datasets.name.subpage' currentName previousPage
|
|
||||||
(query-params urn=urn)}}
|
|
||||||
← Prev
|
|
||||||
{{/link-to}}
|
|
||||||
{{else}}
|
|
||||||
{{#link-to 'datasets.page' previousPage}}
|
|
||||||
← Prev
|
|
||||||
{{/link-to}}
|
|
||||||
{{/if}}
|
|
||||||
</li>
|
|
||||||
{{/unless}}
|
|
||||||
<li>
|
|
||||||
{{ model.data.count }} datasets - page {{ model.data.page }}
|
|
||||||
of {{ model.data.totalPages }}
|
|
||||||
</li>
|
|
||||||
{{#unless last}}
|
|
||||||
<li class="next">
|
|
||||||
{{#if urn}}
|
|
||||||
{{#link-to 'datasets.name.subpage' currentName nextPage
|
|
||||||
(query-params urn=urn)}}
|
|
||||||
Next →
|
|
||||||
{{/link-to}}
|
|
||||||
{{else}}
|
|
||||||
{{#link-to 'datasets.page' nextPage}}
|
|
||||||
Next →
|
|
||||||
{{/link-to}}
|
|
||||||
{{/if}}
|
|
||||||
</li>
|
|
||||||
{{/unless}}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{{/unless}}
|
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
{{datasets/containers/datasets-list}}
|
|
||||||
{{outlet}}
|
|
Loading…
x
Reference in New Issue
Block a user