Converting to project for shared admin models

Author: kyleu

app/com/kyleu/projectile/web/views/project/member/listModel.scala.html

@@ -14,7 +14,7 @@ <h6><i class=" @com.kyleu.projectile.models.template.Icons.model"></i> @project.
   @project.models.sortBy(_.key).map { m =>
     <div class="collection-item">
       <div class="right">
-        @if(m.pkg.isEmpty && com.kyleu.projectile.services.project.ProjectLoadService.Provided.models(m.key)) {
+        @if(com.kyleu.projectile.services.project.ProjectLoadService.Provided.models.isDefinedAt(m.key)) {
           <em>provided</em>
         } else {
           @m.pkg.mkString(".")

build.sbt

@@ -29,6 +29,8 @@ lazy val `projectile-export` = ProjectileExport.`projectile-export`
 // SBT Plugin
 lazy val `projectile-sbt` = SbtExportPlugin.`projectile-sbt`
 lazy val `projectile-sbt-admin` = SbtExportPlugin.`projectile-sbt-admin`
+lazy val `projectile-lib-admin-models-jvm` = LibraryProjects.`projectile-lib-admin-models-jvm`
+lazy val `projectile-lib-admin-models-js` = LibraryProjects.`projectile-lib-admin-models-js`
 
 // Play Web Application
 lazy val `projectile-server` = Server.`projectile-server`

examples/admin/app/models/module/ProjectileModule.scala

@@ -11,7 +11,12 @@ import models.search.SearchHelper
 import models.template.UserMenu
 import util.Version
 
-class ProjectileModule extends AdminModule(projectName = Version.projectName, allowSignup = true, initialRole = "admin", menuProvider = UserMenu) {
+class ProjectileModule extends AdminModule {
+  override def projectName = Version.projectName
+  override def allowSignup = true
+  override def initialRole = "admin"
+  override def menuProvider = UserMenu
+
   override protected def onStartup(app: Application, injector: Injector) = {
     AuditCallbackProvider.init(new AuditCallbacks(injector))
 

examples/admin/app/models/search/SearchHelper.scala

@@ -4,8 +4,8 @@ import java.util.UUID
 
 import com.google.inject.Injector
 import com.kyleu.projectile.models.module.Application
-import com.kyleu.projectile.services.Credentials
 import com.kyleu.projectile.services.search.SearchProvider
+import com.kyleu.projectile.util.Credentials
 import com.kyleu.projectile.util.tracing.TraceData
 
 import scala.concurrent.ExecutionContext

examples/admin/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.0-RC5
+sbt.version=1.3.0

examples/graphql/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.0-RC5
+sbt.version=1.3.0

examples/scalajs/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.0-RC5
+sbt.version=1.3.0

examples/thrift/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.0-RC5
+sbt.version=1.3.0

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/audit/Audit.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/audit/Audit.scala

@@ -19,8 +19,24 @@ final case class AuditRecordResult(
 ) extends BaseResult[AuditRecord]
 
 object AuditRecordResult {
-  implicit val jsonEncoder: Encoder[AuditRecordResult] = deriveEncoder
-  implicit val jsonDecoder: Decoder[AuditRecordResult] = deriveDecoder
+  implicit val jsonEncoder: Encoder[AuditRecordResult] = (r: AuditRecordResult) => io.circe.Json.obj(
+    ("filters", r.filters.asJson),
+    ("orderBys", r.orderBys.asJson),
+    ("totalCount", r.totalCount.asJson),
+    ("paging", r.paging.asJson),
+    ("results", r.results.asJson),
+    ("durationMs", r.durationMs.asJson),
+    ("occurred", r.occurred.asJson)
+  )
+  implicit val jsonDecoder: Decoder[AuditRecordResult] = (c: io.circe.HCursor) => for {
+    filters <- c.downField("filters").as[Seq[Filter]]
+    orderBys <- c.downField("orderBys").as[Seq[OrderBy]]
+    totalCount <- c.downField("totalCount").as[Int]
+    paging <- c.downField("paging").as[PagingOptions]
+    results <- c.downField("results").as[Seq[AuditRecord]]
+    durationMs <- c.downField("durationMs").as[Int]
+    occurred <- c.downField("occurred").as[LocalDateTime]
+  } yield AuditRecordResult(filters, orderBys, totalCount, paging, results, durationMs, occurred)
 
   def fromRecords(
     q: Option[String], filters: Seq[Filter] = Nil, orderBys: Seq[OrderBy] = Nil, limit: Option[Int] = None, offset: Option[Int] = None,

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/audit/AuditField.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/audit/AuditField.scala

@@ -19,8 +19,24 @@ final case class AuditResult(
 ) extends BaseResult[Audit]
 
 object AuditResult {
-  implicit val jsonEncoder: Encoder[AuditResult] = deriveEncoder
-  implicit val jsonDecoder: Decoder[AuditResult] = deriveDecoder
+  implicit val jsonEncoder: Encoder[AuditResult] = (r: AuditResult) => io.circe.Json.obj(
+    ("filters", r.filters.asJson),
+    ("orderBys", r.orderBys.asJson),
+    ("totalCount", r.totalCount.asJson),
+    ("paging", r.paging.asJson),
+    ("results", r.results.asJson),
+    ("durationMs", r.durationMs.asJson),
+    ("occurred", r.occurred.asJson)
+  )
+  implicit val jsonDecoder: Decoder[AuditResult] = (c: io.circe.HCursor) => for {
+    filters <- c.downField("filters").as[Seq[Filter]]
+    orderBys <- c.downField("orderBys").as[Seq[OrderBy]]
+    totalCount <- c.downField("totalCount").as[Int]
+    paging <- c.downField("paging").as[PagingOptions]
+    results <- c.downField("results").as[Seq[Audit]]
+    durationMs <- c.downField("durationMs").as[Int]
+    occurred <- c.downField("occurred").as[LocalDateTime]
+  } yield AuditResult(filters, orderBys, totalCount, paging, results, durationMs, occurred)
 
   def fromRecords(
     q: Option[String], filters: Seq[Filter] = Nil, orderBys: Seq[OrderBy] = Nil, limit: Option[Int] = None, offset: Option[Int] = None,

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/audit/AuditRecord.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/audit/AuditRecord.scala

@@ -0,0 +1,35 @@
+package com.kyleu.projectile.models.config
+
+import com.kyleu.projectile.util.JsonSerializers._
+
+object UserSettings {
+  implicit val jsonEncoder: Encoder[UserSettings] = deriveEncoder
+  implicit val jsonDecoder: Decoder[UserSettings] = deriveDecoder
+
+  val empty = UserSettings()
+}
+
+case class UserSettings(
+    theme: String = "default",
+
+    menuColor: Option[String] = Some("gradient-45deg-indigo-blue"),
+    menuBackgroundColor: Option[String] = None,
+    menuDark: Boolean = true,
+    menuCollapsed: Boolean = false,
+    menuSelection: Option[String] = None,
+
+    navbarColor: Option[String] = Some("gradient-45deg-indigo-blue"),
+    navbarDark: Boolean = true,
+
+    buttonColor: Option[String] = None,
+    accentColor: Option[String] = None,
+
+    avatarUrl: Option[String] = None
+) {
+  val menuDarkClass = if (menuDark) { "sidenav-dark" } else { "sidenav-light" }
+
+  val logo = if (menuDark) { "/assets/images/logo-white.svg" } else { "/assets/images/logo-black.svg" }
+  val navbarDarkClass = if (navbarDark) { "navbar-dark" } else { "navbar-light" }
+
+  val textColor = accentColor.map(_ + "-text").getOrElse("")
+}

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/audit/AuditRecordResult.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/audit/AuditRecordResult.scala

@@ -19,8 +19,24 @@ final case class NoteResult(
 ) extends BaseResult[Note]
 
 object NoteResult {
-  implicit val jsonEncoder: Encoder[NoteResult] = deriveEncoder
-  implicit val jsonDecoder: Decoder[NoteResult] = deriveDecoder
+  implicit val jsonEncoder: Encoder[NoteResult] = (r: NoteResult) => io.circe.Json.obj(
+    ("filters", r.filters.asJson),
+    ("orderBys", r.orderBys.asJson),
+    ("totalCount", r.totalCount.asJson),
+    ("paging", r.paging.asJson),
+    ("results", r.results.asJson),
+    ("durationMs", r.durationMs.asJson),
+    ("occurred", r.occurred.asJson)
+  )
+  implicit val jsonDecoder: Decoder[NoteResult] = (c: io.circe.HCursor) => for {
+    filters <- c.downField("filters").as[Seq[Filter]]
+    orderBys <- c.downField("orderBys").as[Seq[OrderBy]]
+    totalCount <- c.downField("totalCount").as[Int]
+    paging <- c.downField("paging").as[PagingOptions]
+    results <- c.downField("results").as[Seq[Note]]
+    durationMs <- c.downField("durationMs").as[Int]
+    occurred <- c.downField("occurred").as[LocalDateTime]
+  } yield NoteResult(filters, orderBys, totalCount, paging, results, durationMs, occurred)
 
   def fromRecords(
     q: Option[String], filters: Seq[Filter] = Nil, orderBys: Seq[OrderBy] = Nil, limit: Option[Int] = None, offset: Option[Int] = None,

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/audit/AuditResult.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/audit/AuditResult.scala

@@ -0,0 +1,10 @@
+package com.kyleu.projectile.models.user
+
+import com.kyleu.projectile.util.JsonSerializers._
+
+object LoginCredentials {
+  implicit val jsonEncoder: Encoder[LoginCredentials] = deriveEncoder
+  implicit val jsonDecoder: Decoder[LoginCredentials] = deriveDecoder
+}
+
+case class LoginCredentials(providerID: String, providerKey: String)

libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/config/UserSettings.scala

@@ -4,56 +4,52 @@ import java.time.LocalDateTime
 import java.util.UUID
 
 import com.kyleu.projectile.models.config.UserSettings
-import com.mohiva.play.silhouette.api.{Identity, LoginInfo}
 import com.kyleu.projectile.models.result.data.{DataField, DataFieldModel, DataSummary}
 import com.kyleu.projectile.util.DateUtils
 import com.kyleu.projectile.util.JsonSerializers._
 import io.circe.JsonObject
 
 object SystemUser {
-  implicit val jsonLoginInfoEncoder: Encoder[LoginInfo] = deriveEncoder
-  implicit val jsonLoginInfoDecoder: Decoder[LoginInfo] = deriveDecoder
-
   implicit val jsonEncoder: Encoder[SystemUser] = deriveEncoder
   implicit val jsonDecoder: Decoder[SystemUser] = deriveDecoder
 
   def empty() = SystemUser(
     id = UUID.randomUUID,
     username = "",
-    profile = LoginInfo("anonymous", "guest"),
+    profile = LoginCredentials("anonymous", "guest"),
     role = "user"
   )
 
   val system = SystemUser(
     id = UUID.fromString("88888888-8888-8888-8888-888888888888"),
     username = "",
-    profile = LoginInfo("anonymous", "system"),
+    profile = LoginCredentials("anonymous", "system"),
     role = "admin"
   )
 
   val guest = SystemUser(
     id = UUID.fromString("77777777-7777-7777-7777-777777777777"),
     username = "guest",
-    profile = LoginInfo("anonymous", "guest"),
+    profile = LoginCredentials("anonymous", "guest"),
     role = "user"
   )
 
   val api = SystemUser(
     id = UUID.fromString("44444444-4444-4444-4444-444444444444"),
     username = "api",
-    profile = LoginInfo("anonymous", "api"),
+    profile = LoginCredentials("anonymous", "api"),
     role = "admin"
   )
 }
 
 final case class SystemUser(
     id: UUID,
     username: String,
-    profile: LoginInfo,
+    profile: LoginCredentials,
     role: String,
     settings: Json = JsonObject.empty.asJson,
     created: LocalDateTime = DateUtils.now
-) extends Identity with DataFieldModel {
+) extends DataFieldModel {
 
   val email = profile.providerKey
   val provider = profile.providerID

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/feedback/Feedback.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/feedback/Feedback.scala

@@ -19,8 +19,24 @@ final case class SystemUserResult(
 ) extends BaseResult[SystemUser]
 
 object SystemUserResult {
-  implicit val jsonEncoder: Encoder[SystemUserResult] = deriveEncoder
-  implicit val jsonDecoder: Decoder[SystemUserResult] = deriveDecoder
+  implicit val jsonEncoder: Encoder[SystemUserResult] = (r: SystemUserResult) => io.circe.Json.obj(
+    ("filters", r.filters.asJson),
+    ("orderBys", r.orderBys.asJson),
+    ("totalCount", r.totalCount.asJson),
+    ("paging", r.paging.asJson),
+    ("results", r.results.asJson),
+    ("durationMs", r.durationMs.asJson),
+    ("occurred", r.occurred.asJson)
+  )
+  implicit val jsonDecoder: Decoder[SystemUserResult] = (c: io.circe.HCursor) => for {
+    filters <- c.downField("filters").as[Seq[Filter]]
+    orderBys <- c.downField("orderBys").as[Seq[OrderBy]]
+    totalCount <- c.downField("totalCount").as[Int]
+    paging <- c.downField("paging").as[PagingOptions]
+    results <- c.downField("results").as[Seq[SystemUser]]
+    durationMs <- c.downField("durationMs").as[Int]
+    occurred <- c.downField("occurred").as[LocalDateTime]
+  } yield SystemUserResult(filters, orderBys, totalCount, paging, results, durationMs, occurred)
 
   def fromRecords(
     q: Option[String], filters: Seq[Filter] = Nil, orderBys: Seq[OrderBy] = Nil, limit: Option[Int] = None, offset: Option[Int] = None,

libraries/projectile-lib-admin/app/com/kyleu/projectile/models/feedback/FeedbackResult.scala libraries/projectile-lib-admin-models/src/main/scala/com/kyleu/projectile/models/feedback/FeedbackResult.scala

@@ -33,7 +33,7 @@ abstract class AuthController(name: String) extends com.kyleu.projectile.control
       app.silhouette.UserAwareAction.async { implicit request =>
         Instrumented.timeFuture(metricsName + "_request", "action", name + "_" + action) {
           app.tracing.trace(name + ".controller." + action) { td =>
-            enhanceRequest(request, request.identity, td)
+            enhanceRequest(request, request.identity.map(_.user), td)
             block(request)(td)
           }(getTraceData)
         }
@@ -50,7 +50,7 @@ abstract class AuthController(name: String) extends com.kyleu.projectile.control
           case Some(u) => permissions.map(p => PermissionService.check(u.role, p._1, p._2, p._3)).filter(!_._1).map(_._2).toList match {
             case Nil => Instrumented.timeFuture(metricsName + "_request", "action", name + "_" + action) {
               app.tracing.trace(name + ".controller." + action) { td =>
-                enhanceRequest(request, Some(u), td)
+                enhanceRequest(request, Some(u.user), td)
                 val auth = request.authenticator.getOrElse(throw new IllegalStateException("No auth!"))
                 block(SecuredRequest(u, auth, request))(td)
               }(getTraceData)