cm-admin 3.0.7 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672506812534b614e90c415af85104eab56d93f7808573caf22677f5b73617b0
-  data.tar.gz: e237a7b69174f98bd98292774666b72d3dfd830fd26ff46be6f0250e9bfb5a2b
+  metadata.gz: 7470565c394ee297e76878ead64578e8fcb5cc7458b69516fc397f2577374d76
+  data.tar.gz: bf8f4e1694b6e8b4f5095f05eb9df1919a1fb4ce49d588d1fe576346cc76dd46
 SHA512:
-  metadata.gz: efd0a5170f0b0096684233c972c050984d43e80c9e5969fbb8eca22177efac3241c118c0160cab52d93fed5a52f4cbf7efaa76311f57e5ec01bd730b5773bdba
-  data.tar.gz: 3a61e79b3440d91dc992f68d2c6b7a981a36d396384af679add795bf2bd3f87ef917dba10e33e5943271d3b4e90b65ff427e6c946d96ba34fbc7b63b19ae719c
+  metadata.gz: 7e3de3b4dd2892626348a9feab18726c4cc370cca3d9a98625cb7e0a228f21b760413adb5f0e55607cfb4c02fb11625833f0dbd601e134d3dd14eb7aae733945
+  data.tar.gz: 9624eb827a4a5459f4f254e8f57f771afe8f9f6109493e136def8d1e9a0012aa76676fab59fbcd0851b8fcc6c9c9ef073c6a909e5b36bd393de269ec63b3ec82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (3.0.7)
+    cm-admin (3.0.9)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

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

@@ -79,15 +79,68 @@ $(document).on("click", function (e) {
   }
 });
 
-$(document).on("click", ".destroy-attachment button", function (e) {
+$(document).on("click", '[data-section="destroy-attachment"] button', function (e) {
   e.preventDefault();
-  var ar_id = $(this).parent(".destroy-attachment").data("ar-id");
-  $(this).parent(".destroy-attachment").addClass("hidden");
+  var ar_id = $(this).parent('[data-section="destroy-attachment"]').data("ar-id");
+  $(this).parent('[data-section="destroy-attachment"]').addClass("hidden");
+  $(this).closest('[data-field-type="single_file_upload"]').find('input').removeClass('hidden')
   $(this).append(
     '<input type="text" name="attachment_destroy_ids[]" value="' + ar_id + '"/>'
   );
 });
 
+$(document).on('change', '[data-field-type="single_file_upload"] input', function(e) {
+  console.log("File changed")
+  const [file] = $(this)[0].files
+  if (file) {
+    // blah.src = URL.createObjectURL(file)
+    const upload_div = $(this).closest('[data-field-type="single_file_upload"]')
+    $(upload_div).find('input').addClass('hidden')
+    $(upload_div).find('[data-section="destroy-attachment"]').removeClass("hidden")
+    $(upload_div).find('[data-section="image-preview"]').html(`<div data-section="destroy-attachment" data-attachment-name="listing[media_items_attributes][0]_attachment_attachments">\
+        <span class="btn-link">${file.name}</span>\
+        <button class="btn-ghost">\
+          <i class="fa-regular fa-trash-can"></i>\
+        </button>\
+      </div>`
+    )
+    var allowExtention = ".jpg,.bmp,.gif,.png";
+    var extention = file.name.substring(file.name.lastIndexOf(".") + 1).toLowerCase();
+    
+    if (allowExtention.indexOf(extention) > -1) {
+      var img = $('<img height="50" width="50" class="rounded"/>');
+      img.attr("src", URL.createObjectURL(file));
+      $(upload_div).find('[data-section="image-preview"]').find('[data-section="destroy-attachment"]').prepend(img);
+    }
+  }
+})
+
+$(document).on('change', '[data-field-type="multi_file_upload"] input', function(e) {
+  console.log("File changed")
+  const files = $(this)[0].files
+  const element_id = $(this).attr('id')
+  const upload_div = $(this).closest('[data-field-type="multi_file_upload"]')
+  $(upload_div).find('[data-section="image-preview"]').html('')
+  if (files) {
+    $.each(files, function(index, file) {
+      $(upload_div).find('[data-section="destroy-attachment"]').removeClass("hidden");
+      $(upload_div).find('[data-section="image-preview"]').append(`<div data-section="destroy-attachment" data-index="${index}" data-attachment-name="${element_id}_attachments">\
+          <span class="btn-link">${file.name}</span>\
+        </div>`
+      )
+      var allowExtention = ".jpg,.bmp,.gif,.png";
+      var extention = file.name.substring(file.name.lastIndexOf(".") + 1).toLowerCase();
+      
+      if (allowExtention.indexOf(extention) > -1) {
+        var img = $('<img height="50" width="50" class="rounded"/>');
+        img.attr("src", URL.createObjectURL(file));
+        $(upload_div).find('[data-section="image-preview"]').find(`[data-index="${index}"]`).prepend(img);
+      }
+    })
+    
+  }
+})
+
 $(document).on(
   "click",
   '[data-behaviour="permission-check-box"]',

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -61,9 +61,23 @@
 }
 
 //upload attachment style
-.destroy-attachment {
+[data-section="destroy-attachment"] {
   margin-top: 4px;
 }
+[data-section="image-preview"] {
+  [data-section="destroy-attachment"] {
+    background-color: $grey-lightest-clr;
+    mix-blend-mode: multiply;
+    padding: 8px;
+    margin-bottom: 5px;
+    .btn-ghost {
+      float: right;
+      margin-top: 12px;
+    }
+  }
+}
+
+
 
 //Form card UI
 .form-card {

data/app/assets/stylesheets/cm_admin/base/table.scss

@@ -290,19 +290,22 @@
   .nested-form-table {
     @extend .table, .table-light, .table-hover, .table-bordered, .m-0;
     width: max-content;
-    .item-delete-cell {
-      vertical-align: middle;
-      text-align: center;
-    }
   }
-  th:nth-child(1) {
-    min-width: 47px;
-    max-width: 47px;
+  [data-behaviour="action-icons"] {
+    min-width: 48px;
+    max-width: 48px;
+    text-align: center;
+  }
+  [data-section="action-icon-header"] {
+    min-width: 48px;
+    max-width: 48px;
   }
-  td:nth-child(1) {
-    min-width: 47px;
-    max-width: 47px;
+  [data-action-title-pad="2"] {
+   padding-left: 53px !important;
   }
+  [data-action-title-pad="3"] {
+    padding-left: 101px !important;
+   }
   th,
   td {
     min-width: 120px;

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

@@ -1,11 +1,11 @@
 - if nested_table_field.display_type == :table
   tr.nested-fields
     - if nested_table_field.is_positionable.call(f.object)
-      td
-        i class='fa-solid fa-arrows-up-down-left-right drag-handle'
+      td data-behaviour='action-icons'
+        i class='fa-solid fa-grip-dots-vertical drag-handle pointer'
         = f.hidden_field :position, class: 'hidden-position'
     - if nested_table_field.is_deletable.call(f.object)
-      td.item-delete-cell
+      td.item-delete-cell data-behaviour='action-icons'
         = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
     - nested_table_field.fields.each do |field|
       td data-field-type="#{field.input_type}"

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

@@ -4,19 +4,23 @@
   .nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
     / label.field-label = nested_table_field.label.to_s.titleize
     - uniq_no = Random.rand(10000)
+    - colspan_count = 1
     .nested-form-table-wrapper
       table.nested-form-table
         thead
           tr
             - if nested_table_field.is_positionable.call(f.object)
-              th
-                | 
+              - colspan_count +=1
             - if nested_table_field.is_deletable.call(f.object)
-              th
-                |
-            - nested_table_field.fields.each do |field| 
-              th data-field-type="#{field.input_type}"
-                - if field.label
+              - colspan_count +=1
+            - nested_table_field.fields.each_with_index do |field, index|
+              - if index.zero?
+                th data-field-type="#{field.input_type}" data-action-title-pad="#{colspan_count}" colspan="#{colspan_count}"
+                  - if field.label
+                  = field.label.to_s || field.field_name.to_s.titleize 
+              - else
+                th data-field-type="#{field.input_type}"
+                  - if field.label
                   = field.label.to_s || field.field_name.to_s.titleize 
         tbody class="insert-cocoon-position-#{uniq_no}" data-section='nested-form-body'
           = f.fields_for table_name do |record|

data/app/views/cm_admin/roles/permissions.html.slim

@@ -1,38 +1,39 @@
-.form-page.permission-form
-  .form-page__body
-    .form-container
-      = form_for CmPermission.new, url: cm_admin.send('cm_create_role_permission_cm_role_path', @ar_object), method: :post do |f|
-        - cm_models = CmAdmin.config.cm_admin_models.sort_by{|k, v| k.display_name}
-        - cm_models.each do |model|
-          - next if model.override_policy == true
-          .row
-            .col.form-container
-              p.form-title
-                = model.model_name
-              .form-container__inner
-                .row
-                  .col
-                    .form-field.disabled
-                      .form-check
-                        .permission-form__checkbox-wrapper
-                          - saved_permission = @ar_object.cm_permissions.where(ar_model_name: model.name)
-                          - available_actions = model.available_actions.reject {|x| ['custom_action_modal', 'custom_action', 'create', 'update'].include?(x.name)}
-                          - is_checked = (saved_permission.count >= available_actions.count)
-                          input.form-check-input[type="checkbox" value="" data-behaviour="permission-check-all" checked=is_checked]
-                          .cm-checkbox-label
-                            span.action-name
-                              | All
-                      - model.available_actions.each do |action|
-                        - permission = @ar_object.cm_permissions.where(ar_model_name: model.name, action_name: action.name).first
-                        - unless ['custom_action_modal', 'custom_action', 'create', 'update'].include?(action.name)
+  .form-page.permission-form
+    .form-page__body
+      .form-container
+        = form_for CmPermission.new, url: cm_admin.send('cm_create_role_permission_cm_role_path', @ar_object), method: :post do |f|
+          - cm_models = CmAdmin.config.cm_admin_models.sort_by{|k, v| k.display_name}
+          .form-section-container
+            - cm_models.each do |model|
+              - next if model.override_policy == true
+              .row
+                .col.form-container
+                  p.form-title
+                    = model.model_name
+                  .form-container__inner
+                    .row
+                      .col
+                        .form-field.disabled
                           .form-check
                             .permission-form__checkbox-wrapper
-                              input.form-check-input[type="checkbox" value="#{action.name}" checked=permission.present? name="role_permission[#{model.name}][#{action.name}][is_checked]" data-behaviour="permission-check-box"]
+                              - saved_permission = @ar_object.cm_permissions.where(ar_model_name: model.name)
+                              - available_actions = model.available_actions.reject {|x| ['custom_action_modal', 'custom_action', 'create', 'update'].include?(x.name)}
+                              - is_checked = (saved_permission.count >= available_actions.count)
+                              input.form-check-input[type="checkbox" value="" data-behaviour="permission-check-all" checked=is_checked]
                               .cm-checkbox-label
                                 span.action-name
-                                  = action.display_name || action.name.titleize
-                            .cm-select-tag class="#{permission.present? ? '' : 'hidden'}"
-                              = select_tag(:policy_scope_name, options_for_select(model.policy_scopes.map{|policy_hash| [policy_hash[:display_name], policy_hash[:scope_name]]}, permission&.scope_name), {name: "role_permission[#{model.name}][#{action.name}][scope_name]", class: 'select-2', id: "policy-scope-#{model.name}-#{action.name}"})
-                div
-        = f.submit 'Save Changes', class: "btn-cta"
-        = link_to 'Discard', cm_admin.send('cm_index_cm_role_path'), class: "btn-secondary ml-10"
+                                  | All
+                          - model.available_actions.each do |action|
+                            - permission = @ar_object.cm_permissions.where(ar_model_name: model.name, action_name: action.name).first
+                            - unless ['custom_action_modal', 'custom_action', 'create', 'update'].include?(action.name)
+                              .form-check
+                                .permission-form__checkbox-wrapper
+                                  input.form-check-input[type="checkbox" value="#{action.name}" checked=permission.present? name="role_permission[#{model.name}][#{action.name}][is_checked]" data-behaviour="permission-check-box"]
+                                  .cm-checkbox-label
+                                    span.action-name
+                                      = action.display_name || action.name.titleize
+                                .cm-select-tag class="#{permission.present? ? '' : 'hidden'}"
+                                  = select_tag(:policy_scope_name, options_for_select(model.policy_scopes.map{|policy_hash| [policy_hash[:display_name], policy_hash[:scope_name]]}, permission&.scope_name), {name: "role_permission[#{model.name}][#{action.name}][scope_name]", class: 'select-2', id: "policy-scope-#{model.name}-#{action.name}"})
+          .form-submit-button-container
+            = f.submit 'Save Changes', class: "btn-cta"
+            = link_to 'Discard', cm_admin.send('cm_index_cm_role_path'), class: "btn-secondary ml-10"

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.7'
+  VERSION = '3.0.9'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -189,28 +189,28 @@ module CmAdmin
       end
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action, _ajax_url)
-        content_tag(:div) do
+        content_tag(:div, data: { 'field-type': 'single_file_upload' }) do
+          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
           concat form_obj.file_field cm_field.field_name,
                                      merge_wrapper_options(
                                        {
-                                         class: "field-control #{required_class}",
+                                         class: "field-control #{required_class} #{form_obj.object.send(cm_field.field_name).attached? ? 'hidden' : ''}",
                                          disabled: cm_field.disabled.call(form_obj.object)
                                        }, cm_field.html_attrs
                                      )
-          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
 
       def cm_multi_file_upload_field(form_obj, cm_field, _value, required_class, _target_action, _ajax_url)
-        content_tag(:div) do
+        content_tag(:div, data: { 'field-type': 'multi_file_upload' }) do
+          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
           concat form_obj.file_field cm_field.field_name,
                                      merge_wrapper_options(
                                        {
-                                         multiple: true, class: "field-control #{required_class}",
+                                         multiple: true, class: "field-control #{required_class}}",
                                          disabled: cm_field.disabled.call(form_obj.object)
                                        }, cm_field.html_attrs
                                      )
-          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
 
@@ -219,7 +219,7 @@ module CmAdmin
         attachment_name = "#{form_obj.object_name}_#{cm_field.field_name}_attachments"
         return if defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
 
-        content_tag(:div) do
+        content_tag(:div, data: { section: 'image-preview'}) do
           if attached.class == ActiveStorage::Attached::Many
             attached.each do |attachment|
               concat attachment_with_icon(cm_field, attachment, attachment_name:)
@@ -231,16 +231,16 @@ module CmAdmin
       end
 
       def attachment_with_icon(cm_field, attachment, attachment_name:)
-        content_tag(:div, class: 'destroy-attachment', data: { ar_id: attachment.id, attachment_name: }) do
-          concat(content_tag(:button, '', class: 'btn-ghost') do
-            concat tag.i(class: 'fa-regular fa-trash-can')
-          end)
-          concat content_tag(:span, attachment.filename.to_s, class: 'btn-link')
+        content_tag(:div, data: { section: 'destroy-attachment', ar_id: attachment.id, attachment_name: }) do
           concat(content_tag(:a, href: attachment.url, target: '_blank') do
             if attachment.content_type.include?('image')
               image_tag(attachment.url, height: 50, width: 50, class: "rounded")
             end
           end) if cm_field.image_preview
+          concat content_tag(:span, attachment.filename.to_s, class: 'btn-link')
+          concat(content_tag(:button, '', class: 'btn-ghost') do
+            concat tag.i(class: 'fa-regular fa-trash-can')
+          end) if cm_field.input_type == :single_file_upload
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.9
 platform: ruby
 authors:
 - Michael