From 351616434ab79768130cc473b5842703c1d1ec31 Mon Sep 17 00:00:00 2001
From: Andreas Schultz <aschultz@brox.de>
Date: Wed, 28 Oct 2020 12:45:30 +0100
Subject: [PATCH] Rename workspace-beta path to workbench

---
 silk-workbench/conf/routes                                  | 6 +++---
 .../silk-workbench-core/app/views/start.scala.html          | 2 +-
 .../app/controllers/workspaceApi/search/ItemType.scala      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/silk-workbench/conf/routes b/silk-workbench/conf/routes
index 9773f0987e..c7c455ce07 100644
--- a/silk-workbench/conf/routes
+++ b/silk-workbench/conf/routes
@@ -1,7 +1,7 @@
 GET        /               controllers.Workbench.index
-# TODO: remove this route later
-GET        /workspace-beta     controllers.Workbench.reactUIRoot()
-GET        /workspace-beta/*x  controllers.Workbench.reactUI(x: String)
+
+GET        /workbench     controllers.Workbench.reactUIRoot()
+GET        /workbench/*x  controllers.Workbench.reactUI(x: String)
 
 # Redirect call to individual modules
 ->         /core           core.Routes
diff --git a/silk-workbench/silk-workbench-core/app/views/start.scala.html b/silk-workbench/silk-workbench-core/app/views/start.scala.html
index f35b585669..d09d17931f 100644
--- a/silk-workbench/silk-workbench-core/app/views/start.scala.html
+++ b/silk-workbench/silk-workbench-core/app/views/start.scala.html
@@ -34,7 +34,7 @@
       }
       @if(ProductionConfig.betaWorkspaceSwitchEnabled) {
         <span>
-          <a id="beta-workspace-switch" href="@config.baseUrl/workspace-beta" class="mdl-button mdl-js-button mdl-button--raised">New workspace UI (beta)</a>
+          <a id="beta-workspace-switch" href="@config.baseUrl/workbench" class="mdl-button mdl-js-button mdl-button--raised">New workspace UI</a>
           <div class="mdl-tooltip" data-mdl-for="beta-workspace-switch">
             Switch to the beta version of the new workspace user interface.
           </div>
diff --git a/silk-workbench/silk-workbench-workspace/app/controllers/workspaceApi/search/ItemType.scala b/silk-workbench/silk-workbench-workspace/app/controllers/workspaceApi/search/ItemType.scala
index 7d8d22a899..1ab5f986b1 100644
--- a/silk-workbench/silk-workbench-workspace/app/controllers/workspaceApi/search/ItemType.scala
+++ b/silk-workbench/silk-workbench-workspace/app/controllers/workspaceApi/search/ItemType.scala
@@ -26,7 +26,7 @@ object ItemType {
   private def context: String = WorkbenchConfig.applicationContext
 
   // TODO: Update URL after deciding on path for new workspace
-  private def workspaceProjectPath(projectId: String) = s"workspace-beta/projects/$projectId"
+  private def workspaceProjectPath(projectId: String) = s"workbench/projects/$projectId"
 
   /** Link to the item details page. */
   def itemDetailsPage(itemType: ItemType, projectId: String, itemId: String): ItemLink = {
@@ -103,4 +103,4 @@ case class ItemLink(label: String, path: String)
 
 object ItemLink {
   implicit val itemLinkFormat: Format[ItemLink] = Json.format[ItemLink]
-}
\ No newline at end of file
+}