kaui 4.0.15 → 4.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3452f98093718cc5761ee58798ac78467b66d046fc5cf17556060bd02f7637ce
-  data.tar.gz: 555af1e3377e9fcb143716618644e2701138d2a731c7f970761691a0d3ecd0fa
+  metadata.gz: ebd7c6655e0d1bad878e92414dfe4172beb34bd5285eb6032a862519cbf8b891
+  data.tar.gz: 8886bda85a848030e5b057da3a567e0c5a65bd6c0a5c021961960fc524edcdc6
 SHA512:
-  metadata.gz: 30d0269df326b5db8336c910ee4a111da1101d5212c43b728fbac297015b9a18409ffed04978867194bac6e7feda6beea4ea101469e201ab6465de74c863da6d
-  data.tar.gz: 3c289f1741f5ddda2c614adfca575dff1b540ea56cde455beb8fb870bbb4c898c9c793ffd0b991818fe6883f55c50a4412efbd45b0c9d2f0180ac67c7637698c
+  metadata.gz: f23ecc404eda3252987e4fad61ad61618aa0b4211c7f60a9454f97ffdcc06a67222c684b012babd2a25598400639318bb6e84f2adae9b9b5fae7347b75cda73a
+  data.tar.gz: 6378adf68310234434460ec333dbb2ce956e119c744146478034a11d581287386875b04c2f9eb1adfd50f98ee99264171b3f209dcd2107f4f5b7c171a672a242

data/app/assets/javascripts/kaui/multi_functions_bar_utils.js

@@ -89,7 +89,16 @@ function searchQuery(account_id){
     searchLabels = searchFields.map(function() {
       var filter = $(this).find('.search-field-filter').val();
       var value = $(this).find('.search-field-value').val().trim(); // Trim whitespace from value
-      var columnName = $(this).find('.search-field-filter').attr('name').replace('Filter', '').toLowerCase().replace(/\s+/g, '_');
+      var fieldSelect = $(this).find('.search-field-name');
+      var columnName = fieldSelect.length > 0 ?
+        fieldSelect.find('option:selected').text().trim() :
+        $(this).find('.search-field-filter').attr('name').replace('Filter', '').trim();
+
+      if (fieldSelect.length > 0 && !fieldSelect.val()) {
+        return;
+      }
+
+      columnName = columnName.toLowerCase().replace(/\s+/g, '_');
 
       if (value !== '') {
         if (filter === 'like') {
@@ -118,8 +127,9 @@ function searchQuery(account_id){
     searchLabels = builtParams.join('&');
   }
 
-  if (account_id !== undefined && account_id !== '' && account_id.trim() !== '') {
-    searchLabels += '&' + encodeURIComponent('account_id[eq]') + '=' + encodeURIComponent(account_id.trim());
+  var hasAccountIdFilter = /(^|&)account_id%5B/i.test(searchLabels);
+  if (account_id !== undefined && account_id !== '' && account_id.trim() !== '' && !hasAccountIdFilter) {
+    searchLabels += (searchLabels.length > 0 ? '&' : '') + encodeURIComponent('account_id[eq]') + '=' + encodeURIComponent(account_id.trim());
   }
 
   var searchLabelString = searchLabels.length > 0 ? ('_q=1&' + searchLabels) : '';
@@ -166,7 +176,18 @@ function showAdvanceSearchModal() {
     var value = filterAndValue[1].trim();
 
     var template = document.getElementById('search-field-template').content.cloneNode(true);
-    template.querySelector('.search-field-label').textContent = columnName.replace(/([A-Z])/g, ' $1').trim();
+    if (template.querySelector('.search-field-label')) {
+      template.querySelector('.search-field-label').textContent = columnName.replace(/([A-Z])/g, ' $1').trim();
+    }
+    if (template.querySelector('.search-field-name')) {
+      var fieldOptions = template.querySelectorAll('.search-field-name option');
+      for (var i = 0; i < fieldOptions.length; i++) {
+        if (fieldOptions[i].text.trim().toLowerCase() === columnName.toLowerCase()) {
+          fieldOptions[i].selected = true;
+          break;
+        }
+      }
+    }
     template.querySelector('.search-field-filter').name = columnName + 'Filter';
     template.querySelector('.search-field-filter').value = filter;
     template.querySelector('.search-field-value').name = columnName;
@@ -303,6 +324,12 @@ function populateSavedSearchesDropdown() {
   });
 }
 
+function getAdvancedSearchText(key, fallback) {
+  var modal = $('#advanceSearchModal');
+  var value = modal.length ? modal.data(key) : null;
+  return value || fallback;
+}
+
 $(document).ready(function() {
   populateSavedSearchesDropdown();
 
@@ -314,9 +341,9 @@ $(document).ready(function() {
   $(document).on('input', '#savedSearchName', function() {
     var val = $(this).val().trim();
     if (val === '') {
-      $('#saveAdvanceSearch').text('Save Search As...');
+      $('#saveAdvanceSearch').text(getAdvancedSearchText('save-search-label', 'Save Search As...'));
     } else {
-      $('#saveAdvanceSearch').text('Save');
+      $('#saveAdvanceSearch').text(getAdvancedSearchText('save-label', 'Save'));
     }
   });
 
@@ -353,13 +380,28 @@ $(document).ready(function() {
        // Check if there are any search fields before calling searchQuery(),
        // because searchQuery() calls clearAdvanceSearch() (which reloads the page)
        // when no fields exist.
-       if ($('.search-field').length === 0 && $('#search-labels-container .label').length === 0) {
-         alert("Please enter at least one search field.");
+       var hasSearchValue = false;
+       var hasMissingField = false;
+       $('.search-field-value').each(function() {
+         if ($(this).val().trim() !== '') {
+           hasSearchValue = true;
+           var fieldSelect = $(this).closest('.search-field').find('.search-field-name');
+           if (fieldSelect.length > 0 && !fieldSelect.val()) {
+             hasMissingField = true;
+           }
+         }
+       });
+       if (!hasSearchValue && $('#search-labels-container .label').length === 0) {
+         alert(getAdvancedSearchText('empty-value-message', 'Please enter at least one search field.'));
+         return;
+       }
+       if (hasMissingField) {
+         alert(getAdvancedSearchText('missing-field-message', 'Please select a search field for each rule with a value.'));
          return;
        }
        searchParams = searchQuery();
        if (!searchParams) {
-         alert("Please enter at least one search field.");
+         alert(getAdvancedSearchText('empty-value-message', 'Please enter at least one search field.'));
          return;
        }
        searchParams = searchParams.replace(/account_id/g, 'ac_id');
@@ -370,7 +412,7 @@ $(document).ready(function() {
     saveSavedSearches(searches);
     
     input.val('');
-    $('#saveAdvanceSearch').text('Save Search As...');
+    $('#saveAdvanceSearch').text(getAdvancedSearchText('save-search-label', 'Save Search As...'));
     container.hide();
     
     populateSavedSearchesDropdown();
@@ -380,7 +422,7 @@ $(document).ready(function() {
   $(document).on('hidden.bs.modal', '#advanceSearchModal', function () {
     $('#save-search-container').hide();
     $('#savedSearchName').val('');
-    $('#saveAdvanceSearch').text('Save Search As...');
+    $('#saveAdvanceSearch').text(getAdvancedSearchText('save-search-label', 'Save Search As...'));
   });
 
   $(document).on('click', '.apply-saved-search', function(e) {
@@ -406,4 +448,4 @@ $(document).ready(function() {
       populateSavedSearchesDropdown();
     }
   });
-});
+});

data/app/assets/stylesheets/kaui/account.css

@@ -61,9 +61,15 @@ table.dataTable thead > tr > th {
 
 /* app/views/kaui/accounts/_account_filterbar.html.erb */
 
+.kaui-accounts-index .kaui-accounts-index-filterbar .modal-dialog {
+  max-width: 52rem;
+  width: calc(100% - 2rem);
+}
+
 .kaui-accounts-index .modal-content {
   border-radius: 1rem;
   min-width: 40.5rem;
+  width: 100%;
 }
 
 .kaui-accounts-index .modal-body {
@@ -76,9 +82,74 @@ table.dataTable thead > tr > th {
 }
 
 .kaui-accounts-index .modal-footer {
+  align-items: center;
+  border-top: 0.0625rem solid #E9EAEB;
+  display: flex;
+  gap: 0.75rem;
+  justify-content: space-between;
   padding: 1rem 1.5rem 1.5rem 1.5rem !important;
 }
 
+.kaui-accounts-index .advanced-search-footer-left,
+.kaui-accounts-index .advanced-search-footer-right {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.kaui-accounts-index .advanced-search-button {
+  border-radius: 0.75rem;
+  font-size: 0.875rem;
+  font-weight: 600;
+  height: 2.75rem;
+  justify-content: center;
+  line-height: 1.25rem;
+  min-width: 7.75rem;
+  padding: 0.625rem 1rem;
+  text-transform: none;
+  transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.kaui-accounts-index .advanced-search-button:focus {
+  box-shadow: 0 0 0 0.25rem rgba(46, 144, 250, 0.16);
+}
+
+.kaui-accounts-index .advanced-search-button-secondary {
+  background: #FFFFFF;
+  border: 0.0625rem solid #B2DDFF;
+  color: #175CD3;
+}
+
+.kaui-accounts-index .advanced-search-button-secondary:hover {
+  background: #EFF6FF;
+  border-color: #84CAFF;
+  color: #175CD3;
+}
+
+.kaui-accounts-index .advanced-search-button-ghost {
+  background: #FFFFFF;
+  border: 0.0625rem solid #D5D7DA;
+  color: #414651;
+}
+
+.kaui-accounts-index .advanced-search-button-ghost:hover {
+  background: #FAFAFA;
+  border-color: #A4A7AE;
+  color: #181D27;
+}
+
+.kaui-accounts-index .advanced-search-button-primary {
+  background: #2E90FA;
+  border: 0.0625rem solid #2E90FA;
+  color: #FFFFFF;
+}
+
+.kaui-accounts-index .advanced-search-button-primary:hover {
+  background: #175CD3;
+  border-color: #175CD3;
+  color: #FFFFFF;
+}
+
 .kaui-accounts-index .modal-title {
   font-weight: 600;
   font-size: 1.125rem;
@@ -200,10 +271,106 @@ table.dataTable thead > tr > th {
 }
 
 .kaui-accounts-index #search-fields-container {
+  display: flex;
+  flex-direction: column;
+  margin: 0;
+}
+
+.kaui-accounts-index .advanced-search-builder {
   display: flex;
   flex-direction: column;
   gap: 1rem;
-  margin: 1rem 0.75rem;
+}
+
+.kaui-accounts-index .advanced-search-group {
+  background: #EFF6FF;
+  border: 0.125rem solid #B2DDFF;
+  border-radius: 0.75rem;
+  padding: 1rem;
+}
+
+.kaui-accounts-index .advanced-search-group-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  margin-bottom: 1rem;
+}
+
+.kaui-accounts-index .advanced-search-group-title {
+  color: #175CD3;
+  font-size: 0.875rem;
+  font-weight: 700;
+  letter-spacing: 0.03em;
+  line-height: 1.25rem;
+}
+
+.kaui-accounts-index .advanced-search-group-description {
+  color: #535862;
+  font-size: 0.8125rem;
+  line-height: 1.25rem;
+  margin-top: 0.125rem;
+}
+
+.kaui-accounts-index .advanced-search-rules {
+  gap: 0;
+}
+
+.kaui-accounts-index .search-field {
+  display: flex;
+  flex-direction: column;
+}
+
+.kaui-accounts-index .search-field + .search-field::before {
+  align-self: center;
+  color: #2E90FA;
+  content: 'AND';
+  font-size: 0.875rem;
+  font-weight: 700;
+  line-height: 1.25rem;
+  padding: 0.75rem 0;
+}
+
+.kaui-accounts-index .advanced-search-rule-row {
+  align-items: center;
+  background: #FFFFFF;
+  border-radius: 0.75rem;
+  display: grid;
+  gap: 0.75rem;
+  grid-template-columns: minmax(10rem, 1fr) minmax(13.75rem, 1.1fr) minmax(12rem, 1.6fr) 2.5rem;
+  padding: 0.75rem;
+}
+
+.kaui-accounts-index .advanced-search-rule-row .search-field-filter {
+  min-width: 13.75rem;
+}
+
+.kaui-accounts-index .advanced-search-rule-row .form-control {
+  height: 2.5rem;
+  margin-right: 0;
+  border-radius: 0.375rem;
+}
+
+.kaui-accounts-index .advanced-search-rule-row .form-control:focus {
+  outline: none;
+  box-shadow: none;
+}
+
+.kaui-accounts-index .advanced-search-add-rule {
+  align-items: center;
+  align-self: flex-start;
+  background: #FFFFFF;
+  border: 0.0625rem solid #D5D7DA;
+  border-radius: 0.75rem;
+  color: #535862;
+  display: inline-flex;
+  font-weight: 500;
+  gap: 0.5rem;
+  height: 2.75rem;
+  padding: 0.625rem 1rem;
+}
+
+.kaui-accounts-index .advanced-search-add-rule:hover {
+  background: #FFFFFF;
 }
 
 .kaui-accounts-index .filter-bar-container {
@@ -237,7 +404,8 @@ table.dataTable thead > tr > th {
   height: 1.25rem;
 }
 
-.kaui-accounts-index .form-group select.form-control {
+.kaui-accounts-index .form-group select.form-control,
+.kaui-accounts-index .advanced-search-rule-row select.form-control {
   appearance: none;
   -webkit-appearance: none;
   -moz-appearance: none;

data/app/assets/stylesheets/kaui/common.css

@@ -172,6 +172,249 @@ input[type="submit"]:hover {
   color: #fff;
 }
 
+.kaui-advanced-search-modal .modal-dialog {
+  max-width: 52rem;
+  width: calc(100% - 2rem);
+}
+
+.kaui-advanced-search-modal .modal-content {
+  border-radius: 1rem;
+  min-width: 40.5rem;
+  width: 100%;
+}
+
+.kaui-advanced-search-modal .modal-body {
+  padding-bottom: 0.375rem !important;
+  padding-top: 1.25rem !important;
+}
+
+.kaui-advanced-search-modal .modal-header {
+  padding: 1.5rem 1.5rem 1rem 1.5rem !important;
+}
+
+.kaui-advanced-search-modal .modal-footer {
+  align-items: center;
+  border-top: 0.0625rem solid #E9EAEB;
+  display: flex;
+  gap: 0.75rem;
+  justify-content: space-between;
+  padding: 1rem 1.5rem 1.5rem 1.5rem !important;
+}
+
+.kaui-advanced-search-modal .advanced-search-footer-left,
+.kaui-advanced-search-modal .advanced-search-footer-right {
+  align-items: center;
+  display: flex;
+  gap: 0.75rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-button {
+  border-radius: 0.75rem;
+  font-size: 0.875rem;
+  font-weight: 600;
+  height: 2.75rem;
+  justify-content: center;
+  line-height: 1.25rem;
+  min-width: 7.75rem;
+  padding: 0.625rem 1rem;
+  text-transform: none;
+  transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.kaui-advanced-search-modal .advanced-search-button:focus {
+  box-shadow: 0 0 0 0.25rem rgba(46, 144, 250, 0.16);
+}
+
+.kaui-advanced-search-modal .advanced-search-button-secondary {
+  background: #FFFFFF;
+  border: 0.0625rem solid #B2DDFF;
+  color: #175CD3;
+}
+
+.kaui-advanced-search-modal .advanced-search-button-secondary:hover {
+  background: #EFF6FF;
+  border-color: #84CAFF;
+  color: #175CD3;
+}
+
+.kaui-advanced-search-modal .advanced-search-button-ghost {
+  background: #FFFFFF;
+  border: 0.0625rem solid #D5D7DA;
+  color: #414651;
+}
+
+.kaui-advanced-search-modal .advanced-search-button-ghost:hover {
+  background: #FAFAFA;
+  border-color: #A4A7AE;
+  color: #181D27;
+}
+
+.kaui-advanced-search-modal .advanced-search-button-primary {
+  background: #2E90FA;
+  border: 0.0625rem solid #2E90FA;
+  color: #FFFFFF;
+}
+
+.kaui-advanced-search-modal .advanced-search-button-primary:hover {
+  background: #175CD3;
+  border-color: #175CD3;
+  color: #FFFFFF;
+}
+
+.kaui-advanced-search-modal .modal-title {
+  color: #181D27;
+  font-size: 1.125rem;
+  font-weight: 600;
+  line-height: 1.75rem;
+}
+
+.kaui-advanced-search-modal .close-button,
+.kaui-advanced-search-modal .close-button:hover {
+  background: transparent;
+  margin-top: -1.25rem;
+  padding: 0;
+}
+
+.kaui-advanced-search-modal .button,
+.kaui-advanced-search-modal .button:hover {
+  align-items: center;
+  background: transparent;
+  display: inline-flex;
+  height: 2.5rem;
+  justify-content: center;
+  padding: 0.625rem;
+  width: 2.5rem;
+}
+
+.kaui-advanced-search-modal .field-label {
+  color: #414651;
+  font-size: 0.875rem;
+  font-weight: 500;
+  line-height: 1.25rem;
+  margin-top: -1.25rem;
+  min-width: 9.59375rem;
+}
+
+.kaui-advanced-search-modal #search-fields-container {
+  display: flex;
+  flex-direction: column;
+  margin: 0;
+}
+
+.kaui-advanced-search-modal .advanced-search-builder {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-group {
+  background: #EFF6FF;
+  border: 0.125rem solid #B2DDFF;
+  border-radius: 0.75rem;
+  padding: 1rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-rules {
+  gap: 0;
+}
+
+.kaui-advanced-search-modal .advanced-search-query-row,
+.kaui-advanced-search-modal .advanced-search-rule-row {
+  align-items: center;
+  background: #FFFFFF;
+  border-radius: 0.75rem;
+  display: grid;
+  gap: 0.75rem;
+  padding: 0.75rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-query-row {
+  grid-template-columns: minmax(13.75rem, 1fr) minmax(16rem, 1.6fr);
+}
+
+.kaui-advanced-search-modal .advanced-search-rule-row {
+  grid-template-columns: minmax(10rem, 1fr) minmax(13.75rem, 1.1fr) minmax(12rem, 1.6fr) 2.5rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-rule-row .search-field-filter {
+  min-width: 13.75rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-query-row .form-control,
+.kaui-advanced-search-modal .advanced-search-rule-row .form-control {
+  border-radius: 0.375rem;
+  height: 2.5rem;
+  margin-right: 0;
+}
+
+.kaui-advanced-search-modal .advanced-search-query-row .form-control:focus,
+.kaui-advanced-search-modal .advanced-search-rule-row .form-control:focus {
+  box-shadow: none;
+  outline: none;
+}
+
+.kaui-advanced-search-modal .search-field {
+  display: flex;
+  flex-direction: column;
+}
+
+.kaui-advanced-search-modal .search-field + .search-field::before {
+  align-self: center;
+  color: #2E90FA;
+  content: 'AND';
+  font-size: 0.875rem;
+  font-weight: 700;
+  line-height: 1.25rem;
+  padding: 0.75rem 0;
+}
+
+.kaui-advanced-search-modal .advanced-search-add-rule,
+.kaui-advanced-search-modal .advanced-search-add-rule:hover {
+  align-items: center;
+  align-self: flex-start;
+  background: #FFFFFF;
+  border: 0.0625rem solid #D5D7DA;
+  border-radius: 0.75rem;
+  color: #535862;
+  display: inline-flex;
+  font-weight: 500;
+  gap: 0.5rem;
+  height: 2.75rem;
+  padding: 0.625rem 1rem;
+}
+
+.kaui-advanced-search-modal .modal-header .icon-container {
+  align-items: center;
+  border: 0.0625rem solid #D5D7DA;
+  border-radius: 0.375rem;
+  display: inline-flex;
+  height: 2.5rem;
+  justify-content: center;
+  padding: 0.25rem;
+  width: 2.5rem;
+}
+
+.kaui-advanced-search-modal .modal-header .icon-container img {
+  height: 1.25rem;
+  width: 1.25rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-query-row select.form-control,
+.kaui-advanced-search-modal .advanced-search-rule-row select.form-control {
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  background-image: url('data:image/svg+xml;utf8,<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4 6L8 10L12 6" stroke="%23A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>');
+  background-position: right 0.625rem center;
+  background-repeat: no-repeat;
+  background-size: 1rem 1rem;
+  padding-right: 1.875rem;
+}
+
+.kaui-advanced-search-modal .advanced-search-alert {
+  margin-top: 1.875rem;
+}
+
 label {
   cursor: pointer;
   font-size: 100%;