cm-admin 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46493821058fb3837c097bc0a0aa491c8a45ba858c20e079bd2f546f94bd6ef7
-  data.tar.gz: d711c110547d83c120f3d0750f3d6e49db925ab622baf2051686f51927c55203
+  metadata.gz: 8f213806205dddde4c26ef831ca86ff31fdd612f054ca899d579276abec08af9
+  data.tar.gz: 6cfd6cacae15a3939dc6f0f45c898e58d0276836db665a84823d142e8f3806f6
 SHA512:
-  metadata.gz: ae3d4e6c410bf6197b2f932309a60c8f440a7b3f91de3d9f719a65debcda95e09ffe0b101e6ee7bd01dabda916ffeecb21cdbc2bd8b6f17ee17ceba6fe6022d6
-  data.tar.gz: afc522a55a080d8487b761875a407c286a109c84692a177f211f7abc1436ace836440742f544a8ac029d115494b831e903f71bb13fbd814af9be2dcd652153bb
+  metadata.gz: 8e2cc59b2ed25bcb3041065288a352352d74be6ddfe44dc643aeabd748bb3779615418f60eab139e6757a5f2be9da28430a411ea919edc7e1f762765a98a30e6
+  data.tar.gz: 1877097421a3bb47a51d2483c7361d1d906502306f98732150706d31f933535d17e0e196927c84d702c7e3103d96f98e4cd108b14cb288e8fcac1a610cb8af8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.2)
+    cm-admin (0.8.5)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -146,7 +146,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby

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

@@ -193,6 +193,7 @@ $(document).on('click', '[data-behaviour="select-option"]', function(e) {
 
   if (filterType == 'single_select') {
     var filterValue = $(this).data('value')
+    var filterText = $(this).text()
     if (!this.classList.contains('selected')) {
       if (this.parentNode.querySelector('.list-item.selected') != null) {
         this.parentNode.querySelector('.list-item.selected').classList.remove('selected');
@@ -200,7 +201,7 @@ $(document).on('click', '[data-behaviour="select-option"]', function(e) {
       $(this).addClass('selected')
     }
 
-    $(this).parents(':nth(4)').children(':first').children(':nth(1)').text(filterValue)
+    $(this).parents(':nth(4)').children(':first').children(':nth(1)').text(filterText)
     $(this).parents(':nth(4)').children(':first').children(':last').removeClass('hidden')
 
     // Clear the search value post selection and regenerate the dropdown elements.
@@ -216,16 +217,15 @@ $(document).on('click', '[data-behaviour="select-option"]', function(e) {
     var checkboxElement = $(this).find('.cm-checkbox')
     checkboxElement.prop('checked', !checkboxElement.prop('checked'))
     var checkedCount = $(this).parent().find('.cm-checkbox').filter(':checked').length
-
     if (checkboxElement.prop('checked')) {
       var chip = $('<div class="chip"></div>')
-      var firstSpan = $('<span></span>').text($(this).data('value'))
+      var firstSpan = $('<span></span>').text($(this).text())
       var secondSpan = $('<span data-behaviour="selected-chip"><i class="fa fa-times"></i></span>')
       parentChip.prepend(chip.append(firstSpan).append(secondSpan))
     } else {
       var chipElement = parentChip.find('.chip')
       for(var i = 0; i < chipElement.length; i++) {
-        if ($(chipElement[i]).text() == $(this).data('value')) {
+        if ($(chipElement[i]).text() == $(this).text()) {
           $(chipElement[i]).remove()
           break
         }
@@ -248,6 +248,7 @@ $(document).on('click', '.apply-area', function(e) {
   var filterType = filterInputElement.data('filter-type')
   var filterColumn = filterInputElement.data('db-column')
   var filterValue = []
+  var filterValueText = []
 
   var selectFilterElement = $('[data-behaviour="select-option"][data-filter-type=' + filterType + '][data-db-column=' + filterColumn + ']')
   var checkedElements = selectFilterElement.find('.cm-checkbox').filter(':checked')
@@ -255,9 +256,10 @@ $(document).on('click', '.apply-area', function(e) {
   if (checkedElements.length > 0) {
     for(var i = 0; i < checkedElements.length; i++) {
       filterValue.push($(checkedElements[i]).parent().data('value'))
+      filterValueText.push($(checkedElements[i]).parent().text())
     }
 
-    truncatedFilterValue = filterValue[0]
+    truncatedFilterValue = filterValueText[0]
     if (filterValue.length > 1) {
       truncatedFilterValue += ' + ' + (filterValue.length - 1) + ' more'
     }
@@ -335,8 +337,6 @@ CmFilter = {
     var filter = element.val().toUpperCase();
     var searchElements = element.parents(':nth(3)').find('.list-area').children();
     searchElements.removeClass('visible').addClass('hidden')
-    console.log("Filter is ", filter)
-    console.log("Search elements are ", searchElements)
     for (var i = 0; i < searchElements.length; i++) {
       txtValue = $(searchElements[i]).children().text();
       if (txtValue.toUpperCase().indexOf(filter) > -1) {

data/app/models/concerns/cm_admin/file_import.rb

@@ -4,7 +4,7 @@ module CmAdmin::FileImport
     cm_admin do
       STATUS_TAG_COLOR = { in_progress: 'yellow-tag', success: 'success'}
       actions only: [:index, :show]
-      set_icon 'fa fa-user'
+      set_icon 'fa fa-file-upload'
       cm_index do
         page_title 'File Import'
         page_description 'Manage all file import progress here'

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

@@ -23,7 +23,7 @@
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                   span Export
-      - if @model.importer
+      - if @model.importer && has_valid_policy(@model.name, :importable)
         = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'primary-btn ml-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 end

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -71,7 +71,7 @@ module CmAdmin
 
         if value && filter.filter_type.to_s.eql?('multi_select')
           truncated_value = value[0]
-          truncated_value += " + #{value.size - 1} more" if truncated_value.size > 1
+          truncated_value += " + #{value.size - 1} more" if value.size > 1
         end
 
         concat(content_tag(:div, class: "filter-chip #{filter.filter_type.to_s.eql?('single_select') ? 'dropdown' : ''}", data: data_hash) do
@@ -126,7 +126,12 @@ module CmAdmin
       def add_single_select_filter(filter)
         value = params.dig(:filters, :"#{filter.filter_type}", :"#{filter.db_column_name}")
         concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
-          concat filter_chip(value, filter)
+          if value && filter.collection[0].class == Array
+            selected_value_text = filter.collection.map{|collection| collection[0] if collection[1].to_s.eql?(value) }.compact.join(', ')
+          else
+            selected_value_text = value
+          end
+          concat filter_chip(selected_value_text, filter)
 
           concat(content_tag(:div, class: 'dropdown-menu dropdown-popup') do
             concat(content_tag(:div, class: 'popup-base') do
@@ -136,8 +141,14 @@ module CmAdmin
                 end)
                 concat(content_tag(:div, class: 'list-area') do
                   filter.collection.each do |val|
-                    concat(content_tag(:div, class: "pointer list-item #{(value.present? && value.eql?(val)) ? 'selected' : ''}", data: {behaviour: 'select-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}", value: val}) do
-                      concat tag.span val.to_s
+                    if val.class.eql?(Array)
+                      filter_value = val[1]
+                      filter_text = val[0]
+                    elsif val.class.eql?(String)
+                      filter_value = filter_text = val
+                    end
+                    concat(content_tag(:div, class: "pointer list-item #{(value.present? && value.eql?(filter_value.to_s)) ? 'selected' : ''}", data: {behaviour: 'select-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}", value: filter_value}) do
+                      concat tag.span filter_text.to_s
                     end)
                   end
                 end)
@@ -150,16 +161,24 @@ module CmAdmin
 
       def add_multi_select_filter(filter)
         value = params.dig(:filters, :"#{filter.filter_type}", :"#{filter.db_column_name}")
-
+        if value && filter.collection[0].class == Array
+          value_mapped_text = []
+          filter.collection.each do |array|
+            value_mapped_text << array[0].titleize if value.include?(array[1].to_s)
+          end
+        else
+          value_mapped_text = value
+        end
+        
         concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
-          concat filter_chip(value, filter)
+          concat filter_chip(value_mapped_text, filter)
 
           concat(content_tag(:div, class: 'position-absolute mt-2 dropdown-popup hidden') do
             concat(content_tag(:div, class: 'popup-base') do
               concat(content_tag(:div, class: 'popup-inner') do
                 concat(content_tag(:div, class: "#{value ? 'search-with-chips' : 'search-area'}") do
-                  if value
-                    value.each do |val|
+                  if value_mapped_text
+                    value_mapped_text.each do |val|
                       concat(content_tag(:div, class: 'chip') do
                         concat tag.span val
                         concat(content_tag(:span, data: { behaviour: 'selected-chip' }) do
@@ -172,9 +191,15 @@ module CmAdmin
                 end)
                 concat(content_tag(:div, class: 'list-area') do
                   filter.collection.each do |val|
-                    concat(content_tag(:div, class: "pointer list-item #{(value && value.eql?(val)) ? 'selected' : ''}", data: {behaviour: 'select-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}", value: val}) do
-                      concat tag.input class: 'cm-checkbox', type: 'checkbox', checked: value ? value.include?(val) : false
-                      concat tag.label val.to_s.titleize, class: 'pointer'
+                    if val.class.eql?(Array)
+                      filter_value = val[1]
+                      filter_text = val[0]
+                    elsif val.class.eql?(String)
+                      filter_value = filter_text = val
+                    end
+                    concat(content_tag(:div, class: "pointer list-item #{(value && (value.eql?(val) || value.include?(filter_value.to_s))) ? 'selected' : ''}", data: {behaviour: 'select-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}", value: filter_value}) do
+                      concat tag.input class: 'cm-checkbox', type: 'checkbox', checked: value ? value.include?(filter_value.to_s) : false
+                      concat tag.label filter_text.to_s.titleize, class: 'pointer'
                     end)
                   end
                 end)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails