kaui 4.0.12 → 4.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7cae94ec25bd96299f58f2bd783dabf34441f203d38fb2846e0f92b59b97e2a
-  data.tar.gz: 04f9d02da92a77eb81160518cad11a5c88af312d20b1c65cfc0d3ad141814801
+  metadata.gz: e5d83c894b4705f72b548117b270bd7ea3c0d1fb962be8a49198dd81771c8c79
+  data.tar.gz: f95c3ff23e3b8729036252c2f45b2b2294bdb14dc474bf8666c188714bb29eff
 SHA512:
-  metadata.gz: b99fa2fe8751882f22e754e79a1b1eacc1a7933a039e572bbfa22cf880d1967b7e8c8156d04d98cc6511c9b2b6ae634f9ba3ff24102bc4341072b2422dd41e68
-  data.tar.gz: f494903ee370dd0a6bb10808bde638eedd769619cb7e0c70b321c74c9b246ea09ebc00f4d9976cfac8765c53a43fd724daace311ea59b15288d7adb070fb20cb
+  metadata.gz: f0ea477030153cfad26f64b1e8840a72613362a6a0655cf34e5c91c53439d1b67953b2b2c76b4cc1622c171389bb1676b7aa742fc3b90ec3e21b4d897c343a66
+  data.tar.gz: 5f0a1131795c3072024624fc7c55aace8111e8ec65cbf2dc4878b200bf4e6019ef6bf826e4d54364145b2a904fec983fa5f77fdaa809f2dbef43e2cd73bf6895

data/app/assets/images/kaui/save.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/>
+  <polyline points="17 21 17 13 7 13 7 21"/>
+  <polyline points="7 3 7 8 15 8"/>
+</svg>

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

@@ -302,6 +302,27 @@ jQuery(document).ready(function ($) {
 
     setObjectIdPopover();
     setObjectIdTooltip();
+
+    /*
+     * Tag dropdown overflow prevention
+     * Flips each .tag-select-box to open leftward when it would overflow the right edge of the viewport.
+     */
+    function repositionTagDropdowns() {
+      $('.tag-select').each(function() {
+        var $box = $(this).find('.tag-select-box');
+        var triggerRight = $(this).offset().left + $(this).outerWidth();
+        var boxWidth = Math.max($box[0].scrollWidth, 240);
+        var viewportWidth = $(window).width();
+        if (triggerRight + boxWidth > viewportWidth) {
+          $box.css({ left: 'auto', right: '0' });
+        } else {
+          $box.css({ left: '0', right: 'auto' });
+        }
+      });
+    }
+
+    repositionTagDropdowns();
+    $(window).on('resize', repositionTagDropdowns);
 });
 
 

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

@@ -84,11 +84,6 @@ function populateSearchLabelsFromUrl() {
 
 function searchQuery(account_id){
   var searchFields = $('.search-field');
-  var searchLabelsContainer = $('#search-labels-container');
-  
-  if (searchFields.length > 0) {
-    searchLabelsContainer.empty();
-  }
   var searchLabels = '';
   if (searchFields.length > 0) {
     searchLabels = searchFields.map(function() {
@@ -135,17 +130,25 @@ function searchQuery(account_id){
 };
 
 function clearAdvanceSearch() {
+  var hasActiveSearch = $('#search-labels-container .label').length > 0 ||
+                        window.location.search.includes('_q=1');
+
   // Clear all search fields
   $('#search-fields-container').empty();
 
   // Remove all search labels
   $('#search-labels-container').empty();
 
-  // Reload the page with the original URL (no parameters)
-  window.location.href = window.location.pathname;
+  // Clear Persisted Search for this page
+  localStorage.removeItem('kaui_adv_search_' + window.location.pathname);
 
   // Hide the modal
   $('#advanceSearchModal').modal('hide');
+
+  // Only reload if there was an active search to clear
+  if (hasActiveSearch) {
+    window.location.href = window.location.pathname;
+  }
 }
 
 function showAdvanceSearchModal() {
@@ -230,4 +233,177 @@ $(document).on('click', '.filter-close-icon', function() {
     var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
     window.history.pushState({ path: newUrl }, '', newUrl);
   }
+});
+
+// --- Saved Searches Logic ---
+function getSavedSearches() {
+  var key = 'kaui_saved_searches_' + window.location.pathname;
+  var data = localStorage.getItem(key);
+  if (!data) return {};
+  try {
+    var parsed = JSON.parse(data);
+    if (typeof parsed === 'object' && parsed !== null) {
+      return parsed;
+    }
+  } catch (e) {
+    // Legacy string format or invalid JSON
+    var legacy = {};
+    legacy["Default"] = data;
+    localStorage.setItem(key, JSON.stringify(legacy));
+    return legacy;
+  }
+  return {};
+}
+
+function saveSavedSearches(searches) {
+  var key = 'kaui_saved_searches_' + window.location.pathname;
+  localStorage.setItem(key, JSON.stringify(searches));
+}
+
+function populateSavedSearchesDropdown() {
+  var menu = $('#savedSearchesDropdown_menu');
+  if (!menu.length) return;
+  
+  menu.empty();
+  var searches = getSavedSearches();
+  var names = Object.keys(searches);
+  
+  var dropdownButton = $('#savedSearchesDropdown_button');
+  if (names.length === 0) {
+    menu.append('<li><span class="dropdown-item text-muted">No saved searches</span></li>');
+    return;
+  }
+  
+  names.forEach(function(name) {
+    var li = $('<li>');
+    var a = $('<a>', {
+      class: 'dropdown-item d-flex align-items-center justify-content-between apply-saved-search',
+      href: 'javascript:void(0);',
+      'data-name': name,
+      style: 'cursor: pointer;'
+    });
+    
+    var nameSpan = $('<span>', {
+      class: 'text-black-700 fs-6 text-normal',
+      style: 'font-weight: 500; font-size: 0.875rem !important; line-height: 1.25rem;',
+      text: name
+    });
+    
+    var deleteIcon = $('<span>', {
+      class: 'delete-saved-search text-danger',
+      'data-name': name,
+      style: 'cursor: pointer; padding: 0 5px; font-weight: bold;',
+      html: '&times;',
+      title: 'Delete saved search'
+    });
+    
+    a.append(nameSpan).append(deleteIcon);
+    li.append(a);
+    menu.append(li);
+  });
+}
+
+$(document).ready(function() {
+  populateSavedSearchesDropdown();
+
+  $(document).on('submit', '#advanceSearchForm', function(e) {
+    e.preventDefault();
+    return false;
+  });
+
+  $(document).on('input', '#savedSearchName', function() {
+    var val = $(this).val().trim();
+    if (val === '') {
+      $('#saveAdvanceSearch').text('Save Search As...');
+    } else {
+      $('#saveAdvanceSearch').text('Save');
+    }
+  });
+
+  $(document).on('click', '#saveAdvanceSearch', function(e) {
+    e.preventDefault();
+    var container = $('#save-search-container');
+    var input = $('#savedSearchName');
+    
+    if (!container.is(':visible')) {
+      container.show();
+      input.focus();
+      return;
+    }
+    
+    var name = input.val().trim();
+    if (name === '') {
+      container.hide();
+      return;
+    }
+    
+    var searchParams = '';
+    
+    // For bundles, it's search_by and q. For everything else, it's searchQuery()
+    if (window.location.pathname.includes('/bundles')) {
+       var searchBy = $('#searchFieldSelect').val();
+       var q = $('#bundleSearchValue').val();
+       if (q) q = q.trim();
+       if (!q) {
+         alert("Please enter a value to search.");
+         return;
+       }
+       searchParams = 'search_by=' + encodeURIComponent(searchBy) + '&q=' + encodeURIComponent(q);
+    } else {
+       // 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.");
+         return;
+       }
+       searchParams = searchQuery();
+       if (!searchParams) {
+         alert("Please enter at least one search field.");
+         return;
+       }
+       searchParams = searchParams.replace(/account_id/g, 'ac_id');
+    }
+    
+    var searches = getSavedSearches();
+    searches[name] = searchParams;
+    saveSavedSearches(searches);
+    
+    input.val('');
+    $('#saveAdvanceSearch').text('Save Search As...');
+    container.hide();
+    
+    populateSavedSearchesDropdown();
+    $('#advanceSearchModal').modal('hide');
+  });
+
+  $(document).on('hidden.bs.modal', '#advanceSearchModal', function () {
+    $('#save-search-container').hide();
+    $('#savedSearchName').val('');
+    $('#saveAdvanceSearch').text('Save Search As...');
+  });
+
+  $(document).on('click', '.apply-saved-search', function(e) {
+    // If they clicked the delete icon, don't apply the search
+    if ($(e.target).hasClass('delete-saved-search')) return;
+    
+    var name = $(this).data('name');
+    var searches = getSavedSearches();
+    var params = searches[name];
+    if (params) {
+      var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + params;
+      window.location.href = newUrl;
+    }
+  });
+
+  $(document).on('click', '.delete-saved-search', function(e) {
+    e.stopPropagation(); // prevent dropdown from closing and prevent applying search
+    var name = $(this).data('name');
+    if (confirm("Are you sure you want to delete the saved search '" + name + "'?")) {
+      var searches = getSavedSearches();
+      delete searches[name];
+      saveSavedSearches(searches);
+      populateSavedSearchesDropdown();
+    }
+  });
 });

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

@@ -1293,7 +1293,6 @@ table thead th:last-child {
   align-items: center;
   gap: 0.625rem;
   padding: 0.875rem 1.125rem;
-  margin: 0.625rem 0;
   border-radius: 0.375rem;
   font-size: 0.9375rem;
   font-weight: 500;
@@ -1467,6 +1466,10 @@ table thead th:last-child {
   width: 100%;
 }
 
+.field_with_errors {
+  display: contents;
+}
+
 /* Navbar color changes - Higher specificity to override existing rules */
 header .header-icon {
   color: #374151 !important;

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

@@ -689,4 +689,79 @@ table tr.expired td {
   line-height: 1.25rem;
   color: #414651;
   margin-bottom: 0.25rem;
+}
+
+/* Advanced Search modal – Subscription Bundles page */
+.subscription-bundl-index .close-button {
+  background: transparent;
+  padding: 0;
+  margin-top: -1.25rem;
+}
+
+.subscription-bundl-index .close-button:hover {
+  background: transparent;
+  padding: 0;
+}
+
+.subscription-bundl-index .border-button {
+  background: transparent;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  border: 0.0625rem solid #D5D7DA;
+  border-radius: 0.375rem;
+  width: 2.5rem;
+  height: 2.5rem;
+  padding: 0.625rem;
+}
+
+.subscription-bundl-index .border-button:hover {
+  background: transparent;
+}
+
+.subscription-bundl-index .button {
+  background: transparent;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 2.5rem;
+  height: 2.5rem;
+  padding: 0.625rem;
+}
+
+.subscription-bundl-index .button:hover {
+  background: transparent;
+}
+
+.subscription-bundl-index .field-label {
+  font-weight: 500;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  color: #414651;
+  margin-top: -1.25rem;
+  min-width: 9.59375rem;
+}
+
+.subscription-bundl-index .search-field-label {
+  margin-top: -1.25rem;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center {
+  display: flex;
+  align-items: center;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center label {
+  margin-bottom: 0;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center .form-control {
+  margin-right: 0.25rem;
+  height: 2.5rem;
+  border-radius: 0.375rem;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center.search-field div {
+  padding: 0;
+  margin-right: 0.25rem;
 }

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

@@ -58,15 +58,18 @@
 .tag-bar .tag-select .tag-select-box {
   position: absolute;
   top: 100%;
-  left: -0.0625rem;
+  left: 0;
+  right: auto;
   max-height: 0;
   background-color: #fff;
   z-index: 100;
   padding: 0 0.9375rem;
   font-size: 0.75rem;
   color: #999999;
-  overflow: auto;
-  width: auto;
+  overflow: hidden;
+  min-width: 15rem;
+  width: max-content;
+  max-width: min(25rem, 95vw);
   border-bottom: 0;
   display: inline-block;
 }

data/app/controllers/kaui/accounts_controller.rb

@@ -5,7 +5,7 @@ module Kaui
   class AccountsController < Kaui::EngineController
     def index
       @search_query = params[:q]
-      @advance_search_query = @search_query || request.query_string
+      @advance_search_query = @search_query.presence || params[:advance_search_query].presence
       if @search_query.present?
         account = Kaui::Account.list_or_search(@search_query, -1, 1, options_for_klient).first
         if account.nil?

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -61,8 +61,8 @@ module Kaui
         nil
       end
 
-      @overdue = wait(fetch_overdue)
-      @overdue_xml = wait(fetch_overdue_xml)
+      @overdue = flash[:overdue_deleted] ? nil : wait(fetch_overdue)
+      @overdue_xml = flash[:overdue_deleted] ? nil : wait(fetch_overdue_xml)
       @tenant_plugin_config = begin
         wait(fetch_tenant_plugin_config)
       rescue StandardError
@@ -288,7 +288,15 @@ module Kaui
       options = tenant_options_for_client
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
-      @overdue = Kaui::Overdue.get_overdue_json(options)
+      begin
+        @overdue = Kaui::Overdue.get_overdue_json(options)
+        @overdue_corrupted = false
+      rescue StandardError => e
+        Rails.logger.warn("Failed to load overdue configuration for tenant #{@tenant.id}: #{e.class}: #{e.message}")
+        @overdue = KillBillClient::Model::Overdue.new.tap { |o| o.overdue_states = [] }
+        @overdue_corrupted = true
+        flash.now[:warning] = 'The existing overdue configuration is corrupted and cannot be loaded. Use the XML upload below to replace it with a valid configuration.'
+      end
     end
 
     def modify_overdue_config
@@ -298,12 +306,18 @@ module Kaui
       options[:api_key] = current_tenant.api_key
       options[:api_secret] = current_tenant.api_secret
 
-      view_form_model = params.require(:kill_bill_client_model_overdue).permit!.to_h.compact_blank
+      overdue_params = params[:kill_bill_client_model_overdue]&.permit!
+      view_form_model = overdue_params&.to_h&.compact_blank || {}
       view_form_model['states'] = view_form_model['states'].values if view_form_model['states'].present?
-
-      overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
-      Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
-      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
+      if view_form_model['states'].blank?
+        Kaui::AdminTenant.delete_tenant_user_key_value('OVERDUE_CONFIG', options[:username], nil, comment, options)
+        flash[:overdue_deleted] = true
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_updated_successfully')
+      else
+        overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
+        Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
+      end
     end
 
     def upload_overdue_config

data/app/controllers/kaui/bundles_controller.rb

@@ -5,10 +5,11 @@ module Kaui
     # rubocop:disable Lint/HashCompareByIdentity
     def index
       cached_options_for_klient = options_for_klient
+      @search_query = params[:q].presence
+      @search_by = params[:search_by] || 'bundle_id'
       @per_page = (params[:per_page] || 10).to_i
       @page = (params[:page] || 1).to_i
 
-      fetch_bundles = promise { Kaui::Account.paginated_bundles(@account.account_id, (@page - 1) * @per_page, @per_page, 'NONE', cached_options_for_klient) }
       fetch_bundle_tags = promise do
         all_bundle_tags = @account.all_tags(:BUNDLE, false, 'NONE', cached_options_for_klient)
         all_bundle_tags.each_with_object({}) do |entry, hsh|
@@ -36,8 +37,15 @@ module Kaui
       fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(cached_options_for_klient) }
       fetch_available_subscription_tags = promise { Kaui::TagDefinition.all_for_subscription(cached_options_for_klient) }
 
-      @bundles = wait(fetch_bundles)
-      @total_pages = (@bundles.pagination_max_nb_records.to_f / @per_page).ceil
+      if @search_query.present?
+        @bundles = search_bundles(@search_query, @search_by, cached_options_for_klient)
+        @total_pages = 1
+        @page = 1
+      else
+        fetched = Kaui::Account.paginated_bundles(@account.account_id, (@page - 1) * @per_page, @per_page, 'NONE', cached_options_for_klient)
+        @bundles = fetched
+        @total_pages = (fetched.pagination_max_nb_records.to_f / @per_page).ceil
+      end
 
       @tags_per_bundle = wait(fetch_bundle_tags)
       @tags_per_subscription = wait(fetch_subscription_tags)
@@ -46,8 +54,15 @@ module Kaui
       @available_tags = wait(fetch_available_tags)
       @available_subscription_tags = wait(fetch_available_subscription_tags)
 
-      # Don't load the full catalog to avoid memory issues
-      @catalog = nil
+      # Collect the distinct start dates from subscriptions on this page, then fetch
+      # only the catalog versions needed — one per unique date — to avoid loading all
+      # historical versions into memory.
+      start_dates = @bundles.flat_map(&:subscriptions).filter_map(&:start_date).uniq
+      @catalogs = start_dates.filter_map do |date|
+        Kaui::Catalog.get_account_catalog_json(@account.account_id, date, cached_options_for_klient)&.last
+      rescue StandardError
+        nil
+      end.uniq(&:effective_date)
 
       @subscription = {}
       @bundles.each do |bundle|
@@ -112,5 +127,38 @@ module Kaui
              end
       redirect_to kaui_engine.account_bundles_path(@account.account_id), notice: msg
     end
+
+    private
+
+    def search_bundles(query, search_by, options)
+      case search_by
+      when 'bundle_id'
+        bundle = Kaui::Bundle.find_by_id(query, options)
+        bundle ? [bundle] : []
+      when 'bundle_external_key'
+        bundle = Kaui::Bundle.find_by_external_key(query, false, options)
+        bundle ? [bundle] : []
+      when 'subscription_id'
+        subscription = KillBillClient::Model::Subscription.find_by_id(query, 'NONE', options)
+        if subscription
+          bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options)
+          bundle ? [bundle] : []
+        else
+          []
+        end
+      when 'subscription_external_key'
+        subscription = KillBillClient::Model::Subscription.find_by_external_key(query, 'NONE', options)
+        if subscription
+          bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options)
+          bundle ? [bundle] : []
+        else
+          []
+        end
+      else
+        []
+      end
+    rescue KillBillClient::API::NotFound
+      []
+    end
   end
 end

data/app/controllers/kaui/engine_controller_util.rb

@@ -127,7 +127,7 @@ module Kaui
         as_string(exception.cause)
       else
         log_rescue_error(exception)
-        exception.message
+        exception.message.to_s[0..200]
       end
     end
 
@@ -150,7 +150,7 @@ module Kaui
         error_message += " (code=#{error_message['code']})" if error_message['code'].present?
       end
       # Limit the error size to avoid ActionDispatch::Cookies::CookieOverflow
-      error_message[0..1000]
+      error_message.to_s[0..200]
     end
 
     def nested_hash_value(obj, key)

data/app/controllers/kaui/invoices_controller.rb

@@ -6,7 +6,7 @@ module Kaui
     def index
       @search_query = params[:account_id]
       @advance_search_query = params[:q] || request.query_string
-      @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+      @ordering = params[:ordering] || 'desc'
       @offset = params[:offset] || 0
       @limit = params[:limit] || 50
       @search_fields = Kaui::Invoice::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }

data/app/helpers/kaui/plugin_helper.rb

@@ -11,10 +11,8 @@ module Kaui
     def installed_plugin_names
       plugins = []
       nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
-      plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
-      plugins_info.each do |plugin|
-        next unless plugin.state == 'RUNNING'
-
+      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
+      plugins_info.select { |p| p.state == 'RUNNING' }.uniq(&:plugin_name).each do |plugin|
         plugin_name = plugin.plugin_name
         plugin_key = plugin_name.gsub('-plugin', '')
 
@@ -40,7 +38,7 @@ module Kaui
     def installed_plugins
       installed_plugins = []
       nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
-      plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
+      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
 
       plugins_info.each do |plugin|
         next if plugin.version.nil?

data/app/helpers/kaui/subscription_helper.rb

@@ -107,6 +107,24 @@ module Kaui
       end
     end
 
+    def catalog_for_subscription(sub, catalogs)
+      return nil if catalogs.blank? || sub&.start_date.blank?
+
+      start_date = Date.parse(sub.start_date)
+
+      # Find the latest catalog version whose effective_date <= subscription start_date
+      best = catalogs.select do |c|
+        Date.parse(c.effective_date) <= start_date
+      rescue StandardError
+        false
+      end.max_by(&:effective_date)
+
+      # Fall back to the oldest version if none precedes the start_date
+      best || catalogs.first
+    rescue StandardError
+      catalogs.last
+    end
+
     def humanized_subscription_phase_type(sub)
       sub.phase_type
     end

data/app/models/kaui/bundle.rb

@@ -2,6 +2,12 @@
 
 module Kaui
   class Bundle < KillBillClient::Model::Bundle
+    SEARCH_FIELDS = [
+      ['bundle_id', 'Bundle ID'],
+      ['bundle_external_key', 'Bundle External Key'],
+      ['subscription_id', 'Subscription ID'],
+      ['subscription_external_key', 'Subscription External Key']
+    ].freeze
     def self.find_by_id_or_key(bundle_id_or_key, options = {})
       if /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/.match?(bundle_id_or_key)
         bundle = begin

data/app/models/kaui/overdue.rb

@@ -37,8 +37,11 @@ module Kaui
 
           result.overdue_states << state
         end
-        # We reversed them to display on the form , so we have to reverse them back before uploading new config
-        result.overdue_states.reverse!
+        # Sort by days descending (most severe first) so Kill Bill receives them in the correct order
+        # regardless of the order the user added rows in the form.
+        result.overdue_states.sort_by! do |s|
+          -s.condition&.time_since_earliest_unpaid_invoice_equals_or_exceeds&.number.to_i
+        end
 
         result
       end

data/app/views/kaui/accounts/_account_details.html.erb

@@ -45,7 +45,7 @@
         <% end %>
         <span class="tag-bar tag-bar-breathe">
           <% unless @available_tags.blank? %>
-            <div class="tag-select" onclick="void(0)">
+            <div class="tag-select position-relative" onclick="void(0)">
               <%= render "kaui/components/button/button", {
                 label: "Tag As",
                 trailing_icon: "kaui/account/down-arrow.svg",