cm-admin 1.1.4 → 1.1.6

data/app/javascript/stylesheets/cm_admin/application.scss

@@ -1,4 +1,4 @@
 @import "bootstrap/scss/bootstrap";
 @import "flatpickr/dist/flatpickr";
 @import "../../../../node_modules/daterangepicker/daterangepicker.css";
-@import "jgrowl/jquery.jgrowl"
+@import "jgrowl/jquery.jgrowl";

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

@@ -24,6 +24,7 @@
         /   span
         /     input.cm-checkbox type="checkbox"
         - @model.available_fields[@action.name.to_sym].each do |column|
+          - if column.display_if.call(Current.user) && column.viewable
             th = column.header
     tbody.cm-table__body
       - @associated_ar_object.data.each do |ar_object|
@@ -33,14 +34,15 @@
           /   span
           /     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.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 column.display_if.call(Current.user) && column.viewable
+              td class="text-ellipsis"
+                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

@@ -15,7 +15,7 @@
         /   span
         /     input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
-          - if column.display_if.call(Current.user)
+          - if column.display_if.call(Current.user) && column.viewable
             th = column.header
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
@@ -24,7 +24,7 @@
           /   span
           /     input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
-            - if column.display_if.call(Current.user)
+            - if column.display_if.call(Current.user) && column.viewable
               td.text-ellipsis
                 span class="#{column.field_type.to_s} #{column.cm_css_class} "
                   - if index == 0 && is_show_action_available(@model) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))

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

@@ -3,7 +3,7 @@
     - 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.underscore}_index_path")
+          = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path")
     .nav-title-area
       p.title-text = action_title
       p.title-sub-text = action_description
@@ -36,4 +36,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}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'primary-btn ml-2'
+        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'primary-btn ml-2'

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

@@ -16,7 +16,4 @@
                 - @ar_object.errors.full_messages.each do |error_message|
                   li = error_message
       .form-container
-        p.form-title 
-          | Section heading
-        .form-container__inner
-          = generate_form(@ar_object, @model)
+        = generate_form(@ar_object, @model)

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

@@ -25,6 +25,6 @@
             p.email-text = current_user.email
           .profile-info__right
         .auth-option
-          = link_to destroy_user_session_path, method: :delete, class: 'auth-link', data: { turbo_method: :delete }
+          = button_to destroy_user_session_path, method: :delete, class: 'auth-link', data: { turbo: :false }
             | Logout
 = render 'layouts/quick_links'

data/lib/cm_admin/models/column.rb

@@ -7,7 +7,7 @@ module CmAdmin
 
       attr_accessor :field_name, :field_type, :header, :format, :prefix, :suffix, :exportable, :round, :height, :width,
       :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class,
-      :display_if, :association_name, :association_type
+      :display_if, :association_name, :association_type, :viewable, :custom_link
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -41,12 +41,13 @@ module CmAdmin
         self.exportable = true
         self.managable = true
         self.lockable = false
+        self.viewable = true
         self.tag_class = {}
       end
 
       class << self
-        def find_by(model, search_hash)
-          model.available_fields.find { |i| i.name == search_hash[:name] }
+        def find_by(model, action_name, search_hash)
+          model.available_fields[action_name].find { |column| column.field_name == search_hash[:name] }
         end
       end
     end

data/lib/cm_admin/models/export.rb

@@ -4,57 +4,58 @@ module CmAdmin
       class << self
         def generate_excel(klass_name, params, helpers)
           klass = klass_name.constantize
-          columns = params[:columns] || []
+          selected_column_names = params[:columns] || []
           # filter_params = params[:filters]
           model = CmAdmin::Model.find_by({name: klass_name})
           # records = get_records(klass, model, columns, helpers)
           records = "CmAdmin::#{klass_name}Policy::Scope".constantize.new(Current.user, klass).resolve
           filtered_data = CmAdmin::Models::Filter.filtered_data(model.filter_params(params), records, model.filters)
-          formatted_data = format_records(filtered_data, model, columns, helpers)
+          formatted_data = format_records(filtered_data, model, selected_column_names, helpers)
           file_path = "#{Rails.root}/tmp/#{klass}_data_#{DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")}.xlsx"
-          create_workbook(formatted_data, columns, file_path)
+          create_workbook(model, formatted_data, selected_column_names, file_path)
           return file_path
         end
 
-
-        def format_records(records, model, columns, helpers)
-          custom_fields = model.available_fields[:index].map{|field| field if field.field_type == :custom}.compact
-          normal_fields = model.available_fields[:index].map{|field| field unless field.field_type == :custom}.compact
-          deserialized_columns = CmAdmin::Utils.deserialize_csv_columns(columns, :as_json_params)
+        def format_records(records, model, selected_column_names, helpers)
+          deserialized_columns = CmAdmin::Utils.deserialize_csv_columns(selected_column_names, :as_json_params)
           # This includes isn't recursve, a full solution should be recursive
           records_arr = []
           records.includes(deserialized_columns[:include].keys).find_each do |record|
-            record_hash = record.as_json({only: columns.map(&:to_sym)})
-            columns.each do |column|
-              break unless model.available_fields[:index].map(&:field_name).include?(column.to_sym)
-              record_hash[column.to_sym] = record.send(column.to_sym)
-            end
-            custom_fields.each do |field|
-              record_hash[field.field_name.to_sym] = helpers.send(field.helper_method, record, field.field_name)
+            record_hash = record.as_json({ only: selected_column_names.map(&:to_sym) })
+            selected_column_names.each do |column_name|
+              break unless model.available_fields[:index].map(&:field_name).include?(column_name.to_sym)
+
+              column = CmAdmin::Models::Column.find_by(model, :index, { name: column_name.to_sym })
+              if column.field_type == :custom
+                record_hash[column.field_name] = helpers.send(column.helper_method, record, column.field_name).to_s
+              else
+                record_hash[column.field_name] = record.send(column.field_name).to_s
+              end
             end
             records_arr << record_hash
           end
           records_arr
         end
 
-        def create_workbook(records, class_name, file_path)
+        def create_workbook(cm_model, records, _class_name, file_path)
           flattened_records = records.map { |record| CmAdmin::Utils.flatten_hash(record) }
-          columns = flattened_records.map{|x| x.keys}.flatten.uniq.sort
+          # columns = flattened_records.map{|x| x.keys}.flatten.uniq.sort
+          columns = exportable_columns(cm_model).select { |column| flattened_records.first.keys.include?(column.field_name.to_s) }
           size_arr = []
           columns.size.times { size_arr << 22 }
           xl = Axlsx::Package.new
           xl.workbook.add_worksheet do |sheet|
-            sheet.add_row columns&.map(&:titleize), b: true
+            sheet.add_row columns&.map(&:header), b: true
             flattened_records.each do |record|
-              sheet.add_row(columns.map { |column| record[column] })
+              sheet.add_row(columns.map { |column| record[column.field_name.to_s] })
             end
-          sheet.column_widths(*size_arr)
+            sheet.column_widths(*size_arr)
           end
           xl.serialize(file_path)
         end
 
         def exportable_columns(klass)
-          klass.available_fields[:index].map{|x| x.exportable ? x.field_name : ""}.reject { |c| c.empty? }
+          klass.available_fields[:index].select(&:exportable)
         end
 
       end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.4'
+  VERSION = '1.1.6'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -39,7 +39,7 @@ module CmAdmin
 
       def cm_single_select_field(form_obj, cm_field, value, required_class, target_action)
         form_obj.select cm_field.field_name, options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        { include_blank: cm_field.placeholder.to_s },
+                        { include_blank: cm_field.placeholder.to_s.presence || "Select #{cm_field.field_name.to_s.humanize(capitalize: false)}}" },
                         class: "normal-input #{required_class} select-2",
                         disabled: cm_field.disabled,
                         data: {
@@ -53,7 +53,7 @@ module CmAdmin
       def cm_multi_select_field(form_obj, cm_field, value, required_class, target_action)
         form_obj.select cm_field.field_name,
                         options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        { include_blank: "Select #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}" },
+                        { include_blank: cm_field.placeholder.to_s.presence || "Select #{cm_field.field_name.to_s.humanize(capitalize: false)}" },
                         class: "normal-input #{required_class} select-2",
                         disabled: cm_field.disabled, multiple: true
       end

data/lib/cm_admin/view_helpers.rb

@@ -60,16 +60,16 @@ module CmAdmin
 
     def checkbox_row(klass)
       tag.div class: 'row' do
-        CmAdmin::Models::Export.exportable_columns(klass).each do |column_path|
-          concat create_checkbox(column_path)
+        CmAdmin::Models::Export.exportable_columns(klass).each do |column|
+          concat create_checkbox(column)
         end
       end
     end
 
-    def create_checkbox(column_path)
+    def create_checkbox(column)
       tag.div class: 'col-md-4' do
-        concat check_box_tag 'columns[]', column_path, id: column_path.to_s.gsub('/', '-')
-        concat " #{column_path.to_s.gsub('/', '_').humanize}"
+        concat check_box_tag 'columns[]', column.field_name, id: column.field_name.to_s.gsub('/', '-')
+        concat " #{column.header.to_s.gsub('/', '_').humanize}"
       end
     end
 

data/package-lock.json

@@ -1814,9 +1814,9 @@
       }
     },
     "node_modules/@npmcli/fs/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3834,9 +3834,9 @@
       }
     },
     "node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "bin": {
         "semver": "bin/semver"
       }
@@ -7792,9 +7792,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -9872,9 +9872,9 @@
       }
     },
     "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -10410,9 +10410,9 @@
       }
     },
     "node_modules/sass-loader/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -10469,9 +10469,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -13423,9 +13423,9 @@
       }
     },
     "node_modules/webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "bin": {
         "semver": "bin/semver"
       }

data/yarn.lock

@@ -6344,31 +6344,24 @@ selfsigned@^2.0.1:
     node-forge "^1"
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.3.2:
-  version "7.3.5"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.4:
-  version "7.3.8"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.3.2, semver@^7.3.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,14 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/cm_admin_manifest.js
+- app/assets/fonts/fa-brands-400.ttf
+- app/assets/fonts/fa-brands-400.woff2
+- app/assets/fonts/fa-regular-400.ttf
+- app/assets/fonts/fa-regular-400.woff2
+- app/assets/fonts/fa-solid-900.ttf
+- app/assets/fonts/fa-solid-900.woff2
+- app/assets/fonts/fa-v4compatibility.ttf
+- app/assets/fonts/fa-v4compatibility.woff2
 - app/assets/images/image_not_available.png
 - app/assets/images/logo.png
 - app/assets/javascripts/cm_admin/application.js
@@ -212,6 +220,7 @@ files:
 - app/assets/stylesheets/cm_admin/components/index.scss
 - app/assets/stylesheets/cm_admin/dependency/bootstrap.min.css
 - app/assets/stylesheets/cm_admin/dependency/flatpickr.min.css
+- app/assets/stylesheets/cm_admin/dependency/fontawesome.all.css
 - app/assets/stylesheets/cm_admin/helpers/_mixins.scss
 - app/assets/stylesheets/cm_admin/helpers/_variable.scss
 - app/assets/stylesheets/cm_admin/helpers/index.scss