merge back Release 2.4.0

CHANGELOG.md

@@ -4,7 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-### [Unreleased] - xxxx-xx-xx
+### [Unreleased] 
+
+
+### [2.4.0] - 2023-11-02
+
+### Changed
+
+* [#322](https://github.com/owncloud/search_elastic/pull/322) - Always return an int from Symfony Command execute method
+* [#319](https://github.com/owncloud/search_elastic/pull/319) - Refactor connector
+* [#5643](https://github.com/owncloud/enterprise/issues/5643) - [00019894] - Feature Request - Elasticsearch - More Search Results and Latest Files
+
+### Fixed
+
+* [#5556](https://github.com/owncloud/enterprise/issues/5556) - [Fix] Remove trailing wildcard in searches of search_elastic enterprise
 
 ## [2.3.0] - 2022-03-02
 
@@ -105,7 +118,9 @@ This release requires Elastic Search 5.6.x and the `ingest-attachment` processor
 ### Removed
 - Dropped support for Elastic Search 2.x
 
-[Unreleased]: https://github.com/owncloud/search_elastic/compare/v2.2.0...master
+[Unreleased]: https://github.com/owncloud/search_elastic/compare/v2.4.0...master
+[2.4.0]: https://github.com/owncloud/search_elastic/compare/v2.3.0...v2.4.0
+[2.3.0]: https://github.com/owncloud/search_elastic/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/owncloud/search_elastic/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/owncloud/search_elastic/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/owncloud/search_elastic/compare/v1.0.0...v2.0.0

appinfo/info.xml

@@ -2,11 +2,11 @@
 <info>
 	<id>search_elastic</id>
 	<name>Full Text Search</name>
-	<version>2.3.0</version>
+	<version>2.4.0</version>
 	<licence>GPLv2</licence>
 	<author>ownCloud GmbH</author>
 	<dependencies>
-		<owncloud min-version="10.3" max-version="10" />
+		<owncloud min-version="10.5" max-version="10" />
 		<php min-version="7.3" max-version="7.4"/>
 	</dependencies>
 	<use-migrations>true</use-migrations>
@@ -29,5 +29,6 @@
 		<command>OCA\Search_Elastic\Command\Reset</command>
 		<command>OCA\Search_Elastic\Command\Update</command>
 		<command>OCA\Search_Elastic\Command\Rebuild</command>
+		<command>OCA\Search_Elastic\Command\FillSecondary</command>
 	</commands>
 </info>

appinfo/routes.php

@@ -34,6 +34,7 @@
 	['name' => 'admin_settings#checkStatus', 'url' => '/settings/status', 'verb' => 'GET'],
 	['name' => 'admin_settings#setup', 'url' => '/setup', 'verb' => 'POST'],
 	['name' => 'admin_settings#rescan', 'url' => '/rescan', 'verb' => 'POST'],
+	['name' => 'admin_settings#saveConnectors', 'url' => '/settings/connectors/save', 'verb' => 'POST'],
 	['name' => 'api#index', 'url' => '/indexer/index', 'verb' => 'GET'],
 	['name' => 'api#optimize', 'url' => '/indexer/optimize', 'verb' => 'POST'],
 ]];

css/settings/admin.css

@@ -13,6 +13,18 @@
 	width: 215px;
 }
 
+/*
+ * core/css/share.css uses text-transform:lowercase which looks
+ * bad here. Revert it for our elements
+ */
+#searchElasticSettings .select2-search-choice {
+	text-transform: none;
+}
+
+#searchElasticSettings div.field-margin-left-16 > div {
+	margin: 5px 5px 5px 0px;
+}
+
 .hide {
 	display: none;
 }
@@ -23,4 +35,4 @@
 
 .field-margin-left-16 {
 	margin-left: 16px;
-}
+}

js/settings/admin.js

@@ -100,6 +100,28 @@
 			});
 		}
 
+		$('.select2').select2({
+			minimumResultsForSearch: -1
+		});
+		$('#saveConnectors').on('click', function(e) {
+			var sCon = $('#searchConnector').val();
+			var wCon = $('#writeConnectorList').val();
+			if (wCon.indexOf(sCon) !== -1) {
+				// search connector must be present in the write connectors
+				$.post(
+					OC.generateUrl('apps/search_elastic/settings/connectors/save'),
+					{
+						searchConnector: sCon,
+						writeConnectors: wCon
+					}
+				).always(function(result) {
+					OC.msg.finishedSaving('#saveMessage', result);
+				});
+			} else {
+				OC.msg.finishedError('#saveMessage', t('search_elastic', 'Error: the search connector must be present in the write connectors'));
+			}
+		});
+
 		$('#saveConfiguration').on('click', function(e) {
 			var host = $('#host').val();
 			var auth = $('#authType').val();

lib/AdminPanel.php

@@ -25,10 +25,24 @@
 namespace OCA\Search_Elastic;
 
 use OCP\Settings\ISettings;
+use OCA\Search_Elastic\SearchElasticService;
 
 class AdminPanel implements ISettings {
+	/** @var SearchElasticService */
+	private $service;
+
+	public function __construct(SearchElasticService $service) {
+		$this->service = $service;
+	}
+
 	public function getPanel() {
-		return new \OCP\Template('search_elastic', 'settings/admin');
+		$conInfo = $this->service->getConnectorInfo();
+
+		$tmpl = new \OCP\Template('search_elastic', 'settings/admin');
+		$tmpl->assign('connectorList', $conInfo['registered']);
+		$tmpl->assign('writeConnectors', $conInfo['write']);
+		$tmpl->assign('searchConnector', $conInfo['search']);
+		return $tmpl;
 	}
 
 	public function getSectionID() {

lib/AppInfo/Application.php

@@ -36,6 +36,9 @@
 use OCA\Search_Elastic\Db\StatusMapper;
 use OCA\Search_Elastic\Hooks\Files;
 use OCA\Search_Elastic\Jobs\DeleteJob;
+use OCA\Search_Elastic\Connectors\Hub;
+use OCA\Search_Elastic\Connectors\ConnectorLegacy;
+use OCA\Search_Elastic\Connectors\ConnectorRelevanceV2;
 use OCA\Search_Elastic\SearchElasticConfigService;
 use OCA\Search_Elastic\SearchElasticService;
 use OCP\AppFramework\App;
@@ -92,6 +95,14 @@ function (IAppContainer $appContainer) {
 			return false;
 		});
 
+		$container->registerService(Hub::class, function (IAppContainer $c) {
+			$server = $c->getServer();
+			$hub = new Hub($c->query(SearchElasticConfigService::class), $server->getLogger());
+			$hub->registerConnector($c->query(ConnectorLegacy::class));
+			$hub->registerConnector($c->query(ConnectorRelevanceV2::class));
+			return $hub;
+		});
+
 		$container->registerService(AuthManager::class, function (IAppContainer $c) {
 			$server = $c->getServer();
 

lib/Command/Create.php

@@ -68,7 +68,12 @@ public function __construct(
 	protected function configure() {
 		$this
 			->setName('search:index:create')
-			->setDescription('Create initial Search Index for one or all users. This command could not update the search index correctly after the initial indexing.')
+			->setDescription(
+				'Create initial indexes for one or all users.'.
+				' The indexes will be created based on the configured connectors.'.
+				' New indexes will be setup if needed, but old ones won\'t be reset.'.
+				' This command could not update the indexes correctly after the initial indexing.'
+			)
 			->addArgument(
 				'user_id',
 				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,