Merge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section-again-in-the-files-app

[stable14] Fix opening a section again in the Files app

10 files changed, 148 insertions, 29 deletions

diff --git a/apps/files/js/favoritesfilelist.js b/apps/files/js/favoritesfilelist.js
index 8c9c125d0a1..44adf5d7b5b 100644
--- a/apps/files/js/favoritesfilelist.js
+++ b/apps/files/js/favoritesfilelist.js
@@ -94,12 +94,6 @@ $(document).ready(function() {
 
 				return OCA.Files.FileList.prototype.reloadCallback.call(this, status, result);
 			},
-
-			_onUrlChanged: function (e) {
-				if (e && _.isString(e.dir)) {
-					this.changeDirectory(e.dir, false, true);
-				}
-			}
 		});
 
 		OCA.Files.FavoritesFileList = FavoritesFileList;
diff --git a/apps/files/js/favoritesplugin.js b/apps/files/js/favoritesplugin.js
index 7294ef9461c..3ceadca826d 100644
--- a/apps/files/js/favoritesplugin.js
+++ b/apps/files/js/favoritesplugin.js
@@ -67,6 +67,11 @@
 			return new OCA.Files.FavoritesFileList(
 				$el, {
 					fileActions: fileActions,
+					// The file list is created when a "show" event is handled,
+					// so it should be marked as "shown" like it would have been
+					// done if handling the event with the file list already
+					// created.
+					shown: true
 				}
 			);
 		},
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8fb8a021811..42b80189287 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -226,6 +226,10 @@
 				return;
 			}
 
+			if (options.shown) {
+				this.shown = options.shown;
+			}
+
 			if (options.config) {
 				this._filesConfig = options.config;
 			} else if (!_.isUndefined(OCA.Files) && !_.isUndefined(OCA.Files.App)) {
diff --git a/apps/files/js/recentplugin.js b/apps/files/js/recentplugin.js
index 524b556a517..c1b013ef1b8 100644
--- a/apps/files/js/recentplugin.js
+++ b/apps/files/js/recentplugin.js
@@ -67,6 +67,11 @@
 			return new OCA.Files.RecentFileList(
 				$el, {
 					fileActions: fileActions,
+					// The file list is created when a "show" event is handled,
+					// so it should be marked as "shown" like it would have been
+					// done if handling the event with the file list already
+					// created.
+					shown: true
 				}
 			);
 		},
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
index 750f66236ae..b6ca71e15d1 100644
--- a/apps/files_sharing/js/app.js
+++ b/apps/files_sharing/js/app.js
@@ -34,7 +34,11 @@ OCA.Sharing.App = {
 				id: 'shares.self',
 				sharedWithUser: true,
 				fileActions: this._createFileActions(),
-				config: OCA.Files.App.getFilesConfig()
+				config: OCA.Files.App.getFilesConfig(),
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 
@@ -56,7 +60,11 @@ OCA.Sharing.App = {
 				id: 'shares.others',
 				sharedWithUser: false,
 				fileActions: this._createFileActions(),
-				config: OCA.Files.App.getFilesConfig()
+				config: OCA.Files.App.getFilesConfig(),
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 
@@ -78,7 +86,11 @@ OCA.Sharing.App = {
 				id: 'shares.link',
 				linksOnly: true,
 				fileActions: this._createFileActions(),
-				config: OCA.Files.App.getFilesConfig()
+				config: OCA.Files.App.getFilesConfig(),
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 
@@ -101,7 +113,11 @@ OCA.Sharing.App = {
 				showDeleted: true,
 				sharedWithUser: true,
 				fileActions: this._restoreShareAction(),
-				config: OCA.Files.App.getFilesConfig()
+				config: OCA.Files.App.getFilesConfig(),
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 
@@ -122,7 +138,11 @@ OCA.Sharing.App = {
 			{
 				id: 'shares.overview',
 				config: OCA.Files.App.getFilesConfig(),
-				isOverview: true
+				isOverview: true,
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 3a6de0d5012..c7a4d2b6d11 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -444,12 +444,6 @@
 			// Sort by expected sort comparator
 			return files.sort(this._sortComparator);
 		},
-
-		_onUrlChanged: function(e) {
-			if (e && _.isString(e.dir)) {
-				this.changeDirectory(e.dir, false, true);
-			}
-		}
 	});
 
 	/**
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 7cdc157fe47..b345d876997 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -31,17 +31,21 @@ OCA.Trashbin.App = {
 				scrollTo: urlParams.scrollto,
 				config: OCA.Files.App.getFilesConfig(),
 				multiSelectMenu: [
-				{
-					name: 'restore',
-					displayName:  t('files', 'Restore'),
-					iconClass: 'icon-history',
-				},
-				{
-					name: 'delete',
-					displayName: t('files', 'Delete'),
-					iconClass: 'icon-delete',
-				}
-			]
+					{
+						name: 'restore',
+						displayName: t('files', 'Restore'),
+						iconClass: 'icon-history',
+					},
+					{
+						name: 'delete',
+						displayName: t('files', 'Delete'),
+						iconClass: 'icon-delete',
+					}
+				],
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
 			}
 		);
 	},
diff --git a/apps/systemtags/js/app.js b/apps/systemtags/js/app.js
index 04ac53d3b32..2ef88564528 100644
--- a/apps/systemtags/js/app.js
+++ b/apps/systemtags/js/app.js
@@ -28,7 +28,12 @@
 				{
 					id: 'systemtags',
 					fileActions: this._createFileActions(),
-					config: OCA.Files.App.getFilesConfig()
+					config: OCA.Files.App.getFilesConfig(),
+					// The file list is created when a "show" event is handled,
+					// so it should be marked as "shown" like it would have been
+					// done if handling the event with the file list already
+					// created.
+					shown: true
 				}
 			);
 
diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature
index 00f09900d3e..3bded3fef11 100644
--- a/tests/acceptance/features/app-files.feature
+++ b/tests/acceptance/features/app-files.feature
@@ -31,6 +31,78 @@ Feature: app-files
     When I open the details view for "welcome.txt"
     Then I see that the details view is open
 
+  Scenario: show recent files
+    Given I am logged in
+    And I create a new folder named "Folder just created"
+    When I open the "Recent" section
+    Then I see that the current section is "Recent"
+    Then I see that the file list contains a file named "Folder just created"
+
+  Scenario: show recent files for a second time
+    Given I am logged in
+    And I open the "Recent" section
+    And I see that the current section is "Recent"
+    And I open the "All files" section
+    And I see that the current section is "All files"
+    And I create a new folder named "Folder just created"
+    When I open the "Recent" section
+    Then I see that the current section is "Recent"
+    Then I see that the file list contains a file named "Folder just created"
+
+  Scenario: show favorites
+    Given I am logged in
+    And I mark "welcome.txt" as favorite
+    When I open the "Favorites" section
+    Then I see that the current section is "Favorites"
+    Then I see that the file list contains a file named "welcome.txt"
+
+  Scenario: show favorites for a second time
+    Given I am logged in
+    And I open the "Favorites" section
+    And I see that the current section is "Favorites"
+    And I open the "All files" section
+    And I see that the current section is "All files"
+    And I mark "welcome.txt" as favorite
+    When I open the "Favorites" section
+    Then I see that the current section is "Favorites"
+    Then I see that the file list contains a file named "welcome.txt"
+
+  Scenario: show shares
+    Given I am logged in
+    And I share the link for "welcome.txt"
+    When I open the "Shares" section
+    Then I see that the current section is "Shares"
+    Then I see that the file list contains a file named "welcome.txt"
+
+  Scenario: show shares for a second time
+    Given I am logged in
+    And I open the "Shares" section
+    And I see that the current section is "Shares"
+    And I open the "All files" section
+    And I see that the current section is "All files"
+    And I share the link for "welcome.txt"
+    When I open the "Shares" section
+    Then I see that the current section is "Shares"
+    Then I see that the file list contains a file named "welcome.txt"
+
+  Scenario: show deleted files
+    Given I am logged in
+    And I delete "welcome.txt"
+    When I open the "Deleted files" section
+    Then I see that the current section is "Deleted files"
+    Then I see that the file list contains a file named "welcome.txt"
+
+  Scenario: show deleted files for a second time
+    Given I am logged in
+    And I open the "Deleted files" section
+    And I see that the current section is "Deleted files"
+    And I open the "All files" section
+    And I see that the current section is "All files"
+    And I delete "welcome.txt"
+    When I open the "Deleted files" section
+    Then I see that the current section is "Deleted files"
+    Then I see that the file list contains a file named "welcome.txt"
+
   Scenario: rename a file with the details view open
     Given I am logged in
     And I open the details view for "welcome.txt"
diff --git a/tests/acceptance/features/bootstrap/FileListContext.php b/tests/acceptance/features/bootstrap/FileListContext.php
index bc225e3f9b1..6a39d7a999f 100644
--- a/tests/acceptance/features/bootstrap/FileListContext.php
+++ b/tests/acceptance/features/bootstrap/FileListContext.php
@@ -255,6 +255,13 @@ class FileListContext implements Context, ActorAwareInterface {
 	}
 
 	/**
+	 * @return Locator
+	 */
+	public static function deleteMenuItem() {
+		return self::fileActionsMenuItemFor("Delete");
+	}
+
+	/**
 	 * @Given I create a new folder named :folderName
 	 */
 	public function iCreateANewFolderNamed($folderName) {
@@ -323,6 +330,15 @@ class FileListContext implements Context, ActorAwareInterface {
 	}
 
 	/**
+	 * @When I delete :fileName
+	 */
+	public function iDelete($fileName) {
+		$this->actor->find(self::fileActionsMenuButtonForFile($this->fileListAncestor, $fileName), 10)->click();
+
+		$this->actor->find(self::deleteMenuItem(), 2)->click();
+	}
+
+	/**
 	 * @Then I see that the file list is eventually loaded
 	 */
 	public function iSeeThatTheFileListIsEventuallyLoaded() {