Move computed collections to kredits service

They should be available from any place with access to the service.
This commit is contained in:
2019-04-27 17:33:25 +01:00
parent 24a3d8beb4
commit afa09f4b8f
2 changed files with 18 additions and 14 deletions
+3 -13
View File
@@ -1,7 +1,6 @@
import Controller from '@ember/controller'; import Controller from '@ember/controller';
import { alias, filter, sort } from '@ember/object/computed'; import { alias, filter, sort } from '@ember/object/computed';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
export default Controller.extend({ export default Controller.extend({
kredits: service(), kredits: service(),
@@ -15,21 +14,12 @@ export default Controller.extend({
contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'), contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'),
contributions: alias('kredits.contributions'), contributions: alias('kredits.contributions'),
contributionsSorting: Object.freeze(['id:desc']), contributionsUnconfirmed: alias('kredits.contributionsUnconfirmed'),
contributionsConfirmed: alias('kredits.contributionsConfirmed'),
contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
return this.contributions.filter(contribution => {
return contribution.confirmedAt > this.currentBlock;
});
}),
contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
return this.contributions.filter(contribution => {
return contribution.confirmedAt <= this.currentBlock;
});
}),
contributionsUnconfirmedSorted: sort('contributionsUnconfirmed', 'contributionsSorting'), contributionsUnconfirmedSorted: sort('contributionsUnconfirmed', 'contributionsSorting'),
contributionsConfirmedSorted: sort('contributionsConfirmed', 'contributionsSorting'), contributionsConfirmedSorted: sort('contributionsConfirmed', 'contributionsSorting'),
contributionsSorting: Object.freeze(['id:desc']),
actions: { actions: {
+15 -1
View File
@@ -20,15 +20,29 @@ export default Service.extend({
currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded. currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
currentUser: null, currentUser: null,
contributors: null, contributors: null,
proposals: null,
contributions: null, contributions: null,
proposals: null,
currentUserIsContributor: notEmpty('currentUser'), currentUserIsContributor: notEmpty('currentUser'),
currentUserIsCore: alias('currentUser.isCore'), currentUserIsCore: alias('currentUser.isCore'),
hasAccounts: notEmpty('currentUserAccounts'), hasAccounts: notEmpty('currentUserAccounts'),
accountNeedsUnlock: computed('currentUserAccounts', function() { accountNeedsUnlock: computed('currentUserAccounts', function() {
return this.currentUserAccounts && isEmpty(this.currentUserAccounts); return this.currentUserAccounts && isEmpty(this.currentUserAccounts);
}), }),
contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
return this.contributions.filter(contribution => {
return contribution.confirmedAt > this.currentBlock;
});
}),
contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
return this.contributions.filter(contribution => {
return contribution.confirmedAt <= this.currentBlock;
});
}),
init () { init () {
this._super(...arguments); this._super(...arguments);
this.set('contributors', []); this.set('contributors', []);