show reshare public links to the original share owner

changelog/unreleased/36865

@@ -0,0 +1,6 @@
+Bugfix: show re-share public links to share-owner
+
+Public links created by share-recipient were not visible to share-owner.
+This problem has been resolved.
+
+https://github.com/owncloud/core/pull/36865

core/js/shareitemmodel.js

@@ -803,14 +803,6 @@
 						|| share.item_source === this.get('itemSource'));
 
 					if (isShareLink) {
-						/*
-						 * Ignore reshared link shares for now
-						 * FIXME: Find a way to display properly
-						 */
-						if (share.uid_owner !== OC.currentUser) {
-							return share;
-						}
-
 						linkShares.push(share);
 						return share;
 					}

tests/acceptance/features/bootstrap/WebUISharingContext.php

@@ -1636,11 +1636,11 @@ public function thePublicShouldSeeAnErrorMessageWhileAccessingLastCreatedPublicL
 	public function createPublicShareLink($name, $settings = null) {
 		$this->filesPage->waitTillPageIsloaded($this->getSession());
 		//close any open sharing dialog
-		//if there is no dialog open and we try to close it
-		//an exception will be thrown, but we do not care
 		try {
 			$this->filesPage->closeDetailsDialog();
-		} catch (Exception $e) {
+		} catch (ElementNotFoundException $e) {
+			//if there is no dialog open and we try to close it
+			//an exception will be thrown, but we do not care
 		}
 		$session = $this->getSession();
 		$this->sharingDialog = $this->filesPage->openSharingDialog(
@@ -1915,4 +1915,33 @@ public function theFollowingResourcesShouldNotHaveShareIndicatorOnTheWebUI(Table
 			);
 		}
 	}
+
+	/**
+	 * @Then a public link share with name :arg1 should be visible on the webUI
+	 *
+	 * @param string $expectedLinkEntryName
+	 *
+	 * @return void
+	 */
+	public function publicLinkShareWithNameShouldBeVisibleOnTheWebUI($expectedLinkEntryName) {
+		$actualNamesArrayOfPublicLinks = $this->publicShareTab->getListedPublicLinksNames();
+		Assert::assertTrue(\in_array($expectedLinkEntryName, $actualNamesArrayOfPublicLinks));
+	}
+
+	/**
+	 * @Then :arg1 public link shares with name :arg2 should be visible on the webUI
+	 *
+	 * @param string $expectedCount
+	 * @param string $expectedLinkEntryName
+	 *
+	 * @return void
+	 */
+	public function publicLinkSharesWithNameShouldBeVisibleOnTheWebUI($expectedCount, $expectedLinkEntryName) {
+		$actualNamesArrayOfPublicLinks = $this->publicShareTab->getListedPublicLinksNames();
+		Assert::assertTrue(\in_array($expectedLinkEntryName, $actualNamesArrayOfPublicLinks));
+		Assert::assertEquals(
+			\array_count_values($actualNamesArrayOfPublicLinks)[$expectedLinkEntryName],
+			$expectedCount
+		);
+	}
 }

tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php

@@ -41,6 +41,7 @@ class PublicLinkTab extends OwncloudPage {
 	private $createLinkBtnXpath = ".//button[@class='addLink']";
 	private $popupXpath = ".//div[@class='oc-dialog' and not(contains(@style,'display: none'))]";
 	private $linkEntryByNameXpath = ".//*[@class='link-entry--title' and .=%s]/..";
+	private $linkEntriesNamesXpath = "//div[@id='shareDialogLinkList']//span[@class='link-entry--title']";
 	private $linkUrlInputXpath = ".//input";
 	private $publicLinkWarningMessageXpath = ".//*[@class='error-message-global'][last()]";
 	private $linkEditBtnXpath = "//div[@class='link-entry--icon-button editLink']";
@@ -345,4 +346,18 @@ private function findLinkEntryByName($name) {
 		);
 		return $linkEntry;
 	}
+
+	/**
+	 * gets listed public links names created/re-shares
+	 *
+	 * @return array
+	 */
+	public function getListedPublicLinksNames() {
+		$namesArray = [];
+		$visibleNamesArray = $this->findAll("xpath", $this->linkEntriesNamesXpath);
+		foreach ($visibleNamesArray as $entry) {
+			\array_push($namesArray, $entry->getText());
+		}
+		return $namesArray;
+	}
 }

tests/acceptance/features/webUISharingInternalUsers1/createShareWithUsers.feature

@@ -260,3 +260,36 @@ Feature: Sharing files and folders with internal users
     And file "textfile.txt" should be listed on the webUI
     And the content of "textfile.txt" should be the same as the local "textfile.txt"
     And it should not be possible to share file "textfile.txt" using the webUI
+
+  Scenario: reshare indicators of public links to the original share owner
+    Given these users have been created with default attributes and without skeleton files:
+      | username |
+      | user0    |
+      | user1    |
+    And user "user0" has uploaded file with content "uploaded content" to "lorem.txt"
+    And user "user0" has shared file "lorem.txt" with user "user1"
+    And user "user1" has created a public link share with settings
+      | path | /lorem.txt  |
+      | name | Public link |
+    And user "user0" has logged in using the webUI
+    When the user opens the share dialog for file "lorem.txt"
+    And the user opens the public link share tab
+    Then a public link share with name "Public link" should be visible on the webUI
+
+  Scenario: reshare indicators of multiple public links with same name to the original share owner
+    Given these users have been created with default attributes and without skeleton files:
+      | username |
+      | user0    |
+      | user1    |
+    And user "user0" has uploaded file with content "uploaded content" to "lorem.txt"
+    And user "user0" has shared file "lorem.txt" with user "user1"
+    And user "user0" has created a public link share with settings
+      | path | /lorem.txt  |
+      | name | Public link |
+    And user "user1" has created a public link share with settings
+      | path | lorem.txt  |
+      | name | Public link |
+    And user "user0" has logged in using the webUI
+    When the user opens the share dialog for file "lorem.txt"
+    And the user opens the public link share tab
+    Then 2 public link shares with name "Public link" should be visible on the webUI