From 960e92893fcfc0f26cf3195fe97585a0163df9cf Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 1 Dec 2023 10:14:34 +0100
Subject: [PATCH 1/2] refactor: register file quick actions as extensions

---
 .../enhancement-quick-actions-via-extension   |  8 ++
 .../src/components/FilesList/QuickActions.vue | 58 +++++-------
 packages/web-app-files/src/extensions.ts      | 21 ++++-
 packages/web-app-files/src/index.ts           |  3 +-
 .../web-app-files/src/views/Favorites.vue     |  6 +-
 .../src/views/spaces/GenericSpace.vue         |  2 +-
 .../components/FilesList/QuickActions.spec.ts | 34 ++++---
 packages/web-pkg/src/apps/types.ts            |  7 +-
 .../files/useFileActionsCreateQuicklink.ts    |  8 +-
 .../actions/files/useFileActionsShowShares.ts | 10 +--
 packages/web-pkg/src/composables/index.ts     |  1 +
 .../web-pkg/src/composables/shares/index.ts   |  1 +
 .../src/composables/shares/useCanShare.ts     | 21 +++++
 packages/web-pkg/src/helpers/share/link.ts    | 25 +++++-
 packages/web-pkg/src/index.ts                 |  2 -
 packages/web-pkg/src/quickActions.ts          | 88 -------------------
 .../pageObjects/FilesPageElement/filesList.js |  9 +-
 .../pageObjects/FilesPageElement/filesRow.js  |  4 +-
 .../objects/app-files/share/actions.ts        |  2 +-
 19 files changed, 137 insertions(+), 173 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-quick-actions-via-extension
 create mode 100644 packages/web-pkg/src/composables/shares/index.ts
 create mode 100644 packages/web-pkg/src/composables/shares/useCanShare.ts
 delete mode 100644 packages/web-pkg/src/quickActions.ts

diff --git a/changelog/unreleased/enhancement-quick-actions-via-extension b/changelog/unreleased/enhancement-quick-actions-via-extension
new file mode 100644
index 00000000000..00036aa65b6
--- /dev/null
+++ b/changelog/unreleased/enhancement-quick-actions-via-extension
@@ -0,0 +1,8 @@
+Enhancement: Registering quick actions as extension
+
+Quick actions can now registered as extension via our extension registry. They need to be of type `action` and have the `files.quick-action` scope.
+
+The old way of registering quick actions via the `quickaction` property of an app is now officially deprecated.
+
+https://github.com/owncloud/web/pull/10102
+https://github.com/owncloud/web/issues/7338
diff --git a/packages/web-app-files/src/components/FilesList/QuickActions.vue b/packages/web-app-files/src/components/FilesList/QuickActions.vue
index cced6d97b95..a6adaefc8a2 100644
--- a/packages/web-app-files/src/components/FilesList/QuickActions.vue
+++ b/packages/web-app-files/src/components/FilesList/QuickActions.vue
@@ -2,15 +2,13 @@
   <div v-if="!isEmbedModeEnabled" class="oc-flex">
     <oc-button
       v-for="action in filteredActions"
-      :key="action.label($gettext)"
-      v-oc-tooltip="action.label($gettext)"
-      :aria-label="action.label($gettext)"
+      :key="action.label()"
+      v-oc-tooltip="action.label()"
+      :aria-label="action.label()"
       appearance="raw"
       class="oc-mr-xs quick-action-button oc-p-xs"
-      :class="`files-quick-action-${action.id}`"
-      @click="
-        action.handler({ ability, clientService, passwordPolicyService, item, language, store })
-      "
+      :class="`files-quick-action-${action.name}`"
+      @click="action.handler({ space, resources: [item] })"
     >
       <oc-icon :name="action.icon" fill-type="line" />
     </oc-button>
@@ -18,48 +16,36 @@
 </template>
 
 <script lang="ts">
-import pickBy from 'lodash-es/pickBy'
-import { computed, defineComponent } from 'vue'
-import {
-  useAbility,
-  useClientService,
-  useEmbedMode,
-  usePasswordPolicyService,
-  useStore
-} from '@ownclouders/web-pkg'
-import { useGettext } from 'vue3-gettext'
+import { computed, defineComponent, PropType } from 'vue'
+import { ActionExtension, useEmbedMode, useExtensionRegistry } from '@ownclouders/web-pkg'
+import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { unref } from 'vue'
 
 export default defineComponent({
   name: 'QuickActions',
-
   props: {
-    actions: {
-      type: Object,
-      required: true
-    },
     item: {
-      type: Object,
+      type: Object as PropType<Resource>,
       required: true
+    },
+    space: {
+      type: Object as PropType<SpaceResource>,
+      default: undefined
     }
   },
   setup(props) {
-    const store = useStore()
-    const ability = useAbility()
-    const clientService = useClientService()
-    const passwordPolicyService = usePasswordPolicyService()
-    const language = useGettext()
+    const extensionRegistry = useExtensionRegistry()
     const { isEnabled: isEmbedModeEnabled } = useEmbedMode()
 
-    const filteredActions = computed(() =>
-      pickBy(props.actions, (action) => action.displayed(props.item, store, ability) === true)
-    )
+    const filteredActions = computed(() => {
+      return unref(extensionRegistry)
+        .requestExtensions<ActionExtension>('action')
+        .filter(({ scopes }) => scopes.includes('files.quick-action'))
+        .map((e) => e.action)
+        .filter(({ isEnabled }) => isEnabled({ space: props.space, resources: [props.item] }))
+    })
 
     return {
-      ability,
-      clientService,
-      passwordPolicyService,
-      store,
-      language,
       filteredActions,
       isEmbedModeEnabled
     }
diff --git a/packages/web-app-files/src/extensions.ts b/packages/web-app-files/src/extensions.ts
index e43c67966ed..1ead6f54a0f 100644
--- a/packages/web-app-files/src/extensions.ts
+++ b/packages/web-app-files/src/extensions.ts
@@ -3,9 +3,11 @@ import {
   Extension,
   useStore,
   useRouter,
-  useSearch
+  useSearch,
+  useFileActionsShowShares,
+  useFileActionsCreateQuickLink
 } from '@ownclouders/web-pkg'
-import { computed } from 'vue'
+import { computed, unref } from 'vue'
 import { SDKSearch } from './search'
 
 export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
@@ -13,6 +15,9 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
   const router = useRouter()
   const { search: searchFunction } = useSearch()
 
+  const { actions: showSharesActions } = useFileActionsShowShares()
+  const { actions: quickLinkActions } = useFileActionsCreateQuickLink()
+
   return computed(
     () =>
       [
@@ -20,6 +25,18 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
           id: 'com.github.owncloud.web.files.search',
           type: 'search',
           searchProvider: new SDKSearch(store, router, searchFunction)
+        },
+        {
+          id: 'com.github.owncloud.web.files.quick-action.collaborator',
+          scopes: ['files', 'files.quick-action'],
+          type: 'action',
+          action: unref(showSharesActions)[0]
+        },
+        {
+          id: 'com.github.owncloud.web.files.quick-action.quicklink',
+          scopes: ['files', 'files.quick-action'],
+          type: 'action',
+          action: unref(quickLinkActions)[0]
         }
       ] satisfies Extension[]
   )
diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index f25428d475a..06dc524d686 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -8,7 +8,7 @@ import SpaceDriveResolver from './views/spaces/DriveResolver.vue'
 import SpaceProjects from './views/spaces/Projects.vue'
 import TrashOverview from './views/trash/Overview.vue'
 import translations from '../l10n/translations.json'
-import { defineWebApplication, quickActions } from '@ownclouders/web-pkg'
+import { defineWebApplication } from '@ownclouders/web-pkg'
 import store from './store'
 import { extensions } from './extensions'
 import fileSideBars from './fileSideBars'
@@ -151,7 +151,6 @@ export default defineWebApplication({
         }
       }),
       navItems,
-      quickActions,
       translations,
       extensions: extensions(args)
     }
diff --git a/packages/web-app-files/src/views/Favorites.vue b/packages/web-app-files/src/views/Favorites.vue
index 17503caa8f6..d49024ff72c 100644
--- a/packages/web-app-files/src/views/Favorites.vue
+++ b/packages/web-app-files/src/views/Favorites.vue
@@ -31,11 +31,7 @@
           @sort="handleSort"
         >
           <template #quickActions="props">
-            <quick-actions
-              class="oc-visible@s"
-              :item="props.resource"
-              :actions="app.quickActions"
-            />
+            <quick-actions class="oc-visible@s" :item="props.resource" />
           </template>
           <template #contextMenu="{ resource }">
             <context-actions
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 6d1f0dd8518..ccb5162cf19 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -126,8 +126,8 @@
               <quick-actions
                 :class="resource.preview"
                 class="oc-visible@s"
+                :space="space"
                 :item="resource"
-                :actions="app.quickActions"
               />
             </template>
             <template #contextMenu="{ resource }">
diff --git a/packages/web-app-files/tests/unit/components/FilesList/QuickActions.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/QuickActions.spec.ts
index 7d931d3ae6a..2ba16abe892 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/QuickActions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/FilesList/QuickActions.spec.ts
@@ -1,27 +1,32 @@
-import { useEmbedMode } from '@ownclouders/web-pkg'
+import { ActionExtension, useEmbedMode } from '@ownclouders/web-pkg'
 import QuickActions from '../../../../src/components/FilesList/QuickActions.vue'
 import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
+import { useExtensionRegistry } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
 import { ref } from 'vue'
+import { useExtensionRegistryMock } from 'web-test-helpers/src/mocks/useExtensionRegistryMock'
 
 jest.mock('@ownclouders/web-pkg', () => ({
   ...jest.requireActual('@ownclouders/web-pkg'),
-  useEmbedMode: jest.fn()
+  useEmbedMode: jest.fn(),
+  useExtensionRegistry: jest.fn()
 }))
 
 const collaboratorAction = {
-  displayed: jest.fn(() => true),
+  isEnabled: jest.fn(() => true),
   handler: jest.fn(),
   icon: 'group-add',
   id: 'collaborators',
+  name: 'show-shares',
   label: () => 'Add people'
 }
 
 const quicklinkAction = {
-  displayed: jest.fn(() => false),
+  isEnabled: jest.fn(() => false),
   handler: jest.fn(),
   icon: 'link-add',
   id: 'quicklink',
+  name: 'create-quicklink',
   label: () => 'Create and copy quicklink'
 }
 
@@ -45,14 +50,14 @@ describe('QuickActions', () => {
       const iconEl = actionButton.find('oc-icon-stub')
 
       expect(actionButton.exists()).toBeTruthy()
-      expect(actionButton.attributes().class).toContain('files-quick-action-collaborators')
+      expect(actionButton.attributes().class).toContain('files-quick-action-show-shares')
       expect(iconEl.exists()).toBeTruthy()
       expect(iconEl.attributes().name).toBe('group-add')
       expect(actionButton.attributes('aria-label')).toBe('Add people')
     })
 
     it('should not display action buttons where "displayed" is set to false', () => {
-      const linkActionButton = wrapper.find('.files-quick-action-public-link')
+      const linkActionButton = wrapper.find('.files-quick-action-create-quicklink')
 
       expect(linkActionButton.exists()).toBeFalsy()
     })
@@ -66,9 +71,6 @@ describe('QuickActions', () => {
       const actionButton = wrapper.find('.oc-button')
       await actionButton.trigger('click')
       expect(handlerAction).toHaveBeenCalledTimes(1)
-      Object.keys(testItem).forEach((key) => {
-        expect(handlerAction.mock.calls[0][0].item[key]).toBe(testItem[key])
-      })
     })
   })
 
@@ -83,13 +85,19 @@ function getWrapper({ embedModeEnabled = false } = {}) {
     .mocked(useEmbedMode)
     .mockReturnValue(mock<ReturnType<typeof useEmbedMode>>({ isEnabled: ref(embedModeEnabled) }))
 
+  jest.mocked(useExtensionRegistry).mockImplementation(() =>
+    useExtensionRegistryMock({
+      requestExtensions: () =>
+        [
+          mock<ActionExtension>({ scopes: ['files.quick-action'], action: collaboratorAction }),
+          mock<ActionExtension>({ scopes: ['files.quick-action'], action: quicklinkAction })
+        ] as any
+    })
+  )
+
   return {
     wrapper: shallowMount(QuickActions, {
       props: {
-        actions: {
-          collaborators: collaboratorAction,
-          publicLink: quicklinkAction
-        },
         item: testItem
       },
       global: {
diff --git a/packages/web-pkg/src/apps/types.ts b/packages/web-pkg/src/apps/types.ts
index 700544902bd..0bc9f203964 100644
--- a/packages/web-pkg/src/apps/types.ts
+++ b/packages/web-pkg/src/apps/types.ts
@@ -28,8 +28,7 @@ export interface AppNavigationItem {
 /**
  * ApplicationQuickAction describes an application action that is used in the runtime.
  *
- * @deprecated In the future quick actions should be registered just like any other extension. Fine
- * to use this interface for now, but it will be changed in the near future.
+ * @deprecated Quick actions should be registered as extension via the `files.quick-action` scope.
  */
 export interface ApplicationQuickAction {
   id?: string
@@ -43,8 +42,7 @@ export interface ApplicationQuickAction {
 /**
  * ApplicationQuickActions describes a map of application actions that are used in the runtime
  *
- * @deprecated In the future quick actions should be registered just like any other extension. Fine
- * to use this interface for now, but it will be changed in the near future.
+ * @deprecated Quick actions should be registered as extension via the `files.quick-action` scope.
  */
 export interface ApplicationQuickActions {
   [key: string]: ApplicationQuickAction
@@ -85,6 +83,7 @@ export interface ClassicApplicationScript {
   store?: Module<unknown, unknown>
   routes?: ((...args) => RouteRecordRaw[]) | RouteRecordRaw[]
   navItems?: ((...args) => AppNavigationItem[]) | AppNavigationItem[]
+  /** @deprecated Quick actions should be registered as extension via the `files.quick-action` scope. */
   quickActions?: ApplicationQuickActions
   translations?: ApplicationTranslations
   extensions?: Ref<Extension[]>
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateQuicklink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateQuicklink.ts
index ad45d70bdef..f0a83ce2511 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateQuicklink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateQuicklink.ts
@@ -1,4 +1,3 @@
-import quickActions, { canShare } from '../../../quickActions'
 import { copyQuicklink } from '../../../helpers/share'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 
@@ -12,6 +11,7 @@ import { useGettext } from 'vue3-gettext'
 import { Store } from 'vuex'
 import { FileAction, FileActionOptions } from '../types'
 import { usePasswordPolicyService } from '../../passwordPolicyService'
+import { useCanShare } from '../../shares'
 
 export const useFileActionsCreateQuickLink = ({
   store
@@ -25,6 +25,7 @@ export const useFileActionsCreateQuickLink = ({
   const ability = useAbility()
   const clientService = useClientService()
   const passwordPolicyService = usePasswordPolicyService()
+  const { canShare } = useCanShare()
 
   const handler = async ({ space, resources }: FileActionOptions) => {
     const [resource] = resources
@@ -43,8 +44,7 @@ export const useFileActionsCreateQuickLink = ({
   const actions = computed((): FileAction[] => [
     {
       name: 'create-quicklink',
-      icon: quickActions.quicklink.icon,
-      iconFillType: quickActions.quicklink.iconFillType,
+      icon: 'link',
       label: () => $gettext('Copy link'),
       handler,
       isEnabled: ({ resources }) => {
@@ -56,7 +56,7 @@ export const useFileActionsCreateQuickLink = ({
             return false
           }
         }
-        return canShare(resources[0], store, ability)
+        return canShare(resources[0])
       },
       componentType: 'button',
       class: 'oc-files-actions-create-quicklink-trigger'
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
index f32860f9e63..0bbdb9f31bd 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
@@ -1,4 +1,3 @@
-import quickActions, { canShare } from '../../../quickActions'
 import { isLocationSharesActive, isLocationTrashActive } from '../../../router'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import { eventBus } from '../../../services'
@@ -10,14 +9,14 @@ import { useRouter } from '../../router'
 import { useStore } from '../../store'
 import { Store } from 'vuex'
 import { FileAction, FileActionOptions } from '../types'
-import { useAbility } from '../../ability'
+import { useCanShare } from '../../shares'
 
 export const useFileActionsShowShares = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
   const router = useRouter()
-  const ability = useAbility()
   const { $gettext } = useGettext()
   const isFilesAppActive = useIsFilesAppActive()
+  const { canShare } = useCanShare()
 
   const handler = ({ resources }: FileActionOptions) => {
     store.commit('Files/SET_FILE_SELECTION', resources)
@@ -27,8 +26,7 @@ export const useFileActionsShowShares = ({ store }: { store?: Store<any> } = {})
   const actions = computed((): FileAction[] => [
     {
       name: 'show-shares',
-      icon: quickActions.collaborators.icon,
-      iconFillType: quickActions.collaborators.iconFillType,
+      icon: 'user-add',
       label: () => $gettext('Share'),
       handler,
       isEnabled: ({ resources }) => {
@@ -48,7 +46,7 @@ export const useFileActionsShowShares = ({ store }: { store?: Store<any> } = {})
             return false
           }
         }
-        return canShare(resources[0], store, ability)
+        return canShare(resources[0])
       },
       componentType: 'button',
       class: 'oc-files-actions-show-shares-trigger'
diff --git a/packages/web-pkg/src/composables/index.ts b/packages/web-pkg/src/composables/index.ts
index 8569aa6f05c..11ca6f457af 100644
--- a/packages/web-pkg/src/composables/index.ts
+++ b/packages/web-pkg/src/composables/index.ts
@@ -28,6 +28,7 @@ export * from './scrollTo'
 export * from './search'
 export * from './selection'
 export * from './service'
+export * from './shares'
 export * from './sideBar'
 export * from './sort'
 export * from './spaces'
diff --git a/packages/web-pkg/src/composables/shares/index.ts b/packages/web-pkg/src/composables/shares/index.ts
new file mode 100644
index 00000000000..f063f1f192f
--- /dev/null
+++ b/packages/web-pkg/src/composables/shares/index.ts
@@ -0,0 +1 @@
+export * from './useCanShare'
diff --git a/packages/web-pkg/src/composables/shares/useCanShare.ts b/packages/web-pkg/src/composables/shares/useCanShare.ts
new file mode 100644
index 00000000000..6e55ea2254e
--- /dev/null
+++ b/packages/web-pkg/src/composables/shares/useCanShare.ts
@@ -0,0 +1,21 @@
+import { Resource } from '@ownclouders/web-client'
+import { useStore } from '../store'
+import { useAbility } from '../ability'
+
+export const useCanShare = () => {
+  const store = useStore()
+  const ability = useAbility()
+
+  const canShare = (item: Resource) => {
+    const { capabilities } = store.state.user
+    if (!capabilities.files_sharing || !capabilities.files_sharing.api_enabled) {
+      return false
+    }
+    if (item.isReceivedShare() && !capabilities.files_sharing.resharing) {
+      return false
+    }
+    return item.canShare({ ability })
+  }
+
+  return { canShare }
+}
diff --git a/packages/web-pkg/src/helpers/share/link.ts b/packages/web-pkg/src/helpers/share/link.ts
index 78a20840cb8..b11e658889d 100644
--- a/packages/web-pkg/src/helpers/share/link.ts
+++ b/packages/web-pkg/src/helpers/share/link.ts
@@ -12,7 +12,6 @@ import { Ability } from '@ownclouders/web-client/src/helpers/resource/types'
 import { Resource } from '@ownclouders/web-client'
 import { Language } from 'vue3-gettext'
 import { unref } from 'vue'
-import { showQuickLinkPasswordModal } from '../../quickActions'
 import { getLocaleFromLanguage } from '../locale'
 import { PublicExpirationCapability } from '@ownclouders/web-client/src/ocs/capabilities'
 
@@ -30,6 +29,30 @@ export interface CopyQuickLink extends CreateQuicklink {
   passwordPolicyService: PasswordPolicyService
 }
 
+export function showQuickLinkPasswordModal({ $gettext, store, passwordPolicyService }, onConfirm) {
+  const modal = {
+    variation: 'passive',
+    title: $gettext('Set password'),
+    cancelText: $gettext('Cancel'),
+    confirmText: $gettext('Set'),
+    hasInput: true,
+    inputDescription: $gettext('Passwords for links are required.'),
+    inputPasswordPolicy: passwordPolicyService.getPolicy(),
+    inputGeneratePasswordMethod: () => passwordPolicyService.generatePassword(),
+    inputLabel: $gettext('Password'),
+    inputType: 'password',
+    onInput: () => store.dispatch('setModalInputErrorMessage', ''),
+    onPasswordChallengeCompleted: () => store.dispatch('setModalConfirmButtonDisabled', false),
+    onPasswordChallengeFailed: () => store.dispatch('setModalConfirmButtonDisabled', true),
+    onCancel: () => store.dispatch('hideModal'),
+    onConfirm: async (password) => {
+      onConfirm(password)
+    }
+  }
+
+  return store.dispatch('createModal', modal)
+}
+
 // doCopy creates the requested link and copies the url to the clipboard,
 // the copy action uses the clipboard // clipboardItem api to work around the webkit limitations.
 //
diff --git a/packages/web-pkg/src/index.ts b/packages/web-pkg/src/index.ts
index 2ea31ef006e..3ff66b169a7 100644
--- a/packages/web-pkg/src/index.ts
+++ b/packages/web-pkg/src/index.ts
@@ -7,8 +7,6 @@ export * from './errors'
 export * from './helpers'
 export * from './http'
 export * from './observer'
-export { default as quickActions } from './quickActions'
-export * from './quickActions'
 export * from './router'
 export * from './services'
 export * from './types'
diff --git a/packages/web-pkg/src/quickActions.ts b/packages/web-pkg/src/quickActions.ts
deleted file mode 100644
index d5020c3b5c6..00000000000
--- a/packages/web-pkg/src/quickActions.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { copyQuicklink } from './helpers/share'
-import { eventBus } from './services/eventBus'
-import { SideBarEventTopics } from './composables/sideBar/eventTopics'
-import { Resource } from '@ownclouders/web-client'
-import { Language } from 'vue3-gettext'
-import { ClientService, PasswordPolicyService } from './services'
-import { Ability } from '@ownclouders/web-client/src/helpers/resource/types'
-import { Store } from 'vuex'
-import { ApplicationQuickActions } from './apps'
-
-export function canShare(item: Resource, store: Store<any>, ability: Ability) {
-  const { capabilities } = store.state.user
-  if (!capabilities.files_sharing || !capabilities.files_sharing.api_enabled) {
-    return false
-  }
-  if (item.isReceivedShare() && !capabilities.files_sharing.resharing) {
-    return false
-  }
-  return item.canShare({ ability })
-}
-
-export function showQuickLinkPasswordModal({ $gettext, store, passwordPolicyService }, onConfirm) {
-  const modal = {
-    variation: 'passive',
-    title: $gettext('Set password'),
-    cancelText: $gettext('Cancel'),
-    confirmText: $gettext('Set'),
-    hasInput: true,
-    inputDescription: $gettext('Passwords for links are required.'),
-    inputPasswordPolicy: passwordPolicyService.getPolicy(),
-    inputGeneratePasswordMethod: () => passwordPolicyService.generatePassword(),
-    inputLabel: $gettext('Password'),
-    inputType: 'password',
-    onInput: () => store.dispatch('setModalInputErrorMessage', ''),
-    onPasswordChallengeCompleted: () => store.dispatch('setModalConfirmButtonDisabled', false),
-    onPasswordChallengeFailed: () => store.dispatch('setModalConfirmButtonDisabled', true),
-    onCancel: () => store.dispatch('hideModal'),
-    onConfirm: async (password) => {
-      onConfirm(password)
-    }
-  }
-
-  return store.dispatch('createModal', modal)
-}
-
-interface QuickLinkContext {
-  ability: Ability
-  clientService: ClientService
-  item: Resource
-  language: Language
-  store: Store<any>
-  passwordPolicyService: PasswordPolicyService
-}
-
-export default {
-  collaborators: {
-    id: 'collaborators',
-    label: ($gettext) => $gettext('Add people'),
-    icon: 'user-add',
-    iconFillType: undefined,
-    handler: () => eventBus.publish(SideBarEventTopics.openWithPanel, 'sharing#peopleShares'),
-    displayed: canShare
-  },
-  quicklink: {
-    id: 'quicklink',
-    label: ($gettext) => $gettext('Copy link'),
-    icon: 'link',
-    iconFillType: undefined,
-    handler: async ({
-      ability,
-      clientService,
-      item,
-      language,
-      store,
-      passwordPolicyService
-    }: QuickLinkContext) => {
-      await copyQuicklink({
-        ability,
-        passwordPolicyService,
-        clientService,
-        language,
-        resource: item,
-        store
-      })
-    },
-    displayed: canShare
-  }
-} satisfies ApplicationQuickActions
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index f84770f8aaf..8d5760d0adb 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -199,10 +199,7 @@ module.exports = {
      * @return {Promise<module.exports.commands>}
      */
     isSharingButtonPresent: async function (resource, elementType = 'any') {
-      const sharingBtnSelector = util.format(
-        filesRow.elements.quickAction.selector,
-        'collaborators'
-      )
+      const sharingBtnSelector = util.format(filesRow.elements.quickAction.selector, 'show-shares')
       const resourceRowSelector = this.getFileRowSelectorByFileName(resource, elementType)
       let isPresent = true
 
@@ -622,8 +619,8 @@ module.exports = {
     },
 
     useQuickAction: async function (resource, action) {
-      action = action.replace(/\s/, '-')
-      const actionSelector = util.format(filesRow.elements.quickAction.selector, action)
+      const className = action === 'collaborators' ? 'show-shares' : 'create-quicklink'
+      const actionSelector = util.format(filesRow.elements.quickAction.selector, className)
       const resourceRowSelector = this.getFileRowSelectorByFileName(resource)
 
       await this.waitForFileVisible(resource)
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesRow.js b/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
index 6ec4caae46e..524f1445128 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
@@ -4,8 +4,8 @@ const util = require('util')
 module.exports = {
   commands: {
     isQuickActionVisible: function (action) {
-      action = action.replace(/\s/, '-')
-      const actionSelector = util.format(this.elements.quickAction.selector, action)
+      const className = action === 'collaborators' ? 'show-shares' : 'create-quicklink'
+      const actionSelector = util.format(this.elements.quickAction.selector, className)
 
       this.useXpath().expect.element(actionSelector).to.be.visible
       this.useCss()
diff --git a/tests/e2e/support/objects/app-files/share/actions.ts b/tests/e2e/support/objects/app-files/share/actions.ts
index b76a9fa835b..cca6f070d49 100644
--- a/tests/e2e/support/objects/app-files/share/actions.ts
+++ b/tests/e2e/support/objects/app-files/share/actions.ts
@@ -8,7 +8,7 @@ import { config } from '../../../../config.js'
 import { createdLinkStore } from '../../../store'
 
 const quickShareButton =
-  '//*[@data-test-resource-name="%s"]/ancestor::tr//button[contains(@class, "files-quick-action-collaborators")]'
+  '//*[@data-test-resource-name="%s"]/ancestor::tr//button[contains(@class, "files-quick-action-show-shares")]'
 const noPermissionToShareLabel =
   '//*[@data-testid="files-collaborators-no-reshare-permissions-message"]'
 const actionMenuDropdownButton =

From 010fecf62e1dae66097330107f264475b6ebf402 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 1 Dec 2023 10:29:49 +0100
Subject: [PATCH 2/2] refactor: announce password policy service before app
 init

---
 .../src/services/passwordPolicy/passwordPolicy.ts      |  9 ++++++---
 .../web-pkg/tests/unit/services/passwordPolicy.spec.ts |  8 +++++---
 packages/web-runtime/src/container/bootstrap.ts        | 10 ++--------
 packages/web-runtime/src/index.ts                      |  5 +++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
index 89635a60ccd..a01905993df 100644
--- a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
+++ b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
@@ -23,14 +23,17 @@ interface GeneratePasswordRules {
 }
 
 export class PasswordPolicyService {
-  private readonly capability: PasswordPolicyCapability
   private readonly language: Language
+  private capability: PasswordPolicyCapability
   private policy: PasswordPolicy
   private generatePasswordRules: GeneratePasswordRules
 
-  constructor({ store, language }: { store: Store<unknown>; language: Language }) {
-    this.capability = get(store, 'getters.capabilities.password_policy', {})
+  constructor({ language }: { language: Language }) {
     this.language = language
+  }
+
+  public initialize(store: Store<unknown>) {
+    this.capability = get(store, 'getters.capabilities.password_policy', {})
     this.buildGeneratePasswordRules()
     this.buildPolicy()
   }
diff --git a/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts b/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
index 31bbe83e2dc..dc2a4e03e93 100644
--- a/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
+++ b/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
@@ -43,7 +43,8 @@ describe('PasswordPolicyService', () => {
           ]
         ]
       ])('capability "%s"', (capability: PasswordPolicyCapability, expected: Array<string>) => {
-        const { passwordPolicyService } = getWrapper(capability)
+        const { passwordPolicyService, store } = getWrapper(capability)
+        passwordPolicyService.initialize(store)
         expect(Object.keys((passwordPolicyService.getPolicy() as any).rules)).toEqual(expected)
       })
     })
@@ -100,7 +101,8 @@ describe('PasswordPolicyService', () => {
             passwords: Array<string>,
             expected: Array<boolean>
           ) => {
-            const { passwordPolicyService } = getWrapper(capability)
+            const { passwordPolicyService, store } = getWrapper(capability)
+            passwordPolicyService.initialize(store)
             const policy = passwordPolicyService.getPolicy()
             for (let i = 0; i < passwords.length; i++) {
               expect((policy as any).check(passwords[i])).toEqual(expected[i])
@@ -119,8 +121,8 @@ const getWrapper = (capability: PasswordPolicyCapability) => {
   })
   const store = createStore(storeOptions)
   return {
+    store,
     passwordPolicyService: new PasswordPolicyService({
-      store,
       language: { current: 'en' } as Language
     })
   }
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index a81c373b848..f82f35042eb 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -474,15 +474,9 @@ export const announceAuthService = ({
 /**
  * @param vue
  */
-export const announcePasswordPolicyService = ({
-  app,
-  store
-}: {
-  app: App
-  store: Store<any>
-}): void => {
+export const announcePasswordPolicyService = ({ app }: { app: App }): void => {
   const language = app.config.globalProperties.$language
-  const passwordPolicyService = new PasswordPolicyService({ store, language })
+  const passwordPolicyService = new PasswordPolicyService({ language })
   app.config.globalProperties.passwordPolicyService = passwordPolicyService
   app.provide('$passwordPolicyService', passwordPolicyService)
 }
diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts
index 352d6225e78..76cb96e0109 100644
--- a/packages/web-runtime/src/index.ts
+++ b/packages/web-runtime/src/index.ts
@@ -90,6 +90,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
   app.provide('$archiverService', app.config.globalProperties.$archiverService)
   announceLoadingService({ app })
   announcePreviewService({ app, store, configurationManager })
+  announcePasswordPolicyService({ app })
   await announceClient(runtimeConfiguration)
 
   app.config.globalProperties.$wormhole = createWormhole()
@@ -165,9 +166,9 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
         return
       }
 
-      announcePasswordPolicyService({ app, store })
-
       const clientService = app.config.globalProperties.$clientService
+      const passwordPolicyService = app.config.globalProperties.passwordPolicyService
+      passwordPolicyService.initialize(store)
 
       // Register SSE event listeners
       if (store.getters.capabilities?.core?.['support-sse']) {