cm-admin 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785e0d596039b668a8011b689eab464ebf3c0b6133d802d115d80a2916e93e09
-  data.tar.gz: 3cd13d18882cf7bdc31438c95498010ea776eeb3f9fdc3667a92b875800cb09b
+  metadata.gz: 28ba47b6a7c02c8edad75f7407f3c6c65cb2f59b44aea6952c7abbc174595ecc
+  data.tar.gz: 7216647324f0791c1090ae0f0fd9f252b2c1d53939553dfb4c9c390d99dc68b3
 SHA512:
-  metadata.gz: 66e662348351cdc07436a127fae08df52f430e31ec8e0410fd9b3c76307d111c261cd1349d0d4f6497b605a34ee2622ab113a8d909792e03065cbf66c33afc68
-  data.tar.gz: '0914c2ce34558dbe09a7b10e4f6777d46c37ec3fb0aeae30b5c9fefc45a2611236b21d32d36e8f94f653c0c1fa37346f97e7f6ec33ceff8aa0376a1b5e5a7783'
+  metadata.gz: f2f58b8468437f6785010ba74c00210332eabc56de6167503c91ca9df6c07a3ef6709f8b943f2de156aeea897564e17564aa19e70638ca08d28fb1fe212803c3
+  data.tar.gz: 1847f6e693831247dee15f416e537c39f1a6f3725e934774dbed4f76bf879ebfba16fd69324280594232638ce559092fb09b45bf4d22442a2e1ffb608b87bf02

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,82 @@
+---
+name: 🐛 Bug report
+about: Report a reproducible bug and help us improve.
+title: '[Bug]: '
+labels: 'bug'
+assignees:
+  - anbublacky
+  - AdityaTiwari2102
+---
+
+<!-- Before creating a bug report, try disabling browser extensions to see if the bug is still present. -->
+
+<!-- If you have added and/or updated any DSL related code try restarting the server. -->
+
+### Describe the bug
+
+<!-- A clear and concise description of what the bug is. -->
+
+### Logs
+<details>
+  <summary>Error logs</summary>
+
+```
+Place your error logs here
+```
+</details>
+
+### To Reproduce
+
+Steps to reproduce the behavior:
+
+1. Add this configuration '...'
+2. Go to '...'
+3. Click on '....'
+4. Scroll down to '....'
+5. See error
+
+### Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Screenshots & recordings
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### System configuration
+You can help us to understand your problem if you will share some very
+useful information about your project environment (don't forget to
+remove any confidential data if it exists).
+
+**CM Admin version**:
+
+**Rails version**:
+<!-- Requirement is v6.0+ -->
+
+**Ruby version**:
+<!-- Requirement is v2.7+ -->
+
+**OS, version**:
+
+**Browser, version**:
+
+### Additional context
+
+<!-- Add any other context about the problem or helpful links here. -->
+
+#### Impact
+<!--
+  How much are you impacted by this issue?
+  Please set a level of Impact and Urgency
+  (Mark [x] inside the brackets)
+-->
+
+ - [ ] High impact
+ - [ ] Medium impact
+ - [ ] Low impact
+
+#### Urgency
+
+ - [ ] High urgency
+ - [ ] Medium urgency
+ - [ ] low urgency

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🚀 Discussions and Proposals
+    url: https://github.com/commutatus/cm-admin/discussions
+    about: Visit our GitHub Discussions page to suggest an idea to make CM Admin better.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: 💡 Feature request
+about: Request a feature that helps you built the platform better.
+title: ''
+labels: 'enhancement'
+assignees:
+  - anbublacky
+  - AdityaTiwari2102
+---
+
+### Feature
+<!-- A clear and concise description of what the feature is. -->
+
+### Current workarounds
+<!-- Is there a way to achieve this behavior at the moment through some hack? -->
+
+### Screenshots or screen recordings
+<!-- If applicable, add screenshots or recordings to help explain your problem. -->
+
+### Additional context
+<!-- Have you seen this behavior somewhere else where we can test it? -->

data/Gemfile.lock

@@ -1,19 +1,46 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.9.1)
+    cm-admin (7.0.2)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
+      importmap-rails
       local_time (~> 2.1.0)
       pagy (~> 4.11.0)
       pundit (~> 2.2.0)
+      rails (>= 6.0)
       slim (~> 4.1.0)
       webpacker (~> 5.4.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
     actionpack (7.0.3.1)
       actionview (= 7.0.3.1)
       activesupport (= 7.0.3.1)
@@ -21,12 +48,34 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
     actionview (7.0.3.1)
       activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.3.6)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
     activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -53,25 +102,45 @@ GEM
     crass (1.0.6)
     csv-importer (0.8.2)
       virtus
+    date (3.3.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
     erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     htmlentities (4.3.4)
     i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
+    importmap-rails (1.1.5)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     json (2.6.2)
     local_time (2.1.0)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mail (2.8.0)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
+    mini_mime (1.1.2)
     minitest (5.16.2)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    net-imap (0.3.3)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -79,17 +148,31 @@ GEM
       ast (~> 2.4.1)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-proxy (0.7.4)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      bundler (>= 1.15.0)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (7.0.3.1)
       actionpack (= 7.0.3.1)
       activesupport (= 7.0.3.1)
@@ -143,6 +226,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
+    timeout (0.3.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
@@ -155,6 +239,9 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     zeitwerk (2.6.6)
 
 PLATFORMS

data/app/assets/config/cm_admin_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../javascripts/cm_admin

data/app/assets/javascripts/cm_admin/application.js

@@ -0,0 +1,5 @@
+import './scaffolds.js';
+import './form_validation.js'
+import './quick_search.js'
+import './filters.js'
+import './exports.js'

data/app/{javascript/packs → assets/javascripts}/cm_admin/filters.js

@@ -1,5 +1,21 @@
 var currentRequest = null;
 
+var CmFilter = {
+  // Generate or remove elements of the dropdown based on the search value.
+  dropdown_search: function(element) {
+    var filter = element.val().toUpperCase();
+    var dropdownElements = element.parents(':nth(1)').find('.list-area').children();
+    for (var i = 0; i < dropdownElements.length; i++) {
+      var txtValue = $(dropdownElements[i]).children().text();
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        $(dropdownElements[i]).css('display', 'flex');
+      } else {
+        $(dropdownElements[i]).css('display', 'none');
+      }
+    }
+  }
+}
+
 // Main method which will structure the existing filter values with the newly
 // applied filter. Send and receive the value from the backend.
 var getFilteredData = function(filterType, filterValue, filterColumn=null) {
@@ -40,7 +56,7 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
     }
     filterParams = jQuery.param(queryString)
     var availableParams = searchParams + '&' + filterParams
-    queryString = getParamsAsObject(availableParams)
+    var queryString = getParamsAsObject(availableParams)
   }
 
   return currentRequest = $.ajax(url, {
@@ -259,7 +275,7 @@ $(document).on('click', '.apply-area', function(e) {
       filterValueText.push($(checkedElements[i]).parent().text())
     }
 
-    truncatedFilterValue = filterValueText[0]
+    var truncatedFilterValue = filterValueText[0]
     if (filterValue.length > 1) {
       truncatedFilterValue += ' + ' + (filterValue.length - 1) + ' more'
     }
@@ -286,7 +302,7 @@ $(document).on('click', '.filter-chip-remove', function(e) {
 
   var searchParams = window.location.search
   if (searchParams.length > 0) {
-    queryString = getParamsAsObject(searchParams)
+    var queryString = getParamsAsObject(searchParams)
     if (queryString['filters'][filterType] != undefined) {
       delete(queryString['filters'][filterType][filterColumn])
       var queryParam = jQuery.param(queryString)
@@ -317,31 +333,4 @@ $(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
     $(selectElement).parent().siblings(':first').addClass('search-area').removeClass('search-with-chips')
     $(selectElement).parent().siblings(':last').removeClass('active')
   }
-})
-
-CmFilter = {
-  // Generate or remove elements of the dropdown based on the search value.
-  dropdown_search: function(element) {
-    var filter = element.val().toUpperCase();
-    var dropdownElements = element.parents(':nth(1)').find('.list-area').children();
-    for (var i = 0; i < dropdownElements.length; i++) {
-      txtValue = $(dropdownElements[i]).children().text();
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        $(dropdownElements[i]).css('display', 'flex');
-      } else {
-        $(dropdownElements[i]).css('display', 'none');
-      }
-    }
-  },
-  quick_input_search: function(element) {
-    var filter = element.val().toUpperCase();
-    var searchElements = element.parents(':nth(3)').find('.list-area').children();
-    searchElements.removeClass('visible').addClass('hidden')
-    for (var i = 0; i < searchElements.length; i++) {
-      txtValue = $(searchElements[i]).children().text();
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        $(searchElements[i]).removeClass('hidden').addClass('visible');
-      }
-    }
-  }
-}
+})

data/app/{javascript/packs → assets/javascripts}/cm_admin/quick_search.js

@@ -1,3 +1,17 @@
+var CmFilter = {
+  quick_input_search: function(element) {
+    var filter = element.val().toUpperCase();
+    var searchElements = element.parents(':nth(3)').find('.list-area').children();
+    searchElements.removeClass('visible').addClass('hidden')
+    for (var i = 0; i < searchElements.length; i++) {
+      var txtValue = $(searchElements[i]).children().text();
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        $(searchElements[i]).removeClass('hidden').addClass('visible');
+      }
+    }
+  }
+}
+
 $(document).on("keydown", function(e) {
   if (e.keyCode == 75 && e.metaKey) {
     $('#quickSearchModal').modal('show')
@@ -12,7 +26,7 @@ $(document).on('keydown', function(e){
     if(e.which === 40){
       if(liSelected){
         liSelected.removeClass('active-item');
-        next = liSelected.next();
+        var next = liSelected.next();
         if(next.length > 0){
           liSelected = next.addClass('active-item');
           selected = next.text();
@@ -44,8 +58,7 @@ $(document).on('keydown', function(e){
       }
     }
     if(liSelected && e.which === 13) {
-      console.log("Selected item id ", liSelected)
-      href = liSelected.attr('href')
+      var href = liSelected.attr('href')
       window.location = href
     }
   }

data/app/assets/javascripts/cm_admin/scaffolds.js

@@ -0,0 +1,44 @@
+import jQuery from 'jquery';
+window.jQuery = jQuery // <- "select2" will check this
+window.$ = jQuery
+
+// This is a hack to fix 'process is not defined'
+// Ref article: https://adambien.blog/roller/abien/entry/uncaught_referenceerror_process_is_not
+// Based on this filter dropdown works.
+window.process = {
+  env: {
+      NODE_ENV: 'development'
+  }
+} 
+
+import 'moment'
+import 'bootstrap'
+import '@popperjs/core'
+import 'flatpickr'
+import 'jgrowl'
+jqueryJgrowl()
+import Select2 from "select2"
+Select2()
+
+// import '@nathanvda/cocoon'
+import 'daterangepicker'
+import '@fortawesome/fontawesome-free'
+import jqueryJgrowl from 'jgrowl';
+
+
+flatpickr("[data-behaviour='date-only']", {
+  dateFormat: "d-m-Y"
+})
+flatpickr("[data-behaviour='date-time']", {
+  enableTime: true
+})
+flatpickr("[data-behaviour='filter'][data-filter-type='date']", {
+  mode: 'range'
+})
+$('.select-2').select2();
+$(document).on('turbolinks:load', function () {
+  $('.select-2').select2();
+  flatpickr("[data-behaviour='date-only']", {
+    dateFormat: "d-m-Y"
+  })
+})

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

@@ -182,6 +182,18 @@ input.cm-checkbox[type="checkbox"] {
 }
 
 //Radio button styles
+.cm-radio-section {
+  width: 100%;
+  float: left;
+  .cm-radio-label {
+    float: left;
+    padding-left: 10px;
+  }
+  .cm-radio-tag {
+    float: left;
+  }
+}
+
 input.cm-radio[type="radio"] {
   position: relative;
   display: inline-block;

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

@@ -75,6 +75,57 @@ $(document).on('click', '.drawer-close', function(e) {
   }, 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))

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}"