cm-admin 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0716af97418b0a394649987f80dc9ccffa7ebe3476f53c71be4ffee7d3121f
-  data.tar.gz: c920089946afedbe268496bd0a8cb05d44dd950aad3c5b5dd7eb296180700871
+  metadata.gz: 51174128fc2fd12fde48837a9271d8e51bb84d847379c6052080cf3de2c8745f
+  data.tar.gz: 9b2381f05a97106e9b3a1d8e117d71721a8d55ff080dcee96a38d77d819f0bf4
 SHA512:
-  metadata.gz: e7e2cea04419473813adb4d3d5500bf6fb3e5a897aaf0572387c9a42bff4207e1a7539b4314e1d6bea138b76708788018f9c30ac3132e685da992f0b649e4a6a
-  data.tar.gz: 95cda0809b447a0cce7cc4b20ffce7308a74ec8feac2b91e0b63ac02060472abe2fb360e8c44a525a3609be956ce18d7adb232b64a730911b93ce59951e19e33
+  metadata.gz: 4ecc29569a31a996554a0360d3bbc52942f30b90692c5de67afdb7f1e6c79ebfab25736892a0093e9ef209821ee3950fad8df69934b36626151ca4af6d7dde10
+  data.tar.gz: 28018ef669025bb8b62d5127036efca2bfb32e944761089f74b17c9eccbed9f5f3db932ac9fe94fb50b120b2b5c8c3829e78b2b1cecf1478809577d8651c3dc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.8)
+    cm-admin (0.8.9)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -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.9)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)

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/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.8"
+  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.8
+  version: 0.8.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: This is an admin panel gem