From 4fd1da21da0ac5cb41e9431105874b3cb2e512cb Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 29 Nov 2023 11:56:37 +0100
Subject: [PATCH] Bugfix: Disable expiration date alias link followup (#10085)

* Bugfix: Disable expiration date alias link followup

* Add to changelog

* Fix missing padding
---
 .../bugfix-disable-expiration-date-alias-link          |  1 +
 .../components/SideBar/Shares/Links/DetailsAndEdit.vue | 10 ++++++++--
 .../Links/__snapshots__/DetailsAndEdit.spec.ts.snap    |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/changelog/unreleased/bugfix-disable-expiration-date-alias-link b/changelog/unreleased/bugfix-disable-expiration-date-alias-link
index 6997b2e8089..df5e087ce32 100644
--- a/changelog/unreleased/bugfix-disable-expiration-date-alias-link
+++ b/changelog/unreleased/bugfix-disable-expiration-date-alias-link
@@ -4,4 +4,5 @@ We've disabled the option to set an expiration date on an internal link,
 since it could be misleading and doesn't serve any use.
 
 https://github.com/owncloud/web/pull/10083
+https://github.com/owncloud/web/pull/10085
 https://github.com/owncloud/web/issues/9923
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
index e2c343cf9d0..ef55b7fbaa7 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -72,7 +72,10 @@
           padding-size="small"
           mode="click"
         >
-          <oc-list class="edit-public-link-dropdown-menu oc-files-context-actions-border oc-pb-s">
+          <oc-list
+            v-if="editOptions.length > 0"
+            class="edit-public-link-dropdown-menu oc-pb-s oc-files-context-actions-border"
+          >
             <li
               v-for="(option, i) in editOptions"
               :key="`public-link-edit-option-${i}`"
@@ -121,7 +124,10 @@
               </oc-button>
             </li>
           </oc-list>
-          <oc-list class="edit-public-link-dropdown-menu oc-pt-s">
+          <oc-list
+            class="edit-public-link-dropdown-menu"
+            :class="{ 'oc-pt-s': editOptions.length > 0 }"
+          >
             <li class="oc-rounded oc-menu-item-hover">
               <oc-button
                 appearance="raw"
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap
index 4504ab9017b..e5d251c543a 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.ts.snap
@@ -16,7 +16,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit but
         <oc-icon-stub accessiblelabel="" color="" filltype="fill" name="more-2" size="medium" type="span" variation="passive"></oc-icon-stub>
       </oc-button-stub>
       <oc-drop-stub closeonclick="false" dropid="edit-public-link-dropdown" isnested="false" mode="click" paddingsize="small" position="bottom-start" toggle="#edit-public-link-dropdown-toggl-undefined">
-        <oc-list-stub class="edit-public-link-dropdown-menu oc-files-context-actions-border oc-pb-s" raw="false">
+        <oc-list-stub class="edit-public-link-dropdown-menu oc-pb-s oc-files-context-actions-border" raw="false">
           <li class="oc-rounded oc-menu-item-hover">
             <oc-button-stub appearance="raw" class="oc-p-s action-menu-item" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" variation="passive">
               <oc-icon-stub accessiblelabel="" color="" filltype="line" name="pencil" size="medium" type="span" variation="passive"></oc-icon-stub>