Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFR] infinitePagination now resolve reference fields #709

Merged
merged 2 commits into from
Sep 30, 2015
Merged

[RFR] infinitePagination now resolve reference fields #709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d744982
Fixes #624
djhi Sep 25, 2015
21e3b64
`define` to `export default`
djhi Sep 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 94 additions & 82 deletions src/javascripts/ng-admin/Crud/list/ListController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,94 @@
/*global define*/

define(function () {
'use strict';

var ListController = function ($scope, $stateParams, $location, $anchorScroll, ReadQueries, progression, view, dataStore, totalItems) {
this.$scope = $scope;
this.$stateParams = $stateParams;
this.$location = $location;
this.$anchorScroll = $anchorScroll;
this.ReadQueries = ReadQueries;
this.progression = progression;
this.view = view;
this.entity = view.getEntity();
this.loadingPage = false;
this.search = $stateParams.search;
this.dataStore = dataStore;
this.fields = view.fields();
this.listActions = view.listActions();
this.totalItems = totalItems;
this.page = $stateParams.page || 1;
this.infinitePagination = this.view.infinitePagination();
this.nextPageCallback = this.nextPage.bind(this);
this.setPageCallback = this.setPage.bind(this);
this.sortField = this.$stateParams.sortField || this.view.getSortFieldName();
this.sortDir = this.$stateParams.sortDir || this.view.sortDir();

if ($scope.selectionUpdater) {
$scope.selection = $scope.selection || [];
$scope.$watch('selection', $scope.selectionUpdater);
} else {
$scope.selection = null;
}


$scope.$on('$destroy', this.destroy.bind(this));
};

ListController.prototype.nextPage = function (page) {
if (this.loadingPage) {
return;
}

let view = this.view,
dataStore = this.dataStore;

this.progression.start();

this.ReadQueries
.getAll(view, page, this.search, this.sortField, this.sortDir)
.then(response => {
this.progression.done();
var references = view.getReferences();

view.mapEntries(response.data)
.map(entry => {
dataStore.fillReferencesValuesFromEntry(entry, references, true);
dataStore.addEntry(this.entity.uniqueId, entry);
});

this.loadingPage = false;
});
};

ListController.prototype.setPage = function (number) {
this.$location.search('page', number);
this.$anchorScroll(0);
};


ListController.prototype.destroy = function () {
this.$scope = undefined;
this.$stateParams = undefined;
this.$location = undefined;
this.$anchorScroll = undefined;
this.dataStore = undefined;
};

ListController.$inject = ['$scope', '$stateParams', '$location', '$anchorScroll', 'ReadQueries', 'progression', 'view', 'dataStore', 'totalItems'];

return ListController;
});
import Entry from 'admin-config/lib/Entry';

var ListController = function ($scope, $stateParams, $location, $anchorScroll, ReadQueries, progression, view, dataStore, totalItems) {
this.$scope = $scope;
this.$stateParams = $stateParams;
this.$location = $location;
this.$anchorScroll = $anchorScroll;
this.ReadQueries = ReadQueries;
this.progression = progression;
this.view = view;
this.entity = view.getEntity();
this.loadingPage = false;
this.search = $stateParams.search;
this.dataStore = dataStore;
this.fields = view.fields();
this.listActions = view.listActions();
this.totalItems = totalItems;
this.page = $stateParams.page || 1;
this.infinitePagination = this.view.infinitePagination();
this.nextPageCallback = this.nextPage.bind(this);
this.setPageCallback = this.setPage.bind(this);
this.sortField = this.$stateParams.sortField || this.view.getSortFieldName();
this.sortDir = this.$stateParams.sortDir || this.view.sortDir();

if ($scope.selectionUpdater) {
$scope.selection = $scope.selection || [];
$scope.$watch('selection', $scope.selectionUpdater);
} else {
$scope.selection = null;
}


$scope.$on('$destroy', this.destroy.bind(this));
};

ListController.prototype.nextPage = function (page) {
if (this.loadingPage) {
return;
}

let view = this.view,
dataStore = this.dataStore;

this.progression.start();

const references = view.getReferences();
let data;

this.ReadQueries
.getAll(view, page, this.search, this.sortField, this.sortDir)
.then(response => {
data = response.data;
return this.ReadQueries.getReferenceData(view.fields(), data);
})
.then((referenceData) => {
this.progression.done();

for (var name in referenceData) {
Entry.createArrayFromRest(
referenceData[name],
[references[name].targetField()],
references[name].targetEntity().name(),
references[name].targetEntity().identifier().name()
).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry))
}
})
.then(() => {
view.mapEntries(data)
.map(entry => {
dataStore.fillReferencesValuesFromEntry(entry, references, true);
dataStore.addEntry(this.entity.uniqueId, entry);
});

this.loadingPage = false;
});
};

ListController.prototype.setPage = function (number) {
this.$location.search('page', number);
this.$anchorScroll(0);
};


ListController.prototype.destroy = function () {
this.$scope = undefined;
this.$stateParams = undefined;
this.$location = undefined;
this.$anchorScroll = undefined;
this.dataStore = undefined;
};

ListController.$inject = ['$scope', '$stateParams', '$location', '$anchorScroll', 'ReadQueries', 'progression', 'view', 'dataStore', 'totalItems'];

export default ListController;