Поиск по ключам в админке #120. Также улучшен поиск по проектам в админке

Author: sergeytolkachyov

com_swjprojects/admin/forms/filter_keys.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form addfieldprefix="Joomla\Component\SWJProjects\Administrator\Field">
 	<fields name="filter">
-		<field name="search" type="text" hint="JSEARCH_FILTER"/>
+		<field name="search" type="text" hint="JSEARCH_FILTER" description="COM_SWJPROJECTS_KEYS_FILTER_SEARCH_DESC"/>
 		<field name="published" type="list" onchange="this.form.submit();">
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 			<option value="1">JPUBLISHED</option>

com_swjprojects/admin/language/en-GB/com_swjprojects.ini

@@ -93,6 +93,7 @@ COM_SWJPROJECTS_KEYS_N_ITEMS_TRASHED = "%d keys trashed."
 COM_SWJPROJECTS_KEYS_N_ITEMS_DELETED = "%d keys deleted."
 COM_SWJPROJECTS_KEYS_N_ITEMS_PUBLISHED = "%d keys published."
 COM_SWJPROJECTS_KEYS_N_ITEMS_UNPUBLISHED = "%d keys unpublished."
+COM_SWJPROJECTS_KEYS_FILTER_SEARCH_DESC="Search in key, order, note, domain or email. Use prefix ID: for key Id. e: - for email. d: - for domain. o: - for order search"
 
 COM_SWJPROJECTS_KEY = "Key"
 COM_SWJPROJECTS_KEY_ADD = "Create key"

com_swjprojects/admin/language/ru-RU/com_swjprojects.ini

@@ -94,6 +94,7 @@ COM_SWJPROJECTS_KEYS_N_ITEMS_TRASHED = "%d ключей помещено в ко
 COM_SWJPROJECTS_KEYS_N_ITEMS_DELETED = "%d ключей удалено."
 COM_SWJPROJECTS_KEYS_N_ITEMS_PUBLISHED = "%d ключей опубликовано."
 COM_SWJPROJECTS_KEYS_N_ITEMS_UNPUBLISHED = "%d ключей снято с публикации."
+COM_SWJPROJECTS_KEYS_FILTER_SEARCH_DESC="Поиск по ключу, номеру заказа, примечанию, домену или email. Используйте префикс (с двоеточием) ID: для поиска по id. Префикс e: - для email. d: - для домена. o: - для номера заказа"
 
 COM_SWJPROJECTS_KEY = "Ключ"
 COM_SWJPROJECTS_KEY_ADD = "Создать ключ"

com_swjprojects/admin/src/Model/KeysModel.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Component\SWJProjects\Administrator\Helper\KeysHelper;
+use Joomla\Uri\Uri;
 use Joomla\Utilities\ArrayHelper;
 use function array_merge;
 use function array_unique;
@@ -74,11 +75,14 @@ public function __construct($config = [])
 		// Add the ordering filtering fields whitelist
 		if (empty($config['filter_fields']))
 		{
-			$config['filter_fields'] = [
-				'id', 'v.id',
-				'published', 'state', 'k.state',
-				'project', 'project_id', 'k.project_id', 'p.id',
-			];
+            $config['filter_fields'] = [
+                'id', 'k.id',
+                'published', 'state', 'k.state',
+                'project', 'project_id', 'k.project_id', 'p.id',
+                'email','k.email',
+                'domain','k.domain',
+                'order', 'k.order'
+            ];
 		}
 
 		parent::__construct($config);
@@ -208,7 +212,7 @@ public function getProjects($pks = null)
 	 *
 	 * @since  1.6.0
 	 */
-	public function getUsers($pks = null)
+	public function getUsers($pks = null):array
 	{
 		if ($this->_users === null) $this->_users = [];
 
@@ -295,7 +299,7 @@ protected function getStoreId($id = '')
 	}
 
 	/**
-	 * Build an sql query to load versions list.
+	 * Build SQL query to load versions list.
 	 *
 	 * @return  DatabaseQuery  Database query to load versions list.
 	 *
@@ -305,14 +309,14 @@ protected function getListQuery()
 	{
 		$db    = $this->getDatabase();
 		$query = $db->getQuery(true)
-			->select(array('k.*'))
+			->select(['k.*'])
 			->from($db->quoteName('#__swjprojects_keys', 'k'));
 
 		// Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
-			$query->where('k.state = ' . (int) $published);
+			$query->where($db->quoteName('k.state').' = ' . $db->quote((int) $published));
 		}
 		elseif ($published === '')
 		{
@@ -328,28 +332,46 @@ protected function getListQuery()
 			$query->where('(' . implode(' OR ', $sql) . ')');
 		}
 
-		// Filter by search
-		$search = $this->getState('filter.search');
-		if (!empty($search))
-		{
-			if (stripos($search, 'id:') === 0)
-			{
-				$query->where('k.id = ' . (int) substr($search, 3));
-			}
-			else
-			{
-				$sql     = [];
-				$columns = ['k.key', 'k.note'];
-
-				foreach ($columns as $column)
-				{
-					$sql[] = $db->quoteName($column) . ' LIKE '
-						. $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
-				}
-
-				$query->where('(' . implode(' OR ', $sql) . ')');
-			}
-		}
+        // Filter by search
+        $search = $this->getState('filter.search');
+        if (!empty($search))
+        {
+            if (stripos($search, 'id:') === 0)
+            {
+                $query->where($db->quoteName('k.id').' = ' . $db->quote((int) substr($search, 3)));
+            }
+            elseif (stripos($search, 'd:') === 0)
+            {
+                $domain = (new Uri())->setHost(substr($search, 2))->getHost();
+                $query->where($db->quoteName('k.domain').' = ' . $db->quote($domain));
+                $query->where($db->quoteName('k.note').' LIKE ' . $db->quote('%' . str_replace(' ', '%', $db->escape(trim($domain), true) . '%')));
+            }
+            elseif (stripos($search, 'e:') === 0 || str_contains($search,'@'))
+            {
+                if(stripos($search, 'e:') === 0) {
+                    $search = substr($search, 2);
+                }
+
+                $query->where($db->quoteName('k.email').' = ' . $db->quote($search));
+            }
+            elseif (stripos($search, 'o:') === 0)
+            {
+                $query->where($db->quoteName('k.order').' = ' . $db->quote(substr($search, 2)));
+            }
+            else
+            {
+                $sql     = [];
+                $columns = ['k.key', 'k.note', 'k.email', 'k.domain', 'k.order'];
+
+                foreach ($columns as $column)
+                {
+                    $sql[] = $db->quoteName($column) . ' LIKE '
+                        . $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+                }
+
+                $query->where('(' . implode(' OR ', $sql) . ')');
+            }
+        }
 
 		// Group by
 		$query->group(['k.id']);

com_swjprojects/admin/src/Model/ProjectsModel.php

@@ -190,7 +190,7 @@ protected function getListQuery()
 			else
 			{
 				$sql     = [];
-				$columns = ['p.element', 'c.alias', 't_c.title', 'ta_p.title', 'ta_p.introtext', 'ta_p.fulltext'];
+				$columns = ['p.element', 'c.alias', 't_c.title', 'ta_p.title'];
 
 				foreach ($columns as $column)
 				{