cm-admin 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23f6fccd6392ef215ea1e9c8927722e5c8cfe249d04515e49c9aab6daebf9b26
-  data.tar.gz: 6a39df0f21e575502cbe688c69a8a53ba458d81a98fc4dd455fabc6d293d5772
+  metadata.gz: fe6c3a31ee4222884516e3f0cace7e5ef9f3bbee1a67ad34f5d5f3d4201c5859
+  data.tar.gz: db9eaa4f12d9353bacfc94e7a74bdab8450a1b3f6bc84722815c52b308ebe1b3
 SHA512:
-  metadata.gz: 8f944d24b0601cf979f84589fc957d9951c75cfaa1eec722819d581436dd2f496fa2fc73a8c42d98f23c1e73e46d5e40188fb93174fb8bb01a63898e3c0a5e4a
-  data.tar.gz: 6cb1770919c12717fa95119b12d6be1727589e4bc67f54de96af164718fd4b9d9f60feb091e46db6b5b879669cd964c9c0d87acf65f06b09ea38496f6b647a90
+  metadata.gz: 8677cceeb0829d35971662230da99ab04666e590e6f06e4645ef606714f5643c38ba0dfd510a41fa8b88639a1c5a73565813e781f503ae584768285177a4c782
+  data.tar.gz: 2b4179da8e301349e2af5a82a090bc8c4001def407c769c84a9a48caa3d5512c28a8cfea10086dc4da508e692ca6a6eb3f719f1eccfd43f824ed03c79dbf78bc

data/README.md

@@ -1,6 +1,6 @@
 # CmAdmin
 
-New CmAdmin gem
+An admin gem for Ruby on Rails application. Get your admin panel setup running quickly.
 
 ## Installation
 
@@ -31,6 +31,7 @@ You can find more detailed documentation [here](https://github.com/commutatus/cm
 ## Demo
 
 For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)
+For demo repo check [here](https://github.com/commutatus/cm-admin-panel-demo)
 
 ## Development
 

data/app/assets/stylesheets/cm_admin/base/common.scss

@@ -199,9 +199,10 @@
   margin-left: 2px;
 }
 
-.text-ellipsis div {
-  overflow: hidden;
+.text-ellipsis {
   text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 }
 
 @keyframes shakeError {

data/app/javascript/packs/cm_admin/application.js

@@ -7,6 +7,7 @@ require("moment")
 require("bootstrap")
 require('flatpickr')
 require("jgrowl")
+require("trix")
 require('./scaffolds.js')
 require('./form_validation.js')
 require('./quick_search.js')

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -1,6 +1,8 @@
 $(document).on('turbolinks:load', function () {
   $('.select-2').select2();
-  flatpickr("[data-behaviour='date-only']", {})
+  flatpickr("[data-behaviour='date-only']", {
+    dateFormat: "d-m-Y"
+  })
   flatpickr("[data-behaviour='date-time']", {
     enableTime: true
   })

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

@@ -2,11 +2,11 @@
   .table-top
     p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@action.child_records.to_s.gsub('_', ' ')} 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
+      / 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
@@ -46,10 +46,13 @@
                     - if custom_action.display_if.call(ar_object)
                       .popup-option
                         - if custom_action.display_type == :button
-                          = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+                          = link_to cm_admin.send("#{@associated_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                            span
+                              i class="#{custom_action.icon_name}"
+                            = custom_action.name.humanize
                         - elsif custom_action.display_type == :modal
-                          = link_to custom_action.name.titleize, '', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
-                
+                          = link_to custom_action.name.humanize, '', data: { bs_toggle: 'modal', bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
+
 .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
@@ -57,11 +60,11 @@
 
 - @associated_ar_object.data.each do |ar_object|
   - @associated_model && @associated_model.available_actions.select{|act| act if (act.route_type == 'member' && act.display_type == :modal)}.each do |custom_action|
-    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
+    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden='true' aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex='1'
       .modal-dialog
         .modal-content
           .modal-header
             h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
-            button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+            button.btn-close aria-label='Close' data-bs-dismiss='modal'
           .modal-body
-            = render partial: custom_action.partial, locals: { ar_object: ar_object }
+            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -53,11 +53,11 @@
                   - custom_actions.each do |custom_action|
                     - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
                       - if custom_action.display_if.call(ar_object)
-                        = link_to cm_admin.send("#{@model.name.downcase}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                        = link_to cm_admin.send("#{@model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
                           .popup-option
                             span
                               i class="#{custom_action.icon_name}"
-                            = custom_action.name.titleize
+                            = custom_action.name.humanize
 
 .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/_top_navbar.html.slim

@@ -1,9 +1,9 @@
 .cm-navbar
   .cm-navbar__lhs
-    - if cm_admin.method_defined?(:"#{@model.name.downcase}_index_path") && (@model.current_action.name == 'show' || @model.current_action.layout_type.present?)
+    - if cm_admin.method_defined?(:"#{@model.name.underscore}_index_path") && (@model.current_action.name == 'show' || @model.current_action.layout_type.present?)
       .bread-crumb-area
         .breadcrumb-text
-          = link_to @model.name + ' /', cm_admin.send(:"#{@model.name.downcase}_index_path")
+          = link_to @model.name + ' /', cm_admin.send(:"#{@model.name.underscore}_index_path")
     .nav-title-area
       p.title-text = action_title
       p.title-sub-text = action_description
@@ -24,7 +24,7 @@
                 span Export
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?
-        = link_to 'Add', "#{page_url('new')}", class: 'primary-btn ml-2'
+        = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'primary-btn ml-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         = custom_action_items(custom_action, 'index')
     - elsif @model.current_action.name == 'show'
@@ -33,4 +33,4 @@
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-        = link_to "Edit #{@model.name}", "#{page_url('edit', @ar_object)}", class: 'primary-btn ml-2'
+        = link_to "Edit #{@model.name}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'primary-btn ml-2'

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

@@ -19,4 +19,4 @@
         p.form-title 
           | Section heading
         .form-container__inner
-          = generate_form(@ar_object, @model)
+          = generate_form(@ar_object.class.name.constantize.new, @model)

data/lib/cm_admin/models/controller_method.rb

@@ -33,7 +33,7 @@ module CmAdmin
 
 
       def create(params)
-        @ar_object = @ar_model.new(resource_params(params))
+        @ar_object = @ar_model.name.classify.constantize.new(resource_params(params))
       end
 
       def filter_by(params, records, filter_params={}, sort_params={})
@@ -57,11 +57,15 @@ module CmAdmin
 
       def resource_params(params)
         permittable_fields = @permitted_fields || @ar_model.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
-        permittable_fields += @ar_model.reflect_on_all_attachments.map {|x|
-          if x.class.name.include?('HasOne')
-            x.name
-          elsif x.class.name.include?('HasMany')
-            Hash[x.name.to_s, []]
+        permittable_fields += @ar_model.name.constantize.reflect_on_all_associations.map {|x|
+          if x.klass.name == "ActiveStorage::Attachment"
+            if x.class.name.include?('HasOne')
+              x.name
+            elsif x.class.name.include?('HasMany')
+              Hash[x.name.to_s, []]
+            end
+          elsif x.klass.name == "ActionText::RichText"
+            x.name.to_s.gsub('rich_text_', '').to_sym
           end
         }.compact
         nested_tables = self.available_fields[:new].except(:fields).keys
@@ -74,6 +78,7 @@ module CmAdmin
         }
         permittable_fields += nested_fields
         @ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
+
         params.require(self.name.underscore.to_sym).permit(*permittable_fields)
       end
     end

data/lib/cm_admin/models/form_field.rb

@@ -2,7 +2,7 @@ module CmAdmin
   module Models
     class FormField
       attr_accessor :field_name, :label, :header, :input_type, :collection, :custom_value, :disabled
-      VALID_INPUT_TYPES = [:integer, :decimal, :string, :single_select, :multi_select, :date, :date_time, :text, :single_file_upload, :multi_file_upload, :hidden].freeze
+      VALID_INPUT_TYPES = [:integer, :decimal, :string, :single_select, :multi_select, :date, :date_time, :text, :single_file_upload, :multi_file_upload, :hidden, :rich_text].freeze
 
       def initialize(field_name, input_type, attributes = {})
         raise ArgumentError, "Kindly select a valid filter type like #{VALID_INPUT_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{input_type} for column #{field_name}" unless VALID_INPUT_TYPES.include?(input_type.to_sym)

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -25,43 +25,41 @@ module CmAdmin
       end
 
       def show_field_value(ar_object, field)
-        content_tag(:span) do
-          case field.field_type || :string
-          when :integer
-            ar_object.send(field.field_name).to_s
-          when :decimal
-            ar_object.send(field.field_name).to_f.round(field.precision).to_s if ar_object.send(field.field_name)
-          when :string
+        case field.field_type || :string
+        when :integer
+          ar_object.send(field.field_name).to_s
+        when :decimal
+          ar_object.send(field.field_name).to_f.round(field.precision).to_s if ar_object.send(field.field_name)
+        when :string
+          ar_object.send(field.field_name).to_s
+        when :datetime
+          ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s if ar_object.send(field.field_name)
+        when :text
+          ar_object.send(field.field_name)
+        when :custom
+          send(field.helper_method, ar_object, field.field_name)
+        when :link
+          if field.custom_link
+            link = field.custom_link
+          else
+            link = ar_object.send(field.field_name)
+          end
+          content_tag :a, href: link do
             ar_object.send(field.field_name).to_s
-          when :datetime
-            ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s if ar_object.send(field.field_name)
-          when :text
-            ar_object.send(field.field_name)
-          when :custom
-            send(field.helper_method, ar_object, field.field_name)
-          when :link
-            if field.custom_link
-              link = field.custom_link
-            else
-              link = ar_object.send(field.field_name)
-            end
-            content_tag :a, href: link do
-              ar_object.send(field.field_name).to_s
-            end
-          when :enum
-            ar_object.send(field.field_name).to_s.titleize
-          when :tag
-            tag_class = field.tag_class.dig("#{ar_object.send(field.field_name.to_s)}".to_sym).to_s
-            content_tag :span, class: "status-tag #{tag_class}" do
-              ar_object.send(field.field_name).to_s.upcase
-            end
-          when :attachment
-            concat show_attachment_value(ar_object, field)
-          when :drawer
-            content_tag :span do
-              concat content_tag(:span, truncate(ar_object.send(field.field_name).to_s, length: 25))
-              concat content_tag(:span, 'View', class: 'drawer-btn')
-            end
+          end
+        when :enum
+          ar_object.send(field.field_name).to_s.titleize
+        when :tag
+          tag_class = field.tag_class.dig("#{ar_object.send(field.field_name.to_s)}".to_sym).to_s
+          content_tag :span, class: "status-tag #{tag_class}" do
+            ar_object.send(field.field_name).to_s.upcase
+          end
+        when :attachment
+          show_attachment_value(ar_object, field)
+        when :drawer
+          content_tag :div, class: 'd-flex' do
+            concat content_tag(:div, ar_object.send(field.field_name).to_s, class: 'text-ellipsis')
+            concat content_tag(:div, 'View', class: 'drawer-btn')
           end
         end
       end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -17,11 +17,13 @@ module CmAdmin
         when :multi_select
           return f.select field.field_name, options_for_select((field.collection || []), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled, multiple: true
         when :date
-          return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-only' }
+          return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value.strftime('%d-%m-%Y'), placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-only' }
         when :date_time
           return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-time' }
         when :text
           return f.text_area field.field_name, class: "normal-input #{required_class}", placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
+        when :rich_text
+          return f.rich_text_area field.field_name, class: "normal-input #{required_class}", placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_file_upload
           return f.file_field field.field_name, class: "normal-input #{required_class}"
         when :multi_file_upload

data/lib/generators/cm_admin/install_generator.rb

@@ -6,9 +6,12 @@ module CmAdmin
       source_root File.expand_path('templates', __dir__)
 
       def copy_initializer
+        generate 'action_text:install'
         copy_file 'cm_admin_initializer.rb', 'config/initializers/zcm_admin.rb'
         copy_file 'custom.js', 'app/assets/javascripts/cm_admin/custom.js'
         copy_file 'custom.css', 'app/assets/stylesheets/cm_admin/custom.css'
+        copy_file 'actiontext.scss', 'app/assets/stylesheets/cm_admin/actiontext.scss'
+        remove_file 'app/assets/stylesheets/actiontext.scss'
         copy_file 'application_policy.rb', 'app/policies/application_policy.rb'
         route 'mount CmAdmin::Engine => "/admin"'
       end

data/lib/generators/cm_admin/policy_generator.rb

@@ -6,8 +6,8 @@ module CmAdmin
       source_root File.expand_path('templates', __dir__)
 
       def copy_policy_files
-        cm_model = CmAdmin::Model.find_by({name: file_name})
-        raise "cm_admin is not defined inside #{file_name} model" unless cm_model.present?
+        @cm_model = CmAdmin::Model.find_by({name: file_name.classify})
+        raise "cm_admin is not defined inside #{file_name} model" unless @cm_model.present?
         template "policy.rb", "app/policies/cm_admin/#{file_name}_policy.rb"
       end
     end

data/lib/generators/cm_admin/templates/actiontext.scss

@@ -0,0 +1,36 @@
+//
+// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+// the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+// inclusion directly in any other asset bundle and remove this file.
+//
+//= require trix/dist/trix
+
+// We need to override trix.css’s image gallery styles to accommodate the
+// <action-text-attachment> element we wrap around attachments. Otherwise,
+// images in galleries will be squished by the max-width: 33%; rule.
+.trix-content {
+  .attachment-gallery {
+    > action-text-attachment,
+    > .attachment {
+      flex: 1 0 33%;
+      padding: 0 0.5em;
+      max-width: 33%;
+    }
+
+    &.attachment-gallery--2,
+    &.attachment-gallery--4 {
+      > action-text-attachment,
+      > .attachment {
+        flex-basis: 50%;
+        max-width: 50%;
+      }
+    }
+  }
+
+  action-text-attachment {
+    .attachment {
+      padding: 0 !important;
+      max-width: 100% !important;
+    }
+  }
+}

data/lib/generators/cm_admin/templates/custom.css

@@ -0,0 +1,5 @@
+/*
+ *= require_tree .
+ *= require_self
+ */
+ @import "./actiontext.scss";

data/lib/generators/cm_admin/templates/policy.rb

@@ -1,5 +1,5 @@
 class CmAdmin::<%= class_name %>Policy < ApplicationPolicy
-  <%- available_action_names = (cm_model.available_actions.map{|action| action.name}.uniq - ['custom_action', 'new', 'edit']) %>
+  <%- available_action_names = (@cm_model.available_actions.map{|action| action.name}.uniq - ['custom_action', 'new', 'edit']) %>
   <%- available_action_names.each do |action_name| %>
   def <%= action_name %>?
     <%= CmAdmin.authorized_roles.map {|role| "@user.#{role}" }.join(' && ') %>

data/package.json

@@ -15,6 +15,7 @@
     "jquery": "^3.6.0",
     "moment": "^2.29.2",
     "popper.js": "^1.16.1",
+    "trix": "^2.0.0-beta.0",
     "turbolinks": "^5.2.0"
   },
   "version": "0.1.0",

data/yarn.lock

@@ -2697,9 +2697,9 @@ events@^3.0.0:
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
   dependencies:
     original "^1.0.0"
 
@@ -6458,6 +6458,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+trix@^2.0.0-beta.0:
+  version "2.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/trix/-/trix-2.0.0-beta.0.tgz#e7034867182356c023abdef90c7bdc341bb3e105"
+  integrity sha512-D1c7FxP1hGXM/MnTd/+fGUbSDLkfxsqjA0NxOTzByQywVJVNHDOkn8xAScCKVOiAN6hXlqUR2qX4CPJHTGj+cQ==
+
 ts-pnp@^1.1.6:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -223,6 +223,7 @@ files:
 - lib/cm_admin/view_helpers/page_info_helper.rb
 - lib/generators/cm_admin/install_generator.rb
 - lib/generators/cm_admin/policy_generator.rb
+- lib/generators/cm_admin/templates/actiontext.scss
 - lib/generators/cm_admin/templates/application_policy.rb
 - lib/generators/cm_admin/templates/cm_admin_initializer.rb
 - lib/generators/cm_admin/templates/custom.css