Skip to content

AuditLogs page fixes #3059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2023
Merged

AuditLogs page fixes #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions portal-ui/src/api/consoleApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4567,6 +4567,7 @@ export class Api<
/** @default "timeDesc" */
order?: "timeDesc" | "timeAsc";
timeStart?: string;
timeEnd?: string;
},
params: RequestParams = {},
) =>
Expand Down
6 changes: 3 additions & 3 deletions portal-ui/src/screens/Console/Logs/LogSearch/LogsSearchMain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || [];
Expand Down
10 changes: 10 additions & 0 deletions restapi/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions restapi/operations/logging/log_search_parameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions restapi/operations/logging/log_search_urlbuilder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions restapi/user_log_search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions swagger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2943,6 +2943,9 @@ paths:
- name: timeStart
in: query
type: string
- name: timeEnd
in: query
type: string
responses:
200:
description: A successful response.
Expand Down