Merge pull request #6867 from owncloud/fix-public-link-edit

[full-ci] Fix public link edit
owncloud · May 4, 2022 · 52e052c · 52e052c
2 parents 181f677 + f06b370
commit 52e052c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/changelog/unreleased/bugfix-public-link-edit b/changelog/unreleased/bugfix-public-link-edit
@@ -0,0 +1,6 @@
+Bugfix: Edit public links with expiration
+
+We've fixed an issue with public links with expiration date that were failing in update requests.
+
+https://github.com/owncloud/web/issues/6858
+https://github.com/owncloud/web/pull/6867
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -111,6 +111,7 @@ services:
       NODE_TLS_REJECT_UNAUTHORIZED: '0'
       BACKEND_HOST: "https://host.docker.internal:9200"
       REMOTE_UPLOAD_DIR: "/uploads"
+      TEST_WITH_GRAPH_API: "true"
 
   vnc:
     build:

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -335,7 +335,11 @@ export default defineComponent({
       let expireDate = ''
 
       if (link.expiration) {
-        expireDate = DateTime.fromJSDate(link.expiration)
+        expireDate = (
+          typeof link.expiration === 'string'
+            ? DateTime.fromISO(link.expiration)
+            : DateTime.fromJSDate(link.expiration)
+        )
           .setLocale(this.$language.current)
           .endOf('day')
           .toFormat("yyyy-MM-dd'T'HH:mm:ssZZZ")