cm-admin 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71972c83f78f398ea36d7ebcff092bd08d6ebaed009bbd7cd4a7157932b37798
-  data.tar.gz: 43da1cdbad06a71d04357c6f63d9a2c16b9459c04dcabeb6b8e264c90187af73
+  metadata.gz: c4b058ca1f32279400f2104a7f08d34530b85ef2626554c51ca4c9ef37a0751a
+  data.tar.gz: cdd8426486024c7cc1cac97cbc82301ba85fd89babaa5551dfcc67d84fdbc790
 SHA512:
-  metadata.gz: fc28d6cebd0d4c19193922677bfa2ad13fe384d3453bd31fce263d32bfe79a6f8a48344a36874bc3f002b25c441d532e95557b1f565a932d7a688f54145971b0
-  data.tar.gz: 68b1596bb461e543f11591d3b969162e7f6465e7cf44ad24225b3191dc9256ccb579173a138e11f8ecc4256a0a1cd15ec4c3316d99c4f87f28f028ccf64ac9f6
+  metadata.gz: 3702d39e7faec73a45ab2ed4d890ede66c6260a5255d9401e326a1f08efd1d7b6ada253a97a3fbe5037a2f406aa26b1409acd55da0f5e3ba6d6eddfe9bbbb164
+  data.tar.gz: d87c2cbcd760bec066da60339ff88afbdff412a26508083c0d02a6eb5dc5ad630bf53f369506aa6e0adca730d45beaa8192f6fb316aad372ad1161e5eee5422a

data/Gemfile.lock

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

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

@@ -9,7 +9,7 @@
   width: 100%;
   height: 100%;
   z-index: 5;
-  background-color: rgba(0, 0, 0, .7);
+  background-color: rgba(0, 0, 0, 0.7);
   &__container {
     position: relative;
     width: 360px;
@@ -52,32 +52,32 @@
 }
 
 .drawer-slide-in {
-  animation: slideInLeft .3s ease-in forwards;
+  animation: slideInLeft 0.3s ease-in forwards;
 }
 
 .drawer-slide-out {
-  animation: slideOutLeft .3s ease-in forwards;
+  animation: slideOutLeft 0.3s ease-in forwards;
 }
 
 @keyframes slideInLeft {
   0% {
-     left: -400px;
-     opacity: 0;
+    left: -400px;
+    opacity: 0;
   }
   100% {
-      left: 0;
-     opacity: 1;
+    left: 0;
+    opacity: 1;
   }
 }
 
 @keyframes slideOutLeft {
   0% {
-     left: 0;
-     opacity: 1;
+    left: 0;
+    opacity: 1;
   }
   100% {
-      left: -400px;
-     opacity: 0;
+    left: -400px;
+    opacity: 0;
   }
 }
 
@@ -86,3 +86,22 @@
   margin-left: 8px;
   @include font($size: $t4-text, $color: $brand-color);
 }
+
+//Kanban drawer styles
+.kanban-drawer {
+  .cm-drawer {
+    display: flex;
+    justify-content: flex-end;
+    &__actions {
+      display: flex;
+      flex-direction: column;
+      margin: 16px;
+    }
+    &__container {
+      width: 624px;
+      [class^="col-"] {
+        width: 100% !important;
+      }
+    }
+  }
+}

data/app/controllers/cm_admin/resource_controller.rb

@@ -10,7 +10,9 @@ module CmAdmin
       # Based on the params the filter and pagination object to be set
       records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
       records = apply_scopes(records)
-      if (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
+      if (['table', 'card'].include?(params[:view_type]) || [:table, :card].include?(@current_action.view_type))
+        @ar_object = filter_by(params, records, @model.filter_params(params))
+      elsif (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
         @ar_object = kanban_filter_by(params, records, @model.filter_params(params))
       else
         @ar_object = filter_by(params, records, @model.filter_params(params))
@@ -32,7 +34,11 @@ module CmAdmin
       @ar_object = scoped_model.find(params[:id])
       resource_identifier
       respond_to do |format|
-        format.html { render '/cm_admin/main/' + action_name }
+        if request.xhr?
+          format.html { render partial: '/cm_admin/main/show_content' }
+        else
+          format.html { render '/cm_admin/main/' + action_name }
+        end
       end
     end
 
@@ -278,14 +284,14 @@ module CmAdmin
       filtered_result.data = {}
       filtered_result.paging = {}
       filtered_result.paging['next_page'] = true
-      group_record_count = final_data.group(@current_action.kanban_attr[:column_name]).count
+      group_record_count = final_data.group(params[:kanban_column_name] || @current_action.kanban_attr[:column_name]).count
       per_page = params[:per_page] || 20
       page = params[:page] || 1
       max_page = (group_record_count.values.max.to_i / per_page.to_f).ceil
       filtered_result.paging['next_page'] = (page.to_i < max_page)
       filtered_result.column_count = group_record_count.reject {|key, value| key.blank? }
 
-      column_names = @model.ar_model.send(@current_action.kanban_attr[:column_name].pluralize).keys
+      column_names = @model.ar_model.send(params[:kanban_column_name]&.pluralize || @current_action.kanban_attr[:column_name].pluralize).keys
       if @current_action.kanban_attr[:only].present?
         column_names &= @current_action.kanban_attr[:only]
       elsif @current_action.kanban_attr[:exclude].present?

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

@@ -1,2 +1,11 @@
-.cm-drawer.batch-order-item.hidden
-  .cm-drawer__container
+.kanban-drawer
+  .cm-drawer.show-as-drawer.hidden
+    .cm-drawer__actions
+        a.btn-ghost.mb-2 data-behaviour="show-drawer-close"
+          span
+            i.fa.fa-xmark
+        a.btn-ghost data-behaviour="show-drawer-redirect"
+          span
+            i.fa.fa-up-right-and-down-left-from-center
+    .cm-drawer__container
+      

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

@@ -0,0 +1,14 @@
+.show-page__header.page-top-bar
+  == render 'cm_admin/main/top_navbar'
+  == render 'cm_admin/main/tabs'
+.show-page__inner
+  - if @action.partial
+    == render @action.partial
+  - else
+    - @model.available_fields[:show].each do |entity|
+      .row
+        - if entity.class == CmAdmin::Models::Row
+          - entity.sections.each do |section|
+            = render partial: 'cm_admin/main/show_section', locals: { section: section }
+        - elsif entity.class == CmAdmin::Models::Section
+          = render partial: 'cm_admin/main/show_section', locals: { section: entity }

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

@@ -9,12 +9,12 @@
   .cm-index-page__table-container
     - if @action.partial
       == render @action.partial
-    - elsif params[:view_type] == 'card' || @current_action.view_type == :card_view
-      == render 'cm_admin/main/card'
+    - 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'
-    - else
-      == render 'cm_admin/main/table'
     = column_pop_up(@model)
     = manage_column_pop_up(@model)
 

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

@@ -1,15 +1,2 @@
 .show-page
-  .show-page__header.page-top-bar
-    == render 'cm_admin/main/top_navbar'
-    == render 'cm_admin/main/tabs'
-  .show-page__inner
-    - if @action.partial
-      == render @action.partial
-    - else
-      - @model.available_fields[:show].each do |entity|
-        .row
-          - if entity.class == CmAdmin::Models::Row
-            - entity.sections.each do |section|
-              = render partial: 'cm_admin/main/show_section', locals: { section: section }
-          - elsif entity.class == CmAdmin::Models::Section
-            = render partial: 'cm_admin/main/show_section', locals: { section: entity }
+  = render partial: 'cm_admin/main/show_content'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - sajinmp
@@ -363,6 +363,7 @@ files:
 - app/views/cm_admin/main/_nested_table_form.html.slim
 - app/views/cm_admin/main/_nested_table_section.html.slim
 - app/views/cm_admin/main/_show_as_drawer.html.slim
+- app/views/cm_admin/main/_show_content.html.slim
 - app/views/cm_admin/main/_show_section.html.slim
 - app/views/cm_admin/main/_table.html.slim
 - app/views/cm_admin/main/_tabs.html.slim