14794: Adds Workbench2 menu item.

[arvados.git] / apps / workbench / app / views / layouts / body.html.erb

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 174e35fbb64705a1614479c9b2e731947b8bf13a..c1dc15fa91ec6805a47597ec4bca60baceb26c53 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -74,23 +74,41 @@ SPDX-License-Identifier: AGPL-3.0 %>
                 <li role="menuitem"><a href="/projects/<%=current_user.uuid%>" role="menuitem"><i class="fa fa-lg fa-home fa-fw"></i> Home project </a></li>
                   <% if Rails.configuration.composer_url %>
                     <li role="menuitem">
-                      <%= link_to Rails.configuration.composer_url, role: 'menu-item' do %>
-                      <i class="fa fa-lg fa-share-alt fa-fw"></i> Workflow Composer
-                  <% end %>
+                     <form action="<%= Rails.configuration.composer_url %>" method="GET">
+                       <input type="hidden" name="api_token" value="<%= Thread.current[:arvados_api_token] %>" />
+                       <button role="menuitem" type="submit">
+                         <i class="fa fa-lg fa-share-alt fa-fw"></i> Workflow Composer
+                       </button>
+                     </form>
                     </li>
                   <% end %>
+                <li role="menuitem">
+                  <%
+                  protocol, hostname = arvados_api_client.discovery[:workbenchUrl].split("://")
+                  workbench2_url = "#{protocol}://workbench2.#{hostname.split(".")[1..-1].join(".")}"
+                  %>
+                  <form action="<%= workbench2_url %>/token" method="GET">
+                    <input type="hidden" name="api_token" value="<%= Thread.current[:arvados_api_token] %>">
+                    <button role="menuitem" type="submit">
+                      <i class="fa fa-lg fa-share-square fa-fw"></i> Go to new Workbench
+                    </button>
+                  </form>
+                </li>
                 <li role="menuitem">
                   <%= link_to virtual_machines_user_path(current_user), role: 'menu-item' do %>
                     <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
                   <% end %>
                 </li>
+                <% if Rails.configuration.repositories %>
                 <li role="menuitem"><a href="/repositories" role="menuitem"><i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories </a></li>
+                <% end -%>
                 <li role="menuitem"><a href="/current_token" role="menuitem"><i class="fa fa-lg fa-ticket fa-fw"></i> Current token</a></li>
                 <li role="menuitem">
                   <%= link_to ssh_keys_user_path(current_user), role: 'menu-item' do %>
                     <i class="fa fa-lg fa-key fa-fw"></i> SSH keys
                   <% end %>
-                </li>
+</li>
+                <li role="menuitem"><a href="/users/link_account" role="menuitem"><i class="fa fa-lg fa-link fa-fw"></i> Link account </a></li>
                 <% if Rails.configuration.user_profile_form_fields %>
                   <li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-lg fa-user fa-fw"></i> Manage profile</a></li>
                 <% end %>
@@ -117,9 +135,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
                   <li role="presentation" class="dropdown-header">
                     Admin Settings
                   </li>
+                  <% if Rails.configuration.repositories %>
                   <li role="menuitem"><a href="/repositories">
                       <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
                   </a></li>
+                  <% end -%>
                   <li role="menuitem"><a href="/virtual_machines">
                       <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
                   </a></li>