[full-ci] fixes owncloud#8940 (owncloud#8942)

rephrase internal role labels --------- Co-authored-by: Jannik Stehle <[email protected]>
lemanschik · Apr 27, 2023 · 32e8ded · 32e8ded
1 parent 4762eaf
commit 32e8ded
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
@@ -186,7 +186,7 @@ export default defineComponent({
     },
     inviteLabel() {
       if (this.selectedRole.hasCustomPermissions) {
-        return this.$gettext('Invite with custom permissions')
+        return this.$gettext('Custom permissions')
       } else if (this.selectedRole.permissions().includes(SharePermissions.denied)) {
         return this.$gettext('Deny access')
       } else {

diff --git a/...ests/unit/components/SideBar/Shares/Collaborators/__snapshots__/RoleDropdown.spec.ts.snap b/...ests/unit/components/SideBar/Shares/Collaborators/__snapshots__/RoleDropdown.spec.ts.snap
@@ -33,7 +33,7 @@ exports[`RoleDropdown renders a button with existing role if given for resource
       <li>
         <oc-button-stub appearance="raw" class="files-recipient-role-drop-btn oc-p-s" disabled="false" gapsize="medium" id="files-recipient-role-drop-btn-custom" justifycontent="space-between" size="medium" submit="button" type="button" variation="passive">
           <span class="oc-flex oc-flex-middle">
-            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="file-settings" size="medium" type="span" variation="inherit"></oc-icon-stub>
+            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="settings-3" size="medium" type="span" variation="inherit"></oc-icon-stub>
             <role-item-stub allowsharepermission="true" role="[object Object]"></role-item-stub>
           </span>
           <span class="oc-flex">
@@ -103,7 +103,7 @@ exports[`RoleDropdown renders a button with existing role if given for resource
       <li>
         <oc-button-stub appearance="raw" class="files-recipient-role-drop-btn oc-p-s" disabled="false" gapsize="medium" id="files-recipient-role-drop-btn-custom" justifycontent="space-between" size="medium" submit="button" type="button" variation="passive">
           <span class="oc-flex oc-flex-middle">
-            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="file-settings" size="medium" type="span" variation="inherit"></oc-icon-stub>
+            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="settings-3" size="medium" type="span" variation="inherit"></oc-icon-stub>
             <role-item-stub allowsharepermission="true" role="[object Object]"></role-item-stub>
           </span>
           <span class="oc-flex">
@@ -173,7 +173,7 @@ exports[`RoleDropdown renders a button with invite text if no existing role give
       <li>
         <oc-button-stub appearance="raw" class="files-recipient-role-drop-btn oc-p-s" disabled="false" gapsize="medium" id="files-recipient-role-drop-btn-custom" justifycontent="space-between" size="medium" submit="button" type="button" variation="passive">
           <span class="oc-flex oc-flex-middle">
-            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="file-settings" size="medium" type="span" variation="inherit"></oc-icon-stub>
+            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="settings-3" size="medium" type="span" variation="inherit"></oc-icon-stub>
             <role-item-stub allowsharepermission="true" role="[object Object]"></role-item-stub>
           </span>
           <span class="oc-flex">
@@ -237,7 +237,7 @@ exports[`RoleDropdown renders a button with invite text if no existing role give
       <li>
         <oc-button-stub appearance="raw" class="files-recipient-role-drop-btn oc-p-s" disabled="false" gapsize="medium" id="files-recipient-role-drop-btn-custom" justifycontent="space-between" size="medium" submit="button" type="button" variation="passive">
           <span class="oc-flex oc-flex-middle">
-            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="file-settings" size="medium" type="span" variation="inherit"></oc-icon-stub>
+            <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="settings-3" size="medium" type="span" variation="inherit"></oc-icon-stub>
             <role-item-stub allowsharepermission="true" role="[object Object]"></role-item-stub>
           </span>
           <span class="oc-flex">

diff --git a/...iles/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap b/...iles/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap
@@ -14,7 +14,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit but
             <span class="oc-flex oc-flex-middle">
               <oc-icon-stub accessiblelabel="" class="oc-pl-s oc-pr-m" color="" filltype="fill" name="user" size="medium" type="span" variation="inherit"></oc-icon-stub>
               <span>
-                <span class="oc-text-bold oc-display-block oc-width-1-1">Internal</span>
+                <span class="oc-text-bold oc-display-block oc-width-1-1">Invited People</span>
                 <span class="oc-text-small">Link works only for invited people. Login is required.</span>
               </span>
             </span>

diff --git a/packages/web-client/src/helpers/share/role.ts b/packages/web-client/src/helpers/share/role.ts
@@ -175,15 +175,15 @@ export const peopleRoleCustomFile = new CustomShareRole(
   false,
   $gettext('Custom permissions'),
   $gettext('custom permissions'),
-  'file-settings',
+  'settings-3',
   [SharePermissions.read, SharePermissions.update, SharePermissions.share]
 )
 export const peopleRoleCustomFolder = new CustomShareRole(
   'custom',
   true,
   $gettext('Custom permissions'),
   $gettext('custom permissions'),
-  'file-settings',
+  'settings-3',
   [
     SharePermissions.read,
     SharePermissions.update,
@@ -203,18 +203,20 @@ export const peopleRoleDenyFolder = new PeopleShareRole(
 export const linkRoleInternalFile = new LinkShareRole(
   'internal',
   false,
-  $gettext('Internal'),
-  $gettext('internal'),
+  $gettext('Invited People'),
+  $gettext('invited People'),
   'user',
-  [SharePermissions.internal]
+  [SharePermissions.internal],
+  $gettext('Only for invited people')
 )
 export const linkRoleInternalFolder = new LinkShareRole(
   'internal',
   true,
-  $gettext('Internal'),
-  $gettext('internal'),
+  $gettext('Invited people'),
+  $gettext('invited people'),
   'user',
-  [SharePermissions.internal]
+  [SharePermissions.internal],
+  $gettext('Only for invited people')
 )
 export const linkRoleViewerFile = new LinkShareRole(
   'viewer',

diff --git a/tests/e2e/support/objects/app-files/link/index.ts b/tests/e2e/support/objects/app-files/link/index.ts
@@ -28,7 +28,7 @@ export class Link {
   }
 
   roleDisplayText = {
-    internal: 'Internal',
+    internal: 'Only for invited people',
     viewer: 'Anyone with the link can view',
     contributor: 'Anyone with the link can upload',
     editor: 'Anyone with the link can edit',