Remove old Web Actions tabs

GitOrigin-RevId: 63cb87180eae632e3dc0e420ccd1de3707f4cfd0

Author: adrw

misk-admin/build.gradle.kts

@@ -146,7 +146,6 @@ abstract class MiskWebBuildTask @Inject constructor(
 
 val tabDirs = listOf(
   "web/tabs/database",
-  "web/tabs/web-actions",
 )
 
 val buildMiskWeb = tasks.register("buildMiskWeb", MiskWebBuildTask::class.java) {
@@ -187,7 +186,7 @@ tasks.register<Copy>("buildAndCopyWebActions") {
   from({
     project(":misk-admin-web-actions").tasks.named("buildWebActionsTab").get().outputs.files
   })
-  into(project.layout.buildDirectory.dir("resources/main/web/_tab/web-actions-v4"))
+  into(project.layout.buildDirectory.dir("resources/main/web/_tab/web-actions"))
   dependsOn(":misk-admin-web-actions:buildWebActionsTab")
 }
 

misk-admin/src/main/kotlin/misk/web/dashboard/MiskWebTabIndexAction.kt

@@ -33,9 +33,7 @@ class MiskWebTabIndexAction @Inject constructor(
   fun get(@PathParam slug: String?): String {
     val dashboardTab = dashboardTabs.firstOrNull { slug == it.slug }
       ?: throw NotFoundException("No Misk-Web tab found for slug: $slug")
-    // TODO remove this hack when new Web Actions tab lands and old ones removed, v1 and v2 are in the same web-actions tab
-    val normalizedSlug = if (dashboardTab.slug == "web-actions-v1") "web-actions" else dashboardTab.slug
-    val tabEntrypointJs = "/_tab/${normalizedSlug}/tab_${normalizedSlug}.js"
+    val tabEntrypointJs = "/_tab/${dashboardTab.slug}/tab_${dashboardTab.slug}.js"
 
     return buildHtml {
       html {
@@ -52,7 +50,7 @@ class MiskWebTabIndexAction @Inject constructor(
 
             // App anchor
             div {
-              id = normalizedSlug
+              id = dashboardTab.slug
             }
           }
 

misk-admin/src/main/kotlin/misk/web/metadata/webaction/WebActionsDashboardTabModule.kt

@@ -1,61 +1,29 @@
 package misk.web.metadata.webaction
 
 import misk.inject.KAbstractModule
-import misk.web.WebActionModule
 import misk.web.dashboard.AdminDashboard
 import misk.web.dashboard.AdminDashboardAccess
 import misk.web.dashboard.DashboardModule
 
 /**
  * Installs WebActions dashboard tab which allows introspection
- * and exercising actions from a UI form.
- *
- * This installs both versions of the WebActions tab, v1 and v2.
+ * and exercising actions from an auto-fill JSON editor.
  */
-class WebActionsDashboardTabModule(private val isDevelopment: Boolean): KAbstractModule() {
+class WebActionsDashboardTabModule(private val isDevelopment: Boolean) : KAbstractModule() {
   override fun configure() {
-    // Web Actions v2
     bind<WebActionsMetadata>().toProvider(WebActionsMetadataProvider())
-    install(WebActionModule.create<WebActionMetadataAction>())
 
-    // Web Actions v4
     install(
       DashboardModule.createIFrameTab<AdminDashboard, AdminDashboardAccess>(
         // TODO get development proxy working for IFrame tabs
 //        isDevelopment = isDevelopment,
-        slug = "web-actions-v4",
-        urlPathPrefix = "/_admin/web-actions-v4/",
-        iframePath = "/_tab/web-actions-v4/index.html",
+        slug = "web-actions",
+        urlPathPrefix = "/_admin/web-actions/",
+        iframePath = "/_tab/web-actions/index.html",
 //        developmentWebProxyUrl = "http://localhost:3210/",
         menuLabel = "Web Actions",
         menuCategory = "Container Admin",
       )
     )
-
-
-    // Web Actions v2
-    install(
-      DashboardModule.createMiskWebTab<AdminDashboard, AdminDashboardAccess>(
-        isDevelopment = isDevelopment,
-        slug = "web-actions",
-        urlPathPrefix = "/_admin/web-actions/",
-        developmentWebProxyUrl = "http://localhost:3201/",
-        menuLabel = "Old Web Actions v2",
-        menuCategory = "Container Admin"
-      )
-    )
-
-    // Web Actions v1
-    install(
-      DashboardModule.createMiskWebTab<AdminDashboard, AdminDashboardAccess>(
-        isDevelopment = isDevelopment,
-        slug = "web-actions-v1",
-        urlPathPrefix = "/_admin/web-actions-v1/",
-        developmentWebProxyUrl = "http://localhost:3201/",
-        classpathResourcePathPrefix = "classpath:/web/_tab/web-actions/",
-        menuLabel = "Old Web Actions v1",
-        menuCategory = "Container Admin"
-      )
-    )
   }
 }

misk-admin/src/main/kotlin/misk/web/v2/DashboardIFrameTabAction.kt

@@ -69,9 +69,7 @@ internal class DashboardIFrameTabAction @Inject constructor(
               AlertError("No Misk-Web tab found for slug: $slug. Check your install bindings or Misk-Web build.")
             }
           } else {
-            // TODO remove this hack when new Web Actions tab lands and old ones removed, v1 and v2 are in the same web-actions tab
-            val normalizedSlug =
-              if (dashboardTab.slug == "web-actions-v1") "web-actions" else dashboardTab.slug
+            val normalizedSlug = dashboardTab.slug
             val tabEntrypointJs = "/_tab/${normalizedSlug}/tab_${normalizedSlug}.js"
 
             // If tab is Misk-Web do additional checks and show separate development and real errors
@@ -113,12 +111,14 @@ internal class DashboardIFrameTabAction @Inject constructor(
             // If tab is Misk-Web do additional checks and show separate development and real errors
             if (deployment.isLocalDevelopment) {
               // If local development, check web proxy action and show fuller development 404 message
-              val tabEntrypointJsResponse = webProxyAction
+              val proxyResponse = webProxyAction
                 .getResponse((hostname / iframeTab.iframePath).toHttpUrl())
-              if (tabEntrypointJsResponse.statusCode != 200) {
+              val staticResponse = staticResourceAction
+                .getResponse((hostname / iframeTab.iframePath).toHttpUrl())
+              if (proxyResponse.statusCode != 200 && staticResponse.statusCode != 200) {
                 div("container mx-auto p-8") {
                   AlertError("Failed to load tab: ${dashboardTab.menuCategory} / ${dashboardTab.menuLabel}")
-                  if (iframeTab.iframePath == "/_tab/web-actions-v4/index.html") {
+                  if (iframeTab.iframePath == "/_tab/web-actions/index.html") {
                     AlertInfo("In local development, this can be from not having your local dev server (ie. Webpack) running or not doing an initial local frontend build to generate the necessary web assets. Try running in your Terminal: \$ gradle :misk:misk-admin:buildAndCopyWebActions.")
                   } else {
                     AlertInfo("In local development, this can be from not having your local dev server (ie. Webpack) running or not doing an initial local frontend build to generate the necessary web assets. Try running in your Terminal: \$ gradle buildMiskWeb OR \$ misk-web ci-build -e.")