cm-admin 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3fadb7ab461116a44e122cd8ec236b43841f501c898cfea6faa4ca898ef982
-  data.tar.gz: 2c4bc421eebb4ebd67242ae920f4e2d29170606525a72fc57f1807a3aa557e66
+  metadata.gz: a68921cd2290bc55a0fe8bad15e16cfdac64d9365756190a08c1e5ca45b35f57
+  data.tar.gz: 56639a3c550354da66a09cff791cd342fef7e276ca627ab76124c07b1c593ac8
 SHA512:
-  metadata.gz: e8cb857fe0f0d2b673223a9b364b73b0049206dbeaa109f954db6cd483fa6873bafe66000ee2393311d881efa2dcd9d901003fad5766918013044f9bf4a65680
-  data.tar.gz: 98bac5325e98387bacb6fc03be9dd880c74410c2bfd48d20eaf90784014c2eaa23393544a2564de2fad95bf0bb6e9716cbdcc4a7b271d5c4d6c8abdd0ae44a2d
+  metadata.gz: 3f11275fc5ddb6cd3793da121a5ea235b7f6ad0aba979edf3eb37d58800bf881ef55c43afd25e52cefc3b795b1feed6186c645f6a6fed6581cedc868a731e587
+  data.tar.gz: f99f2472c8682e4517210b86aa5ebda52e7134b4f2fcfca4aa3418fae7f42773644852cc1bfd6b1cb7a3392fb4907c05033c79f4c9587805d8428af80b592963

data/Gemfile.lock

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

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

@@ -2,37 +2,45 @@ var currentRequest = null;
 
 var CmFilter = {
   // Generate or remove elements of the dropdown based on the search value.
-  dropdown_search: function(element) {
-    if(element.val()) { 
+  dropdown_search: function (element) {
+    if (element.val()) {
       var filter = element.val().toUpperCase();
-      var dropdownElements = element.parents(':nth(1)').find('.list-area').children();
+      var dropdownElements = element
+        .parents(":nth(1)")
+        .find(".list-area")
+        .children();
       for (var i = 0; i < dropdownElements.length; i++) {
         var txtValue = $(dropdownElements[i]).children().text();
         if (txtValue.toUpperCase().indexOf(filter) > -1) {
-          $(dropdownElements[i]).css('display', 'flex');
+          $(dropdownElements[i]).css("display", "flex");
         } else {
-          $(dropdownElements[i]).css('display', 'none');
+          $(dropdownElements[i]).css("display", "none");
         }
       }
     }
-  }
-}
+  },
+};
 
 // Main method which will structure the existing filter values with the newly
 // applied filter. Send and receive the value from the backend.
-var getFilteredData = function(filterType, filterValue, filterColumn=null, sortData=null) {
+var getFilteredData = function (
+  filterType,
+  filterValue,
+  filterColumn = null,
+  sortData = null
+) {
   let sortColumn = $('[data-behaviour="sort-column"]').val();
   let sortDirection = $('[data-behaviour="sort-direction"]:checked').val();
 
-  var url = window.location.pathname
+  var url = window.location.pathname;
 
   // Based on the value changed for recent filter generate the filterParams hash
   var filterParams = {};
   if (filterColumn) {
     filterParams[filterType] = {};
-    filterParams[filterType][filterColumn] = filterValue
+    filterParams[filterType][filterColumn] = filterValue;
   } else {
-    if (filterType) filterParams[filterType] = filterValue
+    if (filterType) filterParams[filterType] = filterValue;
   }
 
   // page params is reinitialized to 1 when any new filter value is applied so
@@ -42,139 +50,171 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null, sortD
     filters: filterParams,
     sort_column: sortColumn,
     sort_direction: sortDirection,
-    page: 1
+    page: 1,
   };
 
   // Generate the queryString by concatenating the filterParams and
   // searchParams that are already applied, if searchParams are present.
-  var searchParams = window.location.search
-  var searchParamsHash = getParamsAsObject(searchParams)
+  var searchParams = window.location.search;
+  var searchParamsHash = getParamsAsObject(searchParams);
   if (Object.keys(searchParamsHash).length > 0) {
     // Delete the previous applied value for multi_select filter from the
     // searchParams as altering the array with new and old value will create
     // more complicated logic. The new value is passed and structured in
     // filterParams and will be concadinated with the searchParams post deletion
-    if (filterType == 'multi_select') {
-      searchParams = getParamsAsObject(searchParams)
-      if (searchParams['filters'] && searchParams['filters'][filterType] !== undefined) {
-        delete(searchParams['filters'][filterType][filterColumn])
+    if (filterType == "multi_select") {
+      searchParams = getParamsAsObject(searchParams);
+      if (
+        searchParams["filters"] &&
+        searchParams["filters"][filterType] !== undefined
+      ) {
+        delete searchParams["filters"][filterType][filterColumn];
       }
-      searchParams = jQuery.param(searchParams)
+      searchParams = jQuery.param(searchParams);
     }
-    filterParams = jQuery.param(queryString)
-    var availableParams = searchParams + '&' + filterParams
-    var queryString = getParamsAsObject(availableParams)
+    filterParams = jQuery.param(queryString);
+    var availableParams = searchParams + "&" + filterParams;
+    var queryString = getParamsAsObject(availableParams);
   }
-  
+
   if (filterColumn) {
     const filterChip = $(`[data-db-column="${filterColumn}"]`);
-    const filterName = filterChip.find('.filter-name');
-    
+    const filterName = filterChip.find(".filter-name");
+
     if (isValueEmpty(filterValue)) {
-        if (!filterName.data('appended')) {
-            filterName.html(`${filterName.text()} is `);
-            filterName.data('appended', true);
-        }
+      if (!filterName.data("appended")) {
+        filterName.html(`${filterName.text()} is `);
+        filterName.data("appended", true);
+      }
     } else {
-        filterName.html(filterName.text().replace(/\s*is $/, ''));
-        filterName.data('appended', false);
+      filterName.html(filterName.text().replace(/\s*is $/, ""));
+      filterName.data("appended", false);
     }
   }
 
-  return currentRequest = $.ajax(url, {
-    type: 'GET',
+  return (currentRequest = $.ajax(url, {
+    type: "GET",
     data: queryString,
-    beforeSend: function() {
+    beforeSend: function () {
       if (currentRequest !== null) {
         currentRequest.abort();
       }
     },
-    success: function(data) {
-      var queryParam = jQuery.param(queryString)
-      window.history.pushState("", "", url + '?' + queryParam);
-      if ($('#view_type').val() == 'kanban') {
-        $.each(data.table.data, function(key, value) {
-          $('.' + key + ' .cards').html(value)
+    success: function (data) {
+      var queryParam = jQuery.param(queryString);
+      window.history.pushState("", "", url + "?" + queryParam);
+      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)
+        $(".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);
+        $(".cm-index-page__table-container").html(data);
       }
       if (sortData) {
-        const dropdownElement = document.querySelector('[data-behaviour="sort-button-toggle"]');
+        const dropdownElement = document.querySelector(
+          '[data-behaviour="sort-button-toggle"]'
+        );
         if (dropdownElement) {
           const dropdown = new bootstrap.Dropdown(dropdownElement);
           dropdown.show();
         }
       }
     },
-    error: function(jqxhr, textStatus, errorThrown) {
+    error: function (jqxhr, textStatus, errorThrown) {
       console.log(errorThrown, textStatus);
-    }
-  });
-}
+    },
+  }));
+};
 
-const isValueEmpty = function(value) { 
-  return value !== undefined && value !== null && value !== '' && (!Array.isArray(value) || value.length !== 0);
-}
+const isValueEmpty = function (value) {
+  return (
+    value !== undefined &&
+    value !== null &&
+    value !== "" &&
+    (!Array.isArray(value) || value.length !== 0)
+  );
+};
 
-$(document).on('change', '[data-behaviour="filter"]', function(e) {
-  var filterType = $(this).data('filter-type')
-  var filterColumn = $(this).data('db-column')
+$(document).on("change", '[data-behaviour="filter"]', function (e) {
+  var filterType = $(this).data("filter-type");
+  var filterColumn = $(this).data("db-column");
 
-  if (filterType == 'range') {
-    var rangeElements = $(this).parent().children()
-    var filterValue = $(rangeElements[0]).val() + ' to ' + $(rangeElements[1]).val()
+  if (filterType == "range") {
+    var rangeElements = $(this).parent().children();
+    var filterValue =
+      $(rangeElements[0]).val() + " to " + $(rangeElements[1]).val();
   } else {
-    var filterValue = $(this).val()
+    var filterValue = $(this).val();
   }
 
-  $(this).parents(':nth(1)').children(':first').children(':nth(1)').text(filterValue)
-  $(this).parents(':nth(1)').children(':first').children(':last').removeClass('hidden')
+  $(this)
+    .parents(":nth(1)")
+    .children(":first")
+    .children(":nth(1)")
+    .text(filterValue);
+  $(this)
+    .parents(":nth(1)")
+    .children(":first")
+    .children(":last")
+    .removeClass("hidden");
 
-  unhideClearFilterBtn(filterValue)
-  getFilteredData(filterType, filterValue, filterColumn)
+  unhideClearFilterBtn(filterValue);
+  getFilteredData(filterType, filterValue, filterColumn);
 });
 
-$(document).on('keyup', '[data-behaviour="input-search"]', function(e) {
+$(document).on("keyup", '[data-behaviour="input-search"]', function (e) {
   e.stopPropagation();
 
   var searchValue = $(this).val();
-  unhideClearFilterBtn(searchValue)
-  getFilteredData('search', searchValue)
+  unhideClearFilterBtn(searchValue);
+  getFilteredData("search", searchValue);
 });
 
-$(document).on('click', '[data-behaviour="filter-option"]', function(e) {
-  var filterType = $(this).data('filter-type')
-  var filterColumn = $(this).data('db-column')
+$(document).on("click", '[data-behaviour="filter-option"]', function (e) {
+  var filterType = $(this).data("filter-type");
+  var filterColumn = $(this).data("db-column");
 
   // Clear the search value post selection and regenerate the dropdown elements.
-  var searchInputElement = $(this).parents(':nth(1)').children(':first').children()
-  searchInputElement.val('')
-  CmFilter.dropdown_search(searchInputElement)
-
-  unhideFilter(filterType, filterColumn)
+  var searchInputElement = $(this)
+    .parents(":nth(1)")
+    .children(":first")
+    .children();
+  searchInputElement.val("");
+  CmFilter.dropdown_search(searchInputElement);
+
+  unhideFilter(filterType, filterColumn);
 });
 
-var unhideFilter = function(filterType, filterColumn) {
-  var filterInputElement = $('[data-behaviour="filter-input"][data-filter-type=' + filterType + '][data-db-column='+ filterColumn + ']')
-
-  filterInputElement.parent().removeClass('hidden');
-  filterInputElement.click()
+var unhideFilter = function (filterType, filterColumn) {
+  var filterInputElement = $(
+    '[data-behaviour="filter-input"][data-filter-type=' +
+      filterType +
+      "][data-db-column=" +
+      filterColumn +
+      "]"
+  );
+
+  filterInputElement.parent().removeClass("hidden");
+  filterInputElement.click();
 };
 
 // Search inside the dropdowns
-$(document).on('keyup', '[data-behaviour="dropdown-filter-search"]', function(e) {
-  CmFilter.dropdown_search($(this))
-});
+$(document).on(
+  "keyup",
+  '[data-behaviour="dropdown-filter-search"]',
+  function (e) {
+    CmFilter.dropdown_search($(this));
+  }
+);
 
 // Method to decode the encoded nested and/or complex hash and convert it to
 // object that is used for filters while sending the data to the backend.
 var getParamsAsObject = function (query) {
-  query = query.substring(query.indexOf('?') + 1);
+  query = query.substring(query.indexOf("?") + 1);
 
   var re = /([^&=]+)=?([^&]*)/g;
   var decodeRE = /\+/g;
@@ -183,199 +223,257 @@ var getParamsAsObject = function (query) {
     return decodeURIComponent(str.replace(decodeRE, " "));
   };
 
-  var params = {}, e;
-  while (e = re.exec(query)) {
-    var k = decode(e[1]), v = decode(e[2]);
-    if (k.substring(k.length - 2) === '[]') {
+  var params = {},
+    e;
+  while ((e = re.exec(query))) {
+    var k = decode(e[1]),
+      v = decode(e[2]);
+    if (k.substring(k.length - 2) === "[]") {
       k = k.substring(0, k.length - 2);
       (params[k] || (params[k] = [])).push(v);
-    }
-    else params[k] = v;
+    } else params[k] = v;
   }
 
   var assign = function (obj, keyPath, value) {
     var lastKeyIndex = keyPath.length - 1;
     for (var i = 0; i < lastKeyIndex; ++i) {
       var key = keyPath[i];
-      if (!(key in obj))
-        obj[key] = {}
+      if (!(key in obj)) obj[key] = {};
       obj = obj[key];
     }
     obj[keyPath[lastKeyIndex]] = value;
-  }
+  };
 
   for (var prop in params) {
-    var structure = prop.split('[');
+    var structure = prop.split("[");
     if (structure.length > 1) {
       var levels = [];
       structure.forEach(function (item, i) {
-        var key = item.replace(/[?[\]\\ ]/g, '');
+        var key = item.replace(/[?[\]\\ ]/g, "");
         levels.push(key);
       });
       assign(params, levels, params[prop]);
-      delete(params[prop]);
+      delete params[prop];
     }
   }
   return params;
 };
 
-$(document).on('click', '[data-behaviour="filter-input"]', function(e) {
-  var filterType = $(this).data('filter-type')
-  var filterColumn = $(this).data('db-column')
-
-  var filterElement = $('[data-behaviour="filter"][data-filter-type=' + filterType + '][data-db-column=' + filterColumn +']')
-
-  if (filterType == 'range') {
-    filterElement.parent().toggleClass('hidden')
-  } else if (filterType == 'date') {
-    filterElement.click()
+$(document).on("click", '[data-behaviour="filter-input"]', function (e) {
+  var filterType = $(this).data("filter-type");
+  var filterColumn = $(this).data("db-column");
+
+  var filterElement = $(
+    '[data-behaviour="filter"][data-filter-type=' +
+      filterType +
+      "][data-db-column=" +
+      filterColumn +
+      "]"
+  );
+
+  if (filterType == "range") {
+    filterElement.parent().toggleClass("hidden");
+  } else if (filterType == "date") {
+    filterElement.click();
   }
-})
+});
 
 // Remove all the applied filters and reload the page
-$(document).on('click', '.clear-btn', function(e) {
-  window.location.href = window.location.href.split("?")[0]
-})
+$(document).on("click", ".clear-btn", function (e) {
+  window.location.href = window.location.href.split("?")[0];
+});
 
-var unhideClearFilterBtn = function(filterValue) {
+var unhideClearFilterBtn = function (filterValue) {
   if (isValueEmpty(filterValue)) {
-    $('.clear-btn').removeClass('hidden')
+    $(".clear-btn").removeClass("hidden");
   }
-}
+};
 
-$(document).on('click', '[data-behaviour="select-option"] [data-behaviour="multi-select-filter-checkbox"]', function(e) {
-  $(this).prop('checked', !$(this).prop('checked'));
-})
+$(document).on(
+  "click",
+  '[data-behaviour="select-option"] [data-behaviour="multi-select-filter-checkbox"]',
+  function (e) {
+    $(this).prop("checked", !$(this).prop("checked"));
+  }
+);
 // Selecting options for single and multi select filters
-$(document).on('click', '[data-behaviour="select-option"]', function(e) {
-  var filterType = $(this).data('filter-type')
-  var filterColumn = $(this).data('db-column')
-
-  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');
+$(document).on("click", '[data-behaviour="select-option"]', function (e) {
+  var filterType = $(this).data("filter-type");
+  var filterColumn = $(this).data("db-column");
+
+  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");
       }
-      $(this).addClass('selected')
+      $(this).addClass("selected");
     }
 
-    $(this).parents(':nth(4)').children(':first').children(':nth(1)').text(filterText)
-    $(this).parents(':nth(4)').children(':first').children(':last').removeClass('hidden')
+    $(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.
-    var searchInputElement = $(this).parents(':nth(1)').children(':first').children()
-    searchInputElement.val('')
-    CmFilter.dropdown_search(searchInputElement)
-
-    unhideClearFilterBtn(filterValue)
-    getFilteredData(filterType, filterValue, filterColumn)
-  }
-  else if (filterType == 'multi_select') {
-    var parentChip = $(this).parent().siblings(':first')
-    var checkboxElement = $(this).find('[data-behaviour="multi-select-filter-checkbox"]')
-    checkboxElement.prop('checked', !checkboxElement.prop('checked'))
-    var checkedCount = $(this).parent().find('[data-behaviour="multi-select-filter-checkbox"]').filter(':checked').length
-    var filterValue = []
-    var filterValueText = []
-    if (checkboxElement.prop('checked')) {
-      var chip = $('<div class="chip"></div>')
-      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))
+    var searchInputElement = $(this)
+      .parents(":nth(1)")
+      .children(":first")
+      .children();
+    searchInputElement.val("");
+    CmFilter.dropdown_search(searchInputElement);
+
+    unhideClearFilterBtn(filterValue);
+    getFilteredData(filterType, filterValue, filterColumn);
+  } else if (filterType == "multi_select") {
+    var parentChip = $(this).parent().siblings(":first");
+    var checkboxElement = $(this).find(
+      '[data-behaviour="multi-select-filter-checkbox"]'
+    );
+    checkboxElement.prop("checked", !checkboxElement.prop("checked"));
+    var checkedCount = $(this)
+      .parent()
+      .find('[data-behaviour="multi-select-filter-checkbox"]')
+      .filter(":checked").length;
+    var filterValue = [];
+    var filterValueText = [];
+    if (checkboxElement.prop("checked")) {
+      var chip = $('<div class="chip"></div>');
+      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++) {
+      var chipElement = parentChip.find(".chip");
+      for (var i = 0; i < chipElement.length; i++) {
         if ($(chipElement[i]).text() == $(this).text()) {
-          $(chipElement[i]).remove()
-          break
+          $(chipElement[i]).remove();
+          break;
         }
       }
     }
-    $(this).parent().find('[data-behaviour="multi-select-filter-checkbox"]').filter(':checked').each(function() {
-      filterValue.push($(this).parent().data('value'))
-      filterValueText.push($(this).parent().text())
-    })
+    $(this)
+      .parent()
+      .find('[data-behaviour="multi-select-filter-checkbox"]')
+      .filter(":checked")
+      .each(function () {
+        filterValue.push($(this).parent().data("value"));
+        filterValueText.push($(this).parent().text());
+      });
 
     if (checkedCount > 0) {
-      parentChip.addClass('active')
-      $(this).parents(':nth(1)').children(':last').addClass('active')
+      parentChip.addClass("active");
+      $(this).parents(":nth(1)").children(":last").addClass("active");
     } else {
-      parentChip.removeClass('active')
-      $(this).parents(':nth(1)').children(':last').removeClass('active')
+      parentChip.removeClass("active");
+      $(this).parents(":nth(1)").children(":last").removeClass("active");
     }
     // Truncate filter value logic
-    var truncatedFilterValue = filterValueText[0]
+    var truncatedFilterValue = filterValueText[0];
     if (filterValue.length > 1) {
-      truncatedFilterValue += ' + ' + (filterValue.length - 1);
+      truncatedFilterValue += " + " + (filterValue.length - 1);
     }
     // Update the filter input element with the truncated value
-    var filterInputElement = $(this).parents(':nth(4)').children(':first')
+    var filterInputElement = $(this).parents(":nth(4)").children(":first");
     if (filterValue.length > 0) {
-      filterInputElement.children(':nth(1)').text(truncatedFilterValue)
-      filterInputElement.children(':last').removeClass('hidden')
+      filterInputElement.children(":nth(1)").text(truncatedFilterValue);
+      filterInputElement.children(":last").removeClass("hidden");
     } else {
-      filterInputElement.children(':nth(1)').text('')
-      filterInputElement.children(':last').addClass('hidden')
+      filterInputElement.children(":nth(1)").text("");
+      filterInputElement.children(":last").addClass("hidden");
     }
     // Clear the search value post selection and regenerate the dropdown elements.
-    var searchInputElement = $(this).parents(':nth(1)').children(':first').children(':last')
-    searchInputElement.val('')
-    CmFilter.dropdown_search(searchInputElement)
-    unhideClearFilterBtn(filterValue)
-    getFilteredData(filterType, filterValue, filterColumn)
+    var searchInputElement = $(this)
+      .parents(":nth(1)")
+      .children(":first")
+      .children(":last");
+    searchInputElement.val("");
+    CmFilter.dropdown_search(searchInputElement);
+    unhideClearFilterBtn(filterValue);
+    getFilteredData(filterType, filterValue, filterColumn);
   }
 });
 
-
 // Remove single applied filter.
-$(document).on('click', '.filter-chip-remove', function(e) {
-  var url = window.location.pathname
-  var filterType = $(this).parent().data('filter-type')
-  var filterColumn = $(this).parent().data('db-column')
+$(document).on("click", ".filter-chip-remove", function (e) {
+  var url = window.location.pathname;
+  var filterType = $(this).parent().data("filter-type");
+  var filterColumn = $(this).parent().data("db-column");
 
-  var searchParams = window.location.search
+  var searchParams = window.location.search;
   if (searchParams.length > 0) {
-    var queryString = getParamsAsObject(searchParams)
-    if (queryString['filters'][filterType] != undefined) {
-      delete(queryString['filters'][filterType][filterColumn])
-      var queryParam = jQuery.param(queryString)
-      window.history.pushState("", "", url + '?' + queryParam);
-      window.location.reload()
+    var queryString = getParamsAsObject(searchParams);
+    if (queryString["filters"][filterType] != undefined) {
+      delete queryString["filters"][filterType][filterColumn];
+      var queryParam = jQuery.param(queryString);
+      window.history.pushState("", "", url + "?" + queryParam);
+      window.location.reload();
     }
   }
 });
 
-$(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
-  var filterType = $(this).parents(':nth(5)').find('.filter-chip').data('filter-type');
-  var filterColumn = $(this).parents(':nth(5)').find('.filter-chip').data('db-column');
-  var filterValue = []; 
+$(document).on("click", '[data-behaviour="selected-chip"]', function (e) {
+  var filterType = $(this)
+    .parents(":nth(5)")
+    .find(".filter-chip")
+    .data("filter-type");
+  var filterColumn = $(this)
+    .parents(":nth(5)")
+    .find(".filter-chip")
+    .data("db-column");
+  var filterValue = [];
   var filterValueText = $(this).siblings().text();
-  var selectElement = $('[data-behaviour="select-option"][data-filter-type=' + filterType + '][data-db-column=' + filterColumn + ']');
+  var selectElement = $(
+    '[data-behaviour="select-option"][data-filter-type=' +
+      filterType +
+      "][data-db-column=" +
+      filterColumn +
+      "]"
+  );
   $(this).parent().remove();
   for (var i = 0; i < selectElement.length; i++) {
-      if ($(selectElement[i]).text() == filterValueText) {
-          var checkboxElement = $(selectElement[i]).find('[data-behaviour="multi-select-filter-checkbox"]');
-          checkboxElement.prop('checked', false);  // Uncheck the box
-          break;
-      }
+    if ($(selectElement[i]).text() == filterValueText) {
+      var checkboxElement = $(selectElement[i]).find(
+        '[data-behaviour="multi-select-filter-checkbox"]'
+      );
+      checkboxElement.prop("checked", false); // Uncheck the box
+      break;
+    }
   }
-  selectElement.find('[data-behaviour="multi-select-filter-checkbox"]').filter(':checked').each(function() {
-      filterValue.push($(this).parent().data('value'));
-  });
-  var checkedCount = selectElement.find('[data-behaviour="multi-select-filter-checkbox"]').filter(':checked').length;
+  selectElement
+    .find('[data-behaviour="multi-select-filter-checkbox"]')
+    .filter(":checked")
+    .each(function () {
+      filterValue.push($(this).parent().data("value"));
+    });
+  var checkedCount = selectElement
+    .find('[data-behaviour="multi-select-filter-checkbox"]')
+    .filter(":checked").length;
   if (checkedCount < 1) {
-      selectElement.parent().siblings(':first').removeClass('active');
-      selectElement.parent().siblings(':last').removeClass('active');
+    selectElement.parent().siblings(":first").removeClass("active");
+    selectElement.parent().siblings(":last").removeClass("active");
   }
   unhideClearFilterBtn(filterValue);
   getFilteredData(filterType, filterValue, filterColumn);
 });
 
-$(document).on("change", '[data-behaviour="sort-column"], [data-behaviour="sort-direction"]', function (e) {
-  getFilteredData(null, null, null, true);
-});
+$(document).on(
+  "change",
+  '[data-behaviour="sort-column"], [data-behaviour="sort-direction"]',
+  function (e) {
+    getFilteredData(null, null, null, true);
+  }
+);
 
 $(document).on("click", '[data-behaviour="reset-sort"]', function (e) {
   let url = window.location.pathname;
@@ -384,15 +482,15 @@ $(document).on("click", '[data-behaviour="reset-sort"]', function (e) {
   delete queryString["sort_direction"];
   let queryParam = jQuery.param(queryString);
   $.ajax({
-    type: 'POST',
+    type: "POST",
     url: url + "/reset_sort_columns",
-    success: function(data) {
+    success: function (data) {
       window.history.pushState("", "", url + "?" + queryParam);
       window.location.reload();
     },
-    error: function(jqxhr, textStatus, errorThrown) {
+    error: function (jqxhr, textStatus, errorThrown) {
       console.log(errorThrown, textStatus);
-    }
+    },
   });
 });
 
@@ -401,8 +499,13 @@ $(document).on(
   '[data-behaviour="multi-select-filter-apply"]',
   function (e) {
     $(this).parent();
-    $(this).closest('[data-behaviour="multi-select-filter-dropdown"]').removeClass('show');
-    $(this).closest('[data-behaviour="multi-select-filter-wrapper"]').find('[data-behaviour="filter-input"]').removeClass('show');
+    $(this)
+      .closest('[data-behaviour="multi-select-filter-dropdown"]')
+      .removeClass("show");
+    $(this)
+      .closest('[data-behaviour="multi-select-filter-wrapper"]')
+      .find('[data-behaviour="filter-input"]')
+      .removeClass("show");
   }
 );
 
@@ -410,56 +513,62 @@ $(document).on(
   "click",
   '[data-behaviour="multi-select-filter-clear"]',
   function (e) {
-    const dropdown = $(this).closest('[data-behaviour="multi-select-filter-dropdown"]');
+    const dropdown = $(this).closest(
+      '[data-behaviour="multi-select-filter-dropdown"]'
+    );
 
-    const filterInputElement = $(this).parents(':nth(4)').children(':first')
-    filterInputElement.children(':nth(1)').text('')
+    const filterInputElement = $(this).parents(":nth(4)").children(":first");
+    filterInputElement.children(":nth(1)").text("");
 
-    const checkboxes = dropdown.find('[data-behaviour="multi-select-filter-checkbox"]:checked');
-    checkboxes.each(function() {
+    const checkboxes = dropdown.find(
+      '[data-behaviour="multi-select-filter-checkbox"]:checked'
+    );
+    checkboxes.each(function () {
       this.checked = false;
     });
 
-    const chips = dropdown.find('.chip');
-    chips.each(function() {
+    const chips = dropdown.find(".chip");
+    chips.each(function () {
       $(this).remove();
     });
 
-    const chipsArea = dropdown.find('[data-behaviour="multi-select-filter-chips-area"]');
-    chipsArea.removeClass('active');
+    const chipsArea = dropdown.find(
+      '[data-behaviour="multi-select-filter-chips-area"]'
+    );
+    chipsArea.removeClass("active");
 
     const filter_element = dropdown.prev();
-    const db_column = filter_element.attr('data-db-column');
-    getFilteredData(filter_element.attr('data-filter-type'), [], db_column);
+    const db_column = filter_element.attr("data-db-column");
+    getFilteredData(filter_element.attr("data-filter-type"), [], db_column);
   }
 );
 
-const initializeFilterLabels = function(filterParams) {
-  Object.keys(filterParams).forEach(filterType => {
-      const filterObj = filterParams[filterType];
-      Object.keys(filterObj).forEach(filterColumn => {
-          const filterChip = $(`[data-db-column="${filterColumn}"]`);
-          const filterName = filterChip.find('.filter-name');
-
-          // Append "is" to indicate active filter
-          if (filterName.length && !filterName.text().endsWith('is')) {
-              filterName.html(`${filterName.text()} is `);
-              filterName.data('appended', true);
-          }
-      });
+const initializeFilterLabels = function (filterParams) {
+  Object.keys(filterParams).forEach((filterType) => {
+    const filterObj = filterParams[filterType];
+    Object.keys(filterObj).forEach((filterColumn) => {
+      const filterChip = $(`[data-db-column="${filterColumn}"]`);
+      const filterName = filterChip.find(".filter-name");
+
+      // Append "is" to indicate active filter
+      if (filterName.length && !filterName.text().endsWith("is")) {
+        filterName.html(`${filterName.text()} is `);
+        filterName.data("appended", true);
+      }
+    });
   });
 };
 
-$(document).ready(function() {
+$(document).ready(function () {
   const initialFilterParams = getParamsAsObject(window.location.search);
   initializeFilterLabels(initialFilterParams.filters || {});
 });
 
-$(document).ready(function() {
-  const chipsAreas = document.querySelectorAll('[data-behaviour="multi-select-filter-chips-area"]');
-  chipsAreas.forEach(function(chipsArea) {
-    chipsArea.classList.add('active');
+$(document).ready(function () {
+  const chipsAreas = document.querySelectorAll(
+    '[data-behaviour="multi-select-filter-chips-area"]'
+  );
+  chipsAreas.forEach(function (chipsArea) {
+    chipsArea.classList.add("active");
   });
 });
-
-

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";
+
 $(document).on(
   "keypress keyup blur",
   "[data-behaviour='decimal-only'], [data-behaviour='filter'][data-filter-type='range']",
@@ -55,6 +56,11 @@ $(document).on("click", '[data-behaviour="offcanvas"]', function (e) {
       );
       drawerForm.show();
       initializeComponents();
+      $("#cm-drawer .select-2").select2({
+        theme: "bootstrap-5",
+        dropdownParent: "#cm-drawer",
+      });
+
       handleDrawerFormSubmission(drawerForm);
     },
     error: function (error) {
@@ -246,4 +252,4 @@ export function initializeComponents() {
   var calculatedHeight = "calc(100vh - " + headerElemHeight + "px" + ")";
   $(".table-wrapper").css("maxHeight", calculatedHeight);
   LocalTime.start();
-  }
+}

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

@@ -77,8 +77,7 @@
         &:focus {
           border-color: $brand-color !important;
           outline: 0 !important;
-          box-shadow:
-            inset 0 1px 1px rgba(0, 0, 0, 0.075),
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
             0 0 8px rgba(102, 175, 233, 0.6) !important;
         }
       }
@@ -96,8 +95,7 @@
             &:focus {
               border-color: $brand-color;
               outline: 0;
-              box-shadow:
-                inset 0 1px 1px rgba(0, 0, 0, 0.075),
+              box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
                 0 0 8px rgba(102, 175, 233, 0.6);
             }
             .select2-selection__rendered {

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

@@ -132,3 +132,7 @@ a {
 
   z-index: 11;
 }
+
+.toast {
+  background-color: $white;
+}

data/app/controllers/cm_admin/static_controller.rb

@@ -2,11 +2,14 @@ module CmAdmin
   class StaticController < ::ActionController::Base
     layout 'static'
 
-    def dashboard
-    end
+    def dashboard; end
 
-    def error_403
-      
+    def index
+      fallback_path = current_user.present? ? "#{CmAdmin::Engine.mount_path}/users" : '/users/sign_in'
+      redirect_path = current_user&.cm_role&.default_redirect_path || fallback_path
+      redirect_to redirect_path
     end
+
+    def error_403; end
   end
 end

data/app/models/cm_role.rb

@@ -4,6 +4,19 @@ class CmRole < ApplicationRecord
   has_many :cm_permissions
 
   validates :name, uniqueness: true, presence: true
+  validate :valid_default_redirect_path
 
   has_paper_trail
+
+  private
+
+  def valid_default_redirect_path
+    return if default_redirect_path.blank?
+
+    begin
+      Rails.application.routes.recognize_path(default_redirect_path)
+    rescue ActionController::RoutingError
+      errors.add(:default_redirect_path, 'should be valid rails path')
+    end
+  end
 end

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

@@ -18,7 +18,6 @@ module CmAdmin::CmRole
       cm_show page_title: :name do
         custom_action name: 'create_role_permission', route_type: 'member', verb: 'post', path: ':id/create_role_permission',
                       display_type: :route do
-          # allowed_params = params.permit(role_permission: []).to_h
           @role = CmRole.find(params[:id])
           params[:role_permission].except(:submit).each do |model_name, action_arr|
             action_names = action_arr.select { |k, v| k if v.key?('is_checked') }.keys
@@ -37,6 +36,7 @@ module CmAdmin::CmRole
         tab :profile, '' do
           cm_show_section 'Role details' do
             field :name
+            field :default_redirect_path
             field :created_at, field_type: :date, format: '%d %b, %Y'
             field :updated_at, field_type: :date, format: '%d %b, %Y'
           end
@@ -47,12 +47,14 @@ module CmAdmin::CmRole
       cm_new page_title: 'Add Role', page_description: 'Enter all details to add role' do
         cm_section 'Details' do
           form_field :name, input_type: :string
+          form_field :default_redirect_path, input_type: :string, helper_text: 'Enter a correct path to have default redirect path for this role. Usually it will be /cm_admin/<model name in plural>. Example: /cm_admin/users'
         end
       end
 
       cm_edit page_title: 'Edit Role', page_description: 'Enter all details to edit role' do
         cm_section 'Details' do
           form_field :name, input_type: :string
+          form_field :default_redirect_path, input_type: :string, helper_text: 'Enter a correct path to have default redirect path for this role. Usually it will be /cm_admin/<model name in plural>. Example: /cm_admin/users'
         end
       end
     end

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

@@ -55,4 +55,5 @@
     p.count-text.m-0 Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
 
-/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }
+= column_pop_up(@model)
+= manage_column_pop_up(@model)

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

@@ -11,4 +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'
+
+= column_pop_up(@model)
+= manage_column_pop_up(@model)

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

@@ -52,3 +52,6 @@
   .pagination-bar
     p.count-text.m-0 Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
+
+= column_pop_up(@model)
+= manage_column_pop_up(@model)

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

@@ -15,6 +15,3 @@
       == render "cm_admin/#{@model.name.underscore}/card"
     - elsif params[:view_type] == 'kanban' || @current_action.view_type == :kanban
       == render 'cm_admin/main/kanban'
-    = column_pop_up(@model)
-    = manage_column_pop_up(@model)
-

data/docs/RoleManagement.md

@@ -48,25 +48,25 @@ module Authentication
     before_action :check_current_user
     before_action :set_params
   end
-  
+
   def set_params
     Current.request_params = params if params
   end
 
-  # Add other methods here 
+  # Add other methods here
 
 end
 ```
 
-3. Add `belongs_to :cm_role, optional: true` in the `User` model.  
-4. Include `CmRole` in the `config.included_models` section of `config/initializers/zcm_admin.rb`.  
+3. Add `belongs_to :cm_role, optional: true` in the `User` model.
+4. Include `CmRole` in the `config.included_models` section of `config/initializers/zcm_admin.rb`.
 5. Assign `cm_role_id` to `1` for any user in the `User` Model, and use that user to log in.
 
 ## Setting up scopes
 
 By default, `Full Access` scopes is added to each permission item. To add additional scopes, use the following syntax:
 
-```ruby
+````ruby
 ...
 cm_admin do
   actions only: []
@@ -91,7 +91,7 @@ cm_admin do
     page_title 'User'
   end
 end
-```
+````
 
 Then, create a policy file for the respective model, e.g., `app/policies/cm_admin/user_policy.rb`:
 
@@ -106,7 +106,6 @@ end
 
 This structure helps ensure that your application's role and permission management is both flexible and secure.
 
-
 ## Permission based fields
 
 We can apply permission logic to display a field on the interface. You can do this with the following syntax.
@@ -126,3 +125,19 @@ end
 
 ```
 
+## Adding Default Redirect Path for a Role
+
+- We can add default redirect path for a role via cm admin.
+- need to add this on `routes.rb`.
+
+```ruby
+...
+  root 'cm_admin/static#index'
+```
+
+- Create a migration to add a column for default redirect path. (Will be automatically added in new apps)
+
+```ruby
+...
+  add_column :cm_roles, :default_redirect_path, :string, default: "#{CmAdmin::Engine.mount_path}/users"
+```

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.14'
+  VERSION = '3.0.15'
 end

data/lib/cm_admin/view_helpers.rb

@@ -84,7 +84,7 @@ module CmAdmin
     end
 
     def toast_message(message, toast_type)
-      tag.div class: 'position-fixed bottom-0 end-0 p-3', style: 'z-index: 11' do
+      tag.div class: 'cm-toast-container' do
         tag.div class: "toast #{toast_type == 'alert' ? 'text-white bg-danger' : ''}", role: 'alert', 'aria-live': 'assertive', 'aria-atomic': 'true', data: { behaviour: 'toast' } do
           tag.div class: 'd-flex' do
             concat tag.div message.html_safe, class: 'toast-body'

data/lib/generators/cm_admin/install_role_generator.rb

@@ -6,7 +6,7 @@ module CmAdmin
       source_root File.expand_path('templates', __dir__)
 
       def create_migration
-        generate 'migration', 'CreateCmRole name:string'
+        generate 'migration', 'CreateCmRole name:string default_redirect_path:string'
         generate 'migration', 'CreateCmPermission action_name:string action_display_name:string ar_model_name:string scope_name:string cm_role:references'
         rake 'db:migrate'
         puts "Created migration"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails