cm-admin 0.8.7 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6cf3d2c260e9964ab1aa9865d14af11fe287e49b6216ae260ae575567c0e89
-  data.tar.gz: 495df145a9060198ca69bfd1eaeea836b6bba24287a804e69d100fab5d36cbd1
+  metadata.gz: 51174128fc2fd12fde48837a9271d8e51bb84d847379c6052080cf3de2c8745f
+  data.tar.gz: 9b2381f05a97106e9b3a1d8e117d71721a8d55ff080dcee96a38d77d819f0bf4
 SHA512:
-  metadata.gz: 03b3e0f445067d05f32313a7c4e519545ee6396eca549e75719de294380df8be3be2d5e95c6dfcf262d563eb5db4cd8e3ebabcae753075a4b61f69a6957c5c1d
-  data.tar.gz: 498e3dfb9d3580fa69bfaf959df282567590cbdee12d2ad3bc65fcbb7f7101c70fd9d7d5aba2e78ea6a09547afe0fc4161dd478495110bcfe8efe3887e0d7040
+  metadata.gz: 4ecc29569a31a996554a0360d3bbc52942f30b90692c5de67afdb7f1e6c79ebfab25736892a0093e9ef209821ee3950fad8df69934b36626151ca4af6d7dde10
+  data.tar.gz: 28018ef669025bb8b62d5127036efca2bfb32e944761089f74b17c9eccbed9f5f3db932ac9fe94fb50b120b2b5c8c3829e78b2b1cecf1478809577d8651c3dc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.7)
+    cm-admin (0.8.9)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -38,7 +38,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
-    caxlsx (3.2.0)
+    caxlsx (3.3.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -67,10 +67,8 @@ GEM
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
     minitest (5.16.2)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -146,7 +144,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   ruby

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

@@ -72,7 +72,7 @@ a {
   position: sticky;
   top: 0;
   background-color: #fff;
-  z-index: 1;
+  z-index: 4;
 }
 
 .scrollable {

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

@@ -6,7 +6,6 @@
     overflow: auto;
 
     .sticky-container {
-      z-index: 4;
       .cm-filters-v2 {
         padding: 16px 24px 36px 24px;
       }

data/app/controllers/cm_admin/resource_controller.rb

@@ -153,22 +153,25 @@ module CmAdmin
     end
 
     def custom_controller_action(action_name, params)
-      current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
-      if current_action
-        @current_action = current_action
-        @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
-        if @current_action.child_records
-          child_records = @ar_object.send(@current_action.child_records)
-          @associated_model = CmAdmin::Model.find_by(name: @model.ar_model.reflect_on_association(@current_action.child_records).klass.name)
-          if child_records.is_a? ActiveRecord::Relation
-            @associated_ar_object = filter_by(params, child_records, @associated_model.filter_params(params))
-          else
-            @associated_ar_object = child_records
-          end
-          return @ar_object, @associated_model, @associated_ar_object
-        end
-        return @ar_object
-      end
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
+      return unless @current_action
+
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      return @ar_object unless @current_action.child_records
+
+      child_records = @ar_object.send(@current_action.child_records)
+      @reflection = @model.ar_model.reflect_on_association(@current_action.child_records)
+      @associated_model = if @reflection.klass.column_names.include?('type')
+                            CmAdmin::Model.find_by(name: @reflection.plural_name.classify)
+                          else
+                            CmAdmin::Model.find_by(name: @reflection.klass.name)
+                          end
+      @associated_ar_object = if child_records.is_a? ActiveRecord::Relation
+                                filter_by(params, child_records, @associated_model.filter_params(params))
+                              else
+                                child_records
+                              end
+      return @ar_object, @associated_model, @associated_ar_object
     end
 
     def filter_by(params, records, filter_params={}, sort_params={})
@@ -176,7 +179,7 @@ module CmAdmin
       sort_column = "created_at"
       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 = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
       records = records.order("#{@current_action.sort_column} #{@current_action.sort_direction}")
       final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @associated_model ? @associated_model.filters : @model.filters)

data/app/helpers/cm_admin/application_helper.rb

@@ -65,5 +65,11 @@ module CmAdmin
         end
       end
     end
+
+    def is_show_action_available(model)
+      model &&
+      model.available_actions.map(&:name).include?('show') &&
+      has_valid_policy(model.name, 'show')
+    end
   end
 end

data/app/models/concerns/cm_admin/file_import.rb

@@ -9,23 +9,29 @@ module CmAdmin::FileImport
         page_title 'File Import'
         page_description 'Manage all file import progress here'
 
+        filter [:id, :associated_model_name], :search, placeholder: 'ID, Table Name'
+        filter :status, :single_select,
+               collection: %w[in_progress success failed],
+               placeholder: 'Status'
+        filter :created_at, :date, placeholder: 'Created At'
+
         column :id
         column :imported_file_name, header: 'File'
-        column :created_at, header: 'Started At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
-        column :completed_at, header: 'Completed At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
-        column :associated_model_name, header: 'Model name'
-        column :added_by_name, header: 'Uploaded By'
+        column :created_at, header: 'Created At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
         column :status, field_type: :tag, tag_class: STATUS_TAG_COLOR
+        column :associated_model_name, header: 'Table name'
+        column :added_by_name, header: 'Uploaded By'
+        
       end
 
       cm_show page_title: :id do
         tab :profile, '' do
           cm_show_section 'Import details' do
             field :id, label: 'Import ID'
-            field :imported_file_name, label: 'File'
-            field :created_at, header: 'Started At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
+            field :import_file, label: 'File', field_type: :attachment
+            field :created_at, header: 'Created At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
             field :completed_at, header: 'Completed At', field_type: :datetime, format: '%B %d, %Y, %H:%M %p'
-            field :associated_model_name, header: 'Model name'
+            field :associated_model_name, header: 'Table name'
             field :added_by_name, header: 'Uploaded By'
             field :status, field_type: :tag, tag_class: STATUS_TAG_COLOR
           end

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

@@ -35,11 +35,14 @@
           /     input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each_with_index do |column, index|
             td class="text-ellipsis"
-              span class="#{column.cm_css_class}"
-                - if index == 0 && @associated_model && @associated_model.available_actions.map(&:name).include?('show')
+              span class="#{column.field_type.to_s} #{column.cm_css_class} "
+                - if index == 0 && is_show_action_available(@associated_model)
                   a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/#{ar_object.id}" = show_field_value(ar_object, column)
                 - else
                   = show_field_value(ar_object, column)
+                  - if column.field_type == :drawer
+                    = render partial: column.drawer_partial, locals: { ar_object: ar_object }
+                    
           - if @associated_model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
 

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

@@ -28,7 +28,7 @@
             - if column.display_if.call(Current.user)
               td.text-ellipsis
                 span class="#{column.field_type.to_s} #{column.cm_css_class} "
-                  - if index == 0 && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
+                  - if index == 0 && is_show_action_available(@model) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
                     = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object.id)
                   - else
                     = show_field_value(ar_object, column)

data/lib/cm-admin.rb

@@ -0,0 +1 @@
+require 'cm_admin'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.7"
+  VERSION = '0.8.9'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -35,6 +35,9 @@ module CmAdmin
         when :datetime
           self.extend LocalTimeHelper
           local_time(ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s) if ar_object.send(field.field_name)
+        when :date
+          self.extend LocalTimeHelper
+          local_date(ar_object.send(field.field_name), (field.format || '%B %e, %Y'))
         when :text
           ar_object.send(field.field_name)
         when :custom
@@ -88,6 +91,7 @@ module CmAdmin
           end
         end
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -231,6 +231,7 @@ files:
 - config/webpack/test.js
 - config/webpacker.yml
 - lib/.DS_Store
+- lib/cm-admin.rb
 - lib/cm_admin.rb
 - lib/cm_admin/configuration.rb
 - lib/cm_admin/constants.rb