-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added user/users routes, along with components/services/translations …
…to show associated data
- Loading branch information
1 parent
538c3d8
commit e7c4488
Showing
30 changed files
with
381 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<div class="user-list" data-test-user-list ...attributes> | ||
<table> | ||
<thead> | ||
<tr> | ||
<th class="text-left" colspan="1"> | ||
{{t "general.id"}} | ||
</th> | ||
<th class="text-left" colspan="1"> | ||
{{t "general.fullName"}} | ||
</th> | ||
<th class="text-left" colspan="1"> | ||
{{t "general.email"}} | ||
</th> | ||
<th class="text-left" colspan="1"> | ||
<FaIcon @icon="shield" /> | ||
</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
{{#each @users as |user|}} | ||
<tr data-test-user> | ||
<td class="text-left" colspan="1" data-test-id> | ||
{{user.id}} | ||
</td> | ||
<td class="text-left" colspan="1" data-test-full-name> | ||
<LinkTo @route="user" @model={{user}} data-test-user-link> | ||
<UserNameInfo @user={{user}} /> | ||
</LinkTo> | ||
</td> | ||
<td class="text-left" colspan="1" data-test-email> | ||
{{user.email}} | ||
</td> | ||
<td class="text-left" colspan="1" data-test-root> | ||
{{#if user.root}} | ||
<FaIcon @icon="shield" /> | ||
{{/if}} | ||
</td> | ||
</tr> | ||
{{/each}} | ||
</tbody> | ||
</table> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<div class="user-profile" data-test-user-profile ...attributes> | ||
<h1 class="user-display-name"> | ||
<UserNameInfo @user={{@user}} /> | ||
</h1> | ||
<p>{{@user.email}}</p> | ||
<p>{{if @user.root "Admin" "User"}}</p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import Route from '@ember/routing/route'; | ||
import { service } from '@ember/service'; | ||
|
||
export default class UserRoute extends Route { | ||
@service dataLoader; | ||
|
||
model(params) { | ||
return this.dataLoader.loadUserProfile(params.user_id); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import Route from '@ember/routing/route'; | ||
import { service } from '@ember/service'; | ||
|
||
export default class UsersRoute extends Route { | ||
@service store; | ||
|
||
model() { | ||
return this.store.query('user', { sort: 'id' }); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<h2> | ||
<LinkTo @route="users">{{t "general.users"}}</LinkTo> {{t "general.gt"}} {{t "general.user"}} | ||
</h2> | ||
<UserProfile @user={{@model}} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<h2>{{t "layout.headUsers"}}</h2> | ||
{{#if (gt @model.length 0)}} | ||
<UserList @users={{@model}} /> | ||
{{else}} | ||
<span class="no-results"> | ||
{{t "errors.noResultsFound"}} | ||
</span> | ||
{{/if}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
packages/frontend/tests/integration/components/user-list-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupRenderingTest } from 'frontend/tests/helpers'; | ||
import { render } from '@ember/test-helpers'; | ||
import { hbs } from 'ember-cli-htmlbars'; | ||
import { component } from 'frontend/tests/pages/components/user-list'; | ||
|
||
module('Integration | Component | user-list', function (hooks) { | ||
setupRenderingTest(hooks); | ||
|
||
test('it renders', async function (assert) { | ||
// const user1 = this.server.create('user', { | ||
// firstName: 'Aardvark', | ||
// lastName: 'Anteater', | ||
// displayName: 'Aardy A', | ||
// email: 'aardvark@test.edu', | ||
// root: false, | ||
// }); | ||
// const user2 = this.server.create('user', { | ||
// firstName: 'Bennifred', | ||
// lastName: 'Bunchford', | ||
// displayName: 'Benny B', | ||
// email: 'bbunchford@test.edu', | ||
// root: false, | ||
// }); | ||
|
||
// const userModel1 = await this.owner.lookup('service:store').findRecord('user', user1.id); | ||
// const userModel2 = await this.owner.lookup('service:store').findRecord('user', user2.id); | ||
// this.set('users', [userModel1, userModel2]); | ||
|
||
// await render(hbs`<UserList @users={{this.users}} />`); | ||
|
||
await render(hbs`<UserList />`); | ||
|
||
assert.strictEqual(component.users.length, 0); | ||
}); | ||
}); |
31 changes: 31 additions & 0 deletions
31
packages/frontend/tests/integration/components/user-name-info-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupRenderingTest } from 'frontend/tests/helpers'; | ||
import { render } from '@ember/test-helpers'; | ||
import { hbs } from 'ember-cli-htmlbars'; | ||
import { component } from 'rs-common/page-objects/components/user-name-info'; | ||
|
||
module('Integration | Component | user-name-info', function (hooks) { | ||
setupRenderingTest(hooks); | ||
|
||
test('it renders', async function (assert) { | ||
// const user = this.server.create('user'); | ||
// const userModel = await this.owner.lookup('service:store').findRecord('user', user.id); | ||
// this.set('user', userModel); | ||
// await render(hbs`<UserNameInfo @user={{this.user}} />`); | ||
// assert.strictEqual(component.fullName, '0 guy M. Mc0son'); | ||
|
||
await render(hbs`<UserNameInfo />`); | ||
assert.strictEqual(component.fullName, ''); | ||
}); | ||
|
||
test('it renders with additional info when configured to do so', async function (assert) { | ||
// const user = this.server.create('user', { displayName: 'Clem Chowder' }); | ||
// const userModel = await this.owner.lookup('service:store').findRecord('user', user.id); | ||
// this.set('user', userModel); | ||
// await render(hbs`<UserNameInfo @user={{this.user}} />`); | ||
// assert.strictEqual(component.fullName, 'Clem Chowder'); | ||
|
||
await render(hbs`<UserNameInfo />`); | ||
assert.strictEqual(component.fullName, ''); | ||
}); | ||
}); |
14 changes: 14 additions & 0 deletions
14
packages/frontend/tests/integration/components/user-profile-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupRenderingTest } from 'frontend/tests/helpers'; | ||
import { render } from '@ember/test-helpers'; | ||
import { hbs } from 'ember-cli-htmlbars'; | ||
|
||
module('Integration | Component | user-profile', function (hooks) { | ||
setupRenderingTest(hooks); | ||
|
||
test('it renders', async function (assert) { | ||
await render(hbs`<UserProfile />`); | ||
|
||
assert.dom().hasText('User'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { clickable, collection, create } from 'ember-cli-page-object'; | ||
import userNameInfo from 'rs-common/page-objects/components/user-name-info'; | ||
|
||
const definition = { | ||
scope: '[data-test-user-list]', | ||
users: collection('[data-test-user]', { | ||
viewUserDetails: clickable('[data-test-user-link]'), | ||
userNameInfo, | ||
email: { | ||
scope: '[data-test-email]', | ||
}, | ||
}), | ||
}; | ||
|
||
export default definition; | ||
export const component = create(definition); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupTest } from 'frontend/tests/helpers'; | ||
|
||
module('Unit | Route | user', function (hooks) { | ||
setupTest(hooks); | ||
|
||
test('it exists', function (assert) { | ||
let route = this.owner.lookup('route:user'); | ||
assert.ok(route); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupTest } from 'frontend/tests/helpers'; | ||
|
||
module('Unit | Route | users', function (hooks) { | ||
setupTest(hooks); | ||
|
||
test('it exists', function (assert) { | ||
let route = this.owner.lookup('route:users'); | ||
assert.ok(route); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { module, test } from 'qunit'; | ||
import { setupTest } from 'ember-qunit'; | ||
|
||
module('Unit | Service | data-loader', function (hooks) { | ||
setupTest(hooks); | ||
|
||
test('it exists', function (assert) { | ||
let service = this.owner.lookup('service:data-loader'); | ||
assert.ok(service); | ||
}); | ||
}); |
Oops, something went wrong.