cm-admin 0.9.0 → 1.0.0

data/app/controllers/cm_admin/resource_controller.rb

@@ -106,12 +106,14 @@ module CmAdmin
             data = @action.parent == "index" ? @ar_object.data : @ar_object
             format.html { render @action.partial }
           else
-            ar_object = @action.code_block.call(@ar_object)
-            if ar_object.errors.empty?
-              redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+            response_object = @action.code_block.call(@response_object)
+            if response_object.class == Hash
+              format.json { render json: response_object }
+            elsif response_object.errors.empty?
+              redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@response_object.id}"
               format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
             else
-              error_messages = ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
+              error_messages = response_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
               format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
             end
           end
@@ -193,9 +195,11 @@ module CmAdmin
     end
 
     def resource_params(params)
-      columns = @model.ar_model.column_names
+      columns = @model.ar_model.columns_hash.map {|key, ar_adapter|
+        ar_adapter.sql_type_metadata.sql_type.ends_with?('[]') ? Hash[ar_adapter.name, []] : ar_adapter.name.to_sym
+      }
       columns += @model.ar_model.stored_attributes.values.flatten
-      permittable_fields = @model.additional_permitted_fields + columns.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
+      permittable_fields = @model.additional_permitted_fields + columns.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }
       permittable_fields += @model.ar_model.name.constantize.reflect_on_all_associations.map {|x|
         next if x.options[:polymorphic]
         if x.class.name.include?('HasOne')
@@ -214,7 +218,6 @@ module CmAdmin
       }
       permittable_fields += nested_fields
       @model.ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
-
       params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
     end
 

data/app/helpers/cm_admin/application_helper.rb

@@ -1,8 +1,5 @@
-require "webpacker/helper"
-
 module CmAdmin
   module ApplicationHelper
-    include ::Webpacker::Helper
 
     def current_webpacker_instance
       CmAdmin.webpacker

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

@@ -9,10 +9,10 @@ require('flatpickr')
 require("jgrowl")
 require("trix")
 require('./scaffolds.js')
-require('./form_validation.js')
-require('./quick_search.js')
-require('./filters.js')
-require('./exports.js')
+require('/app/assets/javascripts/cm_admin/form_validation.js')
+require('/app/assets/javascripts/cm_admin/quick_search.js')
+require('/app/assets/javascripts/cm_admin/filters.js')
+require('/app/assets/javascripts/cm_admin/exports.js')
 
 import jQuery from 'jquery'
 import LocalTime from "local-time"

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

@@ -74,3 +74,84 @@ $(document).on('click', '.drawer-close', function(e) {
     $('.cm-drawer').addClass('hidden');
   }, 300);
 });
+
+$(document).on('change', '[data-field-type="linked-field"]', function(e) {
+  e.stopPropagation();
+  params = {}
+  params[$(this).data('field-name')] = $(this).val()
+  request_url = $(this).data('target-url') + '?' + $.param(params);
+  console.log(request_url)
+  $.ajax(request_url, {
+    type: 'GET',
+    success: function(data) {
+      apply_response_to_field(data)
+    },
+    error: function(jqxhr, textStatus, errorThrown) {
+      alert('Something went wrong. Please try again later.\n' + errorThrown);
+    }
+  });
+});
+
+function apply_response_to_field(response) {
+  $.each(response['fields'], function(key, value) {
+    switch(value['target_type']) {
+      case 'select':
+        update_options_in_select(value['target_value'])
+        break;
+      case 'input':
+        update_options_input_value(value['target_value'])
+        break;
+      case 'toggle_visibility':
+        toggle_field_visibility(value['target_value'])
+    }
+  })
+}
+
+function update_options_input_value(field_obj) {
+  input_tag = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  input_tag.val(field_obj['field_value'])
+}
+
+function update_options_in_select(field_obj) {
+  select_tag = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  select_tag.empty();
+  $.each(field_obj['field_value'], function(key, value) {
+    select_tag.append($("<option></option>")
+      .attr("value", value[1]).text(value[0]));
+  });
+}
+
+function toggle_field_visibility(field_obj) {
+  element = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  element.closest('.input-wrapper').toggleClass('hidden')
+}
+
+$(document).on('cocoon:after-insert', '.nested-field-wrapper', function(e) {
+  e.stopPropagation();
+  replaceAccordionTitle($(this))
+});
+
+$(document).on('cocoon:after-remove', '.nested-field-wrapper', function(e) {
+  e.stopPropagation();
+  replaceAccordionTitle($(this))
+});
+
+$(document).ready( function () {
+  $('.nested-field-wrapper').each(function() {
+    replaceAccordionTitle($(this))
+  })
+});
+
+var replaceAccordionTitle = function(element) {
+  var i = 0;
+  var table_name = $(element).data('table-name')
+  var model_name = $(element).data('model-name')
+  $(element).find('.accordion-item:visible').each(function() {
+    i++;
+    var accordion_title = model_name + ' ' + i
+    var accordion_id = table_name + '-' + i
+    $(this).find('.accordion-button').text(accordion_title);
+    $(this).find('.accordion-button').attr('data-bs-target', '#' + accordion_id);
+    $(this).find('.accordion-collapse').attr('id', accordion_id);
+  });
+}

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

@@ -1,9 +1,26 @@
-.nested-fields class=assoc_name
-  - @model.available_fields[ action(action_name) ][assoc_name].each do |field|
-    .row
-      .col-sm-10
-        = input_field_for_column(f, field)
-      .col-sm-2
-        - unless field.input_type == :hidden
-          - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-            = link_to_remove_association "x", f
+- fields = @model.available_fields[ action(action_name) ][assoc_name]
+- if fields.count == 1
+  .nested-single-field.nested-fields
+    - fields.each do |field|
+        .field-input
+          = input_field_for_column(f, field)
+        .field-remove-action
+          - unless field.input_type == :hidden
+            - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+              = link_to_remove_association "", f, class: 'fa fa-times'
+- else
+  .accordion-item.nested-fields
+    h2#headingOne.accordion-header
+      button.accordion-button[type="button" data-bs-toggle="collapse" data-bs-target="##{assoc_name}-#{f.object.id}" aria-expanded="true" aria-controls="collapseOne"]
+        | Chapter 1
+      .field-remove-action
+        - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+          = link_to_remove_association "", f, class: 'fa fa-trash ghost-btn accordion-delete-btn'
+    div.accordion-collapse.collapse.show[aria-labelledby="headingOne" id="#{assoc_name}-#{f.object.id}"]
+      .accordion-body
+        - fields.each do |field|
+          .form-field
+            .field-label-wrapper
+              label.field-label = field.field_name.to_s.titleize 
+            .field-input-wrapper
+              = input_field_for_column(f, field)

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

@@ -1,10 +1,9 @@
-.nested-field-wrapper
-  label.field-label = table_name.to_s.titleize
-  - initialized_record_count = 1
-  = f.fields_for table_name do |record|
-    - 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 }}
+.nested-field-wrapper data-table-name=table_name data-model-name=table_name.to_s.classify
+  label.nested-field-label = table_name.to_s.titleize
+  .accordion.nested-form-accordion
+    = f.fields_for table_name do |record|
+      - if record.object.persisted?
+        = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
+    - 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 }}, class: 'd-inline-block secondary-btn mt-2'

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

@@ -4,4 +4,4 @@ ul.nav.nav-pills
       - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))
         li.nav-item
           - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
-          = link_to nav_item.nav_item_name.to_s.titleize, cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
+          = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"

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

@@ -7,12 +7,17 @@ html
     = csrf_meta_tags
     = csp_meta_tag
     = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
-    = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
-    link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
-    = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    - if CmAdmin::VersionManager.use_webpacker?
+      = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+      = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+      script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js" 
+    - elsif CmAdmin::VersionManager.use_importmap?
+      = javascript_importmap_tags
+      = javascript_import_module_tag "cm_admin/application"
     = javascript_include_tag 'cm_admin/custom', 'data-turbolinks-track': 'reload'
     = stylesheet_link_tag 'cm_admin/custom', media: 'all', 'data-turbolinks-track': 'reload'
-    script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js" 
+    link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
+    
     script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"
   body
     .cm-admin

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

@@ -7,8 +7,9 @@ html
     = csrf_meta_tags
     = csp_meta_tag
     = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
-    = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
-    = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    - if CmAdmin::VersionManager.rails6?
+      = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+      = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
   body
     - flash.each do |type, msg|
       .alert class="alert-#{type}"

data/bin/importmap

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# NOTE: make sure we are loading the correct versions of things
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+# NOTE: importmap requires some rails goodness that we don't have in the engine,
+#       because we don't have config/application.rb that loads the environment.
+require 'rails'
+
+# importmap-rails is not loaded automatically
+require 'importmap-rails'
+
+# the actual command runner
+require 'importmap/commands'

data/bin/webpack

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
+ENV['NODE_ENV']  ||= 'development'
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
   Pathname.new(__FILE__).realpath)
 
-require "bundler/setup"
+require 'bundler/setup'
 
-require "webpacker"
-require "webpacker/webpack_runner"
+require 'webpacker'
+require 'webpacker/webpack_runner'
 
-APP_ROOT = File.expand_path("..", __dir__)
+APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   Webpacker::WebpackRunner.run(ARGV)
 end

data/bin/webpack-dev-server

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
+ENV['NODE_ENV']  ||= 'development'
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
   Pathname.new(__FILE__).realpath)
 
-require "bundler/setup"
+require 'bundler/setup'
 
-require "webpacker"
-require "webpacker/dev_server_runner"
+require 'webpacker'
+require 'webpacker/dev_server_runner'
 
-APP_ROOT = File.expand_path("..", __dir__)
+APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   Webpacker::DevServerRunner.run(ARGV)
-end
+end

data/cm_admin.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.add_runtime_dependency('rails', '>= 6.0')
   spec.add_runtime_dependency 'caxlsx_rails'
   spec.add_runtime_dependency 'cocoon', '~> 1.2.15'
   spec.add_runtime_dependency 'local_time', '~> 2.1.0'
@@ -34,4 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'slim', '~> 4.1.0'
   spec.add_runtime_dependency 'webpacker', '~> 5.4.3'
   spec.add_runtime_dependency 'csv-importer', '~> 0.8.2'
+  spec.add_dependency 'importmap-rails'
+  
 end

data/config/importmap.rb

@@ -0,0 +1,12 @@
+pin 'cm_admin/application'
+pin 'jquery', to: 'https://ga.jspm.io/npm:jquery@3.6.0/dist/jquery.js', preload: true
+pin 'bootstrap', to: 'https://ga.jspm.io/npm:bootstrap@5.1.3/dist/js/bootstrap.esm.js', preload: true
+pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.5/lib/index.js', preload: true
+pin 'flatpickr', to: 'https://ga.jspm.io/npm:flatpickr@4.6.13/dist/esm/index.js'
+pin 'jgrowl', to: 'https://ga.jspm.io/npm:jgrowl@1.4.8/jquery.jgrowl.js'
+pin 'moment', to: 'https://ga.jspm.io/npm:moment@2.29.4/moment.js'
+pin 'trix', to: 'https://ga.jspm.io/npm:trix@2.0.0-beta.0/dist/trix.js'
+pin '@fortawesome/fontawesome-free', to: 'https://ga.jspm.io/npm:@fortawesome/fontawesome-free@6.1.1/js/all.js'
+pin 'daterangepicker', to: 'https://ga.jspm.io/npm:daterangepicker@3.1.0/daterangepicker.js'
+pin '@nathanvda/cocoon', to: 'https://ga.jspm.io/npm:@nathanvda/cocoon@1.2.14/cocoon.js'
+pin 'select2', to: 'https://ga.jspm.io/npm:select2@4.1.0-rc.0/dist/js/select2.js'

data/config/webpack/development.js

@@ -2,4 +2,4 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
 const environment = require('./environment')
 
-module.exports = environment.toWebpackConfig()
+module.exports = environment.toWebpackConfig()

data/config/webpack/environment.js

@@ -10,4 +10,4 @@ environment.plugins.prepend('Provide',
   })
 )
 
-module.exports = environment
+module.exports = environment

data/config/webpack/production.js

@@ -2,4 +2,4 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'production'
 
 const environment = require('./environment')
 
-module.exports = environment.toWebpackConfig()
+module.exports = environment.toWebpackConfig()

data/config/webpacker.yml

@@ -10,7 +10,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths: []
+  additional_paths: ['app/assets']
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
@@ -89,4 +89,4 @@ production:
   extract_css: true
 
   # Cache manifest.json for performance
-  cache_manifest: true
+  cache_manifest: true

data/lib/cm_admin/configuration.rb

@@ -1,10 +1,13 @@
 module CmAdmin
   class Configuration
-    attr_accessor :layout, :included_models, :cm_admin_models
-    
+    attr_accessor :layout, :included_models, :cm_admin_models, :authorized_roles
+
     def initialize
+      @layout = 'admin'
       @included_models = []
       @cm_admin_models = []
+      @authorized_roles = []
     end
+
   end
 end

data/lib/cm_admin/engine.rb

@@ -1,4 +1,7 @@
 require 'rails'
+require 'importmap-rails'
+require 'cm_admin/version_manager'
+
 module CmAdmin
   class Engine < Rails::Engine
     isolate_namespace CmAdmin
@@ -17,24 +20,42 @@ module CmAdmin
       )
     end
 
-    initializer "webpacker.proxy" do |app|
-      insert_middleware = begin
-        CmAdmin.webpacker.config.dev_server.present?
-      rescue
-        nil
-      end
-      next unless insert_middleware
-
-      app.middleware.insert_before(
-        0, Webpacker::DevServerProxy, # "Webpacker::DevServerProxy" if Rails version < 5
-        ssl_verify_none: true,
-        webpacker: CmAdmin.webpacker
-      )
-    end
-
     def mount_path
       CmAdmin::Engine.routes.find_script_name({})
     end
 
+    if VersionManager.rails6?
+      initializer "webpacker.proxy" do |app|
+        insert_middleware = begin
+          CmAdmin.webpacker.config.dev_server.present?
+        rescue
+          nil
+        end
+        next unless insert_middleware
+
+        app.middleware.insert_before(
+          0, Webpacker::DevServerProxy, # "Webpacker::DevServerProxy" if Rails version < 5
+          ssl_verify_none: true,
+          webpacker: CmAdmin.webpacker
+        )
+      end
+    elsif VersionManager.rails7?
+      initializer "cm_admin.importmap", before: "importmap" do |app|
+        # NOTE: this will add pins from this engine to the main app
+        # https://github.com/rails/importmap-rails#composing-import-maps
+        app.config.importmap.paths << root.join("config/importmap.rb")
+  
+        # NOTE: something about cache; I did not look into it.
+        # https://github.com/rails/importmap-rails#sweeping-the-cache-in-development-and-test
+        app.config.importmap.cache_sweepers << root.join("app/assets/javascripts")
+      end
+  
+      # NOTE: add engine manifest to precompile assets in production
+      initializer "cm_admin.assets" do |app|
+        app.config.assets.precompile += %w[cm_admin_manifest]
+      end
+    end
+
+    
   end
 end

data/lib/cm_admin/models/filter.rb

@@ -70,7 +70,7 @@ module CmAdmin
 
             if filter.db_column_name.map{|x| x.is_a?(Hash)}.include?(true)
               associations_hash = filter.db_column_name.select{|x| x if x.is_a?(Hash)}.last
-              records = records.joins(associations_hash.keys)
+              records = records.left_joins(associations_hash.keys).distinct
             end
 
             records = records.where(

data/lib/cm_admin/models/form_field.rb

@@ -1,8 +1,13 @@
 module CmAdmin
   module Models
     class FormField
-      attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method, :placeholder, :display_if, :html_attr
-      VALID_INPUT_TYPES = [:integer, :decimal, :string, :single_select, :multi_select, :date, :date_time, :text, :single_file_upload, :multi_file_upload, :hidden, :rich_text].freeze
+      attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
+                    :placeholder, :display_if, :html_attr, :target
+
+      VALID_INPUT_TYPES = %i[
+        integer decimal string single_select multi_select date date_time text
+        single_file_upload multi_file_upload hidden rich_text check_box radio_button
+      ].freeze
 
       def initialize(field_name, input_type, attributes = {})
         @field_name = field_name
@@ -20,6 +25,7 @@ module CmAdmin
         self.input_type = :string
         self.placeholder = "Enter #{self.field_name.to_s.downcase.gsub('_', ' ')}"
         self.html_attr = {}
+        self.target = {}
       end
     end
   end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/lib/cm_admin/version_manager.rb

@@ -0,0 +1,21 @@
+module CmAdmin
+  class VersionManager
+    class << self
+      def rails6?
+        Rails::VERSION::MAJOR == 6
+      end
+
+      def rails7?
+        Rails::VERSION::MAJOR == 7
+      end
+
+      def use_importmap?
+        rails7? && File.exist?('config/importmap.rb')
+      end
+
+      def use_webpacker?
+        rails6? && defined?(Webpacker) == 'constant'
+      end
+    end
+  end
+end