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>
This commit is contained in:
@@ -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": {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user