Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@VinceMacBuche
VinceMacBuche committed Oct 4, 2019
1 parent 7b88ec0 commit 853c9d0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 132 deletions.
2 changes: 1 addition & 1 deletion ...es/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import net.liftweb.json.JsonDSL._
class EventLogAPI (
repos: EventLogRepository
, restExtractor : RestExtractorService
, eventLogDetail : EventListDisplayer
, eventLogDetail : EventLogDetailsGenerator
) extends RestHelper with Loggable {

def serialize(event: EventLog): JValue = {
Expand Down
117 changes: 6 additions & 111 deletions ...web/services/EventLogDetailsService.scala → ...b/services/EventLogDetailsGenerator.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ import scala.util.{Success, Try, Failure => Catch}
import scala.xml._

/**
* Used to display the event list, in the pending modification (AsyncDeployment),
* or in the administration EventLogsViewer
*
*/
class EventListDisplayer(
logDetailsService : EventLogDetailsService
class EventLogDetailsGenerator(
logDetailsService : EventLogDetailsService
, repos : EventLogRepository
, nodeGroupRepository : RoNodeGroupRepository
, directiveRepository : RoDirectiveRepository
Expand All @@ -89,110 +88,6 @@ class EventListDisplayer(

private[this] val xmlPretty = new scala.xml.PrettyPrinter(80, 2)

private[this] val gridName = "eventLogsGrid"

def display(refreshEvents:() => Box[Seq[EventLog]]) : NodeSeq = {
val limit: Int = 500
//common part between last events and interval
def displayEvents(events: Box[Seq[EventLog]]) :JsCmd = {
events match {
case Full(events) =>
val lines = {
val el = events.map(EventLogLine(_)).toList.sortWith(_.event.creationDate.getMillis > _.event.creationDate.getMillis)
if(el.size > limit) JsTableData(el.take(limit)) else JsTableData(el)
}
JsRaw(s"refreshTable('${gridName}',${lines.json.toJsCmd})")
case eb : EmptyBox =>
val fail = eb ?~! "Could not get latest event logs"
logger.error(fail.messageChain)
val xml = <div class="error">Error when trying to get last event logs. Error message was: {fail.messageChain}</div>
SetHtml("eventLogsError",xml)
}
}

def getLastEvents : JsCmd = {
displayEvents(refreshEvents())
}

def getEventsInterval(jsonInterval: String): JsCmd = {
import java.sql.Timestamp
val format = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss")

displayEvents(for {
parsed <- tryo(parse(jsonInterval)) ?~! s"Error when trying to parse '${jsonInterval}' as a JSON datastructure with fields 'start' and 'end'"
startStr <- parsed \ "start" match {
case JString(startStr) if startStr.nonEmpty =>
val date = tryo(DateTime.parse(startStr, format)) ?~! s"Error when trying to parse start date '${startStr}"
date match {
case Full(d) => Full(Some(new Timestamp(d.getMillis)))
case eb: EmptyBox =>
eb ?~! s"Invalid start date"
}
case _ => Full(None)
}
endStr <- parsed \ "end" match {
case JString(endStr) if endStr.nonEmpty =>
val date = tryo(DateTime.parse(endStr, format)) ?~! s"Error when trying to parse end date '${endStr}"
date match {
case Full(d) => Full(Some(new Timestamp(d.getMillis)))
case eb: EmptyBox =>
eb ?~! s"Invalid end date"
}
case _ => Full(None)
}
whereStatement = (startStr, endStr) match {
case (None, None) => None
case (Some(start), None) => Some(s" creationdate > '$start'")
case (None, Some(end)) => Some(s" creationdate < '$end'")
case (Some(start), Some(end)) =>
val orderedDate = if(start.after(end)) (end, start) else (start, end)
Some(s" creationdate > '${orderedDate._1}' and creationdate < '${orderedDate._2}'")
}
logs <- repos.getEventLogByCriteria(whereStatement, None, Some("id DESC")).toBox
} yield {
logs
})
}

val refresh = AnonFunc(SHtml.ajaxInvoke( () => getLastEvents))

Script(OnLoad(JsRaw(s"""
var pickEventLogsInInterval = ${AnonFunc(SHtml.ajaxCall(JsRaw(
"""'{"start":"'+$(".pickStartInput").val()+'", "end":"'+$(".pickEndInput").val()+'"}'"""
), getEventsInterval)._2).toJsCmd}
var refreshEventLogs = ${refresh.toJsCmd};
createEventLogTable('${gridName}',[], '${S.contextPath}', refreshEventLogs, pickEventLogsInInterval)
refreshEventLogs();
""")))

}

/*
* Javascript object containing all data to create a line in event logs table
* { "id" : Event log id [Int]
* , "date": date the event log was produced [Date/String]
* , "actor": Name of the actor making the event [String]
* , "type" : Type of the event log [String]
* , "description" : Description of the event [String]
* , "details" : function/ajax call, setting the details content, takes the id of the element to set [Function(String)]
* , "hasDetails" : do our event needs to display details (do we need to be able to open the row [Boolean]
* }
*/
case class EventLogLine(event : EventLog) extends JsTableLine {
val json = {
JsObj(
"id" -> (event.id.map(_.toString).getOrElse("Unknown"): String)
, "date" -> DateFormaterService.getFormatedDate(event.creationDate)
, "actor" -> event.principal.name
, "type" -> S.?("rudder.log.eventType.names." + event.eventType.serialize)
, "description" -> displayDescription(event).toString
, "hasDetails" -> boolToJsExp(event.details != <entry></entry>)
)
}
}

//////////////////// Display description/details of ////////////////////

//convention: "X" means "ignore"

def displayDescription(event:EventLog) = {
Expand Down Expand Up @@ -1447,7 +1342,7 @@ class EventListDisplayer(
$("#cancel%3$s").show();
scrollToElement('%2$s', ".rudder_col");
if($('#%2$s').prop('open') != "opened")
$('#%2$s').click();""".format(gridName,rollbackInfo.target.id,id))
$('#%2$s').click();""".format("gridName",rollbackInfo.target.id,id))
, Text(rollbackInfo.target.id.toString)
)
} has been completed.
Expand Down Expand Up @@ -1477,7 +1372,7 @@ class EventListDisplayer(
$("#cancel%3$s").show();
scrollToElement('%2$s', ".rudder_col");
if($('#%2$s').prop('open') != "opened")
$('#%2$s').click();""".format(gridName,ev.id,id))
$('#%2$s').click();""".format("gridName",ev.id,id))
, Text(ev.id.toString)
)
}
Expand All @@ -1494,7 +1389,7 @@ class EventListDisplayer(
<div id={"cancel%s".format(id)} style="display:none"> the event <span id={"currentId%s".format(id)}/> is displayed in the table below
{SHtml.ajaxButton("Clear display", () =>
Run("""$('#%s').dataTable().fnFilter("",0,true,false);
$("#cancel%s").hide();""".format(gridName,id) )
$("#cancel%s").hide();""".format("gridName",id) )
) }
</div>
<br/>
Expand Down
20 changes: 0 additions & 20 deletions ...dder/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,4 @@ class EventListDisplayer(
""")))
}

/*
* Javascript object containing all data to create a line in event logs table
* { "id" : Event log id [Int]
* , "date": date the event log was produced [Date/String]
* , "actor": Name of the actor making the event [String]
* , "type" : Type of the event log [String]
* , "hasDetails" : do our event needs to display details (do we need to be able to open the row [Boolean]
* }
*/
case class EventLogLine(event : EventLog) extends JsTableLine {
val json = {
JsObj(
"id" -> (event.id.map(_.toString).getOrElse("Unknown"): String)
, "date" -> DateFormaterService.getFormatedDate(event.creationDate)
, "actor" -> event.principal.name
, "type" -> S.?("rudder.log.eventType.names." + event.eventType.serialize)
, "hasDetails" -> boolToJsExp(event.details != <entry></entry>)
)
}
}
}

0 comments on commit 853c9d0

Please sign in to comment.