From cd6259ec40a209a0046763f21fecc9777d87ac10 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 4 Aug 2022 12:54:48 +0200
Subject: [PATCH 1/4] Adjust contextual helpers

---
 .../components/SideBar/Shares/FileLinks.vue   | 10 ++-
 .../components/SideBar/Shares/FileShares.vue  | 17 ++--
 .../src/helpers/contextualHelpers.js          | 83 ++++++++++++++-----
 3 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 12d5f13939e..f1fef02d9bc 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -68,10 +68,12 @@
     </div>
     <div v-if="indirectLinks.length" id="indirect-link-list">
       <hr class="oc-my-m" />
-      <h3 class="oc-text-bold oc-m-rm oc-text-initial">
-        <span v-text="indirectLinksHeading" />
-        <oc-contextual-helper v-if="helpersEnabled" v-bind="indirectLinkHelp" />
-      </h3>
+      <div class="oc-flex">
+        <h3 class="oc-text-bold oc-m-rm oc-text-initial">
+          <span v-text="indirectLinksHeading" />
+        </h3>
+        <oc-contextual-helper v-if="helpersEnabled" class="oc-pl-xs" v-bind="indirectLinkHelp" />
+      </div>
       <oc-list v-if="!indirectLinkListCollapsed" class="oc-overflow-hidden oc-my-m">
         <li
           v-for="link in displayIndirectLinks"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index a5af1ad232d..210e20632ce 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -156,12 +156,17 @@ export default {
 
     inviteCollaboratorHelp() {
       const cernFeatures = !!this.configuration?.options?.cernFeatures
-      return cernFeatures
-        ? {
-            text: shareInviteCollaboratorHelp.text,
-            list: [...shareInviteCollaboratorHelp.list, ...shareInviteCollaboratorHelpCern.list]
-          }
-        : shareInviteCollaboratorHelp
+
+      if (cernFeatures) {
+        const mergedHelp = shareInviteCollaboratorHelp
+        mergedHelp.list = [
+          ...shareInviteCollaboratorHelpCern.list,
+          ...shareInviteCollaboratorHelp.list
+        ]
+        return mergedHelp
+      }
+
+      return shareInviteCollaboratorHelp
     },
     helpersEnabled() {
       return this.configuration?.options?.contextHelpers
diff --git a/packages/web-app-files/src/helpers/contextualHelpers.js b/packages/web-app-files/src/helpers/contextualHelpers.js
index d7cd3a6ee2f..a749892fceb 100644
--- a/packages/web-app-files/src/helpers/contextualHelpers.js
+++ b/packages/web-app-files/src/helpers/contextualHelpers.js
@@ -7,39 +7,60 @@ export const empty = {
   list: ['', '', '']
 }
 export const shareInviteCollaboratorHelp = {
-  text: $gettext('Invite persons or groups to access this file or folder.'),
+  title: $gettext('Invite specific people'),
+  text: $gettext('Enter a name or group to share this item.'),
   list: [
-    { text: $gettext('Enter a name or group to share this item') },
+    { text: $gettext('Subfolders'), headline: true },
     {
       text: $gettext(
-        'If you share a folder,  all of its contents and subfolders will be shared with the entered persons or groups'
+        'If you share a folder, all of its contents and subfolders will be shared as well.'
       )
     },
+    { text: $gettext('Notification'), headline: true },
     {
-      text: $gettext('Invited persons or groups will be notified via e-mail or in-app notification')
+      text: $gettext('Invited people will be notified via email or in-app notification.')
     },
-    { text: $gettext('Invited persons can not see who else has access') }
-  ]
+    { text: $gettext('Incognito'), headline: true },
+    {
+      text: $gettext('Invited people can not see who else has access..')
+    },
+    { text: $gettext('“via folder”'), headline: true },
+    {
+      text: $gettext(
+        'The “via folder” is shown next to a share, if access has already been given via a parent folder. Click on the “via folder” to edit the share on its parent folder.'
+      )
+    }
+  ],
+  readMoreLink: 'https://doc.owncloud.com/webui/next/owncloud_web/web_for_users.html#sharing'
 }
 export const shareInviteCollaboratorHelpCern = {
   list: [
+    { text: $gettext('Search for service or secondary Account'), headline: true },
     {
       text: $gettext(
-        'To search for service or secondary accounts prefix the username with "a:" (like "a:doe") and for guest accounts prefix the username with "l:" (like "l:doe")'
+        'To search for service or secondary accounts prefix the username with "a:" (like "a:doe") and for guest accounts prefix the username with "l:" (like "l:doe").'
       )
     }
   ]
 }
 export const shareSpaceAddMemberHelp = {
-  text: $gettext('Add persons or groups as members to this Space. Members are allowed to:'),
+  title: $gettext('Add members to this Space'),
+  text: $gettext('Enter a name to add people or groups as members to this Space.'),
   list: [
-    { text: $gettext('see who else is member of this space') },
-    { text: $gettext('view all files in this space') },
-    { text: $gettext('(if permitted) edit or delete files in this Space') },
-    { text: $gettext('(if permitted) share folders of this Space with non-Members') },
-    { text: $gettext('see with whom a folder is shared') }
+    { text: $gettext('What members can do'), headline: true },
+    {
+      text: $gettext(
+        'Members can see who else has access to this space and can access all files in this space. Read or write permissions can be set by the member’s role such as “Viewer” or “Editor”.'
+      )
+    },
+    { text: $gettext('What Space managers can do'), headline: true },
+    {
+      text: $gettext(
+        'Members with the Manager role can edit all properties and content of a Space, such as adding or removing members, sharing subfolders with non-members, or creating links to share.'
+      )
+    }
   ],
-  endText: 'Members can only be added or removed by a Space Manager.'
+  readMoreLink: 'https://doc.owncloud.com/webui/next/owncloud_web/web_for_users.html#sharing'
 }
 export const shareViaLinkHelp = {
   title: $gettext('Choose how access is granted'),
@@ -50,7 +71,7 @@ export const shareViaLinkHelp = {
     },
     {
       text: $gettext(
-        'Only people from the list "Invited people" can access. If there is no list, no people are invited yet.'
+        'Account and login is required. Only people from the list "Invited people" can access.'
       )
     },
     {
@@ -59,13 +80,36 @@ export const shareViaLinkHelp = {
     },
     {
       text: $gettext(
-        'Everyone with the link: Everyone with the link can access. Note: If you share this link with people from the list "Invited people", they need to login-in so that their individual assigned permissions can take effect. If they are not logged-in, the permissions of the link take effect.'
+        'No login required. Everyone with the link can access. If you share this link with people from the list "Invited people", they need to login so that their individual assigned permissions can take effect. If they are not logged-in, the permissions of the link take effect.'
+      )
+    },
+    {
+      text: $gettext('Quicklink'),
+      headline: true
+    },
+    {
+      text: $gettext(
+        'The quicklink is the default link that is copied when you select "Get link” from the context menu.'
       )
     }
-  ]
+  ],
+  readMoreLink: 'https://doc.owncloud.com/webui/next/owncloud_web/web_for_users.html#sharing'
 }
 export const shareViaIndirectLinkHelp = {
-  text: $gettext('This file is shared, because one of the folders it is in is shared via link.')
+  title: $gettext('What are indirect links?'),
+  text: $gettext('Indirect links are links giving access by a parent folder.'),
+  list: [
+    {
+      text: $gettext('How to edit indirect links'),
+      headline: true
+    },
+    {
+      text: $gettext(
+        'Indirect links can only be edited in their parent folder. Click on the folder icon below the link to navgate to the parent folder.'
+      )
+    }
+  ],
+  readMoreLink: 'https://doc.owncloud.com/webui/next/owncloud_web/web_for_users.html#sharing'
 }
 export const shareQuickLinkHelp = {
   text: $gettext('The Quick link is the link that is always copied if you'),
@@ -74,6 +118,3 @@ export const shareQuickLinkHelp = {
     { text: $gettext('click on the quickaction "Get link"') }
   ]
 }
-export const shareAddLinkHelp = {
-  text: $gettext('Add and manage multiple links for the same file or folder.')
-}

From 80887e2af38ff991a97398c36b45f45101e76cbb Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 4 Aug 2022 12:57:48 +0200
Subject: [PATCH 2/4] Removeiu unnecessary ct-helper

---
 packages/web-app-files/src/helpers/contextualHelpers.js   | 7 -------
 packages/web-app-files/src/views/shares/SharedViaLink.vue | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/packages/web-app-files/src/helpers/contextualHelpers.js b/packages/web-app-files/src/helpers/contextualHelpers.js
index a749892fceb..b0d3db20743 100644
--- a/packages/web-app-files/src/helpers/contextualHelpers.js
+++ b/packages/web-app-files/src/helpers/contextualHelpers.js
@@ -111,10 +111,3 @@ export const shareViaIndirectLinkHelp = {
   ],
   readMoreLink: 'https://doc.owncloud.com/webui/next/owncloud_web/web_for_users.html#sharing'
 }
-export const shareQuickLinkHelp = {
-  text: $gettext('The Quick link is the link that is always copied if you'),
-  list: [
-    { text: $gettext('right click on a file and choose "Get link" or') },
-    { text: $gettext('click on the quickaction "Get link"') }
-  ]
-}
diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
index 538dbbae99f..cd6c6adb383 100644
--- a/packages/web-app-files/src/views/shares/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -11,7 +11,6 @@
       >
         <template #message>
           <span v-translate>There are no resources with a public link at the moment</span>
-          <oc-contextual-helper v-if="helpersEnabled" v-bind="quickLinkHelp" />
         </template>
       </no-content-message>
       <resource-table
@@ -71,7 +70,6 @@ import { createLocationSpaces } from '../../router'
 import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent } from '@vue/composition-api'
 import { Resource } from 'web-client'
-import { shareQuickLinkHelp } from '../../helpers/contextualHelpers'
 import { useStore } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()
@@ -111,10 +109,6 @@ export default defineComponent({
       return this.configuration?.options?.contextHelpers
     },
 
-    quickLinkHelp() {
-      return shareQuickLinkHelp
-    },
-
     isEmpty() {
       return this.paginatedResources.length < 1
     },

From eb335c2358c4081b3c88f4afff0d934ba6eb0ddb Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 4 Aug 2022 13:03:48 +0200
Subject: [PATCH 3/4] Add changelog items

---
 changelog/unreleased/enhancement-adjust-helper-texts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-adjust-helper-texts

diff --git a/changelog/unreleased/enhancement-adjust-helper-texts b/changelog/unreleased/enhancement-adjust-helper-texts
new file mode 100644
index 00000000000..de865c69b23
--- /dev/null
+++ b/changelog/unreleased/enhancement-adjust-helper-texts
@@ -0,0 +1,4 @@
+Enhancement: Adjust helper texts
+
+https://github.com/owncloud/web/pull/7404
+https://github.com/owncloud/web/issues/7331

From 448e5f0e0d9eda9fde03c26776ab651b1d3454d7 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 4 Aug 2022 13:07:26 +0200
Subject: [PATCH 4/4] Update snapshots

---
 .../views/shares/__snapshots__/SharedViaLink.spec.js.snap     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap
index e0bd11d5ccc..79af627a239 100644
--- a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap
+++ b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap
@@ -7,9 +7,7 @@ exports[`SharedViaLink view when the view is not loading anymore when there are
     <div class="oc-icon oc-icon-xxl oc-icon-passive">
       <!---->
     </div>
-    <div class="oc-text-muted oc-text-large"><span>There are no resources with a public link at the moment</span>
-      <!---->
-    </div>
+    <div class="oc-text-muted oc-text-large"><span>There are no resources with a public link at the moment</span></div>
     <div class="oc-text-muted"></div>
   </div>
 </div>