Merge pull request #12024 from owncloud/backport-fixes-20241209

fix: backport recent master fixes to stable-11.0

Author: JammingBen

changelog/unreleased/bugfix-change-search-scope-without-term

@@ -0,0 +1,6 @@
+Bugfix: Change search scope without search term
+
+We've fixed the change of search scope on search page when there is no search term entered.
+
+https://github.com/owncloud/web/pull/11997
+https://github.com/owncloud/web/issues/11982

changelog/unreleased/bugfix-do-not-load-versions-when-sidebar-is-closed

@@ -0,0 +1,6 @@
+Bugfix: Do not load version when sidebar is closed
+
+We've fixed the the loading of file versions which was triggered even when sidebar was closed. File version will now be loaded only when the sidebar is opened.
+
+https://github.com/owncloud/web/pull/11998
+https://github.com/owncloud/web/issues/11979

changelog/unreleased/bugfix-missing-activities-shared-with-me-page

@@ -0,0 +1,5 @@
+Bugfix: Missing activities on Shared with me page
+
+We've added the missing activities on the Shared with me page.
+
+https://github.com/owncloud/web/pull/12008

changelog/unreleased/bugfix-missing-translations-share-type-filters

@@ -0,0 +1,6 @@
+Bugfix: Missing translations for share type filters
+
+We've fixed a bug, where the translations for the share type filters were missing.
+This was the case for the "Shared with me" and "Shared with others" page.
+
+https://github.com/owncloud/web/pull/12013

changelog/unreleased/bugfix-ocm-invite-flow

@@ -0,0 +1,6 @@
+Bugfix: OCM invite flow
+
+We've fixed the OCM invite flow and made it more user-friendly.
+
+https://github.com/owncloud/web/pull/11992
+https://github.com/owncloud/web/issues/11983

changelog/unreleased/bugfix-ocm-share-editing

@@ -0,0 +1,6 @@
+Bugfix: OCM share editing
+
+We've fixed a bug where OCM shares could be edited although the server does not support it.
+
+https://github.com/owncloud/web/pull/12002
+https://github.com/owncloud/web/issues/11991

changelog/unreleased/bugfix-ocm-share-recipient-issuer

@@ -0,0 +1,6 @@
+Bugfix: OCM share recipient issuer
+
+We've fixed a bug where the issuer for OCM shares was missing in the invite input field.
+
+https://github.com/owncloud/web/pull/12002
+https://github.com/owncloud/web/issues/11972

changelog/unreleased/bugfix-permanent-link-for-shares

@@ -0,0 +1,6 @@
+Bugfix: Permanent link for shares
+
+We've fixed an issue where the permanent for shares could not be copied.
+
+https://github.com/owncloud/web/pull/12022
+https://github.com/owncloud/web/issues/12001

changelog/unreleased/bugfix-show-missing-role-name-in-link-share-panel

@@ -0,0 +1,5 @@
+Bugfix: Show missing role name in link share panel
+
+We've fixed a bug where the role name was missing in the link share panel.
+
+https://github.com/owncloud/web/pull/12012

changelog/unreleased/bugfix-sidebar-fileinfo-for-shares

@@ -0,0 +1,5 @@
+Bugfix: Sidebar file info for shares
+
+We've fixed a bug some file info regarding size an shares was missing in the right sidebar when opening an incoming share via an editor.
+
+https://github.com/owncloud/web/pull/12010

changelog/unreleased/bugfix-use-only-space-as-space-into-sidebar

@@ -0,0 +1,6 @@
+Bugfix: Use only space resource with `driveType` "project" as space in sidebar
+
+We've fixed the issue where any selected resource got passed to the sidebar as a space in Spaces page. Now only space resource with `driveType` "project" will be passed as a space.
+
+https://github.com/owncloud/web/pull/12000
+https://github.com/owncloud/web/issues/11978

packages/web-app-external/l10n/translations.json

@@ -58,7 +58,7 @@ export default defineWebApplication({
         const provider = mimeType.app_providers.find((provider) => provider.name === appName)
         return {
           extension: mimeType.ext,
-          label: $gettext('Open in %{app}', { app: provider.name }),
+          label: () => $gettext('Open in %{app}', { app: provider.name }),
           icon: provider.icon,
           name: provider.name,
           mimeType: mimeType.mime_type,

packages/web-app-external/src/index.ts

@@ -70,7 +70,7 @@ export default defineComponent({
     const loadActivitiesTask = useTask(function* (signal) {
       activities.value = yield* call(
         clientService.graphAuthenticated.activities.listActivities(
-          `itemid:${unref(resource).id} AND limit:${activitiesLimit} AND sort:desc`,
+          `itemid:${unref(resource).fileId} AND limit:${activitiesLimit} AND sort:desc`,
           { signal }
         )
       )

packages/web-app-files/l10n/translations.json

@@ -27,7 +27,7 @@
         </li>
       </oc-list>
       <oc-list
-        v-if="canEditOrDelete"
+        v-if="canRemove"
         class="collaborator-edit-dropdown-options-list collaborator-edit-dropdown-options-list-remove"
       >
         <li
@@ -91,7 +91,11 @@ export default defineComponent({
         return ['user', 'group'].includes(value) || !value
       }
     },
-    canEditOrDelete: {
+    canEdit: {
+      type: Boolean,
+      required: true
+    },
+    canRemove: {
       type: Boolean,
       required: true
     },
@@ -198,7 +202,7 @@ export default defineComponent({
         })
       }
 
-      if (this.canEditOrDelete && this.isExpirationSupported) {
+      if (this.canEdit && this.isExpirationSupported) {
         result.push({
           title: this.isExpirationDateSet
             ? this.$gettext('Edit expiration date')
@@ -254,7 +258,7 @@ export default defineComponent({
     },
 
     isRemoveExpirationPossible() {
-      return this.canEditOrDelete && this.isExpirationSupported && this.isExpirationDateSet
+      return this.canEdit && this.isExpirationSupported && this.isExpirationDateSet
     }
   },
   methods: {

packages/web-app-files/src/components/SideBar/ActivitiesPanel.vue

@@ -34,6 +34,11 @@
         class="files-collaborators-autocomplete-additionalInfo"
         v-text="`${additionalInfo}`"
       />
+      <div
+        v-if="externalIssuer"
+        class="files-collaborators-autocomplete-externalIssuer"
+        v-text="`${externalIssuer}`"
+      />
     </div>
   </div>
 </template>
@@ -56,7 +61,14 @@ export default {
       return props.item.mail || props.item.onPremisesSamAccountName
     })
 
-    return { additionalInfo }
+    const externalIssuer = computed(() => {
+      if (props.item.shareType === ShareTypes.remote.value) {
+        return props.item.identities?.[0]?.issuer
+      }
+      return ''
+    })
+
+    return { additionalInfo, externalIssuer }
   },
   computed: {
     shareType() {
@@ -87,7 +99,8 @@ export default {
 </script>
 
 <style lang="scss">
-.files-collaborators-autocomplete-additionalInfo {
+.files-collaborators-autocomplete-additionalInfo,
+.files-collaborators-autocomplete-externalIssuer {
   font-size: var(--oc-font-size-small);
 }
 </style>

packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditDropdown.vue

@@ -295,11 +295,14 @@ export default defineComponent({
       })
     })
 
-    onMounted(async () => {
+    const setInitialSelectedRole = () => {
       selectedRole.value = unref(isExternalShareRoleType)
         ? unref(availableExternalRoles)[0]
         : unref(availableInternalRoles)[0]
+    }
 
+    onMounted(async () => {
+      setInitialSelectedRole()
       await nextTick()
       markInstance.value = new Mark('.mark-element')
     })
@@ -479,6 +482,7 @@ export default defineComponent({
         }
       }
       focusShareInput()
+      setInitialSelectedRole()
     }
 
     const focusShareInput = () => {

packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.vue

@@ -20,7 +20,7 @@
 <script lang="ts">
 import { avatarUrl } from '../../../../../helpers/user'
 import { CollaboratorAutoCompleteItem, ShareTypes } from '@ownclouders/web-client'
-import { defineComponent, PropType } from 'vue'
+import { computed, defineComponent, PropType } from 'vue'
 import { Recipient } from '@ownclouders/design-system/helpers'
 import { useCapabilityStore, useConfigStore } from '@ownclouders/web-pkg'
 import { storeToRefs } from 'pinia'
@@ -37,22 +37,35 @@ export default defineComponent({
       default: null
     }
   },
-  setup() {
+  setup(props) {
     const capabilityStore = useCapabilityStore()
     const capabilityRefs = storeToRefs(capabilityStore)
 
     const configStore = useConfigStore()
     const { serverUrl } = storeToRefs(configStore)
 
+    const externalIssuer = computed(() => {
+      if (props.recipient.shareType === ShareTypes.remote.value) {
+        return props.recipient.identities?.[0]?.issuer
+      }
+      return ''
+    })
+
     return {
       serverUrl,
-      userProfilePicture: capabilityRefs.sharingUserProfilePicture
+      userProfilePicture: capabilityRefs.sharingUserProfilePicture,
+      externalIssuer
     }
   },
   data(): { formattedRecipient: Recipient } {
+    let name = this.recipient.displayName
+    if (this.externalIssuer) {
+      name += ` (${this.externalIssuer})`
+    }
+
     return {
       formattedRecipient: {
-        name: this.recipient.displayName,
+        name,
         icon: this.getRecipientIcon(),
         hasAvatar: this.recipient.shareType === ShareTypes.user.value,
         isLoadingAvatar: true

packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue

@@ -103,7 +103,8 @@
           data-testid="collaborator-edit"
           :expiration-date="share.expirationDateTime ? share.expirationDateTime : null"
           :share-category="shareCategory"
-          :can-edit-or-delete="modifiable"
+          :can-edit="modifiable"
+          :can-remove="removable"
           :is-share-denied="isShareDenied"
           :is-locked="isLocked"
           :deniable="deniable"
@@ -165,6 +166,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    removable: {
+      type: Boolean,
+      default: false
+    },
     sharedParentRoute: {
       type: Object as PropType<RouteLocationNamedRaw>,
       default: null

packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue

@@ -22,7 +22,7 @@
       <oc-contextual-helper
         v-if="isDisabledRole"
         class="oc-ml-xs files-permission-actions-list"
-        :list="existingSharePermissions.map((permission) => ({ text: permission }))"
+        :text="customPermissionsText"
         :title="$gettext('Custom permissions')"
       />
     </div>
@@ -141,6 +141,11 @@ export default defineComponent({
 
       return ''
     })
+    const customPermissionsText = computed(() =>
+      $gettext(
+        'Dear user, please replace this legacy role with one of the currently available roles'
+      )
+    )
 
     const availableInternalRoles = inject<Ref<ShareRole[]>>('availableInternalShareRoles')
     const availableExternalRoles = inject<Ref<ShareRole[]>>('availableExternalShareRoles')
@@ -200,6 +205,7 @@ export default defineComponent({
       ability,
       user,
       dropButtonTooltip,
+      customPermissionsText,
       resource: inject<Resource>('resource'),
       selectedRole,
       availableRoles,

packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue

@@ -43,6 +43,7 @@
             :resource-name="resource.name"
             :deniable="isShareDeniable(collaborator)"
             :modifiable="isShareModifiable(collaborator)"
+            :removable="isShareRemovable(collaborator)"
             :is-share-denied="isShareDenied(collaborator)"
             :shared-parent-route="getSharedParentRoute(collaborator)"
             :is-locked="resource.locked"
@@ -438,6 +439,17 @@ export default defineComponent({
     },
 
     isShareModifiable(collaborator: CollaboratorShare) {
+      if (collaborator.indirect || collaborator.shareType === ShareTypes.remote.value) {
+        return false
+      }
+
+      if (isProjectSpaceResource(this.space) || isShareSpaceResource(this.space)) {
+        return this.space.canShare({ user: this.user })
+      }
+
+      return true
+    },
+    isShareRemovable(collaborator: CollaboratorShare) {
       if (collaborator.indirect) {
         return false
       }

packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue

@@ -65,6 +65,7 @@
           <collaborator-list-item
             :share="collaborator"
             :modifiable="isModifiable(collaborator)"
+            :removable="isModifiable(collaborator)"
             :is-space-share="true"
             @on-delete="deleteMemberConfirm(collaborator)"
           />

packages/web-app-files/src/components/SideBar/Shares/FileShares.vue

@@ -34,7 +34,13 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
 
       const resources = value
         .filter((s) => s.permissions.some(({ link }) => !!link))
-        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
+        .map((driveItem) =>
+          buildOutgoingShareResource({
+            driveItem,
+            user: userStore.user,
+            serverUrl: configStore.serverUrl
+          })
+        )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue

@@ -33,7 +33,11 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
       )
 
       const resources = value.map((driveItem) =>
-        buildIncomingShareResource({ driveItem, graphRoles: sharesStore.graphRoles })
+        buildIncomingShareResource({
+          driveItem,
+          graphRoles: sharesStore.graphRoles,
+          serverUrl: configStore.serverUrl
+        })
       )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })

packages/web-app-files/src/services/folder/loaderSharedViaLink.ts

@@ -34,7 +34,13 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
 
       const resources = value
         .filter((s) => s.permissions.some(({ link }) => !link))
-        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
+        .map((driveItem) =>
+          buildOutgoingShareResource({
+            driveItem,
+            user: userStore.user,
+            serverUrl: configStore.serverUrl
+          })
+        )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })