small fix

packages/app/src/components/Admin/AuditLog/SearchUsernameTypeahead.tsx

@@ -49,8 +49,8 @@ export const SearchUsernameTypeahead: FC<Props> = (props: Props) => {
   pushToAllUser(activitySnapshotUsernames, Categories.activitySnapshotUser);
 
   const changeHandler = useCallback((userData: UserDataType[]) => {
-    const usernames = userData.map(user => user.username);
     if (onChange != null) {
+      const usernames = userData.map(user => user.username);
       onChange(usernames);
     }
   }, [onChange]);

packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -45,7 +45,7 @@ export const AuditLogManagement: FC = () => {
    */
   const selectedDate = { startDate: formatDate(startDate), endDate: formatDate(endDate) };
   const selectedActionList = Array.from(actionMap.entries()).filter(v => v[1]).map(v => v[0]);
-  const searchFilter = { action: selectedActionList, date: selectedDate, username: selectedUsernames };
+  const searchFilter = { actions: selectedActionList, dates: selectedDate, usernames: selectedUsernames };
 
   const { data: activityListData, error } = useSWRxActivityList(PAGING_LIMIT, offset, searchFilter);
   const activityList = activityListData?.docs != null ? activityListData.docs : [];

packages/app/src/server/routes/apiv3/activity.ts

@@ -48,21 +48,21 @@ module.exports = (crowi: Crowi): Router => {
     try {
       const parsedSearchFilter = JSON.parse(req.query.searchFilter as string);
 
-      // amdd username to query
-      const canContainUsernameFilterToQuery = parsedSearchFilter.username.every(u => typeof u === 'string');
-      if (canContainUsernameFilterToQuery && parsedSearchFilter.username.length !== 0) {
-        Object.assign(query, { 'snapshot.username': parsedSearchFilter.username });
+      // add username to query
+      const canContainUsernameFilterToQuery = parsedSearchFilter.usernames.every(u => typeof u === 'string');
+      if (canContainUsernameFilterToQuery && parsedSearchFilter.usernames.length > 0) {
+        Object.assign(query, { 'snapshot.username': parsedSearchFilter.usernames });
       }
 
       // add action to query
-      const canContainActionFilterToQuery = parsedSearchFilter.action.every(a => AllSupportedActionType.includes(a));
+      const canContainActionFilterToQuery = parsedSearchFilter.actions.every(a => AllSupportedActionType.includes(a));
       if (canContainActionFilterToQuery) {
-        Object.assign(query, { action: parsedSearchFilter.action });
+        Object.assign(query, { action: parsedSearchFilter.actions });
       }
 
       // add date to query
-      const startDate = parse(parsedSearchFilter.date.startDate, 'yyyy/MM/dd', new Date());
-      const endDate = parse(parsedSearchFilter.date.endDate, 'yyyy/MM/dd', new Date());
+      const startDate = parse(parsedSearchFilter.dates.startDate, 'yyyy/MM/dd', new Date());
+      const endDate = parse(parsedSearchFilter.dates.endDate, 'yyyy/MM/dd', new Date());
       if (isValid(startDate) && isValid(endDate)) {
         Object.assign(query, {
           createdAt: {

packages/app/src/stores/activity.ts

@@ -7,9 +7,9 @@ import { PaginateResult } from '../interfaces/mongoose-utils';
 
 
 type ISearchFilter = {
-  username?: string[]
-  date?: {startDate: string | null, endDate: string | null}
-  action?: SupportedActionType[]
+  usernames?: string[]
+  dates?: {startDate: string | null, endDate: string | null}
+  actions?: SupportedActionType[]
 }
 
 export const useSWRxActivityList = (limit?: number, offset?: number, searchFilter?: ISearchFilter): SWRResponse<PaginateResult<IActivityHasId>, Error> => {