Merge pull request #894 from OSC/update-pinned-apps-menu-rebased

Update pinned apps menu rebased

Author: ericfranz

apps/dashboard/app/apps/ood_app_group.rb

@@ -1,9 +1,9 @@
 class OodAppGroup
-  attr_accessor :apps, :title
+  attr_accessor :apps
 
   def initialize(title: "", apps: [])
     @apps = apps
-    @title = title
+    @_title = title
   end
 
   def has_apps?
@@ -15,6 +15,30 @@ def has_batch_connect_apps?
     @has_batch_connect_apps = apps.any?(&:batch_connect_app?)
   end
 
+  def title
+    @title ||= begin
+      if @_title == "Pinned Apps"
+        if apps.size > nav_limit
+          "Pinned Apps (showing #{nav_limit} of #{apps.size})"
+        else
+          "Pinned Apps"
+        end
+      else
+        @_title
+      end
+    end
+  end
+
+  def nav_limit
+    @nav_limit ||= begin
+      if @_title == "Pinned Apps"
+        ::Configuration.pinned_apps_menu_length
+      else
+        apps.size
+      end
+    end
+  end
+
   # given an array of apps, group those apps by app category (or the attribute)
   # specified by 'group_by', sorting both groups and apps arrays by title
   def self.groups_for(apps: [], group_by: :category)

apps/dashboard/app/controllers/application_controller.rb

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
 
   before_action :set_user, :set_nav_groups, :set_announcements, :set_locale
   before_action :set_my_balances, only: [:index, :new, :featured]
+  before_action :set_featured_group
 
   def set_locale
     I18n.locale = ::Configuration.locale
@@ -17,13 +18,12 @@ def set_user
   end
 
   def set_nav_groups
-    groups = sys_app_groups + pinned_app_group
     #TODO: for AweSim, what if we added the shared apps here?
-    if NavConfig.categories_whitelist?
-      @nav_groups = OodAppGroup.select(titles: NavConfig.categories, groups: groups)
-    else
-      @nav_groups = OodAppGroup.order(titles: NavConfig.categories, groups: groups)
-    end
+    @nav_groups = filter_groups(sys_app_groups)
+  end
+
+  def set_featured_group
+    @featured_group = filter_groups(pinned_app_group).first # 1 single group called 'Apps'
   end
 
   def sys_apps
@@ -80,4 +80,14 @@ def set_my_balances
     ::Configuration.balance_paths.each { |path| @my_balances += Balance.find(path, OodSupport::User.new.name) }
     @my_balances
   end
+
+  private
+
+  def filter_groups(groups)
+    if NavConfig.categories_whitelist?
+      OodAppGroup.select(titles: NavConfig.categories, groups: groups)
+    else
+      OodAppGroup.order(titles: NavConfig.categories, groups: groups)
+    end
+  end
 end

apps/dashboard/app/views/layouts/application.html.erb

@@ -36,6 +36,7 @@
       </div>
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-9">
         <ul class="nav navbar-nav">
+          <%= render partial: 'layouts/nav/featured_apps', locals: { group: @featured_group } if pinned_apps? %>
           <%= render partial: 'layouts/nav/group', collection: @nav_groups %>
           <%= render partial: 'layouts/nav/sessions', nav_groups: @nav_groups if Configuration.app_development_enabled? || @nav_groups.any?(&:has_batch_connect_apps?) %>
           <%= render partial: 'layouts/nav/all_apps' if Configuration.show_all_apps_link? %>

apps/dashboard/app/views/layouts/nav/_featured_apps.erb

@@ -0,0 +1,30 @@
+<li class="dropdown" title="<%= group.title %>" >
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= group.title %><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <% OodAppGroup.groups_for(apps: group.apps, group_by: :subcategory).each_with_index do |g, index| %>
+      <%= content_tag "li", "", class: "divider", role: "separator" if index > 0 %>
+      <%= content_tag "li", g.title, class: "dropdown-header" unless g.title.empty? %>
+      <% g.apps.take(g.nav_limit).each do |app| %>
+        <% app.links.each do |link| %>
+          <li>
+            <%=
+              link_to(
+                link.url.to_s,
+                title: link.title,
+                target: link.new_tab? ? "_blank" : nil
+              ) do
+            %>
+              <%= icon_tag(link.icon_uri) %> <%=link.title %>
+              <% if link.subtitle.present? %>
+                <%= content_tag(:small, link.subtitle, style: "text-indent: 20px", class: 'visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline') %>
+              <% end %>
+            <% end %>
+          </li>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%= content_tag "li", "", class: "divider", role: "separator" %>
+    <%= render partial: 'layouts/nav/all_apps' %>
+  </ul>
+</li>

apps/dashboard/config/configuration_singleton.rb

@@ -260,6 +260,11 @@ def pinned_apps
     config.fetch(:pinned_apps, [])
   end
 
+  # The length of the "Pinned Apps" navbar menu
+  def pinned_apps_menu_length
+    config.fetch(:pinned_apps_menu_length, 6)
+  end
+
   private
 
   def config

apps/dashboard/test/controllers/dashboard_controller_test.rb

@@ -147,10 +147,39 @@ def dropdown_list_items_urls(list)
         "Owens Desktop",
         "Jupyter Notebook",
         "Paraview",
-        "PseudoFuN"
+        "PseudoFuN",
+        :divider,
+        "All Apps"
       ], dditems
   end
 
+  test "should limit list of Pinned Apps in dropdown" do
+    SysRouter.stubs(:base_path).returns(Rails.root.join("test/fixtures/sys_with_gateway_apps"))
+    OodAppkit.stubs(:clusters).returns(OodCore::Clusters.load_file("test/fixtures/config/clusters.d"))
+    Configuration.stubs(:pinned_apps).returns([
+      'sys/bc_jupyter',
+      'sys/bc_paraview',
+      'sys/bc_desktop/owens',
+      'sys/bc_desktop/doesnt_exist',
+      'sys/pseudofun',
+      'sys/should_get_filtered'
+    ])
+    Configuration.stubs(:pinned_apps_menu_length).returns(2)
+
+    get :index
+
+    dd = dropdown_list('Apps')
+    dditems = dropdown_list_items(dd)
+    assert dditems.any?, "dropdown list items not found"
+    assert_equal [
+      { header: "Pinned Apps (showing 2 of 4)" },
+      "Owens Desktop",
+      "Jupyter Notebook",
+      :divider,
+      "All Apps"
+    ], dditems
+end
+
   test "should create Pinned app icons when pinned apps are available" do
     SysRouter.stubs(:base_path).returns(Rails.root.join("test/fixtures/sys_with_gateway_apps"))
     OodAppkit.stubs(:clusters).returns(OodCore::Clusters.load_file("test/fixtures/config/clusters.d"))