Revert the search code update

Author: tungleduyxyz

app/controllers/kaui/accounts_controller.rb

@@ -7,17 +7,14 @@ def index
       @search_query = params[:q]
       @advance_search_query = @search_query || request.query_string
       if @search_query.present?
-        # Fetch 2 to determine if there's exactly 1 match without relying on
-        # pagination_max_nb_records which can be unreliable for small result sets
-        accounts = Kaui::Account.list_or_search(@search_query, 0, 2, options_for_klient)
-        if accounts.empty?
+        account = Kaui::Account.list_or_search(@search_query, -1, 1, options_for_klient).first
+        if account.nil?
           flash[:error] = "No account matches \"#{@search_query}\""
           redirect_to kaui_engine.home_path
-          return
-        elsif accounts.length == 1
-          redirect_to kaui_engine.account_path(accounts.first.account_id)
-          return
+        else
+          redirect_to kaui_engine.account_path(account.account_id)
         end
+        return
       end
       @search_fields = Kaui::Account::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }
       @dropdown_default = default_columns(Kaui.account_search_columns.call[2], Kaui::Account::SENSIVITE_DATA_FIELDS)

app/controllers/kaui/home_controller.rb

@@ -35,7 +35,7 @@ def splitting_new_search(search_query)
       (search_query || '').split(':').map(&:strip)
     end
 
-    def account_search(search_query, search_by = nil, _fast = 0, options = {})
+    def account_search(search_query, search_by = nil, fast = 0, options = {})
       if search_by == 'ID'
         begin
           account = Kaui::Account.find_by_id(search_query, false, false, options)
@@ -51,11 +51,10 @@ def account_search(search_query, search_by = nil, _fast = 0, options = {})
           search_error("No account matches \"#{search_query}\"")
         end
       else
-        accounts = Kaui::Account.list_or_search(search_query, 0, 2, options)
-        account = accounts.first
-        if accounts.empty?
+        account = Kaui::Account.list_or_search(search_query, 0, 1, options).first
+        if account.blank?
           search_error("No account matches \"#{search_query}\"")
-        elsif accounts.length == 1
+        elsif true?(fast)
           redirect_to account_path(account.account_id) and return
         else
           redirect_to accounts_path(q: search_query) and return

test/functional/kaui/accounts_controller_test.rb

@@ -10,8 +10,8 @@ class AccountsControllerTest < Kaui::FunctionalTestHelper
     end
 
     test 'should get index one account' do
-      # When searching by exact account_id, only one result exists → redirect directly to account detail
       parameters = {
+        fast: '1',
         q: @account.account_id
       }
 
@@ -20,6 +20,7 @@ class AccountsControllerTest < Kaui::FunctionalTestHelper
       assert_redirected_to account_path(@account.account_id)
 
       parameters = {
+        fast: '1',
         q: 'THIS_IS_NOT_FOUND_REDIRECT'
       }
 

test/functional/kaui/admin_tenants_controller_test.rb

@@ -365,7 +365,7 @@ def create_kaui_tenant
     def installed_plugins
       installed_plugins = []
       nodes_info = KillBillClient::Model::NodesInfo.nodes_info(build_options(@tenant, USERNAME, PASSWORD)) || []
-      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
+      plugins_info = nodes_info.first.plugins_info || []
       plugins_info.each do |plugin|
         next if plugin.plugin_key.nil? || plugin.version.nil?
         next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }

test/functional/kaui/home_controller_test.rb

@@ -42,37 +42,37 @@ class HomeControllerTest < Kaui::FunctionalTestHelper
 
     test 'should understand account search queries' do
       dummy_uuid = SecureRandom.uuid.to_s
-      # search by account_id (unique UUID) → redirects directly to account detail
+      # search defaults using a UUID
       get :search, params: { q: query_builder('ACCOUNT', @account.account_id) }
-      assert_redirected_to account_path(@account.account_id)
+      assert_redirected_to accounts_path(q: @account.account_id)
 
-      # search by name ('Kaui' is shared across test accounts) → redirects to list
+      # search defaults using a String
       get :search, params: { q: query_builder('ACCOUNT', @account.name) }
       assert_redirected_to accounts_path(q: @account.name)
 
-      # search by account_id again → redirects directly to account detail
+      # search by ID
       get :search, params: { q: query_builder('ACCOUNT', @account.account_id) }
-      assert_redirected_to account_path(@account.account_id)
+      assert_redirected_to accounts_path(q: @account.account_id)
 
       # search by ID and fails
       get :search, params: { q: query_builder('ACCOUNT', dummy_uuid) }
       assert_redirected_to home_path
       assert_equal "No account matches \"#{dummy_uuid}\"", flash[:error]
 
-      # search by external_key (unique UUID) → redirects directly to account detail
+      # search by EXTERNAL_KEY
       get :search, params: { q: query_builder('ACCOUNT', @account.external_key) }
-      assert_redirected_to account_path(@account.account_id)
+      assert_redirected_to accounts_path(q: @account.external_key)
 
       # search by EXTERNAL_KEY and fails
       get :search, params: { q: query_builder('ACCOUNT', dummy_uuid) }
       assert_redirected_to home_path
       assert_equal "No account matches \"#{dummy_uuid}\"", flash[:error]
 
-      # search by name (shared) → redirects to list
+      # search by BLANK only first
       get :search, params: { q: query_builder('ACCOUNT', @account.name) }
       assert_redirected_to accounts_path(q: @account.name)
 
-      # search by name again (shared) → redirects to list
+      # search by BLANK
       get :search, params: { q: query_builder('ACCOUNT', @account.name) }
       assert_redirected_to accounts_path(q: @account.name)
 
@@ -327,11 +327,9 @@ class HomeControllerTest < Kaui::FunctionalTestHelper
     test 'should understand tag search queries' do
       dummy_uuid = SecureRandom.uuid.to_s
       tag = create_tag
-      # search by tag UUID: Kill Bill tag search doesn't support lookup by tag_id,
-      # so this falls through to an error
+      # search by ID
       get :search, params: { q: query_builder('TAG', tag[0].tag_id) }
-      assert_redirected_to home_path
-      assert_equal "No tag matches \"#{tag[0].tag_id}\"", flash[:error]
+      assert_redirected_to tags_path(q: tag[0].tag_id)
 
       # search by ID and fails
       get :search, params: { q: query_builder('TAG', dummy_uuid) }