kaui 4.0.10 → 4.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84aed1c40d61e456534245d5a80b4b6b95a451a45360afcf18094a7251ba5f01
-  data.tar.gz: fc11a32b144e8ade97277016720bafd4679ee28ea9f82b7b6ddae9c4b4f9ce24
+  metadata.gz: 7328709e0c330b84f3e47b4041cf55aa61bf98c7ac80dbb9b2d199b71c3d1f7a
+  data.tar.gz: 27b7f69cdb1e950cd327ac7c31141a76ae6c07e7e063d5ccd6d66c020a4fe612
 SHA512:
-  metadata.gz: 05a9ae9a469dce784b1dbace9d8c7631c542221a27877679737236eda6e454ff8734f52a572eb1e3da1b0e394c0e53ea66efd933ba0907ef25e37606fe01529c
-  data.tar.gz: f483589044e9d823540c8c83710b73e6cf5ffed6bfc24d4890f5105e6cb49e9d194853e9fcd9136044ba8d9e57ffcb3fab7ea7ca031b316181c1f60784d11348
+  metadata.gz: e7e3008686fb14493dca39a5adcda76d6032c0a8ba23cbf76971dac4829d59ae275a34779d3450aaf7babead74924a66a968cfc07579e74bcd6669763681a632
+  data.tar.gz: 9195fcbb008a972b2a8e4b6dbee1b471662e5f30623910ea5b4abe290957f726b8c620c56c82df742ef43587b08f006a7c9d65825833938f01e98a666e3605fe

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -15,8 +15,16 @@ module Kaui
     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?
+
+      context = params[:user_context]
+      @allowed_user.kb_username = context[:kb_username]
+      @allowed_user.description = context[:description]
+      @roles = context[:roles].to_s.split(',').reject(&:blank?)
+      @external_checked = context[:external] == '1'
     end
 
     def create
@@ -59,7 +67,14 @@ module Kaui
       @allowed_user = Kaui::AllowedUser.find(params.require(:id))
       @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
 
-      @roles = roles_for_user(@allowed_user)
+      # 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

data/app/controllers/kaui/refunds_controller.rb

@@ -28,6 +28,7 @@ module Kaui
 
           item = KillBillClient::Model::InvoiceItem.new
           item.invoice_item_id = ii[0]
+          item.description = params.dig(:descriptions, ii[0])
           # If we tried to do a partial item adjustment, we pass the value, if not we don't send any value and let the system
           # decide what is the maximum amount we can have on that item
           item.amount = ii[1].to_f == original_item.amount ? nil : ii[1]

data/app/controllers/kaui/role_definitions_controller.rb

@@ -4,6 +4,17 @@ module Kaui
   class RoleDefinitionsController < Kaui::EngineController
     def new
       @role_definition = Kaui::RoleDefinition.new
+
+      # Store user form context if coming from user creation/edit
+      return unless params[:return_to_user].present?
+
+      session[:role_return_context] = {
+        kb_username: params[:kb_username],
+        description: params[:description],
+        roles: params[:roles],
+        external: params[:external],
+        allowed_user_id: params[:allowed_user_id]
+      }
     end
 
     def create
@@ -13,7 +24,26 @@ module Kaui
 
       begin
         @role_definition = @role_definition.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-        redirect_to admin_allowed_users_path, notice: 'Role was successfully created'
+
+        # Check if we need to return to user form with the new role
+        return_context = session.delete(:role_return_context)
+        if return_context.present?
+          # Add the new role to the existing roles
+          existing_roles = return_context[:roles].to_s.split(',').reject(&:blank?)
+          existing_roles << @role_definition.role unless existing_roles.include?(@role_definition.role)
+          return_context[:roles] = existing_roles.join(',')
+
+          # Redirect back to user form (new or edit)
+          if return_context[:allowed_user_id].present? && return_context[:allowed_user_id] != ''
+            redirect_to edit_admin_allowed_user_path(return_context[:allowed_user_id], user_context: return_context),
+                        notice: "Role '#{@role_definition.role}' was successfully created"
+          else
+            redirect_to new_admin_allowed_user_path(user_context: return_context),
+                        notice: "Role '#{@role_definition.role}' was successfully created"
+          end
+        else
+          redirect_to admin_allowed_users_path, notice: 'Role was successfully created'
+        end
       rescue StandardError => e
         flash.now[:error] = "Error while creating role: #{as_string(e)}"
         render action: :new

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

@@ -5,7 +5,7 @@
       <div class="col-sm-9">
         <div class="checkbox">
           <label for="external" class="d-flex align-items-center gap-2 control-label">
-            <%= check_box_tag :external, '1', false, disabled: !@allowed_user.id.blank?, id: 'external', class: "pt-2" %>
+            <%= check_box_tag :external, '1', @external_checked || false, disabled: !@allowed_user.id.blank?, id: 'external', class: "pt-2" %>
             Managed externally (LDAP, Okta, etc.)?
           </label>
         </div>
@@ -38,7 +38,7 @@
         </div>
         <%= hidden_field_tag :roles, @roles.join(','), id: 'roles-hidden' %>
 
-        <%= link_to new_role_definition_path, class: "border-button custom-hover add-role-button" do %>
+        <%= link_to '#', class: "border-button custom-hover add-role-button", id: "add-role-link", data: { base_url: new_role_definition_path } do %>
           <%= image_tag("kaui/modal/plus.svg", width: 16, height: 16) %>
         <% end %>
       </div>
@@ -78,6 +78,22 @@
 <%= javascript_tag do %>
     $(document).ready(function() {
 
+        // Handle add role button click - pass current form state
+        $('#add-role-link').click(function(e) {
+            e.preventDefault();
+            var baseUrl = $(this).data('base-url');
+            var params = {
+                return_to_user: '1',
+                kb_username: $('#allowed_user_kb_username').val(),
+                description: $('#allowed_user_description').val(),
+                roles: $('#roles-hidden').val(),
+                external: $('#external').is(':checked') ? '1' : '0',
+                allowed_user_id: '<%= @allowed_user.id %>'
+            };
+            var queryString = $.param(params);
+            window.location.href = baseUrl + '?' + queryString;
+        });
+
         $('#external').change(function() {
             is_killbill_managed();
         });

data/app/views/kaui/refunds/_form.html.erb

@@ -47,7 +47,7 @@
                     <div class="col-sm-9 checkbox-label">
                         <label for="<%= "cb_adj_#{ii.invoice_item_id}" %>" class="d-flex align-items-center gap-2 mb-1">
                             <input type="checkbox" id="<%= "cb_adj_#{ii.invoice_item_id}" %>">
-                            <%= Kaui.refund_invoice_description.call(index, ii, bundle_result) %>
+                            <%= text_field_tag "descriptions[#{ii.invoice_item_id}]", Kaui.refund_invoice_description.call(index, ii, bundle_result), id: "desc_#{ii.invoice_item_id}", class: 'form-control' %>
                         </label>
                         <%= text_field_tag "adjustments[#{ii.invoice_item_id}]", index, id: "tf_adj_#{ii.invoice_item_id}", value: ii.amount, class: 'form-control checkbox-label' %>
                     </div>

data/config/locales/en.yml

@@ -18,9 +18,9 @@ en:
   custom_field_uuid_exist_in_invoice_payment_db: "UUID do exist in INVOICE PAYMENT object database."
   custom_field_uuid_do_not_exist_in_db: "UUID do not exist in object database."
   custom_field_uuid_exist_in_invoice_item_db: "UUID do exist in INVOICE ITEMS object database."
-  immediate: "Immediate"
-  start_of_term: "Start of term"
-  end_of_term: "End of term"
+  immediate: "IMMEDIATE"
+  start_of_term: "START_OF_TERM"
+  end_of_term: "END_OF_TERM"
   billing_policy: "Billing Policy"
   new_account_id_or_external_key: "New account id or external key"
   object_invalid_dont_exist: "Object type INVALID or object id do not exist."

data/lib/kaui/error_handler.rb

@@ -7,31 +7,41 @@ module Kaui
 
     included do
       rescue_from(StandardError) do |error|
-        flash[:error] = "Error: #{as_string(error)}"
+        error_message = "Error: #{as_string(error)}"
         try_to_redirect_to_account_path = !params[:controller].ends_with?('accounts')
-        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path, error:, error_message:)
       end
 
       rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception|
         log_rescue_error parameter_missing_exception
-        flash[:error] = "Required parameter missing: #{parameter_missing_exception.param}"
-        perform_redirect_after_error
+        error_message = "Required parameter missing: #{parameter_missing_exception.param}"
+        perform_redirect_after_error(error: parameter_missing_exception, error_message:)
       end
 
       rescue_from(KillBillClient::API::ResponseError) do |killbill_exception|
-        flash[:error] = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
+        error_message = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
         try_to_redirect_to_account_path = !killbill_exception.is_a?(KillBillClient::API::Unauthorized) && !(killbill_exception.is_a?(KillBillClient::API::NotFound) && params[:controller].ends_with?('accounts'))
-        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path, error: killbill_exception, error_message:)
       end
     end
 
-    def perform_redirect_after_error(redirect: true)
+    def perform_redirect_after_error(error:, error_message:, redirect: true)
       account_id = nested_hash_value(params.permit!.to_h, :account_id)
-      if redirect && account_id.present?
-        redirect_to kaui_engine.account_path(account_id)
-      else
-        redirect_to kaui_engine.home_path
-      end
+      home_path = kaui_engine.home_path
+      redirect_path = if redirect && account_id.present?
+                        kaui_engine.account_path(account_id)
+                      else
+                        home_path
+                      end
+
+      redirect_path_without_query = redirect_path.to_s.split('?').first
+      already_on_redirect_target = request.path == redirect_path_without_query
+      already_on_home = params[:controller].to_s.ends_with?('home') && action_name == 'index'
+
+      raise error if already_on_redirect_target || (redirect_path == home_path && already_on_home)
+
+      flash[:error] = error_message
+      redirect_to redirect_path
     end
   end
 end

data/lib/kaui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 4.0.11
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 2026-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack