kaui 4.0.11 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7328709e0c330b84f3e47b4041cf55aa61bf98c7ac80dbb9b2d199b71c3d1f7a
-  data.tar.gz: 27b7f69cdb1e950cd327ac7c31141a76ae6c07e7e063d5ccd6d66c020a4fe612
+  metadata.gz: 62d467e5b936f1738863675c8f5747e9ea4187ac28670556e09d857b1921d588
+  data.tar.gz: c79e0a54c96cb563b1eaf7129f147240fd8da04e784a284f7390c39a7b5ac587
 SHA512:
-  metadata.gz: e7e3008686fb14493dca39a5adcda76d6032c0a8ba23cbf76971dac4829d59ae275a34779d3450aaf7babead74924a66a968cfc07579e74bcd6669763681a632
-  data.tar.gz: 9195fcbb008a972b2a8e4b6dbee1b471662e5f30623910ea5b4abe290957f726b8c620c56c82df742ef43587b08f006a7c9d65825833938f01e98a666e3605fe
+  metadata.gz: f6ff3a1e16012a78cfed10bfaf51ce9733f22d9ebf624d539cdf03cf3a8d7f8dcbda547022dc9258334ae9411c32a0261a7a81b40b19000218a0142950297198
+  data.tar.gz: fa4d96b4ccb3afea63726fa9d6a2c2e0f5c853ce8ce5e5acf518c839ab0487fd9c5952ccf33d0b21307b3703ac48b917c15e486061628fb8462091280fb8d21c

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/stylesheets/kaui/subscription.css

@@ -689,4 +689,79 @@ table tr.expired td {
   line-height: 1.25rem;
   color: #414651;
   margin-bottom: 0.25rem;
+}
+
+/* Advance 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/account_timelines_controller.rb

@@ -76,7 +76,7 @@ module Kaui
         if %w[INVOICE ALL].include?(event_type)
           @invoices.each do |invoice_stub|
             invoice = invoice_stub.invoice_id.present? && @invoices_by_id.key?(invoice_stub.invoice_id) ? @invoices_by_id[invoice_stub.invoice_id] : invoice_stub
-            target_date = invoice.target_date.present? ? invoice.target_date : '[unknown]'
+            target_date = invoice.target_date.presence || '[unknown]'
             bundle_keys = invoice_stub.bundle_keys.present? ? invoice_stub.bundle_keys.split(',').map { |bundle_key| @bundle_names[bundle_key] }.join(', ') : ''
             invoice_details = []
             invoice_details << "Amount: #{invoice.amount_to_money} (#{@account.currency})"
@@ -133,7 +133,7 @@ module Kaui
         end
       end
 
-      send_data csv_string, filename: "account-timelines-#{Date.today}.csv", type: 'text/csv'
+      send_data csv_string, filename: "account-timelines-#{Time.zone.today}.csv", type: 'text/csv'
     end
 
     private
@@ -154,7 +154,7 @@ module Kaui
     end
 
     def extract_invoices_by_id(all_invoices)
-      return {} if all_invoices.nil? || all_invoices.empty?
+      return {} if all_invoices.blank?
 
       # Convert into Kaui::Invoice to benefit from additional methods xxx_to_money
       @invoices_by_id = all_invoices.to_h do |invoice|

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?
@@ -57,7 +57,7 @@ module Kaui
       query_string = params[:search]
 
       if all_fields_checked
-        columns = KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes')
+        columns = KillBillClient::Model::AccountAttributes.instance_variable_get(:@json_attributes)
         csv_headers = columns.dup
         Kaui::Account::REMAPPING_FIELDS.each do |k, v|
           index = csv_headers.index(k)
@@ -97,36 +97,7 @@ module Kaui
           csv << data
         end
       end
-      send_data csv_string, filename: "accounts-#{Date.today}.csv", type: 'text/csv'
-    end
-
-    def new
-      @account = Kaui::Account.new
-    end
-
-    def create
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
-
-      @account.errors.add(:phone, :invalid_phone) if !@account.phone.nil? && !@account.check_account_details_phone?
-
-      @account.errors.add(:check_account_details_bill_cycle_day_local, :invalid_bill_cycle_day_local) if !@account.bill_cycle_day_local.nil? && !@account.check_account_details_bill_cycle_day_local?
-
-      unless @account.errors.empty?
-        flash.now[:errors] = @account.errors.messages.values.flatten
-        render action: :new and return
-      end
-
-      # Transform "1" into boolean
-      @account.is_migrated = @account.is_migrated == '1'
-
-      begin
-        @account = @account.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-
-        redirect_to account_path(@account.account_id), notice: 'Account was successfully created'
-      rescue StandardError => e
-        flash.now[:error] = "Error while creating account: #{as_string(e)}"
-        render action: :new
-      end
+      send_data csv_string, filename: "accounts-#{Time.zone.today}.csv", type: 'text/csv'
     end
 
     # rubocop:disable Style/MultilineBlockChain
@@ -140,7 +111,7 @@ module Kaui
       fetch_children = promise { @account.children(false, false, 'NONE', cached_options_for_klient) }
       fetch_parent = @account.parent_account_id.nil? ? nil : promise { Kaui::Account.find_by_id(@account.parent_account_id, false, false, cached_options_for_klient) }
       fetch_overdue_state = promise { @account.overdue(cached_options_for_klient) }
-      fetch_account_tags = promise { @account.tags(false, 'NONE', cached_options_for_klient).sort { |tag_a, tag_b| tag_a <=> tag_b } }
+      fetch_account_tags = promise { @account.tags(false, 'NONE', cached_options_for_klient).sort }
       fetch_account_fields = promise { @account.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase } }
       fetch_account_emails = promise { Kaui::AccountEmail.find_all_sorted_by_account_id(@account.account_id, 'NONE', cached_options_for_klient) }
       fetch_payments = promise { @account.payments(cached_options_for_klient).map! { |payment| Kaui::Payment.build_from_raw_payment(payment) } }
@@ -180,7 +151,7 @@ module Kaui
       @custom_fields = wait(fetch_account_fields)
       @account_emails = wait(fetch_account_emails)
       wait(fetch_payment_methods)
-      @payment_methods = wait(fetch_payment_methods_with_details).map { |pm_f| wait(pm_f) }.compact
+      @payment_methods = wait(fetch_payment_methods_with_details).filter_map { |pm_f| wait(pm_f) }
       @available_tags = wait(fetch_available_tags)
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
@@ -198,6 +169,52 @@ module Kaui
 
       params.permit!
     end
+
+    def new
+      @account = Kaui::Account.new
+    end
+
+    def edit; end
+
+    def create
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
+
+      @account.errors.add(:phone, :invalid_phone) if !@account.phone.nil? && !@account.check_account_details_phone?
+
+      @account.errors.add(:check_account_details_bill_cycle_day_local, :invalid_bill_cycle_day_local) if !@account.bill_cycle_day_local.nil? && !@account.check_account_details_bill_cycle_day_local?
+
+      unless @account.errors.empty?
+        flash.now[:errors] = @account.errors.messages.values.flatten
+        render action: :new and return
+      end
+
+      # Transform "1" into boolean
+      @account.is_migrated = @account.is_migrated == '1'
+
+      begin
+        @account = @account.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+        redirect_to account_path(@account.account_id), notice: 'Account was successfully created'
+      rescue StandardError => e
+        flash.now[:error] = "Error while creating account: #{as_string(e)}"
+        render action: :new
+      end
+    end
+
+    def update
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
+      @account.account_id = params.require(:account_id)
+
+      # Transform "1" into boolean
+      @account.is_migrated = @account.is_migrated == '1'
+
+      @account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to account_path(@account.account_id), notice: 'Account successfully updated'
+    rescue StandardError => e
+      flash.now[:error] = "Error while updating account: #{as_string(e)}"
+      render action: :edit
+    end
     # rubocop:enable Style/MultilineBlockChain
 
     def destroy
@@ -261,23 +278,6 @@ module Kaui
       end
     end
 
-    def edit; end
-
-    def update
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
-      @account.account_id = params.require(:account_id)
-
-      # Transform "1" into boolean
-      @account.is_migrated = @account.is_migrated == '1'
-
-      @account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-
-      redirect_to account_path(@account.account_id), notice: 'Account successfully updated'
-    rescue StandardError => e
-      flash.now[:error] = "Error while updating account: #{as_string(e)}"
-      render action: :edit
-    end
-
     def set_default_payment_method
       account_id = params.require(:account_id)
       payment_method_id = params.require(:payment_method_id)
@@ -309,7 +309,7 @@ module Kaui
     end
 
     def link_to_parent
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
       @account.account_id = params.require(:account_id)
       @account.is_payment_delegated_to_parent = @account.is_payment_delegated_to_parent == '1'
 

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -12,26 +12,50 @@ module Kaui
       end
     end
 
+    def show
+      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+      raise ActiveRecord::RecordNotFound, "Could not find user #{@allowed_user.id}" unless current_user.root? || @allowed_user.kb_username == current_user.kb_username
+
+      @roles = roles_for_user(@allowed_user)
+
+      tenants_for_current_user = retrieve_tenants_for_current_user
+      @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
+    end
+
     def new
       @allowed_user = Kaui::AllowedUser.new
       @is_killbill_managed = true
       @roles = []
 
       # Restore form state if returning from role creation
-      return unless params[:user_context].present?
+      return if params[:user_context].blank?
 
       context = params[:user_context]
       @allowed_user.kb_username = context[:kb_username]
       @allowed_user.description = context[:description]
-      @roles = context[:roles].to_s.split(',').reject(&:blank?)
+      @roles = context[:roles].to_s.split(',').compact_blank
       @external_checked = context[:external] == '1'
     end
 
+    def edit
+      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+      @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
+
+      # Use roles from context if returning from role creation, otherwise fetch from KB
+      if params[:user_context].present?
+        context = params[:user_context]
+        @roles = context[:roles].to_s.split(',').compact_blank
+        @allowed_user.description = context[:description] if context[:description].present?
+      else
+        @roles = roles_for_user(@allowed_user)
+      end
+    end
+
     def create
       @is_killbill_managed = nil
       @allowed_user = Kaui::AllowedUser.new(allowed_user_params)
 
-      existing_user = Kaui::AllowedUser.find_by_kb_username(@allowed_user.kb_username)
+      existing_user = Kaui::AllowedUser.find_by(kb_username: @allowed_user.kb_username)
       if existing_user.blank?
         if params[:external] == '1'
           # Create locally only
@@ -53,37 +77,13 @@ module Kaui
       end
     end
 
-    def show
-      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
-      raise ActiveRecord::RecordNotFound, "Could not find user #{@allowed_user.id}" unless current_user.root? || @allowed_user.kb_username == current_user.kb_username
-
-      @roles = roles_for_user(@allowed_user)
-
-      tenants_for_current_user = retrieve_tenants_for_current_user
-      @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
-    end
-
-    def edit
-      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
-      @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
-
-      # Use roles from context if returning from role creation, otherwise fetch from KB
-      if params[:user_context].present?
-        context = params[:user_context]
-        @roles = context[:roles].to_s.split(',').reject(&:blank?)
-        @allowed_user.description = context[:description] if context[:description].present?
-      else
-        @roles = roles_for_user(@allowed_user)
-      end
-    end
-
     def update
       @allowed_user = Kaui::AllowedUser.find(params.require(:id))
 
       @allowed_user.description = params[:allowed_user][:description].presence
 
       @allowed_user.update_in_kb!(params[:password].presence,
-                                  params[:roles].blank? ? nil : params[:roles].split(','),
+                                  params[:roles].presence&.split(','),
                                   current_user.kb_username,
                                   params[:reason],
                                   params[:comment],
@@ -149,7 +149,7 @@ module Kaui
     end
 
     def roles_for_user(allowed_user)
-      Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).map(&:presence).compact
+      Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).filter_map(&:presence)
     rescue StandardError
       []
     end

data/app/controllers/kaui/admin_controller.rb

@@ -23,10 +23,10 @@ module Kaui
     def set_clock
       if params[:commit] == 'Submit'
         date = Date.parse(params[:new_date]).strftime('%Y-%m-%d')
-        msg = I18n.translate('flashes.notices.clock_updated_successfully', new_date: date)
+        msg = I18n.t('flashes.notices.clock_updated_successfully', new_date: date)
       else
         date = nil
-        msg = I18n.translate('flashes.notices.clock_reset_successfully')
+        msg = I18n.t('flashes.notices.clock_reset_successfully')
       end
       begin
         Kaui::Admin.set_clock(date, nil, options_for_klient)