Merge pull request #11661 from owncloud/feat/link-type-naming

feat: adjust link type descriptions and remove "Uploader" type
owncloud · Sep 26, 2024 · 420cf4a · 420cf4a
2 parents cf88474 + a261943
commit 420cf4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/changelog/unreleased/enhancement-remove-uploader-link-type b/changelog/unreleased/enhancement-remove-uploader-link-type
@@ -0,0 +1,6 @@
+Enhancement: Remove link type "Uploader"
+
+The link type "Uploader" has been removed because it's almost the same as "Editor". Existing links of this type still work though.
+
+https://github.com/owncloud/web/pull/11661
+https://github.com/owncloud/web/issues/11381
diff --git a/packages/web-pkg/src/composables/links/useLinkTypes.ts b/packages/web-pkg/src/composables/links/useLinkTypes.ts
@@ -36,12 +36,7 @@ export const useLinkTypes = () => {
     }
 
     if (isFolder) {
-      return [
-        SharingLinkType.View,
-        SharingLinkType.Upload,
-        SharingLinkType.Edit,
-        SharingLinkType.CreateOnly
-      ]
+      return [SharingLinkType.View, SharingLinkType.Edit, SharingLinkType.CreateOnly]
     }
 
     return [SharingLinkType.View, SharingLinkType.Edit]
@@ -58,27 +53,25 @@ export const useLinkTypes = () => {
     {
       id: SharingLinkType.View,
       displayName: $gettext('Can view'),
-      description: $gettext('Anyone with the link can view and download.'),
+      description: $gettext('View, download'),
       icon: 'eye'
     },
     {
       id: SharingLinkType.Upload,
       displayName: $gettext('Can upload'),
-      description: $gettext('Anyone with the link can view, download and upload.'),
+      description: $gettext('View, upload, download'),
       icon: 'upload'
     },
     {
       id: SharingLinkType.Edit,
       displayName: $gettext('Can edit'),
-      description: $gettext('Anyone with the link can view, download and edit.'),
+      description: $gettext('View, upload, edit, download, delete'),
       icon: 'pencil'
     },
     {
       id: SharingLinkType.CreateOnly,
       displayName: $gettext('Secret File Drop'),
-      description: $gettext(
-        'Anyone with the link can only upload, existing content is not revealed.'
-      ),
+      description: $gettext('Upload only, existing content is not revealed'),
       icon: 'inbox-unarchive'
     }
   ] satisfies ShareRole[]

diff --git a/packages/web-pkg/tests/unit/composables/links/useLinkTypes.spec.ts b/packages/web-pkg/tests/unit/composables/links/useLinkTypes.spec.ts
@@ -34,7 +34,6 @@ describe('useLinkTypes', () => {
         setup: ({ getAvailableLinkTypes }) => {
           expect(getAvailableLinkTypes({ isFolder: true })).toEqual([
             SharingLinkType.View,
-            SharingLinkType.Upload,
             SharingLinkType.Edit,
             SharingLinkType.CreateOnly
           ])