diff --git a/admin/webapp/websrc/app/routes/components/global-notifications/global-notifications.component.ts b/admin/webapp/websrc/app/routes/components/global-notifications/global-notifications.component.ts index 195149fc..deaf5dcc 100644 --- a/admin/webapp/websrc/app/routes/components/global-notifications/global-notifications.component.ts +++ b/admin/webapp/websrc/app/routes/components/global-notifications/global-notifications.component.ts @@ -202,7 +202,7 @@ export class GlobalNotificationsComponent implements OnInit { .getVersion() .pipe( map(version => { - let _version = version.replace(/^\"|\"$/g, ""); + let _version = version.replace(/^\"|\"$/g, ''); if (_version && _version[0] === 'v') { return _version.substring(1); } diff --git a/admin/webapp/websrc/app/routes/security-events/security-events.component.ts b/admin/webapp/websrc/app/routes/security-events/security-events.component.ts index 51ff20e7..87644575 100644 --- a/admin/webapp/websrc/app/routes/security-events/security-events.component.ts +++ b/admin/webapp/websrc/app/routes/security-events/security-events.component.ts @@ -835,11 +835,13 @@ export class SecurityEventsComponent editSecEventTime - getIpGeoInfoTime ); - let mergedSecEvents = [].concat(this.threatList) + let mergedSecEvents = [] + .concat(this.threatList) .concat(this.violationList) .concat(this.incidentList); - this.securityEventsService.cachedSecurityEvents = _.cloneDeep(mergedSecEvents); + this.securityEventsService.cachedSecurityEvents = + _.cloneDeep(mergedSecEvents); let mergeSecEventTime = new Date().getTime(); console.log( @@ -882,7 +884,9 @@ export class SecurityEventsComponent )! ); } else { - this.securityEventsService.displayedSecurityEvents = _.cloneDeep(this.securityEventsService.cachedSecurityEvents); + this.securityEventsService.displayedSecurityEvents = _.cloneDeep( + this.securityEventsService.cachedSecurityEvents + ); this.printableData = this.getPrintableData( this.securityEventsService.displayedSecurityEvents ); diff --git a/build.sbt b/build.sbt index ae128f38..ffb4a784 100644 --- a/build.sbt +++ b/build.sbt @@ -74,16 +74,16 @@ lazy val commonSettings = Seq( ) ) -lazy val buil1dSettings = Defaults.coreDefaultSettings ++ Seq( - scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-target:jvm-1.7"), - libraryDependencies := Seq(scalaTest), - libraryDependencies += "javax.activation" % "activation" % "1.1.1", - libraryDependencies += "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5", - libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1", - libraryDependencies += "com.sun.xml.ws" % "jaxws-ri" % "4.0.2", - libraryDependencies += "javax.xml.soap" % "javax.xml.soap-api" % "1.4.0", - libraryDependencies += "org.json4s" %% "json4s-native" % "4.0.7" -) +// lazy val buil1dSettings = Defaults.coreDefaultSettings ++ Seq( +// scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-target:jvm-1.7"), +// libraryDependencies := Seq(scalaTest), +// libraryDependencies += "javax.activation" % "activation" % "1.1.1", +// libraryDependencies += "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5", +// libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1", +// libraryDependencies += "com.sun.xml.ws" % "jaxws-ri" % "4.0.2", +// libraryDependencies += "javax.xml.soap" % "javax.xml.soap-api" % "1.4.0", +// libraryDependencies += "org.json4s" %% "json4s-native" % "4.0.7" +// ) lazy val manager = (project in file(".")) .aggregate(common, admin)