cm-admin 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562260419c63a8ecbe47434934436fcbcfcc0bba45d5fdb1ec79b409dab1eae8
-  data.tar.gz: 44254130972962094d599673a89bbc4b1961ef4ef8eedc1087c5313f18c7b683
+  metadata.gz: 680b8d7f174e764d9a17115f20014a8c02ff18a274bc4df022f5285671be343f
+  data.tar.gz: b3278745964ecd7cfc13ea6a4c8381ba5b8ead0b19e086dcc125a6da6ab70fde
 SHA512:
-  metadata.gz: 763022ed87852040e0dfe161df4d9044ce802f8b3555bac98eafd765dde5d6f396eb5f3c4c46ede87cffae6e5b6ba09ac6f9f60001690091f803d9f1b292568c
-  data.tar.gz: b1495b2af0cffaf34e0aedba3a7ead53c13e8ab7ad9dc883d403ec6594e4301cca7c208193daa80ea48fd95f8657045fb31af88de4d87234c2f9bd22fa1b69de
+  metadata.gz: f5ba67994c1f9746a5ccd57a02ea66ce0127cebfec936792f54ad655e8a7a5dc075bfa7c25d3294b234baf095cbf956ef70f65310d332b1271410d51b0728878
+  data.tar.gz: 26c7185ff4ef0168e0ee16936a4518e84250836c10a3b549d21f0691816411d407b99e030c7d605524da04e58fabc4ff424a6de0069bc887b8e820320e622f63

data/Gemfile.lock

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

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

@@ -8,5 +8,5 @@ import './filters.js'
 import './form_validation.js'
 import './quick_search.js'
 import './custom.js'
-
+import './kanban.js'
 

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

@@ -70,7 +70,17 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
     success: function(data) {
       var queryParam = jQuery.param(queryString)
       window.history.pushState("", "", url + '?' + queryParam);
-      $('.cm-index-page__table-container').html(data);
+      if ($('#view_type').val() == 'kanban') {
+        $.each(data.table.data, function(key, value) {
+          $('.' + key + ' .cards').html(value)
+        });
+        $('.kanban-list .counter').html(0)
+        $.each(data.table.column_count, function(key, value) {
+          $('.' + key + ' .counter').html(value)
+        });
+      } else {
+        $('.cm-index-page__table-container').html(data);
+      }
     },
     error: function(jqxhr, textStatus, errorThrown) {
       console.log(errorThrown, textStatus);

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

@@ -0,0 +1,30 @@
+$(document).on('click', '.kanban-show-more', function(e) {
+  e.preventDefault();
+  var page = $(this).data('page') + 1
+  var query_string = window.location.search
+  $.ajax('/admin/batch_order_items' + query_string, {
+    type: "GET",
+    data: {
+      page: page,
+      per_page: $(this).data('per-page'),
+      view_type: 'kanban'
+    },
+    success: function (data) {
+      apply_response_to_board(data.table.data);
+      $('.kanban-show-more').data('page', page)
+      if (data.table.paging.next_page == false) {
+        $('.kanban-show-more').addClass('disabled')
+      }
+      $('.kanban-show-more').data('page', page)
+    },
+    error: function (jqxhr, textStatus, errorThrown) {
+      alert("Something went wrong. Please try again later.\n" + errorThrown);
+    },
+  });
+})
+
+function apply_response_to_board(json_data) {
+  $.each(json_data, function(key, value) {
+    $('.' + key + ' .cards').append(value)
+  });
+}

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

@@ -7,37 +7,38 @@
   .card-grid {
     @extend .row, .row-cols-4, .g-3;
   }
-  .item-card {
-    @extend .card, .position-relative;
-    border-radius: 4px;
-    .card-menu {
-      @extend .dropdown, .position-absolute;
-      top: 8px;
-      right: 8px;
-    }
-    .card-img-top {
-      height: 185px;
-      object-fit: cover;
-      border-top-left-radius: 4px;
-      border-top-right-radius: 4px;
-    }
-    .card-subtitle {
-      @extend .d-flex, .justify-content-between, .text-secondary, .fw-medium;
-      font-size: $t4-text;
-      .item-id {
-        margin: 0;
-        span {
-          border-left: 1px solid;
-          padding-left: 4px;
-        }
+}
+
+.item-card {
+  @extend .card, .position-relative;
+  border-radius: 4px;
+  .card-menu {
+    @extend .dropdown, .position-absolute;
+    top: 8px;
+    right: 8px;
+  }
+  .card-img-top {
+    height: 185px;
+    object-fit: cover;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+  }
+  .card-subtitle {
+    @extend .d-flex, .justify-content-between, .text-secondary, .fw-medium;
+    font-size: $t4-text;
+    .item-id {
+      margin: 0;
+      span {
+        border-left: 1px solid;
+        padding-left: 4px;
       }
     }
-    .card-footer {
-      @extend .d-flex, .justify-content-between, .bg-white;
-      .item-price {
-        font-size: $t4-text;
-        margin: 0;
-      }
+  }
+  .card-footer {
+    @extend .d-flex, .justify-content-between, .bg-white;
+    .item-price {
+      font-size: $t4-text;
+      margin: 0;
     }
   }
 }

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

@@ -0,0 +1,35 @@
+@import "../helpers/index.scss";
+@import "../dependency/bootstrap/scss/bootstrap";
+
+.comments-wrapper {
+  padding: 24px;
+  .comment-card {
+    @extend .card;
+    margin: 8px 0;
+    background-color: $card-grey-lighter-clr;
+    border: none;
+    .comment {
+      @extend .d-flex;
+      gap: 8px;
+      .profile-pic {
+        width: 32px;
+        height: 32px;
+        @extend .rounded-circle;
+      }
+      .comment-info {
+        .user-name {
+          @extend .fw-semibold;
+          color: $ink-regular-clr;
+        }
+        .timing {
+          @extend .text-body-tertiary, .fw-normal;
+        }
+        .comment-text {
+          color: $ink-regular-clr;
+          max-width: 656px;
+          margin: 0;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,37 @@
+@import "../helpers/index.scss";
+@import "../dependency/bootstrap/scss/bootstrap";
+
+.kanban-container {
+  @extend .d-flex, .flex-nowrap;
+  gap: 8px;
+  max-width: 100%;
+  height: calc(100vh - 214px);
+  padding-right: 24px;
+  overflow-x: auto;
+  .kanban-list {
+    min-width: 240px;
+    max-width: 240px;
+    background: var(--grey-lighter, #f3f4f6);
+    padding: 8px;
+    &__header {
+      @extend .d-flex, .justify-content-between;
+      p {
+        font-size: $t4-text;
+        margin-bottom: 8px;
+        &:nth-child(1) {
+          color: $ink-regular-clr;
+        }
+        &:nth-child(2) {
+          color: $ink-lighter-clr;
+        }
+      }
+    }
+  }
+  .item-card {
+    margin-bottom: 8px;
+  }
+}
+
+.kanban-pagination {
+  justify-content: center !important;
+}

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

@@ -233,6 +233,10 @@
       }
     }
   }
+
+  .kanban-pagination {
+    justify-content: center !important;
+  }
 }
 
 [data-field-type="money"] {

data/app/assets/stylesheets/cm_admin/cm_admin.css.scss

@@ -21,8 +21,10 @@
  *= require 'cm_admin/base/scaffold'
  *= require 'cm_admin/base/auth'
  *= require 'cm_admin/base/filters'
+ *= require 'cm_admin/base/comments'
  *= require 'cm_admin/base/common'
  *= require 'cm_admin/base/cardView'
+  *= require 'cm_admin/base/kanban'
  *= require 'cm_admin/components/index'
  *= require 'cm_admin/dependency/bootstrap.min'
  *= require 'cm_admin/dependency/flatpickr.min'

data/app/assets/stylesheets/cm_admin/helpers/_variable.scss

@@ -37,6 +37,7 @@ $grey-light-clr: #d9dee3;
 $grey-lighter-clr: #f3f4f6;
 $grey-lightest-clr: #f8f9fa;
 $grey-dark-clr: #828282;
+$card-grey-lighter-clr: #f3f4f6;
 
 /* Ink Colors */
 $ink-regular-clr: #1d2129;

data/app/controllers/cm_admin/resource_controller.rb

@@ -10,10 +10,15 @@ 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)
-      @ar_object = filter_by(params, records, @model.filter_params(params))
-      # resource_identifier
+      if (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))
+      end
       respond_to do |format|
-        if request.xhr?
+        if request.xhr? && (params[:view_type] == 'kanban' || @current_action.view_type == :kanban)
+          format.json { render json: @ar_object }
+        elsif request.xhr?
           format.html { render partial: '/cm_admin/main/table' }
         else
           format.html { render '/cm_admin/main/' + action_name }
@@ -258,6 +263,45 @@ module CmAdmin
       return filtered_result
     end
 
+    def kanban_filter_by(params, records, filter_params={}, sort_params={})
+      filtered_result = OpenStruct.new
+      cm_model = @associated_model || @model
+      db_columns = cm_model.ar_model&.columns&.map{|x| x.name.to_sym}
+      if db_columns.include?(@current_action.sort_column)
+        sort_column = @current_action.sort_column
+      else
+        sort_column = 'created_at'
+      end
+      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
+      # records = records.order("#{sort_column} #{@current_action.sort_direction}")
+      final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, cm_model.filters)
+      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
+      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
+      if @current_action.kanban_attr[:only].present?
+        column_names &= @current_action.kanban_attr[:only]
+      elsif @current_action.kanban_attr[:exclude].present?
+        column_names -= @current_action.kanban_attr[:exclude]
+      end
+      column_names.each do |column|
+        total_count = group_record_count[column]
+        filtered_result.data[column] = ''
+        next if page.to_i > (total_count.to_i / per_page.to_f).ceil
+
+        pagy, records = pagy(final_data.send(column), items: per_page.to_i)
+        filtered_result.data[column] = render_to_string partial: 'cm_admin/main/kanban_card', locals: { ar_collection: records}
+      end
+      filtered_result
+    end
+
     def generate_nested_params(nested_table_field)
       if nested_table_field.parent_field
         ar_model = nested_table_field.parent_field.to_s.classify.constantize

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -18,6 +18,20 @@ $(document).on('turbolinks:load', function () {
       animation: 150
     });
   }
+
+  // var array = $('#searchKeywords').val().split(",");
+  // $.each(array,function(i){
+  //   alert(array[i]);
+  // });
+ 
+  // var el = document.getElementsByClassName('kanban-list')
+  // if(el[0]) {
+  //   Sortable.create(el,{
+  //     handle: '.kanban-item',
+  //     animation: 150
+  //   });
+  // }
+
   var headerElemHeight = $('.page-top-bar').height() + 64
   var calculatedHeight = "calc(100vh - " + headerElemHeight+"px"+")"
   $('.table-wrapper').css("maxHeight", calculatedHeight);

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

@@ -6,7 +6,7 @@
     .btn-group[role="group" aria-label="Basic example"]
       a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}"
         i.fa.fa-table
-      a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}&list_type=card"
+      a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}&view_type=card"
         i.fa.fa-table-cells
   /  button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
   /    span

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

@@ -0,0 +1,21 @@
+- if flash[:alert].present?
+  .alert.alert-danger role="alert"
+    = flash[:alert].html_safe
+- elsif flash[:notice].present?
+  .alert.alert-success
+    = flash[:notice].html_safe
+
+.kanban-container
+  - column_names = @ar_object.data.keys
+  = hidden_field_tag :kanban_column_names, column_names
+  - column_names.each do |column_name|
+    .kanban-list class="#{column_name}"
+      .kanban-list__header
+          p = column_name.to_s.titleize
+          p.counter = @ar_object.column_count[column_name].to_i
+      .cards 
+        = @ar_object.data[column_name]
+                
+.pagination-bar.kanban-pagination
+  .btn.btn-primary.kanban-show-more data-page=1 Show more
+= render partial: 'cm_admin/main/show_as_drawer'

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

@@ -0,0 +1,2 @@
+.cm-drawer.batch-order-item.hidden
+  .cm-drawer__container

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

@@ -1,11 +1,11 @@
 .table-top
   p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.ar_model.table_name)}"
   .table-top__column-action
-    - if @current_action.card_layout
+    - if @current_action.view_type == :card_view
       .btn-group[role="group" aria-label="Card Toggle"]
         a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}"
           i.fa.fa-table
-        a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}&list_type=card"
+        a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}&view_type=card"
           i.fa.fa-table-cells
   /  button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
   /    span

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

@@ -1,4 +1,5 @@
 
+= hidden_field_tag :view_type, (@current_action.view_type || params[:view_type])
 .cm-index-page.cm-page-container
   .sticky-container.page-top-bar
     == render 'cm_admin/main/top_navbar'
@@ -8,10 +9,12 @@
   .cm-index-page__table-container
     - if @action.partial
       == render @action.partial
-    - elsif params[:list_type] == 'card'
+    - elsif params[:view_type] == 'card' || @current_action.view_type == :card_view
       == render 'cm_admin/main/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)
+    = column_pop_up(@model)
+    = manage_column_pop_up(@model)
 

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

@@ -47,5 +47,6 @@ html
         - else
           = yield
     = render 'layouts/cm_flash_message'
-    = render 'layouts/custom_action_modals'
+    - unless (@current_action.view_type || params[:view_type])
+      = render 'layouts/custom_action_modals'
 

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,8 @@ module CmAdmin
       include Actions::Blocks
       attr_accessor :name, :display_name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
-        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column, :icon_name, :scopes, :card_layout
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column, :icon_name, :scopes, :view_type,
+        :kanban_attr
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
@@ -39,14 +40,15 @@ module CmAdmin
         self.verb = :get
         self.route_type = nil
         self.display_type = nil
-        self.card_layout = false
+        self.view_type = :table
+        self.kanban_attr = {}
       end
 
-      def set_values(page_title, page_description, partial, card_layout=false)
+      def set_values(page_title, page_description, partial, view_type=:table)
         self.page_title = page_title
         self.page_description = page_description
         self.partial = partial
-        self.card_layout = card_layout
+        self.view_type = view_type
       end
 
       def controller_action_name

data/lib/cm_admin/models/dsl_method.rb

@@ -3,9 +3,9 @@ module CmAdmin
     module DslMethod
       extend ActiveSupport::Concern
 
-      def cm_index(page_title: nil, page_description: nil, partial: nil, card_layout: false, &block)
+      def cm_index(page_title: nil, page_description: nil, partial: nil, view_type: :table, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
-        @current_action.set_values(page_title, page_description, partial, card_layout)
+        @current_action.set_values(page_title, page_description, partial, view_type)
         yield
       end
 
@@ -39,6 +39,15 @@ module CmAdmin
         end
       end
 
+      def kanban_view(column_name, exclude: [], only: [])
+        if @current_action
+          @current_action.kanban_attr[:column_name] = column_name
+          @current_action.kanban_attr[:exclude] = exclude
+          @current_action.kanban_attr[:only] = only
+        end
+
+      end
+
       def scope_list(scopes=[])
         return unless @current_action
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.3.9'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,14 +197,17 @@ 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/kanban.js
 - app/assets/javascripts/cm_admin/quick_search.js
 - app/assets/javascripts/cm_admin/scaffolds.js
 - app/assets/javascripts/cm_admin/shared_scaffolds.js
 - app/assets/stylesheets/cm_admin/base/auth.scss
 - app/assets/stylesheets/cm_admin/base/cardView.scss
+- app/assets/stylesheets/cm_admin/base/comments.scss
 - app/assets/stylesheets/cm_admin/base/common.scss
 - app/assets/stylesheets/cm_admin/base/filters.scss
 - app/assets/stylesheets/cm_admin/base/form.scss
+- app/assets/stylesheets/cm_admin/base/kanban.scss
 - app/assets/stylesheets/cm_admin/base/main-nav.scss
 - app/assets/stylesheets/cm_admin/base/navbar.scss
 - app/assets/stylesheets/cm_admin/base/quicksearch.scss
@@ -354,10 +357,12 @@ files:
 - app/views/cm_admin/main/_custom_action_modal_form.html.slim
 - app/views/cm_admin/main/_drawer.html.slim
 - app/views/cm_admin/main/_filters.html.slim
+- app/views/cm_admin/main/_kanban.html.slim
 - app/views/cm_admin/main/_member_custom_action_modal.html.slim
 - app/views/cm_admin/main/_nested_fields.html.slim
 - 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_section.html.slim
 - app/views/cm_admin/main/_table.html.slim
 - app/views/cm_admin/main/_tabs.html.slim