Merge pull request #10306 from owncloud/merge-stable-8.0-to-master-20…

…240108 Merge stable 8.0 to master
owncloud · Jan 8, 2024 · cb2b4ab · cb2b4ab
2 parents fd20cd7 + a63d175
commit cb2b4ab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div id="tiles-view">
     <div v-if="sortFields.length" class="oc-tile-sorting oc-border-b oc-mb-m oc-pb-s">
       <span class="oc-mr-xs" v-text="$gettext('Sort by: ')" />
       <oc-button id="oc-tiles-sort-btn" appearance="raw" gap-size="none">

diff --git a/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -554,6 +554,7 @@ export default defineComponent({
         })
       })
 
+      this.expirationDate = null
       this.selectedCollaborators = []
       this.saving = false
     },

diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -65,7 +65,6 @@
           </no-content-message>
           <resource-tiles
             v-else-if="viewMode === ViewModeConstants.tilesView.name"
-            id="tiles-view"
             v-model:selectedIds="selectedResourcesIds"
             :data="paginatedResources"
             class="oc-px-m oc-pt-l"

diff --git a/...es/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap b/...es/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ResourceTiles component renders a footer slot 1`] = `
-<div>
+<div id="tiles-view">
   <!--v-if-->
   <oc-list class="oc-tiles oc-flex"> </oc-list>
   <!--v-if-->
@@ -10,7 +10,7 @@ exports[`ResourceTiles component renders a footer slot 1`] = `
 `;
 
 exports[`ResourceTiles component renders an array of spaces correctly 1`] = `
-<div>
+<div id="tiles-view">
   <!--v-if-->
   <oc-list class="oc-tiles oc-flex">
     <li class="oc-tiles-item has-item-context-menu">
-Original file line number
+Diff line change
@@ Expand Up / @@ -554,6 +554,7 @@ export default defineComponent({ @@
             })
           })
+          this.expirationDate = null
           this.selectedCollaborators = []
           this.saving = false
         },
@@ Expand Down @@