Merge pull request #29442 from nextcloud/backport/stable22/26841

apps/files/lib/Controller/ViewController.php

@@ -197,7 +197,7 @@ class ViewController extends Controller {
 		// Load the files we need
 		\OCP\Util::addStyle('files', 'merged');
 		\OCP\Util::addScript('files', 'merged-index');
-		\OCP\Util::addScript('files', 'dist/templates');
+		\OCP\Util::addScript('files', 'dist/main');
 
 		// mostly for the home storage's free space
 		// FIXME: Make non static

apps/files/src/legacy/filelistSearch.js

@@ -0,0 +1,42 @@
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { subscribe } from '@nextcloud/event-bus'
+
+(function() {
+
+	const FilesPlugin = {
+		attach(fileList) {
+			subscribe('nextcloud:unified-search.search', ({ query }) => {
+				fileList.setFilter(query)
+			})
+			subscribe('nextcloud:unified-search.reset', () => {
+				this.query = null
+				fileList.setFilter('')
+			})
+
+		},
+	}
+
+	window.OC.Plugins.register('OCA.Files.FileList', FilesPlugin)
+
+})()

apps/files/src/main.js

@@ -0,0 +1,3 @@
+import './files-app-settings'
+import './templates'
+import './legacy/filelistSearch'

apps/files/templates/appnavigation.php

@@ -1,6 +1,3 @@
-<?php
-script(\OCA\Files\AppInfo\Application::APP_ID, 'dist/files-app-settings');
-?>
 <div id="app-navigation">
 	<ul class="with-icon">
 

apps/files/templates/recentlist.php

@@ -5,7 +5,7 @@
 
 <input type="hidden" name="dir" value="" id="dir">
 
-<div class="nofilterresults hidden">
+<div class="nofilterresults emptycontent hidden">
 	<div class="icon-search"></div>
 	<h2><?php p($l->t('No entries found in this folder')); ?></h2>
 	<p></p>

apps/files/templates/simplelist.php

@@ -8,7 +8,7 @@
 
 <input type="hidden" name="dir" value="" id="dir">
 
-<div class="nofilterresults hidden">
+<div class="nofilterresults emptycontent hidden">
 	<div class="icon-search"></div>
 	<h2><?php p($l->t('No entries found in this folder')); ?></h2>
 	<p></p>

apps/files/webpack.js

@@ -26,9 +26,8 @@ const path = require('path')
 
 module.exports = {
 	entry: {
+		main: path.join(__dirname, 'src', 'main.js'),
 		sidebar: path.join(__dirname, 'src', 'sidebar.js'),
-		templates: path.join(__dirname, 'src', 'templates.js'),
-		'files-app-settings': path.join(__dirname, 'src', 'files-app-settings.js'),
 		'personal-settings': path.join(__dirname, 'src', 'main-personal-settings.js'),
 	},
 	output: {

apps/files_sharing/templates/list.php

@@ -5,7 +5,7 @@
 
 <input type="hidden" name="dir" value="" id="dir">
 
-<div class="nofilterresults hidden">
+<div class="nofilterresults emptycontent hidden">
 	<div class="icon-search"></div>
 	<h2><?php p($l->t('No entries found in this folder')); ?></h2>
 </div>

apps/files_trashbin/templates/index.php

@@ -12,7 +12,7 @@
 
 <input type="hidden" name="dir" value="" id="dir">
 
-<div class="nofilterresults hidden">
+<div class="nofilterresults emptycontent hidden">
 	<div class="icon-search"></div>
 	<h2><?php p($l->t('No entries found in this folder')); ?></h2>
 	<p></p>