diff --git a/app/Components.scala b/app/Components.scala index bde78a420ea..0274450033c 100644 --- a/app/Components.scala +++ b/app/Components.scala @@ -83,7 +83,6 @@ class AppComponents(context: Context, val config: ApplicationConfiguration) val updateManager = new UpdateManager(updateActions, configAgent, s3FrontsApi) val cloudwatch = new CloudWatch(config, awsEndpoints) val press = new Press(faciaPress) - val assetsManager = new AssetsManager(config, isDev) override lazy val httpErrorHandler = new LoggingHttpErrorHandler(environment, configuration, sourceMapper, Some(router)) // Controllers @@ -99,10 +98,10 @@ class AppComponents(context: Context, val config: ApplicationConfiguration) val storiesVisible = new StoriesVisibleController(containerService, this) val thumbnail = new ThumbnailController(containerThumbnails, this) val troubleshoot = new TroubleshootController(this) - val uncachedAssets = new UncachedAssets(assets, this) + val uncachedAssets = new V1Assets(assets, this) val v2Assets = new V2Assets(assets) val vanityRedirects = new VanityRedirects(acl, this) - val views = new ViewsController(acl, assetsManager, isDev, this) + val views = new ViewsController(acl, isDev, this) val pressController = new PressController(dynamo, this) val v2App = new V2App(isDev, acl, dynamo, this) val faciaToolV2 = new FaciaToolV2Controller(acl, structuredLogger, faciaPress, updateActions, configAgent, collectionService, faciaApiIO, this) diff --git a/app/controllers/UncachedAssets.scala b/app/controllers/UncachedAssets.scala deleted file mode 100644 index 2749b7810db..00000000000 --- a/app/controllers/UncachedAssets.scala +++ /dev/null @@ -1,9 +0,0 @@ -package controllers - -import scala.concurrent.ExecutionContext.Implicits.global - -class UncachedAssets(val assets: Assets, deps: BaseFaciaControllerComponents) extends BaseFaciaController(deps) { - def at(file: String, relativePath: String = "") = model.NoCache { - assets.at("/public/src", relativePath + file) - } -} diff --git a/app/controllers/V1Assets.scala b/app/controllers/V1Assets.scala new file mode 100644 index 00000000000..76a0f5b1b0d --- /dev/null +++ b/app/controllers/V1Assets.scala @@ -0,0 +1,12 @@ +package controllers + +import scala.concurrent.ExecutionContext.Implicits.global + +class V1Assets(val assets: Assets, deps: BaseFaciaControllerComponents) extends BaseFaciaController(deps) { + + def aggressivelyCached(file: String) = + assets.at("/public/dist", file, aggressiveCaching = true) + def notCached(file: String) = model.NoCache { + assets.at("/public/src", file) + } +} diff --git a/app/controllers/ViewsController.scala b/app/controllers/ViewsController.scala index ac316668c74..8e55fe18027 100644 --- a/app/controllers/ViewsController.scala +++ b/app/controllers/ViewsController.scala @@ -6,11 +6,20 @@ import model.Cached import org.joda.time.DateTime import permissions.ConfigPermissionCheck import play.api.mvc._ -import services.AssetsManager import util.Acl -class ViewsController(val acl: Acl, assetsManager: AssetsManager, isDev: Boolean, - val deps: BaseFaciaControllerComponents)(implicit ec: ExecutionContext) extends BaseFaciaController(deps) { +import java.io.File + +class ViewsController( + val acl: Acl, + isDev: Boolean, + val deps: BaseFaciaControllerComponents +)(implicit ec: ExecutionContext) extends BaseFaciaController(deps) { + + private def getV1DistFilename(prefix: String) = + new File("/public/src/").listFiles().find(_.getName.startsWith(prefix)).get.getName + private val v1ConfigBundleHashedName = getV1DistFilename("config.") + private val v1CollectionsBundleHashedName = getV1DistFilename("collections.") private def shouldRedirectToV2(request: UserRequest[AnyContent], priority: Option[String] = None): Boolean = { val isBreakingNews = priority.getOrElse("") == "breaking-news" || request.queryString.getOrElse("layout", Seq("")).exists(_.contains("breaking-news")) @@ -27,7 +36,12 @@ class ViewsController(val acl: Acl, assetsManager: AssetsManager, isDev: Boolean } else { val identity = request.user Cached(60) { - Ok(views.html.priority(Option(identity), config.facia.stage, isDev, true)) + Ok(views.html.priority( + identity = Option(identity), + stage = config.facia.stage, + isDev = isDev, + displayV2Message = true + )) } } } @@ -38,8 +52,14 @@ class ViewsController(val acl: Acl, assetsManager: AssetsManager, isDev: Boolean } else { val identity = request.user Cached(60) { - Ok(views.html.admin_main(Option(identity), config.facia.stage, overrideIsDev(request, isDev), - assetsManager.pathForCollections, priority != "email", priority)) + Ok(views.html.admin_main( + identity = Option(identity), + stage = config.facia.stage, + isDev = overrideIsDev(request, isDev), + bundleFilename = v1ConfigBundleHashedName, + displayV2Message = priority != "email", + priority = priority + )) } } } @@ -47,8 +67,13 @@ class ViewsController(val acl: Acl, assetsManager: AssetsManager, isDev: Boolean def configEditor() = (AccessAuthAction andThen new ConfigPermissionCheck(acl)) { request => val identity = request.user Cached(60) { - Ok(views.html.admin_main(Option(identity), config.facia.stage, overrideIsDev(request, isDev), - assetsManager.pathForConfig, false)) + Ok(views.html.admin_main( + identity = Option(identity), + stage = config.facia.stage, + isDev = overrideIsDev(request, isDev), + bundleFilename = v1CollectionsBundleHashedName, + displayV2Message = false + )) } } diff --git a/app/services/AssetsManager.scala b/app/services/AssetsManager.scala deleted file mode 100644 index c9803b2fab3..00000000000 --- a/app/services/AssetsManager.scala +++ /dev/null @@ -1,40 +0,0 @@ -package services - -import java.io.FileInputStream - -import conf.ApplicationConfiguration -import play.api.libs.functional.syntax._ -import play.api.libs.json.{JsError, JsPath, JsSuccess, Json} - - -class InvalidAssetsException(msg: String) extends RuntimeException(msg) - -object Bundles { - implicit val jsonRead = ( - (JsPath \ "config.js").read[String] and - (JsPath \ "collections.js").read[String] - )(Bundles.apply _) -} -case class Bundles (config: String, collections: String) - - -class AssetsManager(config: ApplicationConfiguration, isDev: Boolean) { - val filePath = "/etc/gu/facia-tool.assets-map.json" - val assetsMap: Option[Bundles] = if (isDev) None else Some(readFromPath(filePath)) - - private def readFromPath(path: String): Bundles = { - val stream = new FileInputStream(filePath) - val maybeJson = try { Json.parse(stream) } finally { stream.close() } - maybeJson.validate[Bundles] match { - case e: JsError => throw new InvalidAssetsException(s"JSON in $filePath does not match a valid Bundles") - case json: JsSuccess[Bundles] => json.getOrElse(throw new InvalidAssetsException(s"Invalid JSON Bundle in $filePath")) - } - } - - def pathForConfig: String = pathFor(assetsMap.map(_.config).getOrElse("")) - def pathForCollections: String = pathFor(assetsMap.map(_.collections).getOrElse("")) - - private def pathFor(hashedFileName: String): String = { - s"${config.cdn.basePath}$hashedFileName" - } -} diff --git a/app/views/admin_main.scala.html b/app/views/admin_main.scala.html index 88370a3133a..a928a52da40 100644 --- a/app/views/admin_main.scala.html +++ b/app/views/admin_main.scala.html @@ -1,4 +1,4 @@ -@(identity: Option[com.gu.pandomainauth.model.User] = None, stage: String, isDev: Boolean, bundlePath: String, displayV2Message: Boolean = false, priority: String = "") +@(identity: Option[com.gu.pandomainauth.model.User] = None, stage: String, isDev: Boolean, bundleFilename: String, displayV2Message: Boolean = false, priority: String = "") @import switchboard.SwitchManager @@ -9,14 +9,7 @@ Fronts Editor @templates.meta() - - - - @if(!isDev) { - - } - - + diff --git a/build.sbt b/build.sbt index fbaf8ee075d..f5f9b5da1f8 100644 --- a/build.sbt +++ b/build.sbt @@ -23,13 +23,12 @@ riffRaffManifestProjectName := riffRaffPackageName.value riffRaffUploadArtifactBucket := Option("riffraff-artifact") riffRaffUploadManifestBucket := Option("riffraff-builds") riffRaffArtifactResources := { - val jsBundlesDir = baseDirectory.value / "tmp" / "bundles" Seq( (Debian / packageBin).value -> s"${name.value}/${name.value}_1.0_all.deb", baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml", baseDirectory.value / "fluentbit/td-agent-bit.conf" -> "facia-tool/fluentbit/td-agent-bit.conf", baseDirectory.value / "fluentbit/parsers.conf" -> "facia-tool/fluentbit/parsers.conf" - ) ++ ((jsBundlesDir * "*") pair rebase(jsBundlesDir, "static-facia-tool")) + ) } ThisBuild / javacOptions := Seq("-g","-encoding", "utf8") diff --git a/conf/routes b/conf/routes index 6c4cdd8659b..2cb9e82e659 100644 --- a/conf/routes +++ b/conf/routes @@ -11,8 +11,9 @@ GET /logout controllers.PandaAuthContro GET /login/status controllers.PandaAuthController.status # static files -GET /assets/fronts-client/*file controllers.V2Assets.at(path="", file) -GET /assets/*file controllers.UncachedAssets.at(path="", file) +GET /assets/fronts-client/*file controllers.V2Assets.at(path="", file) +GET /assets/dist/*file controllers.V1Assets.aggressivelyCached(file) +GET /assets/*file controllers.V1Assets.notCached(file) ##################### NOTE ############################ #all endpoints below this line should be authenticated# diff --git a/package.json b/package.json index 435e31987db..e71c94dda45 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Guardian front pages editor", "scripts": { - "bundleV1config": "esbuild public/src/js/config.js public/src/js/collections.js --bundle --minify --sourcemap --outdir=public/dist ", + "bundleV1": "esbuild public/src/js/config.js public/src/js/collections.js --bundle --minify --sourcemap --outdir=public/dist ", "watchV1": "esbuild public/src/js/config.js public/src/js/collections.js --bundle --sourcemap --outdir=public/dist --watch", "test": "grunt test", "test:browser": "grunt test --no-single-run" diff --git a/public/src/js/shared.js b/public/src/js/shared.js index 7a7bad10be6..e14cd8f2c9b 100644 --- a/public/src/js/shared.js +++ b/public/src/js/shared.js @@ -10,6 +10,8 @@ import oauthSession from './utils/oauth-session'; import Router from './modules/router'; import handlers from './modules/route-handlers'; +//FIXME reinstate import 'font-awesome/css/font-awesome.min.css!'; here or in the scala templates + var router, bootstrap; function terminate (error) { diff --git a/riff-raff.yaml b/riff-raff.yaml index dfc6affcb41..5d23a6c29f5 100644 --- a/riff-raff.yaml +++ b/riff-raff.yaml @@ -18,18 +18,3 @@ deployments: cloudFormationStackName: facia cloudFormationStackByTags: false prependStackToCloudFormationStackName: false - static-facia-tool: - type: aws-s3 - parameters: - bucket: cms-fronts-static-assets - cacheControl: - - pattern: .*\\.js$ - value: public, max-age=315360000 - - pattern: .* - value: public, max-age=60 - mimeTypes: - js: application/javascript - map: text/plain - json: application/json - prefixStack: false - publicReadAcl: true diff --git a/scripts/ci.sh b/scripts/ci.sh index b1ddad25723..4d2ad6d941e 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -16,12 +16,8 @@ globalJsDependencies() { javascriptV1() { npm install - npm run jspm config registries.github.auth ${JSPM_GITHUB_AUTH_SECRET} - npm run jspm registry export github - npm run jspm install - grunt --stack validate -# grunt --stack test - grunt --stack bundle +# grunt --stack test #FIXME reinstate tests + npm run bundleV1 } javascriptV2() {