From 426f20447325a729e0ce897d8ecc8e6532358f1e Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Fri, 26 May 2023 13:15:01 +0200
Subject: [PATCH] specify default search-field for on-page
 listing-search/filter

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/Froxlor/UI/Listing.php                          | 1 +
 lib/tablelisting/admin/tablelisting.admins.php      | 1 +
 lib/tablelisting/admin/tablelisting.domains.php     | 1 +
 lib/tablelisting/admin/tablelisting.fpmconfigs.php  | 1 +
 lib/tablelisting/admin/tablelisting.ipsandports.php | 1 +
 lib/tablelisting/admin/tablelisting.mysqlserver.php | 1 +
 lib/tablelisting/admin/tablelisting.phpconfigs.php  | 1 +
 lib/tablelisting/admin/tablelisting.plans.php       | 1 +
 templates/Froxlor/table/table.html.twig             | 2 +-
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Froxlor/UI/Listing.php b/lib/Froxlor/UI/Listing.php
index 3d3be00a..c32f30f4 100644
--- a/lib/Froxlor/UI/Listing.php
+++ b/lib/Froxlor/UI/Listing.php
@@ -230,6 +230,7 @@ class Listing
 					'label' => $coldata['label'],
 					'checked' => in_array($column, $tabellisting['visible_columns']),
 					'searchable' => $coldata['searchable'] ?? true,
+					'isdefaultsearchfield' => $coldata['isdefaultsearchfield'] ?? false,
 				];
 			}
 		}
diff --git a/lib/tablelisting/admin/tablelisting.admins.php b/lib/tablelisting/admin/tablelisting.admins.php
index aaa82126..d9abf86d 100644
--- a/lib/tablelisting/admin/tablelisting.admins.php
+++ b/lib/tablelisting/admin/tablelisting.admins.php
@@ -48,6 +48,7 @@ return [
 				'field' => 'loginname',
 				'callback' => [Impersonate::class, 'admin'],
 				'sortable' => true,
+				'isdefaultsearchfield' => true,
 			],
 			'name' => [
 				'label' => lng('customer.name'),
diff --git a/lib/tablelisting/admin/tablelisting.domains.php b/lib/tablelisting/admin/tablelisting.domains.php
index 17aa75bc..3c484e11 100644
--- a/lib/tablelisting/admin/tablelisting.domains.php
+++ b/lib/tablelisting/admin/tablelisting.domains.php
@@ -48,6 +48,7 @@ return [
 			'd.domain_ace' => [
 				'label' => lng('domains.domainname'),
 				'field' => 'domain_ace',
+				'isdefaultsearchfield' => true,
 			],
 			'ipsandports' => [
 				'label' => lng('admin.ipsandports.ipsandports'),
diff --git a/lib/tablelisting/admin/tablelisting.fpmconfigs.php b/lib/tablelisting/admin/tablelisting.fpmconfigs.php
index bae9c366..2d2ac0bc 100644
--- a/lib/tablelisting/admin/tablelisting.fpmconfigs.php
+++ b/lib/tablelisting/admin/tablelisting.fpmconfigs.php
@@ -41,6 +41,7 @@ return [
 			'description' => [
 				'label' => lng('admin.phpsettings.description'),
 				'field' => 'description',
+				'isdefaultsearchfield' => true,
 			],
 			'configs' => [
 				'label' => lng('admin.phpsettings.activephpconfigs'),
diff --git a/lib/tablelisting/admin/tablelisting.ipsandports.php b/lib/tablelisting/admin/tablelisting.ipsandports.php
index 47046c48..b5f920fd 100644
--- a/lib/tablelisting/admin/tablelisting.ipsandports.php
+++ b/lib/tablelisting/admin/tablelisting.ipsandports.php
@@ -37,6 +37,7 @@ return [
 			'ip' => [
 				'label' => lng('admin.ipsandports.ip'),
 				'field' => 'ip',
+				'isdefaultsearchfield' => true,
 			],
 			'port' => [
 				'label' => lng('admin.ipsandports.port'),
diff --git a/lib/tablelisting/admin/tablelisting.mysqlserver.php b/lib/tablelisting/admin/tablelisting.mysqlserver.php
index 53877395..01efcf40 100644
--- a/lib/tablelisting/admin/tablelisting.mysqlserver.php
+++ b/lib/tablelisting/admin/tablelisting.mysqlserver.php
@@ -40,6 +40,7 @@ return [
 			'caption' => [
 				'label' => lng('admin.mysqlserver.caption'),
 				'field' => 'caption',
+				'isdefaultsearchfield' => true,
 			],
 			'host' => [
 				'label' => lng('admin.mysqlserver.host'),
diff --git a/lib/tablelisting/admin/tablelisting.phpconfigs.php b/lib/tablelisting/admin/tablelisting.phpconfigs.php
index 207f90b4..a2f025b1 100644
--- a/lib/tablelisting/admin/tablelisting.phpconfigs.php
+++ b/lib/tablelisting/admin/tablelisting.phpconfigs.php
@@ -42,6 +42,7 @@ return [
 			'c.description' => [
 				'label' => lng('admin.phpsettings.description'),
 				'field' => 'description',
+				'isdefaultsearchfield' => true,
 			],
 			'domains' => [
 				'label' => lng('admin.phpsettings.activedomains'),
diff --git a/lib/tablelisting/admin/tablelisting.plans.php b/lib/tablelisting/admin/tablelisting.plans.php
index a4e08ed2..be4dd5ff 100644
--- a/lib/tablelisting/admin/tablelisting.plans.php
+++ b/lib/tablelisting/admin/tablelisting.plans.php
@@ -40,6 +40,7 @@ return [
 			'p.name' => [
 				'label' => lng('admin.plans.name'),
 				'field' => 'name',
+				'isdefaultsearchfield' => true,
 			],
 			'p.description' => [
 				'label' => lng('admin.plans.description'),
diff --git a/templates/Froxlor/table/table.html.twig b/templates/Froxlor/table/table.html.twig
index 939b9b00..32d9dcb7 100644
--- a/templates/Froxlor/table/table.html.twig
+++ b/templates/Froxlor/table/table.html.twig
@@ -111,7 +111,7 @@
 						<select class="form-select" name="searchfield" id="searchfield">
 						{% for key, column in listing.available_columns %}
 							{% if column.searchable is not defined or (column.searchable is defined and column.searchable == true) %}
-							<option value="{{ key }}">{{ column.label }}</option>
+							<option value="{{ key }}" {% if column.isdefaultsearchfield is defined and column.isdefaultsearchfield == true %}selected{% endif %}>{{ column.label }}</option>
 							{% endif %}
 						{% endfor %}
 						</select>