cm-admin 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c229302e864612a0df2da35d51c384510fed62e4fd791e154537d2dccd7584
-  data.tar.gz: 3f7a97d73f9107a9a203b9ca8418bdfc33ced87d34c52d50ce998a38c50afd77
+  metadata.gz: 2f2cbd6a0eb88a1b484b7dd22581707ba8ace583b855e7d8fddc70a7f707c982
+  data.tar.gz: 3e16b540f328160794ee09d1f2851bd9b017265a033806c56f76902eb8060cb1
 SHA512:
-  metadata.gz: 46524b7ea8d7c189c3c08e54d457ec69839e72acdb66304b9485413a3b629b1e2d81b1a0a3d296b505030b17d7f4e5be0a9bbf0f3c5d759a66758b51095b94e7
-  data.tar.gz: ee892966943c3407da7e26918c6ba4f6943174094c9a4b915c63d5874397c1a349c69607289953995f71acf242d64315e3c0ff33c53ec364a5447a0ad6c1ae10
+  metadata.gz: f75af6089fa15c0d7e3e9d914a3aa2c2c2248b9ae45bc833238677de6c82761717beca49515f0ade78890e9495f1c714e80e9de4c9abb116b6c62f576fba8cc8
+  data.tar.gz: d22b094320cd0a841675b222c20529dc6ab6eb0e136afd73a31ac0bd877714c01cd135a2ac0dd68ee47dbbb0a997877a2f3eb5a9db18e6ff7d7984ac25c4a768

data/Gemfile.lock

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

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

@@ -9,4 +9,4 @@ import "./form_validation.js";
 import "./quick_search.js";
 import "./custom.js";
 import "./kanban.js";
-import "./custom_action";
+import "./custom_action";

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

@@ -1,4 +1,5 @@
 import * as bootstrap from "bootstrap";
+import { initializeComponents } from "./initialize_components";
 window.bootstrap = bootstrap;
 
 export function handleFetchModalClick() {
@@ -21,6 +22,7 @@ export function handleFetchModalClick() {
           modalContainer.children().first()
         );
         actionModal.show();
+        initializeComponents();
       },
       error: function (error) {
         console.error("Error:", error);

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

@@ -0,0 +1,31 @@
+import LocalTime from "./local-time"
+import * as bootstrap from "bootstrap";
+window.bootstrap = bootstrap;
+
+
+export function initializeComponents() {
+  $(".select-2").select2({
+    theme: "bootstrap-5",
+  });
+  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",
+  });
+  var el = document.getElementsByClassName("columns-list");
+  if (el[0]) {
+    Sortable.create(el[0], {
+      handle: ".dragger",
+      animation: 150,
+    });
+  }
+
+  var headerElemHeight = $(".page-top-bar").height() + 64;
+  var calculatedHeight = "calc(100vh - " + headerElemHeight + "px" + ")";
+  $(".table-wrapper").css("maxHeight", calculatedHeight);
+  LocalTime.start();
+}

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

@@ -1,5 +1,6 @@
 // This file is shared between rails 6 and 7 version
-import LocalTime from "./local-time";
+import { initializeComponents } from "./initialize_components";
+
 
 $(document).on(
   "keypress keyup blur",
@@ -41,11 +42,13 @@ $(document).on("mouseleave", ".row-action-cell", function () {
 });
 
 $(document).on("click", '[data-behaviour="offcanvas"]', function (e) {
+  e.preventDefault();
   const drawerFetchUrl = $(this).attr("data-drawer-fetch-url");
   const drawerContainer = $("[data-behaviour='cm-drawer-container']");
 
   if (!drawerFetchUrl || !drawerContainer) return;
 
+  
   $.ajax({
     url: drawerFetchUrl,
     method: "GET",
@@ -64,7 +67,7 @@ $(document).on("click", '[data-behaviour="offcanvas"]', function (e) {
       handleDrawerFormSubmission(drawerForm);
     },
     error: function (error) {
-      console.error("Error:", error);
+      console.log("Error:", error);
     },
   });
 });
@@ -227,29 +230,4 @@ var replaceAccordionTitle = function (element) {
   initializeComponents();
 };
 
-export function initializeComponents() {
-  $(".select-2").select2({
-    theme: "bootstrap-5",
-  });
-  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",
-  });
-  var el = document.getElementsByClassName("columns-list");
-  if (el[0]) {
-    Sortable.create(el[0], {
-      handle: ".dragger",
-      animation: 150,
-    });
-  }
 
-  var headerElemHeight = $(".page-top-bar").height() + 64;
-  var calculatedHeight = "calc(100vh - " + headerElemHeight + "px" + ")";
-  $(".table-wrapper").css("maxHeight", calculatedHeight);
-  LocalTime.start();
-}

data/app/controllers/cm_admin/resource_controller.rb

@@ -15,16 +15,24 @@ module CmAdmin
       records = "CmAdmin::#{@model.name}PolicyIndexScope".constantize.new(Current.user, @model.name.constantize).resolve
       records = records.includes(@current_action.eager_load_associations) if @current_action.eager_load_associations.present?
       records = apply_scopes(records)
-      @ar_object = if %w[table card].include?(params[:view_type]) || %i[table card].include?(@current_action.view_type)
-                     filter_by(params, records, filter_params: @model.filter_params(params))
-                   elsif (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
+      @ar_object = if params[:view_type] == 'kanban' || @current_action.view_type == :kanban
                      kanban_filter_by(params, records, @model.filter_params(params))
                    else
                      filter_by(params, records, filter_params: @model.filter_params(params))
                    end
       respond_to do |format|
-        if request.xhr? && (params[:view_type] == 'kanban' || @current_action.view_type == :kanban)
-          format.json { render json: @ar_object }
+        if params[:view_type] == 'kanban' || @current_action.view_type == :kanban
+          if request.xhr?
+            format.json { render json: @ar_object }
+          else
+            format.html { render '/cm_admin/main/' + action_name }
+          end
+        elsif params[:view_type] == 'card' || @current_action.view_type == :card
+          if request.xhr?
+            format.html { render partial: "/cm_admin/#{@model.name.underscore}/card" }
+          else
+            format.html { render '/cm_admin/main/' + action_name }
+          end
         elsif request.xhr?
           format.html { render partial: '/cm_admin/main/table' }
         else
@@ -224,10 +232,18 @@ module CmAdmin
       @model = Model.find_by({ name: controller_name.classify })
       return if @model.blank?
 
-      action_page_title = CmAdmin::Models::Action.find_by(@model, name: 'new').page_title
-      drawer_title = action_page_title.presence || "New #{@model&.formatted_name}"
-      @ar_object = @model.ar_model.new
-      render partial: 'layouts/drawer', locals: { drawer_title:, from_field_id: params[:from_field_id] }
+      if params[:action_name] == 'show'
+        @action = CmAdmin::Models::Action.find_by(@model, name: 'show')
+        scoped_model = "CmAdmin::#{@model.name}Policy::ShowScope".constantize.new(Current.user, @model.name.constantize).resolve
+        @ar_object = fetch_ar_object(scoped_model, params[:ar_object_id])
+        @alerts = @model.alerts
+        render partial: 'layouts/drawer_show'
+      else
+        action_page_title = CmAdmin::Models::Action.find_by(@model, name: 'new').page_title
+        drawer_title = action_page_title.presence || "New #{@model&.formatted_name}"
+        @ar_object = @model.ar_model.new
+        render partial: 'layouts/drawer_form', locals: { drawer_title:, from_field_id: params[:from_field_id] }
+      end
     end
 
     def get_nested_table_fields(fields)

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

@@ -1,5 +1,5 @@
 .kanban-container
-  - column_names = @ar_object.data.keys
+  - column_names = @model.ar_model.send(params[:kanban_column_name]&.pluralize || @current_action.kanban_attr[:column_name].pluralize).keys
   = hidden_field_tag :kanban_column_names, column_names
   - column_names.each do |column_name|
     .kanban-list class="#{column_name}"
@@ -11,7 +11,7 @@
                 
 .pagination-bar.kanban-pagination
   .btn.btn-primary.kanban-show-more data-page=1 Show more
-= render partial: 'cm_admin/main/show_as_drawer'
+/ = render partial: 'cm_admin/main/show_as_drawer'
 
 = export_modal(@model)
 = manage_column_pop_up(@model)

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

@@ -1,5 +1,6 @@
 .show-page__header.page-top-bar
-  == render 'cm_admin/main/top_navbar'
+  - if defined?(via_xhr) && via_xhr == false
+    == render 'cm_admin/main/top_navbar' 
   == render 'cm_admin/main/tabs', via_xhr: defined?(via_xhr) ? via_xhr : false
 .show-page__inner
   - unless @alerts.empty?

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

@@ -43,6 +43,8 @@
               td.text-ellipsis data-field-type="#{column.field_type || 'string'}"
                 - if index == 0 && is_show_action_available(@model, ar_object) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
                   = link_to ar_object.send(column.field_name), cm_admin.send("cm_show_#{ar_object.model_name.singular}_path", ar_object)
+                  / - drawer_fetch_url = "#{CmAdmin::Engine.mount_path}/#{@model.name.tableize}/fetch_drawer?ar_object_id=#{ar_object.id}&action_name=show"
+                  / = link_to ar_object.send(column.field_name), '', data: { behaviour: "offcanvas", drawer_fetch_url: drawer_fetch_url, id: ar_object.id, action_name: 'show' }
                 - else
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer

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

@@ -1,4 +1,6 @@
-= hidden_field_tag :view_type, (@current_action.view_type || params[:view_type])
+
+= hidden_field_tag :view_type, (params[:view_type] || @current_action.view_type)
+.drawer-container data-behaviour="cm-drawer-container"
 .cm-index-page.cm-page-container
   .sticky-container.page-top-bar
     == render 'cm_admin/main/top_navbar'
@@ -13,9 +15,13 @@
   .cm-index-page__table-container
     - if @action.partial
       == render @action.partial
-    - elsif params[:view_type] == 'table' || @current_action.view_type == :table
-      == render 'cm_admin/main/table'
-    - elsif params[:view_type] == 'card' || @current_action.view_type == :card
-      == render "cm_admin/#{@model.name.underscore}/card"
     - elsif params[:view_type] == 'kanban' || @current_action.view_type == :kanban
       == render 'cm_admin/main/kanban'
+    - elsif params[:view_type] == 'card' || @current_action.view_type == :card
+      == render "cm_admin/#{@model.name.underscore}/card"
+    - elsif params[:view_type] == 'table' || @current_action.view_type == :table 
+      == render 'cm_admin/main/table'
+
+    = column_pop_up(@model)
+    = manage_column_pop_up(@model)
+

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

@@ -1,2 +1,2 @@
 .show-page
-  = render partial: 'cm_admin/main/show_content', via_xhr: false
+  = render partial: 'cm_admin/main/show_content', locals: { via_xhr: false }

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

@@ -0,0 +1,9 @@
+.offcanvas.cm-drawer tabindex="-1" id="cm-drawer" aria-labelledby="offcanvasExampleLabel" data-behavior="cm-drawer" data-from-field-id="#{params[:from_field_id]}"
+  .drawer-btn-group
+    button.drawer-nav-btn type="button" data-bs-dismiss="offcanvas" aria-label="Close"
+      i.fa-solid.fa-x
+  .offcanvas-header
+    h4 =  @action.page_title.present? ? @ar_object.send(@action.page_title) : ''
+  .offcanvas-body
+    .show-page
+      = render partial: 'cm_admin/main/show_content', via_xhr: true

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

@@ -69,5 +69,4 @@ html
     div data-behaviour="flash-container"
     = render 'layouts/cm_flash_message'
     div data-behaviour="export-modal-container"
-    - unless (@current_action&.view_type == :kanban || params[:view_type] == 'kanban')
-      = render 'layouts/custom_action_modals'
+    = render 'layouts/custom_action_modals'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '4.3.0'
+  VERSION = '4.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -213,6 +213,7 @@ files:
 - app/assets/javascripts/cm_admin/exports.js
 - app/assets/javascripts/cm_admin/filters.js
 - app/assets/javascripts/cm_admin/form_validation.js
+- app/assets/javascripts/cm_admin/initialize_components.js
 - app/assets/javascripts/cm_admin/kanban.js
 - app/assets/javascripts/cm_admin/local-time.js
 - app/assets/javascripts/cm_admin/quick_search.js
@@ -410,7 +411,8 @@ files:
 - app/views/layouts/_custom_action_modal.html.slim
 - app/views/layouts/_custom_action_modals.html.slim
 - app/views/layouts/_destroy_action_modal.html.slim
-- app/views/layouts/_drawer.html.slim
+- app/views/layouts/_drawer_form.html.slim
+- app/views/layouts/_drawer_show.html.slim
 - app/views/layouts/_left_sidebar_nav.html.slim
 - app/views/layouts/_quick_links.html.slim
 - app/views/layouts/cm_admin.html.slim