Merge pull request #663 from gemini-hlsw/navigate-ui-package

Use navigate-ui package

.scalafix.conf

@@ -1,2 +1,2 @@
 include ".scalafix-common.conf"
-OrganizeImports.removeUnused = false
+OrganizeImports.removeUnused = true

README.md

@@ -16,10 +16,6 @@ deploy_navigate_server/docker:publishLocal
 
 # Running in Test and Production
 
-## Composing
-
-The `noirlab/gpp-nav` image must be composed with the images from [`navigate-ui`](https://github.com/gemini-hlsw/navigate-ui) and its server in order to run. Also, a shared volume will be needed for `navigate-server` to be able to server the static files from `navigate-ui`.
-
 ## Configuration
 
 Deployment needs configuration that can be shared in the repos, like the TLS certificate and its key. For this, the server expects a directory called `conf/local` to be mounted in the container. A local directory must be [bind mounted](https://docs.docker.com/storage/bind-mounts/) into the container, providing a local `app.conf` and other needed files.

build.sbt

@@ -131,7 +131,8 @@ lazy val navigate_web_server = project
       Http4sCirce,
       GrackleRoutes,
       Natchez,
-      LucumaSchemas
+      LucumaSchemas,
+      NavigateUi
     ) ++
       Http4sClient ++ Http4s ++ PureConfig ++ Logging.value ++ MUnit.value ++ Grackle.value,
     // Supports launching the server in the background
@@ -146,9 +147,7 @@ lazy val navigate_web_server = project
     buildInfoKeys ++= Seq[BuildInfoKey](name, version, buildInfoBuildNumber),
     buildInfoOptions += BuildInfoOption.BuildTime,
     buildInfoObject           := "OcsBuildInfo",
-    buildInfoPackage          := "navigate.web.server",
-    // Make UI available in development mode, as long as navigate-ui is in a sibling directory.
-    javaOptions += "-Dnavigate.ui.path=../../../../navigate-ui"
+    buildInfoPackage          := "navigate.web.server"
   )
   .dependsOn(navigate_server)
   .dependsOn(navigate_model % "compile->compile;test->test")

modules/web/server/src/main/scala/navigate/web/server/common/StaticRoutes.scala

@@ -9,7 +9,6 @@ import cats.effect.Sync
 import cats.syntax.all.*
 import fs2.compression.Compression
 import fs2.io.file.Files
-import fs2.io.file.Path
 import org.http4s.CacheDirective.*
 import org.http4s.Header
 import org.http4s.HttpRoutes
@@ -23,7 +22,7 @@ import org.http4s.server.middleware.GZip
 import scala.concurrent.duration.*
 
 class StaticRoutes[F[_]: Sync: Compression: Files]:
-  private val DistDir: String = "dist"
+  private val NavigateUiBase = "/navigate-ui"
 
   private val OneYear: Int = 365 * 24 * 60 * 60 // One year in seconds
 
@@ -32,13 +31,7 @@ class StaticRoutes[F[_]: Sync: Compression: Files]:
   )
 
   def localFile(path: String, req: Request[F]): OptionT[F, Response[F]] =
-    OptionT
-      .liftF(uiBaseDir)
-      .flatMap: dir =>
-        StaticFile.fromPath(
-          Path.fromNioPath(dir.resolve(DistDir).resolve(path.stripPrefix("/"))),
-          req.some
-        )
+    StaticFile.fromResource(NavigateUiBase + path, Some(req))
 
   extension (req: Request[F])
     def endsWith(exts: String*): Boolean = exts.exists(req.pathInfo.toString.endsWith)

modules/web/server/src/main/scala/navigate/web/server/common/package.scala

@@ -18,8 +18,3 @@ def baseDir[F[_]: Sync]: F[Path] = Sync[F].delay:
   val appPath =
     Paths.get(this.getClass.getProtectionDomain.getCodeSource.getLocation.toURI).getParent.getParent
   if (Files.exists(appPath)) appPath else Paths.get(System.getProperty("user.home"))
-
-def uiBaseDir[F[_]: Sync]: F[Path] =
-  Sync[F]
-    .delay(Paths.get(System.getProperty("navigate.ui.path")))
-    .handleErrorWith(_ => baseDir[F])

project/Settings.scala

@@ -56,6 +56,7 @@ object Settings {
     // Lucuma
     val lucumaCore    = "0.104.0"
     val lucumaSchemas = "0.96.0"
+    val navigateUi    = "0.1.2"
 
     val grackle = "0.18.1"
 
@@ -176,6 +177,8 @@ object Settings {
     )
     val LucumaSchemas = "edu.gemini" %% "lucuma-schemas" % LibraryVersions.lucumaSchemas
 
+    val NavigateUi = "edu.gemini" % "navigate-ui" % LibraryVersions.navigateUi
+
     val Grackle = Def.setting(
       Seq(
         "org.typelevel" %% "grackle-core"    % LibraryVersions.grackle,