kaui 4.0.4 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44468e809ef2b1ffd8115e0b54664822a212fc2ec26ae6513d8b64135f6de48f
-  data.tar.gz: 7ceff36da85b32040813f3101246588d5c9cf07a7893297ac1df44d0462b25b2
+  metadata.gz: e7e6e1d8f1969609b1eb958efa90c3f1afed414dbb9a754e88e9624716997eec
+  data.tar.gz: f42f2106b4c9f9687b267b2d9475820d390aa6a78cd20605341853ada294981b
 SHA512:
-  metadata.gz: b0949ac7f3c9054757e5b7d5ea33867aba33738d185071917127032ac10293fc845b2da1dec911ca7d02ce0a8500ee7c95309264b3b05936e0eaf59e7e84d5c8
-  data.tar.gz: 5d6fcb261e749b7cc6d7c97782b3a78cf917acca0369c055515c18f34f514d739e04062755e669f859be2538d09da2a65d3f5fa1b6ab5a4f8c3e10b39f77a308
+  metadata.gz: 314ac1bb0b060b413aa68ec04183eb39f8df63b94fbe68b1c938b1e726e19733f45986278227f5101884aca3e37ec80d7e86b58348c098350138277e7529de1e
+  data.tar.gz: 45d12ccbc5d09cc0c77450e5b5dce0476be99b658078123148c6335854e9c3690e834fa7df800de0b91bd4623c96b0603e68ba8a8826a91347ec1973d74e00cb

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

@@ -439,7 +439,7 @@ function setObjectIdPopover(){
 // Custom tooltip function for object IDs
 // attributes:
 //      data-id = content of the tooltip, object id; required
-//      title = title of the tooltip; not required
+//      data-title = title of the tooltip; not required
 function setObjectIdTooltip() {
   // Remove any existing tooltips
   $(".custom-tooltip").remove();
@@ -476,6 +476,9 @@ function showCustomTooltip(element, objectId) {
   var position = $element.offset();
   var elementHeight = $element.outerHeight();
   var elementWidth = $element.outerWidth();
+  
+  // Get custom title from data-title attribute or default to "Subscription ID"
+  var tooltipTitle = $element.data("title") || "Subscription ID";
 
   // Create tooltip content with header and custom SVG icon
   var svgIcon =
@@ -485,7 +488,7 @@ function showCustomTooltip(element, objectId) {
     "</svg>";
 
   var tooltipContent =
-    '<div class="tooltip-header">Subscription ID</div>' +
+    '<div class="tooltip-header">' + tooltipTitle + '</div>' +
     '<div class="tooltip-content">' +
     '<span class="tooltip-id">' +
     objectId +

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -6,6 +6,10 @@ module Kaui
 
     def index
       @allowed_users = retrieve_allowed_users_for_current_user
+      @roles_by_user = {}
+      @allowed_users.each do |user|
+        @roles_by_user[user.kb_username] = roles_for_user(user)
+      end
     end
 
     def new

data/app/controllers/kaui/home_controller.rb

@@ -14,7 +14,7 @@ module Kaui
       @max_records = {}
       %w[account payment invoice].each do |type|
         model = "Kaui::#{type.capitalize}".constantize
-        @max_records[type.to_sym] = model.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records || 0
+        @max_records[type.to_sym] = model.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
       end
     end
 

data/app/controllers/kaui/invoices_controller.rb

@@ -36,6 +36,15 @@ module Kaui
                    Kaui::Invoice.list_or_search(query_string, 0, MAXIMUM_NUMBER_OF_RECORDS_DOWNLOAD, options_for_klient.merge(params: kb_params))
                  end
 
+      if start_date && end_date
+        invoices = invoices.select do |invoice|
+          start_date_parsed = Date.parse(start_date)
+          end_date_parsed = Date.parse(end_date)
+          invoice_date = Date.parse(invoice.invoice_date)
+          invoice_date.between?(start_date_parsed, end_date_parsed)
+        end
+      end
+
       csv_string = CSV.generate(headers: true) do |csv|
         csv << columns
 

data/app/controllers/kaui/payments_controller.rb

@@ -24,6 +24,7 @@ module Kaui
 
       if all_fields_checked
         columns = KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes') - %w[transactions audit_logs]
+        columns += %w[payment_date status] # additional fields not part of the model
         csv_headers = columns.dup
         Kaui::Payment::REMAPPING_FIELDS.each do |k, v|
           index = csv_headers.index(k)

data/app/helpers/kaui/admin_allowed_users_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Kaui
+  module AdminAllowedUsersHelper
+    # Check if a user can be deleted
+    # Returns false if the user is an admin or the current logged-in user
+    def can_delete_user?(user, user_roles)
+      is_admin = user_roles.include?('admin') || user.kb_username == Kaui.root_username
+      is_current_user = user.kb_username == current_user.kb_username
+
+      !is_admin && !is_current_user
+    end
+  end
+end

data/app/helpers/kaui/plugin_helper.rb

@@ -24,6 +24,8 @@ module Kaui
                         '/kenui'
                       when /payment-test/
                         '/payment_test'
+                      when /aviate/
+                        '/aviate'
                       else
                         "/#{plugin_key}"
                       end

data/app/views/kaui/account_timelines/_multi_functions_bar.html.erb

@@ -43,7 +43,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Account Timelines" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>

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

@@ -117,12 +117,10 @@
             <% end %>
           </div>
 
-          <% if can? :trigger, Kaui::Invoice %>
-            <div class="info-item">
-              <b>Next invoice date</b>
-              <p id='next-invoice-date'>N/A</p>
-            </div>
-          <% end %>
+          <div class="info-item">
+            <b>Next invoice date</b>
+            <p id='next-invoice-date'>N/A</p>
+          </div>
         </div>
 
         <!-- Right Column -->

data/app/views/kaui/admin_allowed_users/index.html.erb

@@ -60,23 +60,16 @@
                     <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
                     <td><%= u.description %></td>
                     <td class="text-end">
-
-                        
-                      <%= render "kaui/components/button/button", {
-                        label: 'Delete',
-                        variant: "outline-secondary d-inline-flex align-items-center gap-1",
-                        type: "button",
-                        html_class: "kaui-button delete-button custom-hover",
-                        html_options: { 
-                          data: { 
-                            confirm: "Are you sure?",
-                            method: "delete",
-                            turbo: false,
-                            "url": kaui_engine.admin_allowed_user_path(u.id)
-                          }
-                        }
-                      } %>
-                      <%= link_to kaui_engine.edit_admin_allowed_user_path(u.id), :class => '' do %>
+                      <% user_roles = @roles_by_user[u.kb_username] || [] %>
+                      <% if can_delete_user?(u, user_roles) %>
+                        <%= form_tag kaui_engine.admin_allowed_user_path(u.id), method: :delete, class: 'd-inline', onsubmit: "return confirm('Are you sure?');" do %>
+                          <%= button_tag type: 'submit', class: 'btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button delete-button custom-hover' do %>
+                            Delete
+                          <% end %>
+                        <% end %>
+                      <% end %>
+                      
+                      <%= link_to kaui_engine.edit_admin_allowed_user_path(u.id), class: 'text-decoration-none' do %>
                         <%= render "kaui/components/button/button", {
                           label: "Edit",
                           variant: "outline-secondary d-inline-flex align-items-center gap-1",
@@ -154,6 +147,8 @@
           $header.find('.sort-' + direction).addClass('active');
         }
         
+      } catch (e) {
+        console.error('Error initializing DataTable:', e);
       }
     }, 100);
   });

data/app/views/kaui/admin_allowed_users/show.html.erb

@@ -6,21 +6,23 @@
           <h2>User details</h2>
         </div>
         <span>
-          <%= render "kaui/components/button/button", {
-            label: 'Delete',
-            variant: "outline-secondary d-inline-flex align-items-center gap-1",
-            type: "button",
-            html_class: "kaui-button delete-button custom-hover",
-            html_options: { 
-              data: { 
-                confirm: "Are you sure?",
-                method: "delete",
-                turbo: false, # Optional: disable Turbo if using Rails Turbo
-                "url": kaui_engine.admin_allowed_user_path(@allowed_user.id)
-              },
-              onclick: "if (confirm(this.dataset.confirm)) { Rails.ajax({ url: this.dataset.url, type: this.dataset.method }); }"
-            }
-          } %>
+          <% if can_delete_user?(@allowed_user, @roles) %>
+            <%= render "kaui/components/button/button", {
+              label: 'Delete',
+              variant: "outline-secondary d-inline-flex align-items-center gap-1",
+              type: "button",
+              html_class: "kaui-button delete-button custom-hover",
+              html_options: { 
+                data: { 
+                  confirm: "Are you sure?",
+                  method: "delete",
+                  turbo: false, # Optional: disable Turbo if using Rails Turbo
+                  "url": kaui_engine.admin_allowed_user_path(@allowed_user.id)
+                },
+                onclick: "if (confirm(this.dataset.confirm)) { Rails.ajax({ url: this.dataset.url, type: this.dataset.method }); }"
+              }
+            } %>
+          <% end %>
 
           <%= link_to kaui_engine.edit_admin_allowed_user_path(@allowed_user.id), 
                       :class => '' do %>

data/app/views/kaui/admin_tenants/new_catalog.html.erb

@@ -246,6 +246,8 @@ function switch_basic_config() {
 $(document).ready(function() {
     switch_basic_config();
 
+    // jQuery UI autocomplete interferes with HTML5 validation
+    // So we keep the custom JS validation
     $('#simple_plan_product_name').autocomplete({
         source: function(query, process) {
             process(known_products());
@@ -261,8 +263,75 @@ $(document).ready(function() {
     $('#simple_plan_product_name').on('mouseleave', function() {
         recompute_available_base_products_for_ao();
     });
+
+  // Realtime validation function
+  function validateField(field) {
+    var pattern = /^[a-zA-Z_][\w\.-]*$/;
+    var value = field.val().trim();
+    var fieldName = field.attr('id') === 'simple_plan_product_name' ? 'Product Name' : 'Plan Name';
+
+    if (value === '') {
+      showError(field, fieldName + ' is required');
+      return false;
+    } else if (!pattern.test(value)) {
+      showError(field, fieldName + ' must start with a letter or underscore, and can only contain letters, digits, underscores, hyphens, and periods');
+      return false;
+    } else {
+      clearError(field);
+      return true;
+    }
+  }
+
+  // Realtime validation on input
+  $('#simple_plan_product_name, #simple_plan_plan_id').on('input', function() {
+    validateField($(this));
+  });
+
+  // Validation on blur (when user leaves the field)
+  $('#simple_plan_product_name, #simple_plan_plan_id').on('blur', function() {
+    validateField($(this));
+  });
+
+  // Custom validation on form submit
+  $('#catalog_simple form').on('submit', function(e) {
+    var isValid = true;
+
+    // Validate Product Name
+    if (!validateField($('#simple_plan_product_name'))) {
+      isValid = false;
+    }
+    
+    // Validate Plan Name
+    if (!validateField($('#simple_plan_plan_id'))) {
+      isValid = false;
+    }
+
+    if (!isValid) {
+      e.preventDefault();
+      e.stopPropagation();
+      // Scroll to first error
+      $('.error-message:first').get(0)?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+      return false;
+    }
+
+    return true;
+  });
 });
 
+function showError(field, message) {
+    clearError(field);
+    field.addClass('error-field');
+    field.css('border-color', '#dc3545');
+    var errorDiv = $('<div class="error-message" style="color: #dc3545; font-size: 0.875rem; margin-top: 0.25rem;"></div>').text(message);
+    field.parent().append(errorDiv);
+}
+
+function clearError(field) {
+    field.removeClass('error-field');
+    field.css('border-color', '');
+    field.parent().find('.error-message').remove();
+}
+
 document.querySelectorAll('.toggle-option').forEach(el => {
   el.addEventListener('click', () => {
     document.querySelectorAll('.toggle-option').forEach(opt => opt.classList.remove('active-btn'));

data/app/views/kaui/audit_logs/_multi_functions_bar.html.erb

@@ -43,7 +43,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Logs" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>

data/app/views/kaui/components/dashboard/_card.html.erb

@@ -1,3 +1,4 @@
+<% count_text = count.nil? ? "20k+" : count.to_i %>
 <div class="col-md-4">
     <div class="dashboard-card border rounded-4 d-flex flex-column justify-content-between h-100">
         <div class="d-flex px-4 py-3 align-items-center gap-3">
@@ -6,7 +7,7 @@
             </div>
             <div>
                 <h6 class="mb-0 fw-600 text-black-900"><%= title %></h6>
-                <p class="text-muted fw-normal text-tertiary small mb-0"><%= count %></p>
+                <p class="text-muted fw-normal text-tertiary small mb-0"><%= count_text %></p>
             </div>
         </div>
         <div class="w-full dashboard-card-divider"></div>

data/app/views/kaui/invoices/_invoice_table.html.erb

@@ -91,7 +91,11 @@
 
               </td>
           <% end %>
-          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.pretty_plan_name.blank? || !item.item_type.in?(%w{USAGE RECURRING}) ? item.description : item.pretty_plan_name %></td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;">
+            <span id="<%= item.invoice_item_id %>-popover" class="object-id-popover" data-id="<%= item.invoice_item_id %>" data-title="Invoice Item ID">
+              <%= item.pretty_plan_name.blank? || !item.item_type.in?(%w{USAGE RECURRING}) ? item.description : item.pretty_plan_name %>
+            </span>
+          </td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.start_date.html_safe if item.start_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.end_date.html_safe if item.end_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.subscription_id %></td>
@@ -149,4 +153,11 @@
             }
         });
     }
+    
+    $(document).ready(function() {
+        // Initialize tooltips for invoice item IDs
+        if (typeof setObjectIdTooltip === 'function') {
+            setObjectIdTooltip();
+        }
+    });
 </script>

data/app/views/kaui/invoices/_multi_functions_bar.html.erb

@@ -91,7 +91,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Invoices" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>

data/app/views/kaui/payments/_multi_functions_bar.html.erb

@@ -90,7 +90,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Payments" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '4.0.4'
+  VERSION = '4.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.6
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-09 00:00:00.000000000 Z
+date: 2025-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -454,6 +454,7 @@ files:
 - app/controllers/kaui/tenants_controller.rb
 - app/controllers/kaui/transactions_controller.rb
 - app/helpers/kaui/account_helper.rb
+- app/helpers/kaui/admin_allowed_users_helper.rb
 - app/helpers/kaui/application_helper.rb
 - app/helpers/kaui/date_helper.rb
 - app/helpers/kaui/exception_helper.rb