Merge pull request #10677 from owncloud/follow-up-10433

refactor: follow-up for #10433
owncloud · Mar 27, 2024 · 42d1eb1 · 42d1eb1
2 parents 15e907c + 70afc36
commit 42d1eb1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
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
@@ -494,7 +494,7 @@ export default defineComponent({
         onConfirm: (displayName: string) => {
           const linkShare = this.linkShare
           linkShare.displayName = displayName
-          return Promise.resolve(this.$emit('updateLink', { linkShare }))
+          this.$emit('updateLink', { linkShare })
         }
       })
     },
@@ -521,8 +521,9 @@ export default defineComponent({
         inputLabel: this.$gettext('Email address'),
         inputType: 'email',
         onInput: (value, setError) => setError(this.getEmailValidationMsg(value)),
-        onConfirm: (value: string) =>
-          Promise.resolve(this.$emit('updateLink', { linkShare: { ...this.linkShare } }))
+        onConfirm: () => {
+          this.$emit('updateLink', { linkShare: { ...this.linkShare } })
+        }
       })
     },
     getEmailValidationMsg(email: string) {

diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
@@ -75,7 +75,9 @@ describe('FileShares', () => {
     it('reacts on delete events', async () => {
       const { wrapper } = getWrapper({ collaborators })
       const { dispatchModal } = useModals()
-      ;(wrapper.findComponent<any>('collaborator-list-item-stub').vm as any).$emit('onDelete')
+      wrapper
+        .findComponent<typeof CollaboratorListItem>('collaborator-list-item-stub')
+        .vm.$emit('onDelete')
       await wrapper.vm.$nextTick()
       expect(dispatchModal).toHaveBeenCalledTimes(1)
     })

diff --git a/packages/web-pkg/src/composables/piniaStores/modals.ts b/packages/web-pkg/src/composables/piniaStores/modals.ts
@@ -46,7 +46,7 @@ export type Modal = {
   customComponent?: CustomModalComponent
   customComponentAttrs?: () => Record<string, unknown>
   onCancel?: () => void
-  onConfirm?: (value: string) => Promise<void>
+  onConfirm?: (value: string) => void | Promise<void>
   onInput?: (value: string, setError: (error: string) => void) => void
 }
 

diff --git a/packages/web-runtime/src/components/ModalWrapper.vue b/packages/web-runtime/src/components/ModalWrapper.vue
@@ -60,7 +60,9 @@ export default defineComponent({
         updateModal(unref(modal)?.id, 'confirmDisabled', true)
 
         if (unref(modal)?.onConfirm) {
-          await loadingService.addTask(() => unref(modal).onConfirm(value))
+          await loadingService.addTask(async () => {
+            await unref(modal).onConfirm(value)
+          })
         } else if (unref(customComponentRef)?.onConfirm) {
           await loadingService.addTask(() => unref(customComponentRef).onConfirm())
         }

diff --git a/tests/e2e/cucumber/features/shares/share.feature b/tests/e2e/cucumber/features/shares/share.feature
@@ -12,27 +12,27 @@ Feature: share
     Given "Brian" disables auto-accepting using API
     And "Alice" logs in
     And "Alice" creates the following folder in personal space using API
-      | name                   |
-      | folder_to_shared       |
-      | folder_to_customShared |
-      | shared_folder          |
+      | name               |
+      | folder_to_shared   |
+      | folder_to_shared_2 |
+      | shared_folder      |
     And "Alice" opens the "files" app
     And "Alice" uploads the following resource
-      | resource      | to                     |
-      | lorem.txt     | folder_to_shared       |
-      | lorem-big.txt | folder_to_customShared |
+      | resource      | to                 |
+      | lorem.txt     | folder_to_shared   |
+      | lorem-big.txt | folder_to_shared_2 |
     When "Alice" shares the following resource using the sidebar panel
-      | resource               | recipient | type | role       | resourceType |
-      | folder_to_shared       | Brian     | user | Can edit   | folder       |
-      | shared_folder          | Brian     | user | Can edit   | folder       |
-      | folder_to_customShared | Brian     | user | Can edit   | folder       |
+      | resource           | recipient | type | role       | resourceType |
+      | folder_to_shared   | Brian     | user | Can edit   | folder       |
+      | shared_folder      | Brian     | user | Can edit   | folder       |
+      | folder_to_shared_2 | Brian     | user | Can edit   | folder       |
 
     And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" enables the sync for the following shares
-      | name                   |
-      | folder_to_shared       |
-      | folder_to_customShared |
+      | name               |
+      | folder_to_shared   |
+      | folder_to_shared_2 |
     Then "Brian" should not see a sync status for the folder "shared_folder"
     When "Brian" enables the sync for the following share using the context menu
       | name          |
@@ -44,12 +44,12 @@ Feature: share
       | resource                   | as            |
       | folder_to_shared/lorem.txt | lorem_new.txt |
     And "Brian" uploads the following resource
-      | resource        | to                     |
-      | simple.pdf      | folder_to_shared       |
-      | testavatar.jpeg | folder_to_customShared |
+      | resource        | to                 |
+      | simple.pdf      | folder_to_shared   |
+      | testavatar.jpeg | folder_to_shared_2 |
     When "Brian" deletes the following resources using the sidebar panel
-      | resource      | from                   |
-      | lorem-big.txt | folder_to_customShared |
+      | resource      | from               |
+      | lorem-big.txt | folder_to_shared_2 |
     And "Alice" opens the "files" app
     And "Alice" uploads the following resource
       | resource          | to               | option  |
@@ -58,17 +58,17 @@ Feature: share
       | resource   | to               |
       | simple.pdf | folder_to_shared |
     And "Alice" removes following sharee
-      | resource               | recipient |
-      | folder_to_customShared | Brian     |
+      | resource           | recipient |
+      | folder_to_shared_2 | Brian     |
     When "Alice" deletes the following resources using the sidebar panel
       | resource         | from             |
       | lorem_new.txt    | folder_to_shared |
       | folder_to_shared |                  |
     And "Alice" logs out
     Then "Brian" should not be able to see the following shares
-      | resource               | owner        |
-      | folder_to_customShared | Alice Hansen |
-      | folder_to_shared       | Alice Hansen |
+      | resource           | owner        |
+      | folder_to_shared_2 | Alice Hansen |
+      | folder_to_shared   | Alice Hansen |
     And "Brian" logs out