express_admin 1.1.0 → 1.2.0

data/app/assets/stylesheets/express_admin/shared/_layout_components.sass

@@ -0,0 +1,60 @@
+.h_box
+  flex-direction: row
+  top-margin: 1em
+  bottom-margin: 1em
+
+.v_box
+  flex-direction: column
+
+.container
+  flex-wrap: wrap
+  display: flex
+  justify-content: flex-start
+  align-content: flex-start
+
+  .pane
+    &.half_width, &.one_half
+      min-width: 50%
+      max-width: 50%
+
+    &.full_width
+      min-width: 100%
+      max-width: 100%
+
+    &.one_third
+      min-width: 33.33%
+      max-width: 33.33%
+
+    &.two_thirds
+      min-width: 66.66%
+      max-width: 66.66%
+
+    max-height: 50em
+
+    margin-right: 0em
+    margin-bottom: 0em
+
+    background: #F8F8F8
+
+
+    table:
+      overflow: scroll
+
+    .header
+      display: flex
+      justify-content: space-between
+      padding-right: 1em
+
+    dd
+      min-width: 70%
+    dt
+      min-width: 12em
+      overflow: wrap
+    dl
+      display: flex
+      flex-wrap: wrap
+
+
+
+.space-between
+  justify-content: space-between

data/app/assets/stylesheets/express_admin/shared/_messages.sass

@@ -8,5 +8,5 @@
   padding: 20px
   text-align: center
   line-height: 1.5rem
-  color: $red-color
+  color: $red
   font-weight: bold

data/app/assets/stylesheets/express_admin/shared/_tables.sass

@@ -1,75 +1,20 @@
-.table-wrapper
-  margin-bottom: 20px
-  overflow: auto
-
-  .table-content
-    padding-right: 20px
-
-table, .table
-  border-collapse: separate
-  border-spacing: 0
+.table
   width: 100%
 
   thead
-    tr
-      background-color: #fff
-
-      th:first-child
-        border-left: 1px solid $border-color
-
-      th:last-child
-        border-right: 1px solid $border-color
-
-    tr:first-child
-      th
-        border-top: 1px solid $border-color
-
-      th:first-child
-        border-top-left-radius: 5px
-
-      th:last-child
-        border-top-right-radius: 5px
-
-    tr:last-child
-      th
-        border-bottom: 1px solid $border-color
-
+    border:
+      bottom: 2px solid $dark
 
-  tbody
-    tr
-      td:last-child
-        border-right: 1px solid $border-color
-
-      td:first-child
-        border-left: 1px solid $border-color
-
-    tr:first-child
-      td
-
-    tr:last-child
-      td
-        border-bottom: 1px solid $border-color
-
-      td:first-child
-        border-bottom-left-radius: 5px
-
-      td:last-child
-        border-bottom-right-radius: 5px
-
-  tr
     th
-      background-color: #f4f4f4
+      padding: 0.5rem
+      text-align: left
 
-  td
-    .button
-      margin: 0 rem-calc(5)
+  tbody
+    td
+      padding: 0.5rem
 
-  th, td
-    input[type='checkbox'],
-    .inline-list
-      margin: 0
 
-  &.table-hover
-    tr:hover
-      cursor: pointer
-      background-color: #f0f0f0
+  &.striped
+    tbody
+      > tr:nth-of-type(odd)
+        background: $light-blue-background

data/app/assets/stylesheets/express_admin/shared/_trees.sass

@@ -0,0 +1,27 @@
+.tree
+  a
+    display: block
+    padding: 1rem
+
+    &:hover
+      background: $light-gray
+
+  .selected
+    background: $dark-blue
+    font:
+      weight: bold
+
+    a
+      color: $light-gray
+
+      &:hover
+        background: transparent
+
+  ul
+    li
+      a
+        padding:
+          left: 3rem
+      &:last-child
+        border:
+          bottom: 0

data/app/components/express_admin/addon_sidebar_component.rb

@@ -19,14 +19,10 @@ module ExpressAdmin
                            },
 
           menu_wrapper: -> {
-                             div._sidebar_wrapper {
-                               aside.sidebar {
-                                 h1 {
-                                   menu_name
-                                 }
-                                 ul {
-                                   _yield
-                                 }
+                             section._module_sidebar {
+                               ul._menu_items {
+                                 li.title { menu_name }
+                                 _yield
                                }
                              }
                            }
@@ -44,4 +40,4 @@ module ExpressAdmin
     end
 
   end
-end
+end

data/app/components/express_admin/h_box.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), 'layout_component')
+module ExpressAdmin
+  class HBox < LayoutComponent
+
+    emits -> {
+      div(dom_id, class: classes) {
+        _yield
+      }
+    }
+
+    def classes
+      super + ' container'
+    end
+
+  end
+end

data/app/components/express_admin/layout_component.rb

@@ -0,0 +1,14 @@
+module ExpressAdmin
+  class LayoutComponent < ExpressTemplates::Components::Base
+    include ExpressTemplates::Components::Capabilities::Configurable
+    include ExpressTemplates::Components::Capabilities::Parenting
+
+    def dom_id
+      @config.try(:[], :id)
+    end
+
+    def classes
+      ([macro_name] + (@config.try(:[], :class)||[])).join(" ")
+    end
+  end
+end

data/app/components/express_admin/main_region.rb

@@ -1,7 +1,7 @@
 module ExpressAdmin
   class MainRegion < ExpressTemplates::Components::Container
     emits -> {
-      div(:main)._large_8.columns {
+      div._main_region {
         _yield
       }
     }

data/app/components/express_admin/pane.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), 'layout_component')
+
+module ExpressAdmin
+  class Pane < LayoutComponent
+
+    emits -> {
+      div(dom_id, class: classes) {
+        heading if title || status
+        _yield
+      }
+    }
+
+    def heading
+      h2.title {
+        null_wrap { title }
+        span.status(status) if status
+      }
+    end
+
+    def dom_id
+      nil
+    end
+
+    def title
+      @config[:title] || ''
+    end
+
+    def status
+      @config[:status] || nil
+    end
+
+    def classes
+      super << " #{@config[:id]}"
+    end
+
+  end
+end

data/app/components/express_admin/sidebar_region.rb

@@ -1,10 +1,8 @@
 module ExpressAdmin
   class SidebarRegion < ExpressTemplates::Components::Container
     emits -> {
-      div(:sidebar)._large_4.columns {
-        div._container {
-          _yield
-        }
+      div._sidebar_region {
+        _yield
       }
     }
   end

data/app/components/express_admin/smart_form.rb

@@ -1,14 +1,28 @@
 require 'rails/generators/generated_attribute'
+
 module ExpressAdmin
   class SmartForm < ExpressTemplates::Components::Base
     include ExpressTemplates::Components::Capabilities::Configurable
+    include ExpressTemplates::Components::Capabilities::Resourceful
+    include ExpressTemplates::Components::Forms::FormSupport
 
     emits -> {
       express_form(form_args) {
-        attributes.each do |attrib|
+        hidden(:id)
+        filter_by_name(editable_attributes).each do |attrib|
           form_field_for(attrib)
         end
-        submit(class: "button right tight tiny")
+        filter_by_name(has_many_through_associations).each do |assoc|
+          select_collection(assoc.name)
+        end
+        filter_by_name(timestamp_attributes).each do |timestamp|
+          div {
+            label {
+              "#{timestamp.name.titleize}: {{@#{resource_name}.try(:#{timestamp.name})}}"
+            }
+          }
+        end
+        submit(class: 'button')
       }
     }
 
@@ -19,51 +33,73 @@ module ExpressAdmin
                                   'datetime_select' => 'datetime',
                                   'check_box'       => 'checkbox'}
       field_type = attrib.field_type.to_s.sub(/_field$/,'')
-      case
-      when attrib.name.eql?('id')
-        hidden(:id)
-      when TIMESTAMPS.include?(attrib.name)
-        div {
-          label {
-            "#{attrib.name.titleize}: {{@#{resource_name}.try(:#{attrib.name})}}"
-          }
-        }
+      if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
+        if opts = @config["#{relation}_collection".to_sym]
+          select(attrib.name, opts)
+        else
+          select(attrib.name)
+        end
       else
         self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
       end
     end
 
-
     protected
 
       def form_args
         {           id: resource_name,
-                action: action_path,
-         resource_name: resource_name }
+                action: form_action,
+         resource_name: resource_name,
+        resource_class: @config[:resource_class],
+             namespace: namespace}
       end
 
-      def action_path
-        "{{resource.persisted? ? resource_path(resource.id) : collection_path}}"
+      def attributes
+        super.map do |attrib|
+          field_definition = [attrib.name, attrib.type] # index not important here for now
+          Rails::Generators::GeneratedAttribute.parse(field_definition.join(":"))
+        end
       end
 
-      def resource_name
-        @config[:id].to_s.singularize
+      def editable_attributes
+        non_timestamp_attributes + virtual_attributes
       end
 
-      def columns
-        resource_class.constantize.columns
+      def virtual_attributes
+        (@config[:virtual]||[]).map do |attrib_name|
+          Rails::Generators::GeneratedAttribute.parse("#{attrib_name}:string")
+        end
       end
 
-      def attributes
-        columns.map do |attrib|
-          field_definition = [attrib.name, attrib.type] # index not important here for now
-          Rails::Generators::GeneratedAttribute.parse(field_definition.join(":"))
+      def excluded_attributes
+        excl = [:id]
+        excl += @config[:exclude] if @config[:exclude]
+        excl
+      end
+
+      def timestamp_attributes
+        attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
+      end
+
+      def non_timestamp_attributes
+        attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
+      end
+
+      def has_many_through_associations
+        resource_class.reflect_on_all_associations(:has_many).select do |assoc|
+          assoc.options.keys.include?(:through)
         end
       end
 
-      def resource_class
-        # TODO: Module namespace needs to be guessed somehow
-        @config[:class_name] || "ExpressCms::#{resource_name.classify}"
+      def filter_by_name(attribs)
+        if @config[:only]
+          # if using :only, we respect the order
+          @config[:only].map do |only|
+            attribs.detect {|attrib| only.to_s.eql?(attrib.name)} || nil
+          end.compact
+        else
+          attribs
+        end.reject {|attrib| (excluded_attributes).map(&:to_s).include? attrib.name }
       end
 
   end

data/app/components/express_admin/smart_table.rb

@@ -1,97 +1,187 @@
 module ExpressAdmin
   class SmartTable < ExpressTemplates::Components::Base
     include ExpressTemplates::Components::Capabilities::Configurable
+    include ExpressTemplates::Components::Capabilities::Resourceful
 
     MAX_COLS_TO_SHOW_IDX = 5
 
+    attr :columns
+
     emits -> {
-      table(my[:id], 'data-turbolinks-permanent': nil)._table_hover {
+      table(my[:id], options).table.striped {
         thead {
           tr {
             display_columns.each do |column|
               th.send(column.name) {
-                div { # wrap in div so we can use overflow
-                  column.name.titleize
-                }
+                column.title
               }
             end
-            th.actions { 'Actions' }
-            show_hidden_columns_header_indicator if columns_hidden?
+            actions_header if should_show_actions?
+            hidden_columns_header_indicator if columns_hidden?
           }
         }
         tbody {
-          for_each(collection_var) {
-            tr(id: row_id, 'data-resource-url': resource_link) {
+          for_each(collection, as: collection_member_name) {
+            tr(row_args) {
               display_columns.each do |column|
                 td.send(column.name) {
-                  cell_value(column.name)
+                  cell_value(column.accessor)
                 }
               end
-              td {
-                link_to 'Delete', resource_link, method: :delete, data: {confirm: 'Are you sure?'}, class: 'button tiny secondary'
-              }
-              show_hidden_column_cell if columns_hidden?
+              actions_column if should_show_actions?
+              hidden_column_cell if columns_hidden?
             }
           }
         }
       }
       if @config[:show_on_click]
-        script {
-          %Q(
-            $(document).on('click', 'tr', function(e){
-              e.preventDefault();
-              Turbolinks.visit($(this).attr('data-resource-url'), { cacheRequest: false, change: ['#{collection_member_name}', e.currentTarget.id] });
-            })
-          )
-        }
+        if is_permanent?
+          script {
+            %Q(
+              $(document).on('click', 'tr', function(e){
+                e.preventDefault();
+                Turbolinks.visit($(this).attr('data-resource-url'), { cacheRequest: false });
+              })
+            )
+          }
+        else
+          script {
+            %Q(
+              $(document).on('click', 'tr', function(e){
+                e.preventDefault();
+                Turbolinks.visit($(this).attr('data-resource-url'), { cacheRequest: false, change: 'main' });
+              })
+            )
+          }
+        end
+
       end
+
+      scroll_table if !!@config[:scroll_table]
     }
 
-    def resource_link
-      "{{resource_path(#{collection_member_name}.id)}}"
+    def scroll_table
+      script {
+        %Q($('\##{my[:id]}').scrollTableBody())
+      }
+    end
+
+    def options
+      if is_permanent?
+        {'data-turbolinks-permanent' => nil}
+      end
+    end
+
+    def actions_header
+      th.actions { 'Actions' }
+    end
+
+    def should_show_actions?
+      @config[:actions].nil? || !!@config[:actions]
+    end
+
+    def actions_column
+      td {
+        link_to 'Delete', "{{#{resource_path}}}", method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+      }
+    end
+
+    def row_class
+      @config[:row_class].try(:respond_to?, :call) ? 
+        "{{#{@config[:row_class].source}.call(#{collection_member_name})}}" : 
+        "{{#{collection_member_name}.eql?(@#{resource_name}) ? 'current' : ''}}"
+    end
+
+    def is_permanent?
+      @config[:permanent].nil? || (@config[:permanent].present? && @config[:permanent])
     end
 
     def row_id
       "#{collection_member_name}:{{#{collection_member_name}.id}}"
     end
 
-    def collection_member_name
-      @config[:id].to_s.singularize
+    def row_args
+      row_args = {id: row_id, class: row_class}
+      row_args.merge!('data-resource-url': "{{#{resource_path}}}") if !!@config[:show_on_click]
+      row_args
     end
 
-    def collection_var
-      "@#{collection_member_name.pluralize}".to_sym
-    end
+    def cell_value(accessor)
+      if accessor.respond_to?(:call)
+        value = "(begin #{accessor.source}.call(#{collection_member_name}).to_s rescue 'Error: '+$!.to_s ; end)"
+      elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
+        value = "(link_to #{collection_member_name}.#{attrib}, #{collection_member_name}_path(#{collection_member_name}))"
+      elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
+        value = "(#{collection_member_name}.#{attrib} ? time_ago_in_words(#{collection_member_name}.#{attrib})+' ago' : 'never')"
+      else
+        if relation_name = accessor.to_s.match(/(.*)_id$/).try(:[], 1)
+          reflection = resource_class.reflect_on_association(relation_name.to_sym)
+        end
 
-    def cell_value(column_name)
-      "{{#{collection_member_name}.#{column_name}}}"
+        value = if reflection
+          relation = "#{collection_member_name}.#{relation_name}"
+          "#{relation}.try(:name) || #{relation}.to_s"
+        else
+          "#{collection_member_name}.#{accessor}"
+        end
+      end
+      span {
+        "{{#{value}}}"
+      }
     end
 
     def display_columns
-      columns.slice(0..MAX_COLS_TO_SHOW_IDX)
+      specified_columns? ? columns : columns.slice(1..MAX_COLS_TO_SHOW_IDX)
     end
 
     def columns_hidden?
-      columns.size > MAX_COLS_TO_SHOW_IDX+1
+      !specified_columns? && columns.size > MAX_COLS_TO_SHOW_IDX+1
+    end
+
+    class Column
+      attr :name, :title, :accessor
+      def initialize(accessor, title = nil)
+        @name = accessor.kind_of?(Symbol) ? accessor.to_s.underscore : title.titleize.gsub(/\s+/,'').underscore
+        @accessor = accessor
+        @title = title || @name.titleize
+      end
+    end
+
+    def columns
+      @columns ||= _initialize_columns
     end
 
-    def show_hidden_columns_header_indicator
+    def specified_columns?
+      !!specified_columns
+    end
+
+    def specified_columns
+      @config[:columns]
+    end
+
+    def hidden_columns_header_indicator
       th._more_columns_indicator {
         "..."
       }
     end
 
-    def show_hidden_column_cell
+    def hidden_column_cell
       td._more_columns_indicator
     end
 
-    def columns
-      resource_class.constantize.content_columns
-    end
+    private
+      def _initialize_columns
+        @columns =
+          if specified_columns.kind_of?(Array)
+            specified_columns.map { |name| Column.new(name) }
+
+          elsif specified_columns.kind_of?(Hash)
+            specified_columns.map { |title, accessor| Column.new(accessor, title) }
+
+          else
+            attributes.map { |column| Column.new(column.name.to_sym) }
+          end
+      end
 
-    def resource_class
-      # TODO: Module namespace needs to be guessed somehow
-      @config[:class_name] || "ExpressCms::#{collection_member_name.classify}"
-    end
   end
 end