adminterface 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa4367f85794395d6b92b141c12488c2158b99f0585f4a76f201bb080fb167c
-  data.tar.gz: 88a7bb2ecafe63f80145908a0cd4d1289011a71352ee9960f2870a80c91fc08f
+  metadata.gz: 2b30a8aff4bfb6cf7d7b27a339506303115d5405b0469235a8bc30b742dfc83d
+  data.tar.gz: fb9a449e608873ef279011a2aa28842c0ea58ebffe536c2e5dd5ea86073554bc
 SHA512:
-  metadata.gz: 92dfa1e53f319043ee355df3d0d70e9888f070727c5828851ee1e10d6e2aa590af464dc7ad75ef871d8e375676dfc68ed4c97decc0fc3f0492868d642f2f2667
-  data.tar.gz: 650a23ef8b8f323f6f792fa591aec71d60701c7b5c32d3d2d311cb51ed73a42f9ef8bf0d988498d60aba2cfe0b8a87e82bd8aa7c8e5162b209ac6f72e5d60004
+  metadata.gz: fa068e11984acb0479d6cf5b91b9af4ca200da51fd5eca97db028350cf5aac3069c5f1d31fd02232e0b0a8f2cb265e9f93ce87d24bb9c86b8dbbd8daec7362e8
+  data.tar.gz: 38bd9d91f3748df7c4e81482eccf9262e8426aaf02be1a7014be6ef9a4074432608688dabd3ae0b4b37cd3fa8e9ffb68b22fb96e26e7322539cc1cbfcd408e82

data/README.md

@@ -50,7 +50,7 @@ Check our [website](https://adminterface.io) to find in-depth documentation for
 See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## License
-Adminterface is free for personal and non-commercial use and with a yearly subscription for commercial purposes. See [our Terms of Service in full text](LICENSE.md) for more information.
+Adminterface is free for personal and non-commercial use and with a yearly subscription for commercial purposes. See our [Terms of Service in full text](LICENSE.md) for more information.
 
 ### For Commerical License
 Get a license at https://adminterface.io/pricing, then create and add the `license_key` into the following file in your project:

data/Rakefile

@@ -18,7 +18,7 @@ task :prepare_assets do
   system "rm -rf test/dummy/public/packs"
   system "rm -rf test/dummy/public/packs-test"
   system "yarn install --frozen-lockfile"
-  system "(cd test/dummy && yarn install --frozen-lockfile)"
+  system "cd test/dummy && yarn install --frozen-lockfile"
 end
 
 # Generate dependency licenses

data/lib/adminterface/extensions/base_controller.rb

@@ -9,11 +9,19 @@ module Adminterface
 
       def set_resource_scope
         session[:resource_scope] = {
-          controller: controller_name,
-          action: action_name
+          controller: controller_path,
+          action: action_name_pairing(action_name)
         }
       end
 
+      def action_name_pairing(name)
+        case name
+        when "create" then "new"
+        when "update" then "edit"
+        else name
+        end
+      end
+
       def reset_tab
         params.delete(:tab)
         params.delete(:anchor_id)
@@ -26,30 +34,26 @@ module Adminterface
       def same_controller?
         return true if resource_scope[:controller].blank?
 
-        resource_scope[:controller] == controller_name
+        resource_scope[:controller] == controller_path
       end
 
       def same_action?
-        return true if resource_scope[:action].blank?
-
-        case resource_scope[:action]
-        when "edit", "update" then %w[edit update].include? action_name
-        else action_name == resource_scope[:action]
-        end
+        resource_scope[:action].presence &&
+          action_name_pairing(action_name).eql?(resource_scope[:action])
       end
 
       def resource_scope
-        session.fetch(:resource_scope, {})
+        session.fetch(:resource_scope, {}).with_indifferent_access
       end
     end
   end
 end
 
 # Overwrite activeadmin/lib/active_admin/base_controller.rb
-ActiveSupport.on_load(:active_admin) do
+ActiveAdmin.after_load do
   ActiveAdmin::BaseController.class_eval do
     prepend Adminterface::Extensions::BaseController
     before_action :reset_tab, if: :should_reset_tab?
-    after_action :set_resource_scope
+    before_action :set_resource_scope
   end
 end

data/lib/adminterface/extensions/view_helpers/alert_helper.rb

@@ -4,7 +4,9 @@ module Adminterface
       module AlertHelper
         def flashes_html
           flash.each do |type, msg|
-            concat(content_tag(:div, msg, class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]}".squish))
+            concat(content_tag(:div, msg,
+              class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]}".squish,
+              role: "alert"))
           end
           nil
         end

data/lib/adminterface/extensions/views/components/dropdown_menu.rb

@@ -47,7 +47,10 @@ ActiveAdmin::Views::DropdownMenu.class_eval do
     button_options[:class] = "#{button_options[:class]} dropdown-toggle".squish
     options[:class] = "#{options[:class]} dropdown".squish
 
-    @button = build_button(name, button_options.merge("data-bs-toggle": "dropdown"))
+    @button = build_button(
+      name,
+      button_options.merge("data-bs-toggle": "dropdown", role: "button", "aria-expanded": "false")
+    )
     @menu = build_menu(menu_options)
 
     super(options)

data/lib/adminterface/extensions/views/components/menu_item.rb

@@ -15,8 +15,13 @@ module Adminterface
             end
           end
 
-          def item_class(item)
-            "#{item.html_options[:class]} #{item.current?(assigns[:current_tab]) ? "active" : nil}".squish
+          def current_item_options(item)
+            return {} unless item.current?(assigns[:current_tab])
+
+            {
+              class: "#{item.html_options[:class]} active".squish,
+              "aria-current": "page"
+            }
           end
         end
       end
@@ -51,7 +56,7 @@ ActiveAdmin::Views::MenuItem.class_eval do
     end
 
     if url
-      item_options = item.html_options.merge(class: item_class(item)).delete_if { |_k, v| v.blank? }
+      item_options = item.html_options.merge(current_item_options(item)).delete_if { |_k, v| v.blank? }
       text_node link_to(menu_label, url, **item_options)
     else
       span menu_label, item.html_options.merge(class: "navbar-text")

data/lib/adminterface/extensions/views/components/tabs.rb

@@ -6,20 +6,16 @@ module Adminterface
           def build_menu_item(title, options, &_block)
             fragment = options.fetch(:id, fragmentize(title))
             html_options = options.fetch(:html_options, {})
-            li html_options.merge(class: "nav-item") do
-              if @http
-                params[:tab] ||= @default_tab || fragment
-                link_to title, url_for(tab: fragment, anchor: id, anchor_id: id), class: toggler_class(fragment)
-              else
-                link_to title, "##{fragment}", class: toggler_class(fragment), data: {"bs-toggle": "tab", "bs-target": "##{fragment}"}
-              end
+
+            li html_options.merge(class: "nav-item", role: "presentation") do
+              @http ? link_to_http(title, fragment) : link_to_js(title, fragment)
             end
           end
 
           def build_content_item(title, options, &block)
             fragment = options.fetch(:id, fragmentize(title))
-            options = options.reverse_merge(id: fragmentize(title))
-            div(options.merge(class: tab_pane_class(fragment)), &block)
+            options = options.reverse_merge(id: fragment, "aria-labelledby": "#{fragment}-tab")
+            div(options.merge(tab_pane_options(fragment)), &block)
           end
 
           def default_css_class
@@ -39,12 +35,41 @@ module Adminterface
 
           private
 
-          def toggler_class(fragment)
-            "nav-link #{current_tab?(fragment) ? "active" : nil}".squish
+          def link_to_js(title, fragment)
+            options = toggler_options(fragment).merge(data: {"bs-toggle": "tab", "bs-target": "##{fragment}"})
+            link_to(title, "##{fragment}", **options)
+          end
+
+          def link_to_http(title, fragment)
+            params[:tab] ||= @default_tab || fragment
+
+            link_to(title,
+              url_for(controller: resource_scope[:controller],
+                      action: resource_scope[:action], tab: fragment, anchor: id, anchor_id: id),
+              **toggler_options(fragment))
+          end
+
+          def resource_scope
+            session.fetch(:resource_scope, {}).with_indifferent_access
+          end
+
+          def toggler_options(fragment)
+            defaults = {id: "#{fragment}-tab", "aria-controls": fragment}
+            options =
+              if current_tab?(fragment)
+                {class: "nav-link active", "aria-selected": "true"}
+              else
+                {class: "nav-link", "aria-selected": "false"}
+              end
+
+            defaults.merge(options)
           end
 
-          def tab_pane_class(fragment)
-            "tab-pane #{current_tab?(fragment) ? "active" : nil}".squish
+          def tab_pane_options(fragment)
+            {
+              class: "tab-pane #{current_tab?(fragment) ? "active" : nil}".squish,
+              role: "tabpanel"
+            }
           end
 
           def current_tab?(fragment)

data/lib/adminterface/extensions/views/header.rb

@@ -26,7 +26,8 @@ module Adminterface
         end
 
         def navbar_toggler
-          button(class: "navbar-toggler", 'data-bs-target': "##{ID}", 'data-bs-toggle': "collapse") do
+          button(class: "navbar-toggler", 'data-bs-target': "##{ID}",
+                 'data-bs-toggle': "collapse", "aria-expanded": "false") do
             span class: "navbar-toggler-icon"
           end
         end

data/lib/adminterface/extensions/views/pages/base.rb

@@ -102,7 +102,8 @@ module Adminterface
             div class: "flashes" do
               flash_messages.each do |type, messages|
                 [*messages].each do |message|
-                  div class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]} #{flash_dismissible_class}".squish do
+                  div class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]} #{flash_dismissible_class}".squish,
+                      role: "alert" do
                     text_node(message)
                     button(class: "btn-close", "data-bs-dismiss": "alert", "aria-label": "Close") if flash_dismissible?
                   end

data/lib/adminterface/initializers/configurations.rb

@@ -25,7 +25,7 @@ module Adminterface
 
             meta_tags = {
               version: Adminterface::VERSION,
-              viewport: "width=device-width, height=device-height, initial-scale=1.0, user-scalable=no"
+              viewport: "width=device-width, height=device-height, initial-scale=1.0"
             }
 
             config.meta_tags_for_logged_out_pages = meta_tags

data/lib/adminterface/version.rb

@@ -1,3 +1,3 @@
 module Adminterface
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminterface
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - I-Lung Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin