Shun Miyazawa 3 лет назад
Родитель
Сommit
c10a207964

+ 1 - 1
packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -20,7 +20,7 @@ const formatDate = (date: Date | null) => {
   if (date == null) {
     return '';
   }
-  return format(new Date(date), 'yyyy/MM/dd');
+  return format(new Date(date), 'yyyy-MM-dd');
 };
 
 const PAGING_LIMIT = 10;

+ 5 - 3
packages/app/src/server/routes/apiv3/activity.ts

@@ -1,4 +1,4 @@
-import { parse, addMinutes, isValid } from 'date-fns';
+import { parseISO, addMinutes, isValid } from 'date-fns';
 import express, { Request, Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import { query } from 'express-validator';
@@ -48,6 +48,8 @@ module.exports = (crowi: Crowi): Router => {
     try {
       const parsedSearchFilter = JSON.parse(req.query.searchFilter as string);
 
+      console.log(parsedSearchFilter);
+
       // add username to query
       const canContainUsernameFilterToQuery = parsedSearchFilter.usernames.every(u => typeof u === 'string');
       if (canContainUsernameFilterToQuery && parsedSearchFilter.usernames.length > 0) {
@@ -61,8 +63,8 @@ module.exports = (crowi: Crowi): Router => {
       }
 
       // add date to query
-      const startDate = parse(parsedSearchFilter.dates.startDate, 'yyyy/MM/dd', new Date());
-      const endDate = parse(parsedSearchFilter.dates.endDate, 'yyyy/MM/dd', new Date());
+      const startDate = parseISO(parsedSearchFilter.dates.startDate);
+      const endDate = parseISO(parsedSearchFilter.dates.endDate);
       if (isValid(startDate) && isValid(endDate)) {
         Object.assign(query, {
           createdAt: {