cm-admin 4.4.8 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f200f0b81773d02d7dd472b90c0dcdc124cd3797e7a09b06cef05b42b597132
-  data.tar.gz: 31ebaa25c7016f262697e52f76bc695db07595286d8ac088175390d09eea1ffe
+  metadata.gz: 5b2fb69e4b0dd8324fcf648c7fa0309e86208cf5cb580ed74897013c8fe1c1d2
+  data.tar.gz: 249eadf19d6edc9bebc6d7798c3ba3203f0429d7f1b18ede7e3e6264a9a85a5c
 SHA512:
-  metadata.gz: a655ebbf63906cd67dd83f3e2a68eaff22c1d215a4e6b0eb1ea7e05b471ccb24907a65552236ca893161fa64979cb03c825d4b922637de73124fb601174df8d3
-  data.tar.gz: 9ebfab98bc9321b20141765412dbb229e6c994195a3f82de0c1420c423bea0fe6790aaaaf57147a92a9c850713e051f471e49f35e9d64f5e1d31a470fab6268a
+  metadata.gz: 5070c55b836e1eebe92f4548eb5a79b567506e760d38ea4938dc42e72555dcf9d9d07788b5903c4d15cda3180aee7f9101055e15cd3153af2d1847261e8ebda4
+  data.tar.gz: 2d8a1a41e1155f6060546cc1d61d04457c9b1ab182dd03c50a065fe40c48b16cee8bb2535578763303bfa922f364a60ff33573244144e6b73ce812576a16918d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (4.4.8)
+    cm-admin (4.6.5)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv (>= 3.3.0)

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

@@ -34,19 +34,20 @@ $(document).on("click", '[data-behaviour="export-submit"]', function (e) {
 });
 
 document.addEventListener("turbo:load", function () {
-  document
-    .querySelector('[data-behaviour="export-modal"]')
-    .addEventListener("hidden.bs.modal", function () {
-      const exportFormBody = $("[data-behaviour='export-form-container']");
-      const exportProcessing = $("[data-behaviour='export-processing']");
-      const exportTitle = $("[data-behaviour='export-modal-title']");
-      const exportFooter = $("[data-behaviour='export-modal-footer']");
-      const exportContent = $("[data-behaviour='export-modal-content']");
-      exportTitle.html("Export Data");
-      exportProcessing.addClass("hidden");
-      exportFormBody.removeClass("hidden");
-      exportFooter.removeClass("hidden");
-      exportContent.addClass("export-modal-content");
-      exportContent.removeClass("modal-content");
-    });
+  const exportModal = document.querySelector('[data-behaviour="export-modal"]');
+  if (!exportModal) return;
+
+  exportModal.addEventListener("hidden.bs.modal", function () {
+    const exportFormBody = $("[data-behaviour='export-form-container']");
+    const exportProcessing = $("[data-behaviour='export-processing']");
+    const exportTitle = $("[data-behaviour='export-modal-title']");
+    const exportFooter = $("[data-behaviour='export-modal-footer']");
+    const exportContent = $("[data-behaviour='export-modal-content']");
+    exportTitle.html("Export Data");
+    exportProcessing.addClass("hidden");
+    exportFormBody.removeClass("hidden");
+    exportFooter.removeClass("hidden");
+    exportContent.addClass("export-modal-content");
+    exportContent.removeClass("modal-content");
+  });
 });

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

@@ -1,12 +1,15 @@
-import LocalTime from "./local-time"
+import LocalTime from "./local-time";
 import * as bootstrap from "bootstrap";
 window.bootstrap = bootstrap;
 
-
-export function initializeComponents() {
-  $(".select-2").select2({
+export function initializeComponents(select2Parent = null) {
+  let select2Options = {
     theme: "bootstrap-5",
-  });
+  };
+  if (select2Parent) {
+    select2Options.dropdownParent = select2Parent;
+  }
+  $(".select-2").select2(select2Options);
   flatpickr("[data-behaviour='date-only']", {
     dateFormat: "d-m-Y",
   });
@@ -23,7 +26,12 @@ export function initializeComponents() {
       animation: 150,
     });
   }
-
+  $("select").each(function () {
+    $(this).select2({
+      theme: "bootstrap-5",
+      dropdownParent: $(this).parent(),
+    });
+  });
   var headerElemHeight = $(".page-top-bar").height() + 64;
   var calculatedHeight = "calc(100vh - " + headerElemHeight + "px" + ")";
   $(".table-wrapper").css("maxHeight", calculatedHeight);

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

@@ -18,7 +18,7 @@ import "flatpickr";
 import "trix";
 import "@rails/actiontext";
 import Select2 from "select2";
-import LocalTime from "./local-time"
+import LocalTime from "./local-time";
 Select2();
 
 // import '@nathanvda/cocoon'
@@ -37,10 +37,10 @@ document.addEventListener("turbo:load", function () {
   $(".select-2").select2({
     theme: "bootstrap-5",
   });
-  LocalTime.start()
+  LocalTime.start();
 
   setup_select_2_ajax();
-  
+
   const bsToast = $('[data-behaviour="toast"]')[0];
   if (bsToast) {
     const toast = new bootstrap.Toast(bsToast);
@@ -79,67 +79,100 @@ $(document).on("click", function (e) {
   }
 });
 
-$(document).on("click", '[data-section="destroy-attachment"] button', function (e) {
-  e.preventDefault();
-  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(
+  "click",
+  '[data-section="destroy-attachment"] button',
+  function (e) {
+    e.preventDefault();
+    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">\
+$(document).on(
+  "change",
+  '[data-field-type="single_file_upload"] input',
+  function (e) {
+    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>`
-      )
+      </div>`);
       var allowExtention = ".jpg,.bmp,.gif,.png";
-      var extention = file.name.substring(file.name.lastIndexOf(".") + 1).toLowerCase();
-      
+      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);
+        $(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) {
+    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",
@@ -192,6 +225,7 @@ window.addEventListener("popstate", (e) => window.location.reload());
 function setup_select_2_ajax() {
   $(".select-2-ajax").each(function (index, element) {
     $(element).select2({
+      theme: "bootstrap-5",
       ajax: {
         url: $(element)[0]["dataset"].ajaxUrl,
         dataType: "json",

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

@@ -7,7 +7,7 @@ $(document).on(
   "[data-behaviour='decimal-only'], [data-behaviour='filter'][data-filter-type='range']",
   function (e) {
     var charCode = e.which ? e.which : e.keyCode;
-    if (charCode > 31 && charCode != 46 && (charCode < 48 || charCode > 57))
+    if (charCode > 31 && charCode != 46 && charCode != 45 && (charCode < 48 || charCode > 57))
       return false;
     return true;
   }
@@ -20,9 +20,9 @@ $(document).on(
     $(this).val(
       $(this)
         .val()
-        .replace(/[^\d].+/, "")
+        .replace(/[^\d].-+/, "")
     );
-    if (event.which < 48 || event.which > 57) {
+    if ((event.which < 48 || event.which > 57) && (event.which != 45)) {
       event.preventDefault();
     }
   }
@@ -72,9 +72,17 @@ $(document).on("click", '[data-behaviour="offcanvas"]', function (e) {
   });
 });
 
-// Select2 focus on open
-$(document).on("select2:open", () => {
-  document.querySelector(".select2-search__field").focus();
+// Select2 search input focus on open
+$(document).on("select2:open", function () {
+  // Find the search input inside the Select2 dropdown and focus it
+  setTimeout(() => {
+    const searchInput = document.querySelector(
+      ".select2-container--open .select2-search__field"
+    );
+    if (searchInput) {
+      searchInput.focus();
+    }
+  }, 100);
 });
 
 $(document).on("click", '[data-bs-dismiss="offcanvas"]', function (e) {
@@ -232,7 +240,8 @@ var replaceAccordionTitle = function (element) {
         .attr("data-bs-target", "#" + accordion_id);
       $(this).find(".accordion-collapse").attr("id", accordion_id);
     });
-  initializeComponents();
+  const dropdownParent = $("#cm-drawer").length > 0 ? "#cm-drawer" : null;
+  initializeComponents(dropdownParent);
 };
 
 

data/app/helpers/cm_admin/application_helper.rb

@@ -36,13 +36,13 @@ module CmAdmin
 
     def validate_cm_path_policy(path_helper)
       recognized_path= cm_recognize_path(path_helper)
-      
+
       model_name = recognized_path[:controller].split('/').last.singularize.classify
       action_name = action(recognized_path[:action])
       @policy_model = CmAdmin::Model.find_by(name: model_name)
       policy([:cm_admin, @policy_model&.name&.constantize]).send("#{action_name}?")
     end
-    
+
 
     def action(action_name)
       case action_name.to_sym

data/app/jobs/generate_export_file_job.rb

@@ -4,12 +4,33 @@ class GenerateExportFileJob < ApplicationJob
   def perform(file_export)
     Current.user = file_export.exported_by
     CmCurrent.user_permissions = Current.user.cm_role.cm_permissions if Current.user.cm_role.present?
+    set_current_for_development
 
     file_export.attach_export_file
-    ExportMailer.export_email(file_export).deliver_now
+
+    expires_in = (file_export.expires_at - Time.now).to_i
+    model = file_export.associated_model_name&.pluralize
+    link = file_export.export_file.url(expires_in:)
+    expires_at = file_export.expires_at.utc
+    html_body = ::FileExport.email_html_body(model, expires_at)
+    subject = "#{model} Export is ready for download"
+    SendCmAdminEmailJob.perform_later(file_export.exported_by.email, subject, html_body, 'Download Excel', link)
+
     file_export.success!
   rescue StandardError => e
     file_export&.failed!
     raise e
   end
+
+  private
+
+  def set_current_for_development
+    return unless Rails.env.development?
+
+    url = Rails.application.credentials[:be_url]
+    host = URI.parse(url).host
+    protocol = URI.parse(url).scheme
+    port = URI.parse(url).port
+    ActiveStorage::Current.url_options = { host:, protocol:, port: }
+  end
 end

data/app/jobs/send_cm_admin_email_job.rb

@@ -0,0 +1,7 @@
+class SendCmAdminEmailJob < ApplicationJob
+  queue_as :default
+
+  def perform(to, subject, body, button_text = nil, button_link = nil)
+    CmAdminMailer.cm_admin_mail(to, subject, body, button_text, button_link).deliver_now
+  end
+end

data/app/mailers/cm_admin_mailer.rb

@@ -0,0 +1,8 @@
+class CmAdminMailer < ApplicationMailer
+  def cm_admin_mail(to, subject, body, button_text = nil, button_link = nil)
+    @body = body
+    @button_text = button_text
+    @button_link = button_link
+    mail(to:, subject:)
+  end
+end

data/app/models/concerns/exportable.rb

@@ -46,6 +46,24 @@ module Exportable
     klass.available_fields[action_name].select(&:exportable)
   end
 
+  class_methods do
+    def email_html_body(model, expires_at)
+      <<~HTML
+        <p style="color: #333333; font-weight: 700; font-size: 16px; line-height: 36px; margin: 0; margin-bottom: 16px;">
+          #{model} Export is ready
+        </p>
+        <div style="margin-bottom: 40px;">
+          <p>
+            The download link will expire at <strong>#{expires_at.strftime("%H:%M:%S")} UTC</strong> on <strong>#{expires_at.strftime("%d %B %Y")}.</strong>
+          </p>
+          <p>
+            Make sure to save the file before the link expires.
+          </p>
+        </div>
+      HTML
+    end
+  end
+
   private
 
   def fetch_ar_object(model_object, id)
@@ -58,7 +76,7 @@ module Exportable
     deserialized_columns = CmAdmin::Utils.deserialize_csv_columns(selected_column_names, :as_json_params)
     main_model = parent_model || model
     available_fields = main_model.available_fields[action_name.to_sym]
-    # This includes isn't recursve, a full solution should be recursive
+    # This includes isn't recursive, a full solution should be recursive
     records_arr = []
     records.includes(deserialized_columns[:include].keys).find_each do |record|
       record_hash = record.as_json({ only: selected_column_names.map(&:to_sym) })
@@ -66,12 +84,11 @@ module Exportable
         break unless available_fields.map(&:field_name).include?(column_name.to_sym)
 
         column = CmAdmin::Models::Column.find_by(model, :index, { name: column_name.to_sym })
-        record_hash[column.field_name] = if column.field_type == :custom
-                                           send(column.helper_method, record, column.field_name).to_s
-                                          elsif column.field_type == :enum
-                                            record.send(column.field_name).to_s.titleize
-                                          else
-                                           record.send(column.field_name).to_s
+        record_hash[column.field_name] = case column.field_type
+                                         when :enum
+                                           record.send(column.export_method).to_s.titleize
+                                         else
+                                           record.send(column.export_method).to_s
                                          end
       end
       records_arr << record_hash

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

@@ -0,0 +1,21 @@
+.table-top
+  - if @associated_model.filters.present? && @action.partial.nil?
+    .cm-index-page__filters
+      == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
+  p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
+  div.d-flex.gap-3
+    .table-top__column-action
+      - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
+        - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
+        - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
+        a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
+          button.btn-secondary Add
+    - if @associated_model.sort_columns.present?
+      = render 'cm_admin/main/sort', model: @associated_model, ar_object: @associated_ar_object
+
+- if flash[:bulk_action_error].present?
+  .alert.alert-danger.me-4 role="alert"
+    = flash[:bulk_action_error].html_safe
+- if flash[:bulk_action_success].present?
+  .alert.alert-success.me-4 role="alert"
+    = flash[:bulk_action_success].html_safe

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

@@ -0,0 +1,40 @@
+.card-list-container
+  == render partial: 'cm_admin/main/actions_associated', locals: { cm_model: @model }
+  - bulk_actions = actions_filter(@associated_model, @associated_ar_object, :bulk_action)
+  - if bulk_actions.present?
+    .table-top.hidden data-section="bulk-action"
+      - bulk_actions.each do |action|
+        = custom_action_items(action, 'index')
+  .card-grid
+    - @associated_ar_object.data.each do |ar_object|
+      .col
+        .item-card
+          .card-menu
+            - if bulk_actions.present?
+              .check-box-space
+                span
+                  input.cm-checkbox type="checkbox" data-behaviour="bulk-action-checkbox" data-ar-object-id="#{ar_object.id}"
+            - if @associated_model
+            .row-action-cell
+              == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
+          - attachment = ar_object.profile_picture
+          - if attachment
+            = image_tag(attachment.url, class: "card-img-top")
+          - else
+            = image_tag("https://www.hawaiilife.com/images/tile/missing.png", class: "card-img-top")
+          .card-body
+            - @model.available_fields[@action.name.to_sym].each_with_index do |column, index|
+              - if column.display_if.call(Current.user) && column.viewable
+                .card-text
+                  th = "#{column.header.titleize}:"
+                  - if index == 0 && is_show_action_available(@associated_model, ar_object)
+                    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 }
+  .pagination-bar
+    p.count-text.m-0 Showing #{number_with_delimiter(@associated_ar_object.pagy.from.to_i)} to #{number_with_delimiter(@associated_ar_object.pagy.to.to_i)} out of #{number_with_delimiter(@associated_ar_object.pagy.count.to_i)}
+    == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
+
+= export_modal(@model, action_name: @action.name.to_sym, associated_klass: @associated_model)

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

@@ -1,25 +1,4 @@
-.table-top
-  - if @associated_model.filters.present? && @action.partial.nil?
-    .cm-index-page__filters
-      == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
-  p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
-  div.d-flex.gap-3
-    .table-top__column-action
-      - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
-        - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
-        - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
-        a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
-          button.btn-secondary Add
-    - if @associated_model.sort_columns.present?
-      = render 'cm_admin/main/sort', model: @associated_model, ar_object: @associated_ar_object
-
-- if flash[:bulk_action_error].present?
-  .alert.alert-danger.me-4 role="alert"
-    = flash[:bulk_action_error].html_safe
-- if flash[:bulk_action_success].present?
-  .alert.alert-success.me-4 role="alert"
-    = flash[:bulk_action_success].html_safe
-
+== render partial: 'cm_admin/main/actions_associated'
 - bulk_actions = actions_filter(@associated_model, @associated_ar_object, :bulk_action)
 - if bulk_actions.present?
   .table-top.hidden data-section="bulk-action"

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

@@ -1,8 +1,8 @@
 - if nested_table_field.display_type == :table
   tr.nested-fields
     - if nested_table_field.is_positionable.call(f.object)
-      td data-behaviour='action-icons'
-        i class='fa-solid fa-grip-dots-vertical drag-handle pointer'
+      td data-behaviour='action-icons' class='drag-handle pointer'
+        i class='fa-solid fa-grip-dots-vertical'
         = f.hidden_field :position, class: 'hidden-position'
     - if nested_table_field.is_deletable.call(f.object)
       td.item-delete-cell data-behaviour='action-icons'

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

@@ -1,3 +1,6 @@
 .cm-index-page.associated-index
   .cm-index-page__table-container
-    == render partial: 'cm_admin/main/associated_table'
+    - if params[:view_type] == 'card' || @current_action.view_type == :card
+      == render partial: "cm_admin/main/associated_card"
+    - else
+      == render partial: 'cm_admin/main/associated_table'

data/app/views/cm_admin_mailer/cm_admin_mail.html.slim

@@ -0,0 +1,24 @@
+table style="background: #F2F4F6; padding: 56px 0px; width: 100%; border-spacing: 0 24px; border-collapse: separate;"
+  tr
+    td colspan="3" style="text-align: center;"
+      img src="#{Rails.configuration.x.project_settings.logo_url}" alt="logo" style="height: auto; width: 50px;"
+  tr style="width: fit-content;"
+    td
+      div style="padding: 40px; background: #fff; border-radius: 5px; margin: 0px 24px;"
+        h4 style="margin: 0; font-size: 20px; color: #000;" Hello,
+        = raw(@body)
+        - if @button_link.present? && @button_link.present?
+          table width="100%" border="0" cellspacing="0" cellpadding="0"
+            tr 
+              td align='center'
+                div style="border: none; background: #6D0094; padding: 16px 32px; width: fit-content; border-radius: 5px;"
+                  a style="text-decoration: none; color: #fff;" href="#{@button_link}"
+                    = @button_text
+        div
+          p style="margin: 0; color: #000; font-size: 14px;"
+            strong Best Regards,
+          p style="margin: 0; color: #000; font-size: 14px;"
+            strong = Rails.configuration.x.project_settings.name
+  tr
+    td colspan="3" style="text-align: center; color: #5F6166; font-size: 12px;"
+      = "© #{Time.current.year} #{Rails.configuration.x.project_settings.name}"

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

@@ -13,7 +13,8 @@ html
       script
         | window.dataLayer = window.dataLayer || [];
         | dataLayer.push({
-        |   'projectName': "#{project_name_with_env}"
+        |   'projectName': "#{project_name_with_env}",
+        |   'userId': "#{current_user&.id}"
         | });
     title
       = project_name_with_env

data/docs/CmAdminEmail.md

@@ -0,0 +1,50 @@
+# Sending Email from CM Admin 📧
+
+## Overview
+
+The CM Admin email feature allows to send emails directly from the CM Admin. This documentation outlines how to use the CM Admin emails, including its configuration and examples.
+
+## Usage
+
+To user CM Admin email use the `CmAdmin.send_email` method.
+
+### Attributes
+
+- `to`
+
+  - Specify to whom mail should be delivered. Takes array or single emails.
+
+- `subject`
+
+  - subject of email. Takes only string
+
+- `body`
+
+  - body of email. takes html string or normal string.
+
+- `button_text` (optional) and `button_link` (optional)
+  - If email template requires a link with button, use these attributes.
+
+### Examples
+
+Here are some examples of how to use the `CmAdmin.send_email` method to send emails:
+
+```ruby
+CmAdmin.send_email(
+  "example@example.com",
+  "Test Email",
+  "<p>This is a test email from CM Admin.</p>"
+)
+```
+
+- With Link Button:
+
+```ruby
+CmAdmin.send_email(
+  "example@example.com",
+  "Test Email",
+  "<p>This is a test email from CM Admin.</p>",
+  "This is link",
+  "https://google.com"
+)
+```

data/lib/cm_admin/models/column.rb

@@ -6,8 +6,8 @@ module CmAdmin
       include Utils::Associations
 
       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, :viewable, :custom_link
+                    :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class,
+                    :display_if, :association_name, :association_type, :viewable, :custom_link, :export_method
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -21,6 +21,7 @@ module CmAdmin
         self.height = 50 if self.field_type == :image && self.height.nil?
         self.width = 50 if self.field_type == :image && self.width.nil?
         self.display_if = lambda { |arg| return true } if self.display_if.nil?
+        self.export_method = self.field_name if export_method.nil?
 
         validation_for_association
       end

data/lib/cm_admin/models/dsl_method.rb

@@ -131,19 +131,20 @@ module CmAdmin
       # @param layout [String] the layout of tab
       # @param partial [String] the partial path of tab
       # @param display_if [Proc] A lambda that takes the current object and return true or false
+      # @param view_type [Symbol] view type of page +:table+ or +:card+
       #
       # @example Creating a tab
       #   tab :comments, 'comment', associated_model: 'comments', layout_type: 'cm_association_index' do
       #     column :message
       #   end
-      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, display_if: nil, &block)
+      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, display_if: nil, view_type: nil, &block)
         if custom_action.to_s == ''
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
           @available_tabs << CmAdmin::Models::Tab.new(tab_name, '', display_if, &block)
         else
           action = CmAdmin::Models::Action.new(name: custom_action.to_s, verb: :get, path: ':id/' + custom_action,
                                                layout_type:, layout:, partial:, child_records: associated_model,
-                                               action_type: :custom, display_type: :page, model_name: name)
+                                               action_type: :custom, display_type: :page, model_name: name, view_type:)
           @available_actions << action
           @current_action = action
           @available_tabs << CmAdmin::Models::Tab.new(tab_name, custom_action, display_if, &block)
@@ -191,6 +192,7 @@ module CmAdmin
       # @param header [String] the header of field
       # @param format [String] the format of field for date field
       # @param helper_method [Symbol] the helper method for field, should be defined in custom_helper.rb file, will take two arguments, +record+ and +field_name+
+      # @param export_method [Symbol] the export method for field, should be defined in model, will take no arguments
       # @param height [Integer] the height of field for image field
       # @param width [Integer] the width of field for image field
       # @params custom_link [String] the custom link for field

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '4.4.8'
+  VERSION = '4.6.5'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -152,7 +152,7 @@ module CmAdmin
       def attachment_with_preview(attachment, field, custom_class = nil)
         content_tag :a, href: attachment.url, target: '_blank' do
           if attachment.content_type.include?('image')
-            image_tag(attachment.url, height: field.height, width: field.width, class: "rounded #{custom_class}")
+            image_tag(attachment.variant(resize_to_fill: [field.width, field.height]), height: field.height, width: field.width, class: "rounded #{custom_class}")
           else
             image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50, class: "rounded #{custom_class}")
           end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -167,7 +167,9 @@ module CmAdmin
 
       def user_full_name
         return false unless current_user
+
         return current_user.full_name if defined?(current_user.full_name)
+
         current_user.email.split('@').first
       end
 

data/lib/cm_admin.rb

@@ -44,9 +44,14 @@ module CmAdmin
 
     def initialize_model(entity, &block)
       return unless entity.is_a?(Class)
+
       CmAdmin::Model.delete_entity(entity.name) if CmAdmin::Model.find_by({ name: entity.name })
 
       config.cm_admin_models << CmAdmin::Model.new(entity, &block)
     end
+
+    def send_email(to, subject, body, button_text = nil, button_link = nil)
+      SendCmAdminEmailJob.perform_later(to, subject, body, button_text, button_link)
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 4.4.8
+  version: 4.6.5
 platform: ruby
 authors:
 - Michael
@@ -13,7 +13,7 @@ authors:
 - Austin
 bindir: exe
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -362,7 +362,8 @@ files:
 - app/helpers/cm_admin/permission_helper.rb
 - app/jobs/file_import_processor_job.rb
 - app/jobs/generate_export_file_job.rb
-- app/mailers/export_mailer.rb
+- app/jobs/send_cm_admin_email_job.rb
+- app/mailers/cm_admin_mailer.rb
 - app/models/cm_current.rb
 - app/models/cm_permission.rb
 - app/models/cm_role.rb
@@ -373,8 +374,10 @@ files:
 - app/models/file_export.rb
 - app/models/file_import.rb
 - app/policies/cm_admin/file_import_policy.rb
+- app/views/cm_admin/main/_actions_associated.html.slim
 - app/views/cm_admin/main/_actions_dropdown.html.slim
 - app/views/cm_admin/main/_alert_banner.html.slim
+- app/views/cm_admin/main/_associated_card.html.slim
 - app/views/cm_admin/main/_associated_table.html.slim
 - app/views/cm_admin/main/_card.html.slim
 - app/views/cm_admin/main/_cm_pagy_nav.html.slim
@@ -405,7 +408,7 @@ files:
 - app/views/cm_admin/static/dashboard.html.slim
 - app/views/cm_admin/static/error_401.html.slim
 - app/views/cm_admin/static/error_403.html.slim
-- app/views/export_mailer/export_email.html.slim
+- app/views/cm_admin_mailer/cm_admin_mail.html.slim
 - app/views/layouts/_cm_flash_message.html.slim
 - app/views/layouts/_custom_action_modal.html.slim
 - app/views/layouts/_custom_action_modals.html.slim
@@ -424,6 +427,7 @@ files:
 - config/importmap.rb
 - config/routes.rb
 - docs/AddingAlert.md
+- docs/CmAdminEmail.md
 - docs/CustomFilterMethod.md
 - docs/ListingSelectTwoAjax.md
 - docs/ListingSelectTwoItems.md

data/app/mailers/export_mailer.rb

@@ -1,22 +0,0 @@
-class ExportMailer < ApplicationMailer
-  def export_email(file_export)
-    set_current_for_development
-    expires_in = (file_export.expires_at - Time.now).to_i
-    @model = file_export.associated_model_name&.pluralize
-    @link = file_export.export_file.url(expires_in:)
-    @expires_at = file_export.expires_at.utc
-    mail(to: file_export&.exported_by&.email, subject: "#{@model} Export is ready for download")
-  end
-
-  private
-
-  def set_current_for_development
-    return unless Rails.env.development?
-
-    url = Rails.application.credentials[:be_url]
-    host = URI.parse(url).host
-    protocol = URI.parse(url).scheme
-    port = URI.parse(url).port
-    ActiveStorage::Current.url_options = { host:, protocol:, port: }
-  end
-end

data/app/views/export_mailer/export_email.html.slim

@@ -1,19 +0,0 @@
-table style="background: #F2F4F6; padding: 56px 0px; width: 100%; border-spacing: 24px;"
-  tr
-    td colspan="3" style="text-align: center; margin-bottom: 24px;"
-      img src="#{Rails.configuration.x.project_settings.logo_url}" alt="logo" style="height: auto; width: 50px;"
-  tr style="width: fit-content; style=width: 100px;"
-    td
-    td style="background: #fff; padding: 40px; padding-bottom: 56px;"
-      p style="color: #333333; font-weight: 700; font-size: 24px; line-height: 36px; margin: 0; margin-bottom: 24px;"
-        = "#{@model} Export is ready"
-      div style="margin-bottom: 40px;"
-        p
-          | The download link will expire at <strong>#{@expires_at.strftime("%H:%M:%S")} UTC</strong> on <strong>#{@expires_at.strftime("%d %B %Y")}.</strong>
-        p Make sure to save the file before the link expires.
-      a style="border: none; background: #6D0094; color: #fff; padding: 16px 32px; width: fit-content; border-radius: 5px; text-decoration: none;" href="#{@link}"
-        | Download Excel
-    td
-  tr
-    td colspan="3" style="text-align: center; color: #5F6166; font-size: 16px; margin-top: 24px;"
-      = "© #{Time.current.year} #{Rails.configuration.x.project_settings.name}"