Add unified search toggle in config

The new global search UI is new and might be unstable, hence we are giving users the option to use the old unified search UI, if the encounter signficant bottlenecks. Signed-off-by: fenn-cs <fenn25.fn@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Nov 10, 2023 · 5263add · 5263add
1 parent 61f8d5f
commit 5263add
Show file tree

Hide file tree

Showing 110 changed files with 174 additions and 159 deletions.
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -2395,4 +2395,11 @@
  * Defaults to ``true``
  */
 'reference_opengraph' => true,
+
+/**
+ * Enable use of old unified search
+ *
+ * Defaults to ``false``
+ */
+'unified_search.enabled' => false,
 ];
diff --git a/core/css/server.css b/core/css/server.css
diff --git a/core/css/server.css.map b/core/css/server.css.map
diff --git a/dist/2250-2250.js b/dist/2250-2250.js
diff --git a/dist/3998-3998.js b/dist/3998-3998.js
diff --git a/dist/2250-2250.js.LICENSE.txt → dist/3998-3998.js.LICENSE.txt b/dist/2250-2250.js.LICENSE.txt → dist/3998-3998.js.LICENSE.txt
diff --git a/dist/2250-2250.js.map → dist/3998-3998.js.map b/dist/2250-2250.js.map → dist/3998-3998.js.map
diff --git a/dist/4107-4107.js b/dist/4107-4107.js
diff --git a/dist/4107-4107.js.map b/dist/4107-4107.js.map
diff --git a/dist/6318-6318.js b/dist/6318-6318.js
diff --git a/dist/6318-6318.js.map b/dist/6318-6318.js.map
diff --git a/dist/701-701.js b/dist/701-701.js
diff --git a/dist/701-701.js.map b/dist/701-701.js.map
diff --git a/dist/7683-7683.js b/dist/7683-7683.js
diff --git a/dist/7683-7683.js.map b/dist/7683-7683.js.map
diff --git a/dist/9064-9064.js b/dist/9064-9064.js
diff --git a/dist/701-701.js.LICENSE.txt → dist/9064-9064.js.LICENSE.txt b/dist/701-701.js.LICENSE.txt → dist/9064-9064.js.LICENSE.txt
diff --git a/dist/9064-9064.js.map b/dist/9064-9064.js.map
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-init.js b/dist/comments-init.js
diff --git a/dist/comments-init.js.map b/dist/comments-init.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.LICENSE.txt b/dist/core-common.js.LICENSE.txt
@@ -74,8 +74,6 @@
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
 /**
  * @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
  *

diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-global-search.js b/dist/core-global-search.js
diff --git a/dist/core-global-search.js.map b/dist/core-global-search.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/dashboard-main.js b/dist/dashboard-main.js
diff --git a/dist/dashboard-main.js.map b/dist/dashboard-main.js.map
diff --git a/dist/dav-settings-admin-caldav.js b/dist/dav-settings-admin-caldav.js
diff --git a/dist/dav-settings-admin-caldav.js.map b/dist/dav-settings-admin-caldav.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.js.map
diff --git a/dist/federatedfilesharing-vue-settings-admin.js b/dist/federatedfilesharing-vue-settings-admin.js
diff --git a/dist/federatedfilesharing-vue-settings-admin.js.map b/dist/federatedfilesharing-vue-settings-admin.js.map
diff --git a/dist/federatedfilesharing-vue-settings-personal.js b/dist/federatedfilesharing-vue-settings-personal.js
diff --git a/dist/federatedfilesharing-vue-settings-personal.js.map b/dist/federatedfilesharing-vue-settings-personal.js.map
diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.LICENSE.txt b/dist/files-init.js.LICENSE.txt
@@ -1,3 +1,5 @@
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *

diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files-personal-settings.js b/dist/files-personal-settings.js
diff --git a/dist/files-personal-settings.js.map b/dist/files-personal-settings.js.map
diff --git a/dist/files-reference-files.js b/dist/files-reference-files.js
diff --git a/dist/files-reference-files.js.map b/dist/files-reference-files.js.map
diff --git a/dist/files-sidebar.js b/dist/files-sidebar.js
diff --git a/dist/files-sidebar.js.map b/dist/files-sidebar.js.map
diff --git a/dist/files_external-init.js b/dist/files_external-init.js
diff --git a/dist/files_external-init.js.map b/dist/files_external-init.js.map
diff --git a/dist/files_reminders-init.js b/dist/files_reminders-init.js
diff --git a/dist/files_reminders-init.js.map b/dist/files_reminders-init.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map
diff --git a/dist/files_sharing-init.js b/dist/files_sharing-init.js
diff --git a/dist/files_sharing-init.js.map b/dist/files_sharing-init.js.map
diff --git a/dist/files_sharing-personal-settings.js b/dist/files_sharing-personal-settings.js
diff --git a/dist/files_sharing-personal-settings.js.map b/dist/files_sharing-personal-settings.js.map
diff --git a/dist/files_trashbin-main.js b/dist/files_trashbin-main.js
diff --git a/dist/files_trashbin-main.js.map b/dist/files_trashbin-main.js.map
diff --git a/dist/files_versions-files_versions.js b/dist/files_versions-files_versions.js
diff --git a/dist/files_versions-files_versions.js.map b/dist/files_versions-files_versions.js.map
diff --git a/dist/settings-apps-view-7418.js b/dist/settings-apps-view-7418.js
diff --git a/dist/settings-apps-view-7418.js.map b/dist/settings-apps-view-7418.js.map
diff --git a/dist/settings-users-8351.js b/dist/settings-users-8351.js
diff --git a/dist/settings-users-8351.js.map b/dist/settings-users-8351.js.map
diff --git a/dist/settings-vue-settings-admin-ai.js b/dist/settings-vue-settings-admin-ai.js
diff --git a/dist/settings-vue-settings-admin-ai.js.map b/dist/settings-vue-settings-admin-ai.js.map
diff --git a/dist/settings-vue-settings-admin-basic-settings.js b/dist/settings-vue-settings-admin-basic-settings.js
diff --git a/dist/settings-vue-settings-admin-basic-settings.js.map b/dist/settings-vue-settings-admin-basic-settings.js.map
diff --git a/dist/settings-vue-settings-admin-delegation.js b/dist/settings-vue-settings-admin-delegation.js
diff --git a/dist/settings-vue-settings-admin-delegation.js.map b/dist/settings-vue-settings-admin-delegation.js.map
diff --git a/dist/settings-vue-settings-admin-security.js b/dist/settings-vue-settings-admin-security.js
diff --git a/dist/settings-vue-settings-admin-security.js.map b/dist/settings-vue-settings-admin-security.js.map
diff --git a/dist/settings-vue-settings-apps-users-management.js b/dist/settings-vue-settings-apps-users-management.js
diff --git a/dist/settings-vue-settings-apps-users-management.js.map b/dist/settings-vue-settings-apps-users-management.js.map
diff --git a/dist/settings-vue-settings-personal-info.js b/dist/settings-vue-settings-personal-info.js
diff --git a/dist/settings-vue-settings-personal-info.js.map b/dist/settings-vue-settings-personal-info.js.map
diff --git a/dist/settings-vue-settings-personal-password.js b/dist/settings-vue-settings-personal-password.js
diff --git a/dist/settings-vue-settings-personal-password.js.map b/dist/settings-vue-settings-personal-password.js.map
diff --git a/dist/settings-vue-settings-personal-security.js b/dist/settings-vue-settings-personal-security.js
diff --git a/dist/settings-vue-settings-personal-security.js.map b/dist/settings-vue-settings-personal-security.js.map
diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js b/dist/sharebymail-vue-settings-admin-sharebymail.js
diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js.map b/dist/sharebymail-vue-settings-admin-sharebymail.js.map
diff --git a/dist/systemtags-init.js b/dist/systemtags-init.js
diff --git a/dist/systemtags-init.js.LICENSE.txt b/dist/systemtags-init.js.LICENSE.txt
@@ -1,3 +1,5 @@
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *

diff --git a/dist/systemtags-init.js.map b/dist/systemtags-init.js.map
diff --git a/dist/theming-admin-theming.js b/dist/theming-admin-theming.js
diff --git a/dist/theming-admin-theming.js.map b/dist/theming-admin-theming.js.map
diff --git a/dist/theming-personal-theming.js b/dist/theming-personal-theming.js
diff --git a/dist/theming-personal-theming.js.map b/dist/theming-personal-theming.js.map
diff --git a/dist/updatenotification-updatenotification.js b/dist/updatenotification-updatenotification.js
diff --git a/dist/updatenotification-updatenotification.js.map b/dist/updatenotification-updatenotification.js.map
diff --git a/dist/user-status-modal-8299.js b/dist/user-status-modal-8299.js
diff --git a/dist/user-status-modal-8299.js.map b/dist/user-status-modal-8299.js.map
diff --git a/dist/user_status-menu.js b/dist/user_status-menu.js
diff --git a/dist/user_status-menu.js.map b/dist/user_status-menu.js.map
diff --git a/dist/weather_status-weather-status.js b/dist/weather_status-weather-status.js
diff --git a/dist/weather_status-weather-status.js.map b/dist/weather_status-weather-status.js.map
diff --git a/dist/workflowengine-workflowengine.js b/dist/workflowengine-workflowengine.js
diff --git a/dist/workflowengine-workflowengine.js.map b/dist/workflowengine-workflowengine.js.map
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -106,12 +106,18 @@ public function __construct($renderAs, $appId = '') {
 
 			$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
 			$this->initialState->provideInitialState('core', 'apps', $this->navigationManager->getAll());
-			$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
-			$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
-			$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
-			Util::addScript('core', 'unified-search', 'core');
-			Util::addScript('core', 'global-search', 'core');
-
+			/*
+			 * NB : Unified search enabled, defaults to true since new advanced search is
+			 * unstable. Once we think otherwise, the default should be false.
+			 */
+			if ($this->config->getSystemValueBool('unified_search.enabled', true)) {
+				$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
+				$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
+				$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
+				Util::addScript('core', 'unified-search', 'core');
+			} else {
+				Util::addScript('core', 'global-search', 'core');
+			}
 			// Set body data-theme
 			$this->assign('enabledThemes', []);
 			if (\OC::$server->getAppManager()->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {