yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gets filtering on user state working

Browse Source
This commit is contained in:
Shannon
2017-07-03 19:27:48 +10:00
parent 94b0cb04da
commit 82bd11e66d
5 changed files with 242 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
View File

@@ -79,15 +79,16 @@ namespace Umbraco.Core.Persistence.Repositories
public IDictionary<UserState, int> GetUserStates()
{
var sql = @"SELECT 'CountOfAll' AS name, COUNT(id) AS num FROM umbracoUser
var sql = @"SELECT '1CountOfAll' AS colName, COUNT(id) AS num FROM umbracoUser
UNION
SELECT 'CountOfActive' AS name, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL
SELECT '2CountOfActive' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL
UNION
SELECT 'CountOfDisabled' AS name, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 1
SELECT '3CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 1
UNION
SELECT 'CountOfLockedOut' AS name, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
UNION
SELECT 'CountOfInvited' AS name, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL";
SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
ORDER BY colName";
var result = Database.Fetch<dynamic>(sql);
@@ -513,7 +514,7 @@ SELECT 'CountOfInvited' AS name, COUNT(id) AS num FROM umbracoUser WHERE lastLog
Sql filterSql = null;
if (filter != null || (userGroups != null && userGroups.Length > 0))
if (filter != null || (userGroups != null && userGroups.Length > 0) || (userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false))
filterSql = new Sql();
if (filter != null)
@@ -531,10 +532,33 @@ SELECT 'CountOfInvited' AS name, COUNT(id) AS num FROM umbracoUser WHERE lastLog
INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
filterSql.Append(subQuery, new {userGroups= userGroups});
}
if (userState != null && userState.Length > 0)
{
//the "ALL" state doesn't require any filtering so we ignore that, if it exists in the list we don't do any filtering
if (userState.Contains(UserState.All) == false)
{
if (userState.Contains(UserState.Active))
{
filterSql.Append("AND (userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL)");
}
if (userState.Contains(UserState.Disabled))
{
filterSql.Append("AND (userDisabled = 1)");
}
if (userState.Contains(UserState.LockedOut))
{
filterSql.Append("AND (userNoConsole = 1)");
}
if (userState.Contains(UserState.Invited))
{
filterSql.Append("AND (lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL)");
}
}
}
// Get base query for returning IDs
var sqlBaseIds = GetBaseQuery("id");
// Get base query for returning IDs
var sqlBaseIds = GetBaseQuery("id");
if (query == null) query = new Query<IUser>();
var translatorIds = new SqlTranslator<IUser>(sqlBaseIds, query);

335
src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
View File

@@ -7,179 +7,184 @@
* Used by the users section to get users and send requests to create, invite, delete, etc. users.
*/
(function () {
'use strict';
'use strict';
function usersResource($http, umbRequestHelper, $q, umbDataFormatter) {
function usersResource($http, umbRequestHelper, $q, umbDataFormatter) {
function clearAvatar(userId) {
function clearAvatar(userId) {
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostClearAvatar",
{ id: userId })),
'Failed to clear the user avatar ' + userId);
}
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostClearAvatar",
{ id: userId })),
'Failed to clear the user avatar ' + userId);
}
function disableUsers(userIds) {
if (!userIds) {
throw "userIds not specified";
}
function disableUsers(userIds) {
if (!userIds) {
throw "userIds not specified";
}
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = "userIds=" + userIds.join("&userIds=");
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = "userIds=" + userIds.join("&userIds=");
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostDisableUsers", qry)),
'Failed to disable the users ' + userIds.join(","));
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostDisableUsers", qry)),
'Failed to disable the users ' + userIds.join(","));
}
function enableUsers(userIds) {
if (!userIds) {
throw "userIds not specified";
}
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = "userIds=" + userIds.join("&userIds=");
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostEnableUsers", qry)),
'Failed to enable the users ' + userIds.join(","));
}
function getPagedResults(options) {
var defaults = {
pageSize: 25,
pageNumber: 1,
filter: '',
orderDirection: "Ascending",
orderBy: "Username",
userGroups: [],
userStates: []
};
if (options === undefined) {
options = {};
}
//overwrite the defaults if there are any specified
angular.extend(defaults, options);
//now copy back to the options we will use
options = defaults;
//change asc/desct
if (options.orderDirection === "asc") {
options.orderDirection = "Ascending";
}
else if (options.orderDirection === "desc") {
options.orderDirection = "Descending";
}
var params = {
pageNumber: options.pageNumber,
pageSize: options.pageSize,
orderBy: options.orderBy,
orderDirection: options.orderDirection,
filter: options.filter
};
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = umbRequestHelper.dictionaryToQueryString(params);
if (options.userGroups.length > 0) {
//we need to create a custom query string for an array
qry += "&userGroups=" + options.userGroups.join("&userGroups=");
}
if (options.userStates.length > 0) {
//we need to create a custom query string for an array
qry += "&userStates=" + options.userStates.join("&userStates=");
}
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"GetPagedUsers",
qry)),
'Failed to retrieve users paged result');
}
function getUser(userId) {
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"GetById",
{ id: userId })),
"Failed to retrieve data for user " + userId);
}
function createUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostCreateUser"),
formattedSaveData),
"Failed to save user");
}
function inviteUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostInviteUser"),
formattedSaveData),
"Failed to invite user");
}
function saveUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostSaveUser"),
formattedSaveData),
"Failed to save user");
}
var resource = {
disableUsers: disableUsers,
enableUsers: enableUsers,
getPagedResults: getPagedResults,
getUser: getUser,
createUser: createUser,
inviteUser: inviteUser,
saveUser: saveUser,
clearAvatar: clearAvatar
};
return resource;
}
function enableUsers(userIds) {
if (!userIds) {
throw "userIds not specified";
}
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = "userIds=" + userIds.join("&userIds=");
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostEnableUsers", qry)),
'Failed to enable the users ' + userIds.join(","));
}
function getPagedResults(options) {
var defaults = {
pageSize: 25,
pageNumber: 1,
filter: '',
orderDirection: "Ascending",
orderBy: "Username",
userGroups: []
};
if (options === undefined) {
options = {};
}
//overwrite the defaults if there are any specified
angular.extend(defaults, options);
//now copy back to the options we will use
options = defaults;
//change asc/desct
if (options.orderDirection === "asc") {
options.orderDirection = "Ascending";
}
else if (options.orderDirection === "desc") {
options.orderDirection = "Descending";
}
var params = {
pageNumber: options.pageNumber,
pageSize: options.pageSize,
orderBy: options.orderBy,
orderDirection: options.orderDirection,
filter: options.filter
};
//we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
var qry = umbRequestHelper.dictionaryToQueryString(params);
if (options.userGroups.length > 0) {
//we need to create a custom query string for an array
qry += "&userGroups=" + options.userGroups.join("&userGroups=");
}
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"GetPagedUsers",
qry)),
'Failed to retrieve users paged result');
}
function getUser(userId) {
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"GetById",
{ id: userId })),
"Failed to retrieve data for user " + userId);
}
function createUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostCreateUser"),
formattedSaveData),
"Failed to save user");
}
function inviteUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostInviteUser"),
formattedSaveData),
"Failed to invite user");
}
function saveUser(user) {
if (!user) {
throw "user not specified";
}
//need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
var formattedSaveData = umbDataFormatter.formatUserPostData(user);
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostSaveUser"),
formattedSaveData),
"Failed to save user");
}
var resource = {
disableUsers: disableUsers,
enableUsers: enableUsers,
getPagedResults: getPagedResults,
getUser: getUser,
createUser: createUser,
inviteUser: inviteUser,
saveUser: saveUser,
clearAvatar: clearAvatar
};
return resource;
}
angular.module('umbraco.resources').factory('usersResource', usersResource);
angular.module('umbraco.resources').factory('usersResource', usersResource);
})();

37
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -313,7 +313,42 @@
return name;
}
function setUserStatesFilter(value) {
function setUserStatesFilter(userState) {
if (!vm.usersOptions.userStates) {
vm.usersOptions.userStates = [];
}
//If the selection is "ALL" then we need to unselect everything else since this is an 'odd' filter
if (userState.key === "All") {
angular.forEach(vm.userStatesFilter, function(i) {
i.selected = false;
});
//we can't unselect All
userState.selected = true;
//reset the selection passed to the server
vm.usersOptions.userStates = [];
}
else {
angular.forEach(vm.userStatesFilter, function (i) {
if (i.key === "All") {
i.selected = false;
}
});
var indexOfAll = vm.usersOptions.userStates.indexOf("All");
if (indexOfAll >= 0) {
vm.usersOptions.userStates.splice(indexOfAll, 1);
}
}
if (userState.selected) {
vm.usersOptions.userStates.push(userState.key);
}
else {
var index = vm.usersOptions.userStates.indexOf(userState.key);
vm.usersOptions.userStates.splice(index, 1);
}
getUsers();
}

2
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -111,7 +111,7 @@
<ul ng-if="vm.showStatusFilter" on-outside-click="vm.showStatusFilter = false;" class="dropdown-menu db" role="menu" aria-labelledby="dropdownMenu">
<li ng-repeat="userState in vm.userStatesFilter" style="padding: 5px 10px;">
<div class="flex items-center">
<input style="margin-right: 7px; margin-top: 2px;" type="checkbox" ng-model="userState.selected" ng-change="vm.setUserStatesFilter(userState.key)" />
<input style="margin-right: 7px; margin-top: 2px;" type="checkbox" ng-model="userState.selected" ng-change="vm.setUserStatesFilter(userState)" />
{{ userState.name }} ({{userState.count}})
</div>
</li>

9
src/Umbraco.Web/Editors/UsersController.cs
View File

@@ -198,13 +198,8 @@ namespace Umbraco.Web.Editors
{
long pageIndex = pageNumber - 1;
long total;
var result = Services.UserService.GetAll(pageIndex, pageSize, out total, orderBy, orderDirection, null, userGroups, filter);
if (total == 0)
{
return new PagedUserResult(0, 0, 0);
}
var result = Services.UserService.GetAll(pageIndex, pageSize, out total, orderBy, orderDirection, userStates, userGroups, filter);
var paged = new PagedUserResult(total, pageNumber, pageSize)
{
Items = Mapper.Map<IEnumerable<UserBasic>>(result),