tramway-admin 1.25 → 1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7852be8e1252b1898b91dfa9d2cb59ea27964a5324dfe28f853b8246c4128f4d
-  data.tar.gz: 93324c1d3e853a2c2c7f8e44f850af44e1235282b67ae27ea3b3a996fa09bcc6
+  metadata.gz: 3bd2a0e29a7da7e51b34b7040faf3554d31c8e3d62782700497283cd1edc5f81
+  data.tar.gz: db5c2b60ddb4511153633c10b1015e54e36f8d6b4d6453d5c093972cccc97fd6
 SHA512:
-  metadata.gz: c111155d6b7bc46989c9d744e9404a59e7a0a1894d3ad9eabd0e25616891e22368d8602d141c9a9891efe15cf3fc803e0369c23c50f37b031102547672a93622
-  data.tar.gz: c748a1042f1c39311b6042a4ab79a241b142611182c7c6819ed7ead59896989a8130035575bdf078d4143f14194cea87c2e77e972bc49a49358274fbf2a5da55
+  metadata.gz: 07d5ac7855e789ebfc6b119d8e0326762b3ca4f24785fa16890fb75ac6f03abade1cf0db10ea91c8fb4e84a9f3adab8d67707369d093194385cf9a32487daf87
+  data.tar.gz: 0c9f8a55011a621d84d13cf720dcb66df5953dec647db2bb4cd1bbf5b1f6cd6b50f5ec3c81fefb5a739593363fe6d23498066b781219d06cf8613640c656557a

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -9,10 +9,27 @@
     .navbar-collapse.collapse#navbar
       - if signed_in?
         %ul.navbar-nav
-          - ::Tramway::Admin.singleton_models_for(@application_engine || @application.name, role: current_user.role)&.each do |model|
-            = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model), pluralize: plural(model.model_name).capitalize
-          - ::Tramway::Admin.available_models_for(@application_engine || @application.name, role: current_user.role)&.each do |model|
-            = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
+          - ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_user.role)&.each do |item|
+            - case item.keys.first
+            - when Class
+              - model = item.keys.first
+              - case item.values.first
+              - when :singleton
+                = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
+              - when :record
+                = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
+            - when Symbol
+              = dropdown t("admin.navbar.links.#{item.keys.first}") do
+                - item.values.first.each do |sub_item|
+                  - if sub_item == :divider
+                    = dropdown_divider
+                  - else
+                    - model = sub_item.keys.first
+                    - if sub_item.values.first == :singleton
+                      = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
+                    - if sub_item.values.first == :record
+                      = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
+
       %ul.nav.navbar-nav.ml-auto
         - if signed_in?
           - if @notifications_count > 0

data/lib/tramway/admin.rb

@@ -6,6 +6,7 @@ require 'tramway/admin/records_models'
 require 'tramway/admin/additional_buttons'
 require 'tramway/admin/notifications'
 require 'tramway/admin/welcome_page_actions'
+require 'tramway/admin/navbar'
 require 'tramway/error'
 
 module Tramway
@@ -18,6 +19,7 @@ module Tramway
       include ::Tramway::Admin::AdditionalButtons
       include ::Tramway::Admin::Notifications
       include ::Tramway::Admin::WelcomePageActions
+      include ::Tramway::Admin::Navbar
 
       attr_reader :customized_admin_navbar
 

data/lib/tramway/admin/navbar.rb

@@ -0,0 +1,33 @@
+module Tramway::Admin::Navbar
+  def navbar_structure(*links)
+    @navbar_structure ||= links
+  end
+
+  def navbar_items_for(project, role:)
+    @singleton_models_for ||= singleton_models_for(project, role: role)
+    @available_models_for ||= available_models_for(project, role: role)
+    @navbar_structure ||= {}
+    @navbar_structure.map do |item|
+      if item.is_a? Class
+        should_be_in_navbar_as item
+      elsif item.is_a? Hash
+        sub_items = item.values.first.map do |sub_item|
+          should_be_in_navbar_as sub_item
+        end.compact
+        { item.keys.first => sub_items } if sub_items.any?
+      end
+    end.compact
+  end
+
+  private
+
+  def should_be_in_navbar_as(item)
+    if @singleton_models_for.include?(item)
+      { item => :singleton }
+    elsif @available_models_for.include?(item)
+      { item => :record }
+    elsif item.is_a? Symbol
+      :divider
+    end
+  end
+end

data/lib/tramway/admin/singleton_models.rb

@@ -19,7 +19,7 @@ module Tramway::Admin::SingletonModels
     models = get_models_by_key(@singleton_models, project, role)
     if project_is_engine?(project)
       models += engine_class(project).dependencies.map do |dependency|
-        @singleton_models[dependency][role]&.keys
+        @singleton_models&.dig(dependency, role)&.keys
       end.flatten.compact
     end
     models

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.25'
+    VERSION = '1.26'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.26'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 description: Engine for admin
 email:
 - kalashnikovisme@gmail.com
@@ -229,6 +229,7 @@ files:
 - lib/tramway/admin.rb
 - lib/tramway/admin/additional_buttons.rb
 - lib/tramway/admin/engine.rb
+- lib/tramway/admin/navbar.rb
 - lib/tramway/admin/notifications.rb
 - lib/tramway/admin/record_routes_helper.rb
 - lib/tramway/admin/records_models.rb