fix naming

packages/app/src/server/models/activity.ts

@@ -129,7 +129,7 @@ activitySchema.statics.findSnapshotUsernamesByUsernameRegex = async function(
   const usernames = await this.aggregate()
     .match(conditions)
     .group({ _id: '$snapshot.username' })
-    .sort({ _id: sortOpt }) // Sort "snapshot.username" in ascending order
+    .sort({ _id: sortOpt }); // Sort "snapshot.username" in ascending order
     .skip(offset)
     .limit(limit);
 

packages/app/src/server/routes/apiv3/users.js

@@ -943,26 +943,28 @@ module.exports = (crowi) => {
       const options = JSON.parse(req.query.options || '{}');
       const data = {};
 
-      if (options.isIncludeActiveUsernames == null || options.isIncludeActiveUsernames) {
+      console.log(options);
+
+      if (options.isIncludeActiveUser == null || options.isIncludeActiveUser) {
         const activeUserData = await User.findUserByUsernameRegex(q, [User.STATUS_ACTIVE], { offset, limit });
         const activeUsernames = activeUserData.users.map(user => user.username);
         Object.assign(data, { activeUser: { usernames: activeUsernames, totalCount: activeUserData.totalCount } });
       }
 
-      if (options.isIncludeInactiveUsernames) {
+      if (options.isIncludeInactiveUser) {
         const inactiveUserStates = [User.STATUS_REGISTERED, User.STATUS_SUSPENDED, User.STATUS_DELETED, User.STATUS_INVITED];
         const inactiveUserData = await User.findUserByUsernameRegex(q, inactiveUserStates, { offset, limit });
         const inactiveUsernames = inactiveUserData.users.map(user => user.username);
         Object.assign(data, { inactiveUser: { usernames: inactiveUsernames, totalCount: inactiveUserData.totalCount } });
       }
 
-      if (options.isIncludeActivitySnapshotUsernames && req.user.admin) {
+      if (options.isIncludeActivitySnapshotUser && req.user.admin) {
         const activitySnapshotUserData = await Activity.findSnapshotUsernamesByUsernameRegex(q, { offset, limit });
         Object.assign(data, { activitySnapshotUser: activitySnapshotUserData });
       }
 
       // eslint-disable-next-line max-len
-      const canIncludeMixedUsernames = (options.isIncludeMixedUsernames && req.user.admin) || (options.isIncludeMixedUsernames && !options.isIncludeActivitySnapshotUsernames);
+      const canIncludeMixedUsernames = (options.isIncludeMixedUsernames && req.user.admin) || (options.isIncludeMixedUsernames && !options.isIncludeActivitySnapshotUser);
       if (canIncludeMixedUsernames) {
         const allUsernames = [...data.activeUser?.usernames || [], ...data.inactiveUser?.usernames || [], ...data?.activitySnapshotUser?.usernames || []];
         const distinctUsernames = Array.from(new Set(allUsernames));

packages/app/src/stores/user.tsx

@@ -18,9 +18,9 @@ export const useSWRxUsersList = (userIds: string[]): SWRResponse<IUserHasId[], E
 
 
 type usernameRequestOptions = {
-  isIncludeActiveUsernames?: boolean,
-  isIncludeInactiveUsernames?: boolean,
-  isIncludeActivitySnapshotUsernames?: boolean,
+  isIncludeActiveUser?: boolean,
+  isIncludeInactiveUser?: boolean,
+  isIncludeActivitySnapshotUser?: boolean,
   isIncludeMixedUsernames?: boolean,
 }
 
@@ -33,7 +33,7 @@ type usernameResult = {
   activeUser?: userData
   inactiveUser?: userData
   activitySnapshotUser?: userData
-  mixedUsernames: string[]
+  mixedUsernames?: string[]
 }
 
 export const useSWRxUsernames = (q: string, offset?: number, limit?: number, options?: usernameRequestOptions): SWRResponse<usernameResult, Error> => {