cm-admin 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0644c45e1ae1e807b94e66341d607778f8ca9fbe456a1d741d34db0cf5489550
-  data.tar.gz: 3cb2975b1c28a7cf6e150c16bb4e235750e02fb2ce39df110a4b2bb0b17f6a7c
+  metadata.gz: 23f6fccd6392ef215ea1e9c8927722e5c8cfe249d04515e49c9aab6daebf9b26
+  data.tar.gz: 6a39df0f21e575502cbe688c69a8a53ba458d81a98fc4dd455fabc6d293d5772
 SHA512:
-  metadata.gz: 412c8867112a3241b3e71b9049473f437bcc99950cf9c286495d5bd85b25459446a3465d150703cf4056c49daadfa1dd556eb0172e873cab2d665090c9d9c66c
-  data.tar.gz: ec362ed640f95dd335b653d6040c904d40b53fb941eeb7f0eeefe94bf3d38910fdbdf5a00fb68b5b303ab15b578b680d0ed79cd764748813ef70b3556d138666
+  metadata.gz: 8f944d24b0601cf979f84589fc957d9951c75cfaa1eec722819d581436dd2f496fa2fc73a8c42d98f23c1e73e46d5e40188fb93174fb8bb01a63898e3c0a5e4a
+  data.tar.gz: 6cb1770919c12717fa95119b12d6be1727589e4bc67f54de96af164718fd4b9d9f60feb091e46db6b5b879669cd964c9c0d87acf65f06b09ea38496f6b647a90

data/app/assets/stylesheets/cm_admin/components/_input.scss

@@ -81,6 +81,16 @@
   }
 }
 
+.select2 {
+  &.error {
+    border: 1px solid $error-clr;
+    border-radius: 5px;
+    &:focus {
+      outline: 3px auto rgba(248, 54, 54, 0.3);
+    }
+  }
+}
+
 .file-upload-wrapper {
   display: inline-flex;
   align-items: center;

data/app/controllers/cm_admin/exports_controller.rb

@@ -8,7 +8,7 @@ module CmAdmin
   class ExportsController < ApplicationController
 
     def export
-      file_path = CmAdmin::Models::Export.generate_excel(params[:class_name], params[:columns], helpers)
+      file_path = CmAdmin::Models::Export.generate_excel(params[:class_name], params, helpers)
       send_file file_path, disposition: 'attachment'
     end
 

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

@@ -8,8 +8,10 @@ require("bootstrap")
 require('flatpickr')
 require("jgrowl")
 require('./scaffolds.js')
+require('./form_validation.js')
 require('./quick_search.js')
 require('./filters.js')
+require('./exports.js')
 
 import jQuery from 'jquery'
 window.$ = jQuery

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

@@ -0,0 +1,6 @@
+$(document).on('click', '.export-to-file-btn', function(e) {
+  e.preventDefault();
+  query_param = window.location.href.split("?")[1]
+  $('#export-to-file-form').get(0).setAttribute('action', '/cm_admin/export_to_file.js?' + query_param);
+  $("#export-to-file-form").submit();
+});

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

@@ -0,0 +1,37 @@
+$(document).on('turbolinks:load', function () {
+  $(document).on('click', '.form_submit', function(e) {
+    e.preventDefault();
+    var submit = [];
+    var form_class = $(this).data('form-class');
+    $("." + form_class + " input.required, ." + form_class + " textarea.required").each(function() {
+      $(this).removeClass('error');
+      if ($(this).val().trim().length === 0) {
+        $(this).addClass('error');
+        window.scrollTo(top);
+        submit.push(true);
+      }
+    });
+    $("." + form_class + " select.required").each(function() {
+      $(this).removeClass('error');
+      if ($(this).val().trim().length === 0) {
+        $(this).parent().find('.select2').addClass('error');
+        window.scrollTo(top);
+        submit.push(true);
+      }
+    });
+    $('.nested_input_validation').each(function() {
+      var class_name;
+      class_name = $(this).data('class-name');
+      $(this).parents(':nth(1)').find('.' + class_name).addClass('hidden');
+      if ($(this).val().trim().length === 0) {
+        $(this).parents(':nth(1)').find('.' + class_name).removeClass('hidden');
+        window.scrollTo(top);
+        submit.push(true);
+      }
+    });
+    if (submit.length === 0) {
+      $('.' + form_class).submit();
+      return $('.form_submit').button('loading');
+    }
+  });
+});

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

@@ -26,8 +26,8 @@
           /   span
           /     input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each do |column|
-            td
-              span class="#{column.cm_css_class} text-ellipsis" = show_field_value(ar_object, column)
+            td class="text-ellipsis"
+              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
           - associated_model_actions = @associated_model && @associated_model.available_actions.select{|act| act if act.route_type == 'member'}
           - if associated_model_actions.present?
             td.row-action-cell

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

@@ -1,7 +1,10 @@
 .nested-field-wrapper
   label.field-label = table_name.to_s.titleize
+  - initialized_record_count = 1
   = f.fields_for table_name do |record|
-    = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
+    - if record.object.persisted? || initialized_record_count == 1
+      = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
+    - initialized_record_count += 1 if record.object.new_record?
   - if @reflections.select {|x| x if x.name == table_name}.first.macro == :has_many
     .links
       = link_to_add_association "+ Add #{table_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}

data/lib/cm_admin/model.rb

@@ -26,10 +26,6 @@ module CmAdmin
       :current_action, :params, :filters, :available_tabs, :icon_name
     attr_reader :name, :ar_model, :is_visible_on_sidebar
 
-    # Class variable for storing all actions
-    # CmAdmin::Model.all_actions
-    singleton_class.send(:attr_accessor, :all_actions)
-
     def initialize(entity, &block)
       @name = entity.name
       @ar_model = entity
@@ -44,14 +40,10 @@ module CmAdmin
       instance_eval(&block) if block_given?
       actions unless @actions_set
       $available_actions = @available_actions.dup
-      self.class.all_actions.push(@available_actions)
       define_controller
     end
 
     class << self
-      def all_actions
-        @all_actions || []
-      end
 
       def find_by(search_hash)
         CmAdmin.config.cm_admin_models.find { |x| x.name == search_hash[:name] }
@@ -97,6 +89,15 @@ module CmAdmin
       @icon_name = name
     end
 
+    def filter_params(params)
+      # OPTIMIZE: Need to check if we can permit the filter_params in a better way
+      date_columns = @filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
+      range_columns = @filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
+      single_select_columns = @filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
+      multi_select_columns = @filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
+
+      params.require(:filters).permit(:search, date: date_columns, range: range_columns, single_select: single_select_columns, multi_select: multi_select_columns) if params[:filters]
+    end
 
     private
 
@@ -185,14 +186,6 @@ module CmAdmin
       CmAdmin.const_set "#{@name}Controller", klass
     end
 
-    def filter_params(params)
-      # OPTIMIZE: Need to check if we can permit the filter_params in a better way
-      date_columns = @filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
-      range_columns = @filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
-      single_select_columns = @filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
-      multi_select_columns = @filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
-
-      params.require(:filters).permit(:search, date: date_columns, range: range_columns, single_select: single_select_columns, multi_select: multi_select_columns) if params[:filters]
-    end
+    
   end
 end

data/lib/cm_admin/models/column.rb

@@ -27,30 +27,6 @@ module CmAdmin
         self.tag_class = {}
       end
 
-      #formatting value for different data types
-      def self.format_data_type(column, value)
-        case column.column_type
-        when :string
-          if column.format.present?
-            column.format = [column.format] if column.format.is_a? String
-            column.format.each do |formatter|
-              value = value.send(formatter)
-            end
-          end
-        when :datetime
-          format_value = column.format.present? ? column.format.to_s : '%d/%m/%Y'
-          value = value.strftime(format_value)
-        when :enum
-          value = value.titleize
-        when :decimal
-          round_to = column.round.present? ? column.round.to_i : 2
-          value = value.round(round_to)
-        when :custom
-
-        end
-        return value
-      end
-
       class << self
         def find_by(model, search_hash)
           model.available_fields.find { |i| i.name == search_hash[:name] }

data/lib/cm_admin/models/dsl_method.rb

@@ -3,18 +3,10 @@ module CmAdmin
     module DslMethod
       extend ActiveSupport::Concern
 
-      def cm_page(name: nil, partial: nil, path: nil, route_type: nil, page_title: nil, display_type: :button, &block)
-        action = CmAdmin::Models::CustomAction.new(name: name, verb: :get, partial: partial, path: path, route_type: route_type, display_type: display_type, &block)
-        @available_actions << action
-        # @available_actions << CmAdmin::Models::CustomAction.new(name: name, verb: 'get', layout: 'cm_admin', partial: partial, path: path, parent: self.current_action.name, route_type: route_type, page_title: page_title, display_type: display_type, &block)
-        # @current_action = CmAdmin::Models::CustomAction.find_by(self, name: name)
-      end
-
       def cm_index(page_title: nil, page_description: nil, partial: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
         @current_action.set_values(page_title, page_description, partial)
         yield
-        # action.instance_eval(&block)
       end
 
       def cm_show(page_title: nil, page_description: nil, partial: nil, &block)

data/lib/cm_admin/models/export.rb

@@ -2,24 +2,29 @@ module CmAdmin
   module Models
     class Export
       class << self
-        def generate_excel(klass_name, columns = [], helpers)
+        def generate_excel(klass_name, params, helpers)
           klass = klass_name.constantize
+          columns = params[:columns] || []
+          # filter_params = params[:filters]
           model = CmAdmin::Model.find_by({name: klass_name})
-          records = get_records(klass, model, columns, helpers)
+          # 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)
           file_path = "#{Rails.root}/tmp/#{klass}_data_#{DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")}.xlsx"
-          create_workbook(records, columns, file_path)
+          create_workbook(formatted_data, columns, file_path)
           return file_path
         end
 
-        def get_records(klass, model, columns, helpers)
-          records = klass
+
+        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)
           # 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: normal_fields.map(&:field_name)})
+            record_hash = record.as_json({only: columns.map(&:to_sym)})
             custom_fields.each do |field|
               record_hash[field.field_name.to_sym] = helpers.send(field.helper_method, record, field.field_name)
             end

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -3,27 +3,29 @@ module CmAdmin
     module FormFieldHelper
       def input_field_for_column(f, field)
         value = field.custom_value || f.object.send(field.field_name)
+        is_required = f.object._validators[field.field_name].map(&:kind).include?(:presence)
+        required_class = is_required ? 'required' : ''
         case field.input_type
         when :integer
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.humanize.downcase}", data: { behaviour: 'integer-only' }
+          return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.humanize.downcase}", data: { behaviour: 'integer-only' }
         when :decimal
-          return f.number_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'decimal-only' }
+          return f.number_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: 'decimal-only' }
         when :string
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
+          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('_', ' ')}"
         when :single_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 select-2', disabled: field.disabled
+          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
         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 select-2', disabled: field.disabled, multiple: true
+          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', 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, 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', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: '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', placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
+          return f.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'
+          return f.file_field field.field_name, class: "normal-input #{required_class}"
         when :multi_file_upload
-          return f.file_field field.field_name, multiple: true, class: 'normal-input'
+          return f.file_field field.field_name, multiple: true, class: "normal-input #{required_class}"
         when :hidden
           return f.hidden_field field.field_name, value: field.custom_value
         end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -37,7 +37,7 @@ module CmAdmin
       end
 
       def set_form_for_fields(resource, available_fields_hash, url, method)
-        form_for(resource, url: url, method: method) do |f|
+        form_for(resource, url: url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |f|
           available_fields_hash.each do |key, fields_array|
             if key == :fields
               fields_array.each do |field|
@@ -59,7 +59,7 @@ module CmAdmin
             end
           end
           concat tag.br
-          concat f.submit 'Save', class: 'cta-btn mt-3'
+          concat f.submit 'Save', class: 'cta-btn mt-3 form_submit', data: {form_class: "cm_#{f.object.class.name.downcase}_form"}
         end
       end
     end

data/lib/cm_admin/view_helpers.rb

@@ -5,7 +5,6 @@ module CmAdmin
     include PageInfoHelper
     include NavigationHelper
     include FormHelper
-    include ColumnFieldHelper
     include FieldDisplayHelper
     include FilterHelper
     include ManageColumnPopupHelper

data/yarn.lock

@@ -1331,9 +1331,9 @@ async-limiter@~1.0.0:
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -148,7 +148,9 @@ files:
 - app/helpers/cm_admin/application_helper.rb
 - app/helpers/cm_admin/custom_helper.rb
 - app/javascript/packs/cm_admin/application.js
+- app/javascript/packs/cm_admin/exports.js
 - app/javascript/packs/cm_admin/filters.js
+- app/javascript/packs/cm_admin/form_validation.js
 - app/javascript/packs/cm_admin/quick_search.js
 - app/javascript/packs/cm_admin/scaffolds.js
 - app/javascript/stylesheets/cm_admin/application.scss
@@ -212,7 +214,6 @@ files:
 - lib/cm_admin/utils.rb
 - lib/cm_admin/version.rb
 - lib/cm_admin/view_helpers.rb
-- lib/cm_admin/view_helpers/column_field_helper.rb
 - lib/cm_admin/view_helpers/field_display_helper.rb
 - lib/cm_admin/view_helpers/filter_helper.rb
 - lib/cm_admin/view_helpers/form_field_helper.rb

data/lib/cm_admin/view_helpers/column_field_helper.rb

@@ -1,29 +0,0 @@
-module CmAdmin
-  module ViewHelpers
-    module ColumnFieldHelper
-
-      #adds prefix and suffix to a value
-      def add_prefix_and_suffix_helper(value, prefix, suffix)
-        "#{prefix} #{value} #{suffix}"
-      end
-
-      #formats the column value a field
-      def column_for_field_helper(ar_object, column)
-        value = ar_object.send(column.db_column_name)
-        formatted_value = CmAdmin::Models::Column.format_data_type(column, value)
-        formatted_value = add_prefix_and_suffix_helper(formatted_value, column.prefix, column.suffix)
-        formatted_value = link_url_value_helper(column, value, formatted_value)
-        return formatted_value
-      end
-
-      #column's value is either linked with 'url' attribute's value or its own value
-      def link_url_value_helper(column, value, formatted_value)
-        return formatted_value unless column.column_type.to_s == 'link'
-        link_url_value = column.url.present? ? column.url : value
-        final_value = "<a href=#{link_url_value}>#{formatted_value}</a>".html_safe
-        return final_value
-      end
-
-    end
-  end
-end