AuditLogs page fixes (minio#3059)

- Added support to endDate - Converted dates to UTC as required by AuditLogs API Signed-off-by: Benjamin Perez <[email protected]>
brandongevat · Sep 22, 2023 · 1ce2846 · 1ce2846
1 parent 7fb8c11
commit 1ce2846
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 3 deletions.
diff --git a/portal-ui/src/api/consoleApi.ts b/portal-ui/src/api/consoleApi.ts
@@ -4567,6 +4567,7 @@ export class Api<
         /** @default "timeDesc" */
         order?: "timeDesc" | "timeAsc";
         timeStart?: string;
+        timeEnd?: string;
       },
       params: RequestParams = {},
     ) =>

diff --git a/portal-ui/src/screens/Console/Logs/LogSearch/LogsSearchMain.tsx b/portal-ui/src/screens/Console/Logs/LogSearch/LogsSearchMain.tsx
@@ -119,9 +119,9 @@ const LogsSearchMain = () => {
             queryParams !== "" ? `${queryParams}` : ""
           }&pageSize=100&pageNo=${nextPage}&order=${
             sortOrder === "DESC" ? "timeDesc" : "timeAsc"
-          }${timeStart !== null ? `&timeStart=${timeStart.toISO()}` : ""}${
-            timeEnd !== null ? `&timeEnd=${timeEnd.toISO()}` : ""
-          }`,
+          }${
+            timeStart !== null ? `&timeStart=${timeStart.toUTC().toISO()}` : ""
+          }${timeEnd !== null ? `&timeEnd=${timeEnd.toUTC().toISO()}` : ""}`,
         )
         .then((res: ISearchResponse) => {
           const fetchedResults = res.results || [];

diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/restapi/operations/logging/log_search_parameters.go b/restapi/operations/logging/log_search_parameters.go
diff --git a/restapi/operations/logging/log_search_urlbuilder.go b/restapi/operations/logging/log_search_urlbuilder.go
diff --git a/restapi/user_log_search.go b/restapi/user_log_search.go
@@ -80,6 +80,12 @@ func getLogSearchResponse(session *models.Principal, params logApi.LogSearchPara
 	if params.TimeStart != nil && *params.TimeStart != "" {
 		endpoint = fmt.Sprintf("%s&timeStart=%s", endpoint, *params.TimeStart)
 	}
+
+	// timeEnd
+	if params.TimeEnd != nil && *params.TimeEnd != "" {
+		endpoint = fmt.Sprintf("%s&timeEnd=%s", endpoint, *params.TimeEnd)
+	}
+
 	// page size and page number
 	endpoint = fmt.Sprintf("%s&pageSize=%d", endpoint, *params.PageSize)
 	endpoint = fmt.Sprintf("%s&pageNo=%d", endpoint, *params.PageNo)

diff --git a/swagger.yml b/swagger.yml
@@ -2943,6 +2943,9 @@ paths:
         - name: timeStart
           in: query
           type: string
+        - name: timeEnd
+          in: query
+          type: string
       responses:
         200:
           description: A successful response.