Skip to content

fix: Enable sorting in admin users table #3488

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

Merged
merged 14 commits into from
Oct 16, 2019
Merged

fix: Enable sorting in admin users table #3488

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
508d748
Enable sorting in admin users table
kushthedude Aug 28, 2019
0ca150c
Merge branch 'development' into sort
kushthedude Aug 29, 2019
b1d5abf
Update list.js
kushthedude Aug 30, 2019
2d8c23f
Merge branch 'development' into sort
kushthedude Aug 30, 2019
31fcf7f
Merge branch 'development' into sort
mariobehling Aug 30, 2019
2abdcc4
Merge branch 'development' into sort
kushthedude Sep 1, 2019
41fe6ae
Sorting through name
kushthedude Sep 1, 2019
a2798e4
Fix: extraRecords used wrongly
kushthedude Sep 5, 2019
48f62eb
Merge branch 'development' into sort
kushthedude Sep 5, 2019
1dc40dd
Merge branch 'development' into sort
kushthedude Sep 7, 2019
3888d1d
Merge branch 'development' into sort
shreyanshdwivedi Sep 9, 2019
28f8027
Merge branch 'development' into sort
kushthedude Sep 20, 2019
7c05fd9
Merge branch 'development' into sort
kushthedude Oct 12, 2019
94ddaa7
Merge branch 'development' into sort
kushthedude Oct 16, 2019
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
35 changes: 23 additions & 12 deletions app/controllers/admin/users/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
return [
{
name : 'Name',
valuePath : 'id',
extraValuePaths : ['firstName', 'deletedAt'],
valuePath : 'firstName',
extraValuePaths : ['deletedAt', 'id'],
cellComponent : 'ui-table/cell/admin/users/cell-first-name',
width : 155,
isSortable : true,
headerComponent : 'tables/headers/sort',
options : {
hasRestorePrivileges: this.hasRestorePrivileges
},
Expand All @@ -27,9 +29,11 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
}
},
{
name : 'Email',
valuePath : 'email',
width : 160
name : 'Email',
valuePath : 'email',
width : 175,
isSortable : true,
headerComponent : 'tables/headers/sort'
},
{
name : 'Status',
Expand Down Expand Up @@ -59,15 +63,19 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/admin/users/cell-user-links'
},
{
name : 'Member Since',
valuePath : 'createdAt',
cellComponent : 'ui-table/cell/admin/users/cell-created-at'
name : 'Member Since',
valuePath : 'createdAt',
cellComponent : 'ui-table/cell/admin/users/cell-created-at',
isSortable : true,
headerComponent : 'tables/headers/sort'
},
{
name : 'Last Accessed',
valuePath : 'lastAccessedAt',
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
name : 'Last Accessed',
valuePath : 'lastAccessedAt',
isSortable : true,
headerComponent : 'tables/headers/sort',
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
dateFormat: 'MMMM DD, YYYY - hh:mm A'
}
}
Expand All @@ -78,6 +86,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
moveToUserDetails(id) {
this.transitionToRoute('admin.users.view', id);
}

@action
async deleteUser(user_id) {
this.set('isLoading', true);
Expand All @@ -89,6 +98,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
} catch (e) {
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
}

this.set('isLoading', false);
}

Expand All @@ -113,6 +123,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
console.warn(e);
}

this.set('isLoading', false);
}
}
14 changes: 7 additions & 7 deletions app/templates/components/ui-table/cell/admin/users/cell-first-name.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<span>{{extraRecords.firstName}}</span>
<span>{{record}}</span>
<div class="ui hidden divider"></div>
<div class="ui horizontal compact basic buttons">
{{#ui-popup tagName='a' click=(action props.actions.moveToUserDetails record) content=(t 'View') class='ui icon button'}}
{{#ui-popup tagName='a' click=(action props.actions.moveToUserDetails extraRecords.id) content=(t 'View') class='ui icon button'}}
<i class="unhide icon"></i>
{{/ui-popup}}
{{#unless record.isSuperAdmin}}
{{#if (not record.deletedAt)}}
{{#ui-popup content=(t 'Edit') click=(action props.actions.openEditModal record) class='ui icon button'}}
{{#unless extraRecords.id.isSuperAdmin}}
{{#if (not extraRecords.id.deletedAt)}}
{{#ui-popup content=(t 'Edit') click=(action props.actions.openEditModal extraRecords.id) class='ui icon button'}}
<i class="edit icon"></i>
{{/ui-popup}}
{{/if}}
{{#if (and props.options.hasRestorePrivileges extraRecords.deletedAt)}}
{{#ui-popup content=(t 'Restore') click=(action props.actions.restoreUser record) class='ui icon button' position='left center'}}
{{#ui-popup content=(t 'Restore') click=(action props.actions.restoreUser extraRecords.id) class='ui icon button' position='left center'}}
<i class="undo icon"></i>
{{/ui-popup}}
{{else}}
{{#ui-popup content=(t 'Delete') click=(action (confirm (t 'Are you sure you would like to delete this user?') (action props.actions.deleteUser record))) class='ui icon button'}}
{{#ui-popup content=(t 'Delete') click=(action (confirm (t 'Are you sure you would like to delete this user?') (action props.actions.deleteUser extraRecords.id))) class='ui icon button'}}
<i class="trash outline icon"></i>
{{/ui-popup}}
{{/if}}
Expand Down