cm-admin 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740dc3d69ceebeee0f6137dc2858b9d10bea0f5ef5c71013c988115e445b779b
-  data.tar.gz: d6f44e0ad96646096ab7fd33595c9e57e9605d5f6e746638b1a3141876854adb
+  metadata.gz: 9e71407dad6f3a42e093faa7247489382dd4b650b3c61f85b6758286a7d2ee45
+  data.tar.gz: e50e11e94676d06e9044a58b84f20cb416d92e8a0a92507afa5ff362b98d9640
 SHA512:
-  metadata.gz: 95e5b8b2e3ac48e776577fe2cdbfb864f82c29777210e57c5342a726593b51d8f543d4b5ef1bafe7e4bb693746881b646ca3504857d07b7749c5ee791b8d4721
-  data.tar.gz: 3b6a1a37c18bbae57b57e662f4ff6401a8fba43470cc7da6b5e1b8af3f174120d15fa928e8d745afddb7f3be20841b4f9b6bc391a935ca2dd29de66bf7f1fe47
+  metadata.gz: 07bf22fe0ea5157252da7a3b17b012f6842ce5da4815764fd6ace17af0203db2dd09158d97efc9f19c51e9df5529f742c7284e501b5879b3694e48aed4283cf3
+  data.tar.gz: 9433f9fd8d71db8f7d1a95668e723cf655cc91e66df19b73d73f405336a7649e8c2a1f011c901a898990512a1e4eefe5092ed7f6502feabf75599a2e0ac0ff1d

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

@@ -45,21 +45,23 @@ $(document).on('click', '.row-action-cell', function(e) {
 
 $(document).on('click', '.drawer-btn', function(e) {
   e.stopPropagation();
-  if ($('.cm-drawer').hasClass('hidden')) {
-     $('.cm-drawer').removeClass('hidden');
-     if ($('#drawer-container').hasClass('drawer-slide-out')) {
-        $('#drawer-container').removeClass('drawer-slide-out');
+  drawer_el = $(this).parent().closest('.drawer').find('.cm-drawer')
+  if (drawer_el.hasClass('hidden')) {
+     drawer_el.removeClass('hidden');
+     drawer_container = drawer_el.find('.drawer-container')
+     if (drawer_container.hasClass('drawer-slide-out')) {
+        drawer_container.removeClass('drawer-slide-out');
      }
-     $('#drawer-container').addClass('drawer-slide-in');
+     drawer_container.addClass('drawer-slide-in');
   } else {
-    return $('.cm-drawer').addClass('hidden');
+    return drawer_el.addClass('hidden');
   }
 });
 
 $(document).on('click', '.drawer-close', function(e) {
   e.stopPropagation();
-  $('#drawer-container').removeClass('drawer-slide-in');
-  $('#drawer-container').addClass('drawer-slide-out');
+  $('.drawer-container').removeClass('drawer-slide-in');
+  $('.drawer-container').addClass('drawer-slide-out');
   setTimeout(() => {
     $('.cm-drawer').addClass('hidden');
   }, 300);

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

@@ -16,7 +16,6 @@
             input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
           th = column.header
-        // th Drawer
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
@@ -25,13 +24,13 @@
               input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
-              span class="#{column.cm_css_class}"
+              span class="#{column.field_type.to_s} #{column.cm_css_class} "
                 - if index == 0
                   = link_to ar_object.send(column.field_name), "/cm_admin/#{ar_object.model_name.collection}/#{ar_object.id}"
                 - else
                   = show_field_value(ar_object, column)
-          // td
-           // button.drawer-btn Open Drawer
+                  - if column.field_type == :drawer
+                    = render partial: column.drawer_partial, locals: { ar_object: ar_object}
           td.row-action-cell
             .row-action-tool
               button.secondary-btn.tool-btn type="button"
@@ -43,10 +42,10 @@
                 .popup-option
                   a href="#{page_url('edit', ar_object)}"
                     | Edit
-                - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
+                - @model.available_actions.select{|act| act if act.route_type == 'member' && [:button, :modal].include?(act.display_type)}.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
+                      = link_to custom_action.name.titleize, 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/index.html.slim

@@ -10,4 +10,4 @@
 
     = column_pop_up(@model)
     = manage_column_pop_up(@model)
-  == render 'cm_admin/main/drawer'
+

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,9 @@ module CmAdmin
       include Actions::Blocks
       attr_accessor :name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
-        :display_type, :action_type, :redirection_url
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column
+
+      VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
       def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?
@@ -30,6 +32,8 @@ module CmAdmin
         self.display_if = lambda { |arg| return true }
         self.display_type = :button
         self.action_type = :default
+        self.sort_column = :created_at
+        self.sort_direction = :desc
       end
 
       class << self

data/lib/cm_admin/models/column.rb

@@ -2,7 +2,7 @@ module CmAdmin
   module Models
     class Column
       attr_accessor :field_name, :field_type, :header, :format, :prefix, :suffix, :exportable, :round,
-      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial
 
       def initialize(field_name, attributes = {})
         @field_name = field_name

data/lib/cm_admin/models/controller_method.rb

@@ -41,6 +41,8 @@ module CmAdmin
         sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
         sort_params = {sort_column: sort_column, sort_direction: sort_direction}
         records = self.name.constantize.where(nil) if records.nil?
+        records = records.order("#{current_action.sort_column} #{current_action.sort_direction}")
+
         final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @filters)
         pagy, records = pagy(final_data)
         filtered_result.data = records

data/lib/cm_admin/models/dsl_method.rb

@@ -24,14 +24,14 @@ module CmAdmin
         @current_action.page_description = page_description
         yield
       end
-  
+
       def cm_edit(page_title: nil,page_description: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
         @current_action.page_title = page_title
         @current_action.page_description = page_description
         yield
       end
-  
+
       def cm_new(page_title: nil,page_description: nil,&block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
         @current_action.page_title = page_title
@@ -44,13 +44,13 @@ module CmAdmin
           @current_action.page_title = title
         end
       end
-  
+
       def page_description(description)
         if @current_action
           @current_action.page_description = description
         end
       end
-  
+
       def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, &block)
         if custom_action.to_s == ''
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
@@ -65,12 +65,12 @@ module CmAdmin
         end
         yield if block
       end
-  
+
       def cm_show_section(section_name, &block)
         @available_fields[@current_action.name.to_sym] ||= []
         @available_fields[@current_action.name.to_sym] << CmAdmin::Models::CmShowSection.new(section_name, &block)
       end
-  
+
       def form_field(field_name, options={}, arg=nil)
         unless @current_action.is_nested_field
           @available_fields[@current_action.name.to_sym][:fields] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
@@ -79,23 +79,24 @@ module CmAdmin
           @available_fields[@current_action.name.to_sym][@current_action.nested_table_name] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
         end
       end
-  
+
       def nested_form_field(field_name, &block)
         @current_action.is_nested_field = true
         @current_action.nested_table_name = field_name
         yield
       end
-  
+
       def column(field_name, options={})
         @available_fields[@current_action.name.to_sym] ||= []
         if @available_fields[@current_action.name.to_sym].select{|x| x.lockable}.size > 0 && options[:lockable]
           raise "Only one column can be locked in a table."
         end
+
         unless @available_fields[@current_action.name.to_sym].map{|x| x.field_name.to_sym}.include?(field_name)
           @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Column.new(field_name, options)
         end
       end
-  
+
       def all_db_columns(options={})
         field_names = self.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
         if options.include?(:exclude) && field_names
@@ -130,6 +131,24 @@ module CmAdmin
       def filter(db_column_name, filter_type, options={})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end
+
+      def sort_direction(direction = :desc)
+        raise ArgumentError, "Select a valid sort direction like #{CmAdmin::Models::Action::VALID_SORT_DIRECTION.join(' or ')} instead of #{direction}" unless CmAdmin::Models::Action::VALID_SORT_DIRECTION.include?(direction.to_sym.downcase)
+
+        @current_action.sort_direction = direction.to_sym if @current_action
+      end
+
+      def sort_column(column = :created_at)
+        model = if @current_action.child_records
+          CmAdmin::Model.find_by(name: @current_action.child_records.to_s.classify)
+        else
+          self
+        end
+        db_columns = model.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
+        raise "Sorting for custom column #{column} does not exist." unless db_columns.include?(column.to_sym)
+
+        @current_action.sort_column = column.to_sym if @current_action
+      end
     end
   end
-end
+end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -47,6 +47,11 @@ module CmAdmin
             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(:a, " View", class: "drawer-btn")
+            end
           end
         end
       end

data/tmp/cache/webpacker/last-compilation-digest-development

@@ -1 +1 @@
-07d558738c316293586496817b2bccbf6430b5bd
+d5850cd60f91abe79ff8a84a45a9e24c75cb0e4b

data/yarn.lock

@@ -6589,9 +6589,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
-  integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy