Skip to content

removed fetching of institutions on dashboard, fixed sparse-node model root relationship #2484

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

removed fetching of institutions on dashboard, fixed sparse-node model root relationship #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions app/dashboard/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Store from '@ember-data/store';
import { A } from '@ember/array';
import Controller from '@ember/controller';
import { action, computed } from '@ember/object';
import { alias, or } from '@ember/object/computed';
Expand All @@ -11,7 +10,6 @@ import config from 'ember-osf-web/config/environment';
import $ from 'jquery';
import Media from 'ember-responsive';

import Institution from 'ember-osf-web/models/institution';
import Node from 'ember-osf-web/models/node';
import { QueryHasManyResult } from 'ember-osf-web/models/osf-model';
import User from 'ember-osf-web/models/user';
Expand Down Expand Up @@ -46,7 +44,7 @@ export default class Dashboard extends Controller {
'failedLoading-noteworthy' = false;
'failedLoading-popular' = false;

institutions: Institution[] = A([]);
// institutions: Institution[] = A([]);
nodes?: QueryHasManyResult<Node>;
noteworthy!: QueryHasManyResult<Node>;
popular!: QueryHasManyResult<Node>;
Expand All @@ -65,16 +63,16 @@ export default class Dashboard extends Controller {
async setupTask() {
this.set('filter', null);

const institutions = this.store.findAll('institution');
// const institutions = this.store.findAll('institution');

await all([
institutions,
// institutions,
taskFor(this.findNodes).perform(),
taskFor(this.getPopularAndNoteworthy).perform(popularNode, 'popular'),
taskFor(this.getPopularAndNoteworthy).perform(noteworthyNode, 'noteworthy'),
]);

this.set('institutions', institutions.toArray());
// this.set('institutions', institutions.toArray());
}

@restartableTask
Expand Down
4 changes: 2 additions & 2 deletions app/models/sparse-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export default class SparseNodeModel extends OsfModel {
@belongsTo('node', { inverse: 'children' })
parent!: AsyncBelongsTo<NodeModel> & NodeModel;

@belongsTo('node', { inverse: null })
root!: AsyncBelongsTo<NodeModel> & NodeModel;
@belongsTo('sparse-node', { inverse: null })
root!: AsyncBelongsTo<SparseNodeModel> & SparseNodeModel;

@belongsTo('node', { inverse: null })
detail!: AsyncBelongsTo<NodeModel> & NodeModel;
Expand Down
Loading