From 567cefb3a56c1fcfc8b60ebd239d2ca0849fd7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Piaggio?= Date: Tue, 21 Oct 2025 10:23:27 -0300 Subject: [PATCH] remove reusability overlay. bump scalajs-react --- explore/app/src/main/scala/explore/Explore.scala | 9 --------- explore/app/src/main/scala/explore/TopBar.scala | 12 ++---------- .../src/main/scala/explore/utils/package.scala | 9 --------- project/Versions.scala | 2 +- .../src/main/scala/lucuma/ui/demo/AladinDemo.scala | 3 --- ui/demo/src/main/scala/lucuma/ui/demo/AppMain.scala | 3 --- 6 files changed, 3 insertions(+), 35 deletions(-) diff --git a/explore/app/src/main/scala/explore/Explore.scala b/explore/app/src/main/scala/explore/Explore.scala index aa092572d0..6d7549d9e4 100644 --- a/explore/app/src/main/scala/explore/Explore.scala +++ b/explore/app/src/main/scala/explore/Explore.scala @@ -25,12 +25,10 @@ import explore.model.RootModel import explore.model.RoutingInfo import explore.model.WorkerClients import explore.model.enums.AppTab -import explore.utils.* import fs2.dom.BroadcastChannel import japgolly.scalajs.react.* import japgolly.scalajs.react.extra.router.* import log4cats.loglevel.LogLevelLogger -import lucuma.core.enums.ExecutionEnvironment import lucuma.core.model.Program import lucuma.react.primereact.ToastRef import lucuma.ui.sso.UserVault @@ -96,12 +94,6 @@ object ExploreMain { def run: IO[Unit] = { - def setupReusabilityOverlay(env: ExecutionEnvironment): IO[Unit] = - if (env === ExecutionEnvironment.Development) { - toggleReusabilityOverlay[IO]() >> - IO(japgolly.scalajs.react.extra.ReusabilityOverlay.overrideGloballyInDev()) - } else IO.unit - val reconnectionStrategy: ReconnectionStrategy = (attempt, _) => // Increase the delay to get exponential backoff with a minimum of 1s and a max of 1m @@ -151,7 +143,6 @@ object ExploreMain { bc, toastRef ) - _ <- setupReusabilityOverlay(appConfig.environment) r <- (ctx.sso.whoami, setupDOM[IO], showEnvironment[IO](appConfig.environment)).parTupled (vault, container, _) = r } yield ReactDOMClient diff --git a/explore/app/src/main/scala/explore/TopBar.scala b/explore/app/src/main/scala/explore/TopBar.scala index 202f08dc66..e37637b050 100644 --- a/explore/app/src/main/scala/explore/TopBar.scala +++ b/explore/app/src/main/scala/explore/TopBar.scala @@ -20,7 +20,6 @@ import explore.undo.UndoStacks import explore.users.RedeemInvitationsPopup import explore.users.UserPreferencesPopup import japgolly.scalajs.react.* -import japgolly.scalajs.react.callback.CallbackCatsEffect.* import japgolly.scalajs.react.vdom.html_<^.* import lucuma.core.enums.ExecutionEnvironment import lucuma.core.model.GuestRole @@ -162,15 +161,8 @@ object TopBar: ).flattenOption val lastItems = - if (LinkingInfo.developmentMode) - val reusabilityItem = MenuItem - .Item( - label = "Toggle Reusability", - icon = Icons.CrystalBall, - command = utils.toggleReusabilityOverlay[CallbackTo](), - visible = ctx.environment === ExecutionEnvironment.Development - ) - lastCommonItems ++ List(ThemeSubMenu(props.theme), reusabilityItem) + if LinkingInfo.developmentMode + then lastCommonItems :+ ThemeSubMenu(props.theme) else lastCommonItems val menuItems = diff --git a/explore/common/src/main/scala/explore/utils/package.scala b/explore/common/src/main/scala/explore/utils/package.scala index 4be83926f5..6b37bd8c7a 100644 --- a/explore/common/src/main/scala/explore/utils/package.scala +++ b/explore/common/src/main/scala/explore/utils/package.scala @@ -24,12 +24,10 @@ import lucuma.core.util.Display import lucuma.core.util.Enumerated import lucuma.core.util.NewBoolean import lucuma.core.util.TimeSpan -import lucuma.react.common.style.Css import lucuma.ui.components.TimeSpanView import lucuma.ui.format.versionDateFormatter import lucuma.ui.input.ChangeAuditor import lucuma.ui.syntax.all.given -import org.scalajs.dom import java.time.Instant @@ -38,13 +36,6 @@ val canvasHeight = VdomAttr("height") val dataAbbrv = VdomAttr("data-abbrv") val filter = VdomAttr("filter") -def toggleReusabilityOverlay[F[_]: Sync](): F[Unit] = - Sync[F] - .delay( - dom.document.body.classList.toggle(ExploreStyles.HideReusability.htmlClass) - ) - .void - val gitHash = BuildInfo.gitHeadCommit def version(environment: ExecutionEnvironment): NonEmptyString = { diff --git a/project/Versions.scala b/project/Versions.scala index 01df72eeb2..cb9eec2f38 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -53,7 +53,7 @@ object Versions { val sbtRevolver = "0.10.0" val scalaCollectionContrib = "0.4.0" val scalaJsDom = "2.8.1" - val scalaJsReact = "3.0.0-beta12" + val scalaJsReact = "3.0.0-beta13" val slf4j = "2.0.17" val unboundId = "3.2.1" } diff --git a/ui/demo/src/main/scala/lucuma/ui/demo/AladinDemo.scala b/ui/demo/src/main/scala/lucuma/ui/demo/AladinDemo.scala index 6788300de8..af6b3d4181 100644 --- a/ui/demo/src/main/scala/lucuma/ui/demo/AladinDemo.scala +++ b/ui/demo/src/main/scala/lucuma/ui/demo/AladinDemo.scala @@ -7,7 +7,6 @@ import cats.effect.* import demo.TargetBody import japgolly.scalajs.react.React import japgolly.scalajs.react.ReactDOMClient -import japgolly.scalajs.react.extra.ReusabilityOverlay import japgolly.scalajs.react.vdom.html_<^.* import lucuma.ui.syntax.all.given import org.scalajs.dom @@ -21,8 +20,6 @@ trait AladinAppMain extends IOApp.Simple { def runIOApp(): Unit = main(Array.empty) override final def run: IO[Unit] = IO { - ReusabilityOverlay.overrideGloballyInDev() - val container = Option(dom.document.getElementById("root")).getOrElse { val elem = dom.document.createElement("div") elem.id = "root" diff --git a/ui/demo/src/main/scala/lucuma/ui/demo/AppMain.scala b/ui/demo/src/main/scala/lucuma/ui/demo/AppMain.scala index 464e979450..f7ef361a1b 100644 --- a/ui/demo/src/main/scala/lucuma/ui/demo/AppMain.scala +++ b/ui/demo/src/main/scala/lucuma/ui/demo/AppMain.scala @@ -6,7 +6,6 @@ package lucuma.ui.demo import cats.effect.* import japgolly.scalajs.react.React import japgolly.scalajs.react.ReactDOMClient -import japgolly.scalajs.react.extra.ReusabilityOverlay import japgolly.scalajs.react.vdom.html_<^.* import org.scalajs.dom @@ -19,8 +18,6 @@ trait AppMain extends IOApp.Simple { def runIOApp(): Unit = main(Array.empty) override final def run: IO[Unit] = IO { - ReusabilityOverlay.overrideGloballyInDev() - val container = Option(dom.document.getElementById("root")).getOrElse { val elem = dom.document.createElement("div") elem.id = "root"