Rename workspace-beta path to workbench

silk-framework · Oct 28, 2020 · 3516164 · 3516164
1 parent 2a85679
commit 3516164
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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]
-}
+}