action_admin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 744d35d72168f97e4b21090228b74cb79f7e63e4
-  data.tar.gz: 37e859e3f7beb0093b102796002490a04cbe1b59
+  metadata.gz: 982edc1021b2a77531f490363c7bd03ccd771dc6
+  data.tar.gz: d31e4dd9c6d0a407a1484ca3fbc4e303f1ab5299
 SHA512:
-  metadata.gz: 2873abf6a53398466252f625d5019f150b0f11fa4238f8757a5ce86f737169fed06c396b77693b9a04828f92c26afa2739343943d843539097da6072c129b0a2
-  data.tar.gz: 215d8e6fdf62b86e3b20247afc1f77cd7b51c2c95069179f3522e1539be645a1aacde44772f1b217b4ee100e87ecc51085f6cb668c2916b3f321fd8590c92a4e
+  metadata.gz: dbc141a4e4a8da89026d6d74f925a6408723cdbd7fb99aad16311e6c4d9e1741077170adebfe74b1eef46ac20f2060c0a31b0eeb4851559c5e151effd3683625
+  data.tar.gz: 18fd1ac7ffa3a656ed76982930ca505222c24d5f0f6bd6dce7ca750ce7a830f5b7c8d790e698308514fdfe0131e8c5ba023c728db53db3c73b4bfa04113fb702

data/app/controllers/concerns/action_admin/actionable.rb

@@ -19,6 +19,12 @@ module ActionAdmin
         self.action_header.action(nil)
       end
 
+      def action_links(action, links=[])
+        self.action_header.action(action)
+        self.action_header.links(links)
+        self.action_header.action(nil)
+      end
+
       def action_template(action, template, options={})
         self._action_templates = self._action_templates.merge(
           action => options.merge(partial: "admin/templates/#{template}")

data/app/helpers/action_admin/markup_helper.rb

@@ -27,16 +27,35 @@ module ActionAdmin
       content_tag :div, info + links, class: 'grid-x'
     end
 
+    def admin_settings_menu(records, label_method=:id)
+      options = {
+        menu_class:    'menu horizontal',
+        active_class:  'active',
+        keep_defaults: false
+      }
+
+      items = records.map do |record|
+        label = record.send(label_method)
+        url   = edit_record_url(record)
+
+        [:"#{label.downcase.underscore}", { label: label, url: url, html: { class: 'padding-1' } }]
+      end
+
+      smart_navigation_for Hash[items], options
+    end
+
     def admin_primary_menu
       options = {
         menu_class:           'vertical menu icons icon-left accordion-menu',
         menu_html:            { 'data-accordion-menu': '', 'data-submenu-toggle': true },
-        separator_class:      'is-separator',
-        submenu_parent_class: 'has-children',
+        menu_icons:           true,
+        submenu_icons:        false,
         submenu_class:        'vertical menu nested',
         active_class:         'is-current',
         active_submenu_class: 'is-current',
-        icon_prefix:          'mdi mdi-'
+        icon_prefix:          'mdi mdi-',
+        icon_position:        'left',
+        keep_defaults:        false
       }
 
       smart_navigation_for ActionAdmin.config.menus.primary, options
@@ -45,13 +64,11 @@ module ActionAdmin
     def admin_secondary_menu
       options = {
         menu_class:           'vertical menu secondary icons icon-right',
-        separator_class:      'is-separator',
-        submenu_parent_class: 'has-children',
-        submenu_class:        'vertical menu nested',
+        menu_icons:           true,
         active_class:         'is-current',
-        active_submenu_class: 'is-current',
         icon_prefix:          'mdi mdi-',
-        icon_position:        'right'
+        icon_position:        'right',
+        keep_defaults:        false
       }
 
       smart_navigation_for ActionAdmin.config.menus.secondary, options
@@ -68,14 +85,12 @@ module ActionAdmin
       }
 
       options = {
-        menu_class:           'menu icons icon-left',
-        separator_class:      'is-separator',
-        submenu_parent_class: 'has-children',
-        submenu_class:        'vertical menu nested',
-        active_class:         'is-current',
-        active_submenu_class: 'is-current',
-        icon_prefix:          'mdi mdi-',
-        icon_position:        'left'
+        menu_class:    'menu icons icon-left',
+        menu_icons:    true,
+        submenu_class: 'vertical menu nested',
+        icon_prefix:   'mdi mdi-',
+        icon_position: 'left',
+        keep_defaults: false
       }
 
       custom = ActionAdmin.config.menus.send(:"topbar_#{position}")
@@ -87,27 +102,33 @@ module ActionAdmin
     def admin_action_links(action=nil)
       name  = action || action_name
       links = controller.action_header.action_links(name, self).map do |link|
-        opts    = Hash(link[:html]).merge(method: link[:method])
-        classes = "button small hollow #{opts[:class]}".strip
-        label   = admin_icon(link[:icon], text: link[:label])
+        unless link[:url].nil?
+          opts    = Hash(link[:html]).merge(method: link[:method])
+          classes = "button small hollow #{opts[:class]}".strip
+          label   = admin_icon(link[:icon], text: link[:label])
 
-        link_to label, link[:url], opts.merge(class: classes)
+          link_to label, link[:url], opts.merge(class: classes)
+        end
       end
 
-      links.join(' ').html_safe
+      links.reject(&:blank?).join(' ').html_safe
     end
 
     def admin_table_action_links(record, actions=nil)
+      app_url  = method(ActionAdmin.config.app_urls).call(record) rescue nil
+      app_link = link_to admin_icon('web'), app_url, title: 'Web', target: :_blank, class: 'button hollow info' if app_url.present?
+
       options = {
-        show:    { label: admin_icon('eye'), title: 'View', class: 'success' },
+        # show:    { label: admin_icon('eye'), title: 'View', class: 'success' },
         edit:    { label: admin_icon('pencil'), title: 'Edit' },
         destroy: { label: admin_icon('delete'), title: 'Delete', class: 'alert' }
       }
 
-      options = options.select { |k, _v| k.in? actions } if actions.present?
-      options = options.merge(html: { class: 'button hollow' })
+      options   = options.select { |k, _v| k.in? actions } if actions.present?
+      options   = options.merge(html: { class: 'button hollow' })
+      all_links = record_links_to record, options
 
-      record_links_to record, options
+      app_link.nil? ? all_links : (app_link + all_links)
     end
   end
 end

data/app/presenters/action_admin/presenter.rb

@@ -16,7 +16,7 @@ module ActionAdmin
       if attributes.keys.any?
         attributes.keys
       else
-        items = ['title', 'name', 'email', 'id']
+        items = ['title', 'name', 'email', 'id', 'var']
         names = @record.class.attribute_names.select { |i| i.in? items }
 
         names.sort_by { |i| items.index i }.first(1)
@@ -61,32 +61,41 @@ module ActionAdmin
     end
 
     def fields
-      self.record_fields
+      if self.record_fields.any?
+        self.record_fields
+      else
+        Hash[@record.permitted_attributes.map { |e| [:"#{e}", {}] }]
+      end
     end
 
     def render_field(form, field, options={})
+      options     = Hash(options)
       association = options[:association]
 
       if association.present?
-        form.association field, Hash(options).except(:association)
+        form.association field, options.except(:association)
       else
-        form.input field, Hash(options)
+        form.input field, options
       end
     end
 
     def render_fields(form)
-      fields.map { |f, o| render_field(form, f, 0) }.join.html_safe
+      fields.map { |f, o| render_field(form, f, o) }.join.html_safe
     end
 
     def panels
-      self.record_panels
+      if self.record_panels.any?
+        self.record_panels
+      else
+        { attributes: { title: 'Attributes', fields: fields.keys } }
+      end
     end
 
     def render_panel(form, options={})
       template = "admin/panels/#{options.fetch :template, 'default'}"
-      content = Array(options[:fields]).map { |f| render_panel_field(form, f, options) }
-      footer = Array(Hash(options[:footer])[:fields]).map { |f| render_panel_field(form, f, options) }.join.html_safe
-      footer = nil if footer.blank?
+      content  = Array(options[:fields]).map { |f| render_panel_field(form, f, options) }
+      footer   = Array(Hash(options[:footer])[:fields]).map { |f| render_panel_field(form, f, options) }.join.html_safe
+      footer   = nil if footer.blank?
 
       options = {
         layout:  false,

data/app/views/admin/templates/_settings.html.slim

@@ -0,0 +1,22 @@
+= admin_form_for([:admin, current_record]) do |f|
+  = f.error_notification
+
+  / .page-content
+  /   .sidebar
+  /     .panel
+  /       .panel-header.border
+  /         = 'Menu'
+  /
+  /       .panel-content
+  /         = admin_settings_menu collection, label_method
+  /
+  /   .content
+  /     = admin_present(current_record).render_panels(form: f)
+  /     = f.button :submit
+
+  .panel
+    .panel-content.padding-0
+      = admin_settings_menu collection, label_method
+
+  = admin_present(current_record).render_panels(form: f)
+  = f.button :submit

data/lib/action_admin/header.rb

@@ -2,9 +2,11 @@ module ActionAdmin
   class Header
     class_attribute :actions
     class_attribute :current_actions
+    class_attribute :active_links
 
     def initialize
-      self.actions = {}
+      self.actions      = {}
+      self.active_links = {}
     end
 
     def action(names)
@@ -19,15 +21,22 @@ module ActionAdmin
       current_actions.each { |a| add_action_key(a, :links, options, true) }
     end
 
+    def links(names)
+      current_actions.each { |a| self.active_links[a] = Array(names) }
+    end
+
     def action_title(name, context)
       title = Hash(actions[:"#{name}"]).fetch :title, default_title(context)
       evaluate_value(title, context)
     end
 
     def action_links(name, context)
-      links = Hash(actions[:"#{name}"]).fetch :links, default_action_links(name, context)
+      active = self.active_links[:"#{name}"]
+      links  = Hash(actions[:"#{name}"]).fetch :links, default_action_links(name, context)
+      links  = links.select { |k, _v| k.in? active } if active.is_a? Array
+      links  = links.values if links.is_a? Hash
 
-      Array(links).map do |link|
+      Array(links).reject(&:blank?).map do |link|
         Hash[link.map { |k, v| [k, evaluate_value(v, context)] }]
       end
     end
@@ -41,17 +50,20 @@ module ActionAdmin
     end
 
     def default_action_links(name, context)
-      setup = { index: :new, new: :index, show: [:index, :edit, :destroy], edit: [:index, :show, :destroy] }
+      setup = { index: :new, new: :index, show: [:index, :app, :edit, :destroy], edit: [:index, :app, :show, :destroy] }
       links = default_links(context)
 
-      Array(setup[:"#{name}"]).map { |l| links[l] }.reject(&:nil?)
+      Hash[Array(setup[:"#{name}"]).map { |l| [l, links[l]] }.reject(&:nil?)]
     end
 
     def default_links(context)
       return {} unless context.controller.respond_to? :permitted_params
 
+      show = -> { method(ActionAdmin.config.app_urls).call(current_record) rescue nil }
+
       {
-        show:    { label: 'View',   icon: 'eye',        url: :record_path,      html: { class: 'success' } },
+        app:     { label: 'Web',    icon: 'web',        url: show,              html: { class: 'info', target: :_blank } },
+        # show:    { label: 'View',   icon: 'eye',        url: :record_path,      html: { class: 'success' } },
         index:   { label: 'Back',   icon: 'arrow-left', url: :records_path,     html: { class: 'secondary' } },
         new:     { label: 'New',    icon: 'plus',       url: :new_record_path,  html: { class: 'success' } },
         edit:    { label: 'Edit',   icon: 'pencil',     url: :edit_record_path, html: { class: 'warning' } },

data/lib/action_admin/version.rb

@@ -1,3 +1,3 @@
 module ActionAdmin
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jonian Guveli
@@ -237,6 +237,7 @@ files:
 - app/views/admin/records/index.html.slim
 - app/views/admin/records/new.html.slim
 - app/views/admin/records/show.html.slim
+- app/views/admin/templates/_settings.html.slim
 - app/views/admin/templates/_upload.html.slim
 - app/views/layouts/admin.html.slim
 - app/views/layouts/admin/devise.html.slim