AuditLogs page fixes (#3059)

- Added support to endDate
- Converted dates to UTC as required by AuditLogs API

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>

portal-ui/src/api/consoleApi.ts

@@ -4567,6 +4567,7 @@ export class Api<
         /** @default "timeDesc" */
         order?: "timeDesc" | "timeAsc";
         timeStart?: string;
+        timeEnd?: string;
       },
       params: RequestParams = {},
     ) =>

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 || [];

restapi/embedded_spec.go

@@ -3878,6 +3878,11 @@ func init() {
             "type": "string",
             "name": "timeStart",
             "in": "query"
+          },
+          {
+            "type": "string",
+            "name": "timeEnd",
+            "in": "query"
           }
         ],
         "responses": {
@@ -12920,6 +12925,11 @@ func init() {
             "type": "string",
             "name": "timeStart",
             "in": "query"
+          },
+          {
+            "type": "string",
+            "name": "timeEnd",
+            "in": "query"
           }
         ],
         "responses": {

restapi/operations/logging/log_search_parameters.go

@@ -86,6 +86,10 @@ type LogSearchParams struct {
 	/*
 	  In: query
 	*/
+	TimeEnd *string
+	/*
+	  In: query
+	*/
 	TimeStart *string
 }
 
@@ -120,6 +124,11 @@ func (o *LogSearchParams) BindRequest(r *http.Request, route *middleware.Matched
 		res = append(res, err)
 	}
 
+	qTimeEnd, qhkTimeEnd, _ := qs.GetOK("timeEnd")
+	if err := o.bindTimeEnd(qTimeEnd, qhkTimeEnd, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
 	qTimeStart, qhkTimeStart, _ := qs.GetOK("timeStart")
 	if err := o.bindTimeStart(qTimeStart, qhkTimeStart, route.Formats); err != nil {
 		res = append(res, err)
@@ -233,6 +242,24 @@ func (o *LogSearchParams) bindPageSize(rawData []string, hasKey bool, formats st
 	return nil
 }
 
+// bindTimeEnd binds and validates parameter TimeEnd from query.
+func (o *LogSearchParams) bindTimeEnd(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+	o.TimeEnd = &raw
+
+	return nil
+}
+
 // bindTimeStart binds and validates parameter TimeStart from query.
 func (o *LogSearchParams) bindTimeStart(rawData []string, hasKey bool, formats strfmt.Registry) error {
 	var raw string

restapi/operations/logging/log_search_urlbuilder.go

@@ -36,6 +36,7 @@ type LogSearchURL struct {
 	Order     *string
 	PageNo    *int32
 	PageSize  *int32
+	TimeEnd   *string
 	TimeStart *string
 
 	_basePath string
@@ -110,6 +111,14 @@ func (o *LogSearchURL) Build() (*url.URL, error) {
 		qs.Set("pageSize", pageSizeQ)
 	}
 
+	var timeEndQ string
+	if o.TimeEnd != nil {
+		timeEndQ = *o.TimeEnd
+	}
+	if timeEndQ != "" {
+		qs.Set("timeEnd", timeEndQ)
+	}
+
 	var timeStartQ string
 	if o.TimeStart != nil {
 		timeStartQ = *o.TimeStart

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)

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.