cm-admin 0.3.0 → 0.4.3

data/app/views/cm_admin/main/_associated_table.html.slim

@@ -0,0 +1,60 @@
+.admin-table-index
+  .table-top
+    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@associated_model.ar_model.table_name} found"
+    .table-top__column-action
+      button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
+        span
+          i.fa.fa-columns.bolder
+        span
+          i.fa.fa-angle-down
+
+.new-admin-table.scrollable
+  table.cm-table
+    thead.cm-table__header
+      tr.header-row
+        th.check-box-space
+          span
+            input.cm-checkbox type="checkbox"
+        - @model.available_fields[@action.name.to_sym].each do |column|
+          th = column.header
+    tbody.cm-table__body
+      - @associated_ar_object.data.each do |ar_object|
+        tr.body-row
+          td.check-box-space
+            span
+              input.cm-checkbox type="checkbox"
+          - @model.available_fields[@action.name.to_sym].each do |column|
+            td
+              span class="#{column.cm_css_class} text-ellipsis" = show_field_value(ar_object, column)
+          td.row-action-cell
+            .row-action-tool
+              button.secondary-btn.tool-btn type="button"
+                span
+                  i.fa.fa-bars.bolder
+                span
+                  i.fa.fa-angle-down
+              .popup-card.table-export-popup.hidden
+                .popup-option
+                  a href="#{page_url('edit', ar_object)}"
+                    | Edit
+/ .cm-pagination
+/   .cm-pagination__lhs Showing 1 to 15 out of 104
+/   .cm-pagination__rhs
+/     span.page-move-btn.disabled
+/       i.fa.fa-angle-double-left.bolder.f14
+/     span.page-move-btn.disabled
+/       i.fa.fa-chevron-left.bolder
+/     span.page-num-btn.active 1
+/     span.page-num-btn 2
+/     span.page-num-btn 3
+/     span.page-num-btn 4
+/     span.page-num-btn 5
+/     span.page-move-btn
+/       i.fa.fa-chevron-right.bolder
+/     span.page-move-btn
+/       i.fa.fa-angle-double-right.bolder.f14
+
+.cm-pagination
+  .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
+  .cm-pagination__rhs
+    == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }

data/app/views/cm_admin/main/_cm_pagy_nav.html.slim

@@ -3,21 +3,21 @@
 nav.pagy_nav.pagination role="navigation" aria-label="pager"
 
   - if pagy.prev
-    span.page-move-btn ==> link.call(pagy.prev, '<', 'aria-label="previous"')
+    span ==> link.call(pagy.prev, '<', 'aria-label="previous" class="page-move-btn"')
   - else
-    span.page-move-btn.disabled ==> '<'
+    span ==> link.call('#', '<', 'class="page-move-btn disabled"')
 
   - pagy.series.each do |item|        # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
     - if item.is_a?(Integer)          # page link
-      span.page-num-btn ==> link.call(item)
+      span ==> link.call(item, item, 'class="page-num-btn"')
 
     - elsif item.is_a?(String)        # current page
-      span.page-num-btn.active ==> item
+      span ==> link.call(item, item, 'class="page-num-btn active"')
 
     - elsif item == :gap              # page gap
       span.page.gap ==> pagy_t('pagy.nav.gap')
 
   - if pagy.next
-    span.page-move-btn == link.call(pagy.next, '>', 'aria-label="next"')
+    span == link.call(pagy.next, '>', 'aria-label="next" class="page-move-btn"')
   - else
-    span.page-move-btn.disabled == '>'
+    span ==> link.call('#', '>', 'class="page-move-btn disabled"')

data/app/views/cm_admin/main/_filters.html.slim

@@ -1,10 +1 @@
-.cm-filters-v2
-  .cm-filters-v2__inner
-    .filter-search
-      .form-field
-        .field-input-wrapper
-          - filters.each do |filter|
-            - if filter.filter_type.eql?(:search)
-              input.search-input value="#{params.dig(:filters, :search)}" placeholder="#{filter.placeholder}"
-              span.search-input-icon
-                i.fa.fa-search
+= generate_filters(filters)

data/app/views/cm_admin/main/_nested_fields.html.slim

@@ -0,0 +1,7 @@
+.nested-fields
+  - @model.available_fields[action_name.to_sym][assoc_name].each do |field|
+    = f.label field.field_name, class: 'field-label'
+    br
+    = input_field_for_column(f, field)
+  - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+    = link_to_remove_association "remove #{assoc_name}", f

data/app/views/cm_admin/main/_nested_table_form.html.slim

@@ -0,0 +1,6 @@
+#tasks
+  = f.fields_for table_name do |record|
+    = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
+  - if @reflections.select {|x| x if x.name == table_name}.first.macro == :has_many
+    .links
+      = link_to_add_association "add #{table_name}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}

data/app/views/cm_admin/main/_table.html.slim

@@ -2,13 +2,13 @@
   .table-top
     p.table-top__total-count = "#{@ar_object.pagy.count} #{@model.ar_model.table_name} found"
     .table-top__column-action
-      button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
+      button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
         span
           i.fa.fa-columns.bolder
         span
           i.fa.fa-angle-down
 
-.new-admin-table
+.new-admin-table.scrollable
   table.cm-table
     thead.cm-table__header
       tr.header-row
@@ -16,7 +16,7 @@
           span
             input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
-          th = column.header.present? ? column.header.to_s.titleize : column.db_column_name.to_s.titleize
+          th = column.header
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
@@ -24,7 +24,8 @@
             span
               input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each do |column|
-            td = column_for_field_helper(ar_object, column)
+            td.text-ellipsis
+              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
           td.row-action-cell
             .row-action-tool
               button.secondary-btn.tool-btn type="button"
@@ -36,22 +37,10 @@
                 .popup-option
                   a href="#{page_url('edit', ar_object)}"
                     | Edit
-/ .cm-pagination
-/   .cm-pagination__lhs Showing 1 to 15 out of 104
-/   .cm-pagination__rhs
-/     span.page-move-btn.disabled
-/       i.fa.fa-angle-double-left.bolder.f14
-/     span.page-move-btn.disabled
-/       i.fa.fa-chevron-left.bolder
-/     span.page-num-btn.active 1
-/     span.page-num-btn 2
-/     span.page-num-btn 3
-/     span.page-num-btn 4
-/     span.page-num-btn 5
-/     span.page-move-btn
-/       i.fa.fa-chevron-right.bolder
-/     span.page-move-btn
-/       i.fa.fa-angle-double-right.bolder.f14
+                - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
+                  - if custom_action.display_if.call(ar_object)
+                    .popup-option
+                      = link_to custom_action.name, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}

data/app/views/cm_admin/main/_tabs.html.slim

@@ -0,0 +1,5 @@
+ul.nav.nav-pills
+  - @model.available_tabs.each do |nav_item|
+    li.nav-item
+	    - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
+	    = link_to nav_item.nav_item_name.to_s.titleize, "/cm_admin/#{@model.name.underscore.pluralize}/#{@ar_object.id}/#{nav_item.custom_action}", class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"

data/app/views/cm_admin/main/_top_navbar.html.slim

@@ -3,13 +3,13 @@
     .bread-crumb-area
       = yield :bread_crumb
     .nav-title-area
-      p.title-text = @model.current_action.page_title
-      p.title-sub-text = @model.current_action.page_description
-  - if @model.current_action.name == 'index'
-    .cm-navbar__rhs
+      p.title-text = action_title
+      p.title-sub-text = action_description
+  .cm-navbar__rhs
+    - if @model.current_action.name == 'index'
       .export-container
         .dropdown
-          button.secondary-btn type="button" data-toggle="dropdown"
+          button.secondary-btn data-bs-toggle='dropdown'
             span
               i.fa.fa-arrow-down
             span
@@ -18,8 +18,14 @@
               i.fa.fa-angle-down
           ul.dropdown-menu.export-popup
             li
-              .popup-option.pointer data-toggle="modal" data-target="#exportmodal"
+              .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                 span Export
 
       a.primary-btn.ml-2 href="#{page_url('new')}"
         | Add
+      - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
+        = link_to custom_action.name, @model.ar_model.table_name + '/' + custom_action.path, class: 'primary-btn ml-2', method: custom_action.verb
+    - elsif @model.current_action.name == 'show'
+      - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
+        - if custom_action.display_if.call(@ar_object)
+          = link_to custom_action.name, custom_action.path.gsub(':id', params[:id]), class: 'primary-btn ml-2', method: custom_action.verb

data/app/views/cm_admin/main/associated_index.html.slim

@@ -0,0 +1,6 @@
+.cm-index-page
+	.index-page
+		.index-page__table-container.pt-0
+			== render 'cm_admin/main/associated_table'
+
+		= column_pop_up(@associated_model)

data/app/views/cm_admin/main/associated_show.html.slim

@@ -0,0 +1,6 @@
+- @model.available_fields[@action.name.to_sym].each do |section|
+  .info-section
+    p.section-heading = section.section_name
+    .paper
+      - section.available_section_fields.each do |field|
+        = show_field(@associated_ar_object, field)

data/app/views/cm_admin/main/edit.html.slim

@@ -2,16 +2,19 @@
 .form-page
   .form-page__inner
     .form-wrapper
-      .flag-alert.mb-4
-        p.alert-header
+      - if @ar_object.errors.present?
+        .flag-alert.mb-4
+          p.alert-header
             span
               i.fa.fa-exclamation-triangle
             | Attention
-        .alert-body
-          p.body-title 
-            | Error heading
-          p.body-info 
-            | The details of the error would be explained in this line. It could also be listed out as points on below the other if there are multiple reasons.
+          .alert-body
+            p.body-title 
+              | Error heading
+            p.body-info 
+              ul
+                - @ar_object.errors.full_messages.each do |error_message|
+                  li = error_message
       .form-container
         p.form-title 
           | Section heading

data/app/views/cm_admin/main/index.html.slim

@@ -1,9 +1,12 @@
-== render 'cm_admin/main/top_navbar'
-.index-page
-  - if @model.filters.present?
-    .index-page__filters
-      == render partial: 'cm_admin/main/filters', locals: { filters: @model.filters }
-  .index-page__table-container
-    == render 'cm_admin/main/table'
+.cm-index-page
+  .index-page.page-container
+    .sticky-container
+      == render 'cm_admin/main/top_navbar'
+      - if @model.filters.present?
+        .index-page__filters
+          == render partial: 'cm_admin/main/filters', locals: { filters: @model.filters }
+    .index-page__table-container
+      == render 'cm_admin/main/table'
 
-= column_pop_up(@model)
+    = column_pop_up(@model)
+    = manage_column_pop_up(@model)

data/app/views/cm_admin/main/show.html.slim

@@ -1,13 +1,12 @@
-== render 'cm_admin/main/top_navbar'
-.show-page
-  .show-page__inner
-    .info-section
-      p.section-heading   
-        | Section heading
-      .paper
-        - @model.available_fields[:show].each do |field|
-          .info-split
-            .info-split__lhs
-              p = field.label.present? ? field.label.to_s : field.field_name.to_s.titleize
-            .info-split__rhs
-              p = @ar_object.send(field.field_name)
+.show-page.page-container
+  .show-page__tabs.sticky-container
+    .cm-tabs-bar
+      == render 'cm_admin/main/top_navbar'
+      == render 'cm_admin/main/tabs'
+  .show-page__inner.scrollable
+    - @model.available_fields[:show].each do |section|
+      .info-section
+        p.section-heading = section.section_name
+        .paper
+          - section.available_section_fields.each do |field|
+            = show_field(@ar_object, field)

data/app/views/cm_admin/static/error_401.html.slim

@@ -0,0 +1,4 @@
+main.flex-shrink-0
+  .container
+    h1.mt-5 401
+    p.lead You do not authorized to access this page.

data/app/views/layouts/_flash_message.html.slim

@@ -0,0 +1,9 @@
+- if flash[:notice].present?
+  javascript:
+    $.jGrowl("#{flash[:notice]}", {theme: 'notice'})
+- elsif flash[:success].present?
+  javascript:
+    $.jGrowl("#{flash[:success]}", {theme: 'success'})
+- elsif flash[:alert].present?
+  javascript:
+    $.jGrowl("#{flash[:alert]}", {theme: 'error'})

data/app/views/layouts/_left_sidebar_nav.html.slim

@@ -5,12 +5,15 @@
   .cm-sidebar__quick-search
     span
       i.fa.fa-search
-    input type="text" placeholder="Quick Links"
+    input data-bs-target="#quickSearchModal" data-bs-toggle="modal" type="text" placeholder="Quick Links"
 
   .cm-sidebar__menu-wrapper
-    = sidebar_navigation
+    = navigation_links('sidebar')
 
-  .cm-sidebar__footer
+    .sidebar-menu__tabs-wrapper
+
+
+  .sidebar__footer
     .profile-name
       span.profile-avatar J
       | John Doe
@@ -28,3 +31,4 @@
       .auth-option
         = link_to '/sign-out', method: :delete, class: 'auth-link'
           | Logout
+= render 'layouts/quick_links'

data/app/views/layouts/_quick_links.html.slim

@@ -0,0 +1,25 @@
+#quickSearchModal.modal.fade.quick-search-modal aria-hidden="true" aria-labelledby="exampleModalLabel" role="dialog" tabindex="-1"
+  .modal-dialog role="document"
+    .modal-content
+      .modal-body
+        .quick-search-field
+          .form-field
+            .field-input-wrapper
+              input#quick-search-input.search-input placeholder="Search" data-behaviour="quick-input-search" autocomplete="off"
+              span.search-input-icon
+                i.fa.fa-search
+              span.clear-search.hidden
+                i.fa.fa-times
+        .search-results-container.list-area
+          = navigation_links('quick_links')
+        .results-action
+          .select
+            span.move-arrow
+              i.fa.fa-long-arrow-up
+            span.move-arrow
+              i.fa.fa-long-arrow-down
+            span Select
+          button.text-btn.enter-btn
+            | ENTER
+          button.text-btn.open-btn
+            | open

data/app/views/layouts/cm_admin.html.slim

@@ -7,7 +7,11 @@ html
     = csrf_meta_tags
     = csp_meta_tag
     = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
+    = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
     = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js" 
+    script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"
   body
     - flash.each do |type, msg|
       .alert class="alert-#{type}"
@@ -15,4 +19,24 @@ html
     .cm-admin
       = render 'layouts/left_sidebar_nav'
       .panel-area
-        = yield
+        - if defined?(@action) && @action&.layout_type.to_s == 'cm_association_show'
+          .show-page.page-container
+            .show-page__tabs.sticky-container
+              .cm-tabs-bar
+                == render 'cm_admin/main/top_navbar'
+                == render 'cm_admin/main/tabs'
+            .show-page__inner.scrollable
+              = yield
+        - elsif defined?(@action) && @action&.layout_type.to_s == 'cm_association_index'
+          .show-page.page-container
+            .show-page__tabs.sticky-container
+              .cm-tabs-bar
+                == render 'cm_admin/main/top_navbar'
+                == render 'cm_admin/main/tabs'
+                - if @associated_model.filters.present?
+                  .index-page__filters
+                    == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
+            = yield
+        - else
+          = yield
+    = render 'layouts/flash_message'

data/app/views/layouts/static.html.slim

@@ -0,0 +1,18 @@
+doctype html
+html
+  head
+    title
+      | Admin
+    meta[name="viewport" content="width=device-width,initial-scale=1"]
+    = csrf_meta_tags
+    = csp_meta_tag
+    = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
+    = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+  body
+    - flash.each do |type, msg|
+      .alert class="alert-#{type}"
+        = msg
+    .cm-admin-static
+      .d-flex.flex-column.h-100
+        = yield

data/bin/console

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "cm_admin"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/cm_admin.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'pagy', '~> 3.13'
+  spec.add_runtime_dependency 'pagy', '~> 4.11.0'
   spec.add_runtime_dependency 'slim', '~> 4.1.0'
   spec.add_runtime_dependency 'webpacker', '~> 5.2.1'
   spec.add_runtime_dependency 'axlsx_rails', '~> 0.6.1'
+  spec.add_runtime_dependency 'cocoon', '~> 1.2.15'
 end

data/config/routes.rb

@@ -1,6 +1,7 @@
 CmAdmin::Engine.routes.draw do
-  controller 'main' do
+  controller 'static' do
     get '/', action: 'dashboard'
+    get '/access-denied', action: 'error_403'
   end
 
   controller 'exports' do

data/config/webpack/environment.js

@@ -3,8 +3,9 @@ const { environment } = require('@rails/webpacker')
 const webpack = require('webpack')
 environment.plugins.prepend('Provide',
   new webpack.ProvidePlugin({
-    $: 'jquery/src/jquery',
-    jQuery: 'jquery/src/jquery',
+    $: 'jquery',
+    jQuery: 'jquery',
+    moment: 'moment',
     Popper: ['popper.js', 'default']
   })
 )

data/lib/cm_admin/constants.rb

@@ -27,6 +27,9 @@ module CmAdmin
     destroy: {
       verb: :delete,
       path: ':id'
+    },
+    custom_action: {
+      verb: :post
     }
   }
   REJECTABLE_FIELDS = %w(id created_at updated_at)