refactor: move shares from vuex store to pinia

owncloud · Jan 18, 2024 · 0bca7e6 · 0bca7e6
1 parent a074763
commit 0bca7e6
Show file tree

Hide file tree

Showing 33 changed files with 872 additions and 716 deletions.
diff --git a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
@@ -24,7 +24,7 @@ import {
   useClientService,
   useMessages,
   usePasswordPolicyService,
-  useStore
+  useSharesStore
 } from '@ownclouders/web-pkg'
 import { Share } from '@ownclouders/web-client/src/helpers'
 
@@ -36,11 +36,11 @@ export default defineComponent({
   },
   emits: ['confirm', 'update:confirmDisabled'],
   setup(props, { expose }) {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const passwordPolicyService = usePasswordPolicyService()
     const { $gettext } = useGettext()
+    const { updateLink } = useSharesStore()
 
     const password = ref('')
     const errorMessage = ref<string>()
@@ -52,9 +52,9 @@ export default defineComponent({
 
     const onConfirm = async () => {
       try {
-        await store.dispatch('Files/updateLink', {
+        await updateLink({
           id: props.link.id,
-          client: clientService.owncloudSdk,
+          clientService: clientService,
           params: { ...props.link, password: unref(password) }
         })
         showMessage({ title: $gettext('Link was updated successfully') })

diff --git a/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -132,9 +132,6 @@
 import { debounce } from 'lodash-es'
 import PQueue from 'p-queue'
 import { storeToRefs } from 'pinia'
-
-import { mapActions } from 'vuex'
-
 import AutocompleteItem from './AutocompleteItem.vue'
 import RoleDropdown from '../RoleDropdown.vue'
 import RecipientContainer from './RecipientContainer.vue'
@@ -153,12 +150,13 @@ import {
   useUserStore,
   useMessages,
   useSpacesStore,
-  useConfigStore
+  useConfigStore,
+  useSharesStore,
+  useStore
 } from '@ownclouders/web-pkg'
 
 import { computed, defineComponent, inject, ref, unref, watch, onMounted } from 'vue'
 import { Resource } from '@ownclouders/web-client'
-import { useShares } from 'web-app-files/src/composables'
 import {
   displayPositionedDropdown,
   formatDateFromDateTime,
@@ -194,6 +192,7 @@ export default defineComponent({
   },
 
   setup() {
+    const store = useStore()
     const userStore = useUserStore()
     const clientService = useClientService()
     const spacesStore = useSpacesStore()
@@ -207,6 +206,10 @@ export default defineComponent({
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const sharesStore = useSharesStore()
+    const { addShare } = sharesStore
+    const { outgoingCollaborators } = storeToRefs(sharesStore)
+
     const saving = ref(false)
     const savingDelayed = ref(false)
     const notifyEnabled = ref(false)
@@ -262,6 +265,7 @@ export default defineComponent({
     })
 
     return {
+      store,
       resource: inject<Resource>('resource'),
       hasResharing: capabilityRefs.sharingResharing,
       resharingDefault: capabilityRefs.sharingResharingDefault,
@@ -276,7 +280,8 @@ export default defineComponent({
       clientService,
       saving,
       savingDelayed,
-      ...useShares(),
+      outgoingCollaborators,
+      addShare,
       showContextMenuOnBtnClick,
       contextMenuButtonRef,
       notifyEnabled,
@@ -355,8 +360,6 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions('Files', ['addShare']),
-
     async fetchRecipients(query) {
       try {
         const recipients = await this.$client.shares.getRecipients(
@@ -494,43 +497,56 @@ export default defineComponent({
       const saveQueue = new PQueue({
         concurrency: this.createSharesConcurrentRequests
       })
+
+      const bitmask = this.selectedRole.hasCustomPermissions
+        ? SharePermissions.permissionsToBitmask(this.customPermissions)
+        : SharePermissions.permissionsToBitmask(
+            this.selectedRole.permissions(
+              (this.hasResharing && this.resharingDefault) || this.resourceIsSpace
+            )
+          )
+
+      let path = this.resource.path
+      // sharing a share root from the share jail -> use resource name as path
+      if (this.hasShareJail && path === '/') {
+        path = `/${this.resource.name}`
+      }
+
       const savePromises = []
       this.selectedCollaborators.forEach((collaborator) => {
         savePromises.push(
           saveQueue.add(async () => {
-            const bitmask = this.selectedRole.hasCustomPermissions
-              ? SharePermissions.permissionsToBitmask(this.customPermissions)
-              : SharePermissions.permissionsToBitmask(
-                  this.selectedRole.permissions(
-                    (this.hasResharing && this.resharingDefault) || this.resourceIsSpace
-                  )
-                )
-
-            let path = this.resource.path
-            // sharing a share root from the share jail -> use resource name as path
-            if (this.hasShareJail && path === '/') {
-              path = `/${this.resource.name}`
-            }
-
-            const addMethod = this.resourceIsSpace ? this.addSpaceMember : this.addShare
-
             try {
-              await addMethod({
-                client: this.$client,
-                resource: this.resource,
-                graphClient: this.clientService.graphAuthenticated,
-                path,
-                shareWith: collaborator.value.shareWith,
-                displayName: collaborator.label,
-                shareType: collaborator.value.shareType,
-                shareWithUser: collaborator.value.shareWithUser,
-                shareWithProvider: collaborator.value.shareWithProvider,
-                permissions: bitmask,
-                role: this.selectedRole,
-                expirationDate: this.expirationDate,
-                storageId: this.resource.fileId || this.resource.id,
-                notify: this.notifyEnabled
-              })
+              if (this.resourceIsSpace) {
+                await this.addSpaceMember({
+                  client: this.$client,
+                  graphClient: this.clientService.graphAuthenticated,
+                  path,
+                  shareWith: collaborator.value.shareWith,
+                  displayName: collaborator.label,
+                  shareType: collaborator.value.shareType,
+                  permissions: bitmask,
+                  role: this.selectedRole,
+                  expirationDate: this.expirationDate,
+                  storageId: this.resource.fileId || this.resource.id
+                })
+              } else {
+                await this.addShare({
+                  clientService: this.$clientService,
+                  vuexStore: this.store,
+                  resource: this.resource,
+                  path,
+                  shareWith: collaborator.value.shareWith,
+                  shareType: collaborator.value.shareType,
+                  shareWithUser: collaborator.value.shareWithUser,
+                  shareWithProvider: collaborator.value.shareWithProvider,
+                  permissions: bitmask,
+                  role: this.selectedRole,
+                  expirationDate: this.expirationDate,
+                  storageId: this.resource.fileId || this.resource.id,
+                  notify: this.notifyEnabled
+                })
+              }
             } catch (e) {
               console.error(e)
               errors.push({

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -129,7 +129,6 @@
 
 <script lang="ts">
 import { storeToRefs } from 'pinia'
-import { mapActions } from 'vuex'
 import { DateTime } from 'luxon'
 
 import EditDropdown from './EditDropdown.vue'
@@ -141,7 +140,8 @@ import {
   useModals,
   useSpacesStore,
   useUserStore,
-  useCapabilityStore
+  useCapabilityStore,
+  useSharesStore
 } from '@ownclouders/web-pkg'
 import { Resource, extractDomSelector } from '@ownclouders/web-client/src/helpers/resource'
 import { computed, defineComponent, inject, PropType, Ref } from 'vue'
@@ -195,6 +195,8 @@ export default defineComponent({
     const { dispatchModal } = useModals()
     const { changeSpaceMember } = useSpacesStore()
 
+    const { updateShare } = useSharesStore()
+
     const { user } = storeToRefs(userStore)
 
     const sharedParentDir = computed(() => {
@@ -238,6 +240,7 @@ export default defineComponent({
     return {
       resource: inject<Ref<Resource>>('resource'),
       changeSpaceMember,
+      updateShare,
       user,
       hasResharing: capabilityRefs.sharingResharing,
       resharingDefault: capabilityRefs.sharingResharingDefault,
@@ -422,8 +425,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['changeShare']),
-
     removeShare() {
       this.$emit('onDelete', this.share)
     },
@@ -470,18 +471,28 @@ export default defineComponent({
               (this.hasResharing && this.resharingDefault) || this.isAnySpaceShareType
             )
           )
-      const changeMethod = this.isAnySpaceShareType ? this.changeSpaceMember : this.changeShare
 
       try {
-        changeMethod({
-          client: this.$client,
-          graphClient: this.clientService.graphAuthenticated,
-          resource: this.resource,
-          share: this.share,
-          permissions: bitmask,
-          expirationDate: expirationDate || '',
-          role
-        })
+        if (this.isAnySpaceShareType) {
+          this.changeSpaceMember({
+            client: this.$client,
+            graphClient: this.clientService.graphAuthenticated,
+            share: this.share,
+            permissions: bitmask,
+            expirationDate: expirationDate || '',
+            role
+          })
+        } else {
+          this.updateShare({
+            clientService: this.$clientService,
+            resource: this.resource,
+            share: this.share,
+            permissions: bitmask,
+            expirationDate: expirationDate || '',
+            role
+          })
+        }
+
         this.showMessage({ title: this.$gettext('Share successfully changed') })
       } catch (e) {
         console.error(e)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -112,7 +112,7 @@
 <script lang="ts">
 import { computed, defineComponent, inject, ref, Ref, unref } from 'vue'
 import { DateTime } from 'luxon'
-import { mapActions, mapMutations } from 'vuex'
+import { mapMutations } from 'vuex'
 import {
   useStore,
   useAbility,
@@ -148,8 +148,7 @@ import {
   isProjectSpaceResource,
   isShareSpaceResource
 } from '@ownclouders/web-client/src/helpers'
-import { isLocationSharesActive } from '@ownclouders/web-pkg'
-import { useShares } from 'web-app-files/src/composables'
+import { isLocationSharesActive, useSharesStore } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { storeToRefs } from 'pinia'
 
@@ -174,6 +173,10 @@ export default defineComponent({
     const { defaultLinkPermissions } = useDefaultLinkPermissions()
     const { dispatchModal } = useModals()
 
+    const sharesStore = useSharesStore()
+    const { updateLink, deleteLink, shares } = sharesStore
+    const { outgoingLinks } = storeToRefs(sharesStore)
+
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
@@ -191,7 +194,6 @@ export default defineComponent({
     const initialLinkListCollapsed = !configStore.options.sidebar.shares.showAllOnLoad
     const linkListCollapsed = ref(initialLinkListCollapsed)
     const indirectLinkListCollapsed = ref(initialLinkListCollapsed)
-    const { outgoingLinks } = useShares()
     const directLinks = computed(() =>
       unref(outgoingLinks)
         .filter((l) => !l.indirect && !l.quicklink)
@@ -249,9 +251,9 @@ export default defineComponent({
 
     const updatePublicLink = async ({ params }) => {
       try {
-        await store.dispatch('Files/updateLink', {
+        await updateLink({
           id: params.id,
-          client: clientService.owncloudSdk,
+          clientService: clientService,
           params
         })
         showMessage({ title: $gettext('Link was updated successfully') })
@@ -272,6 +274,7 @@ export default defineComponent({
     }
 
     return {
+      store,
       ability,
       space,
       resource,
@@ -287,6 +290,7 @@ export default defineComponent({
       outgoingLinks,
       directLinks,
       indirectLinks,
+      deleteLink,
       canCreatePublicLinks,
       canDeleteReadOnlyPublicLinkPassword,
       configStore,
@@ -379,7 +383,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['addLink', 'updateLink', 'removeLink']),
     ...mapMutations('Files', ['REMOVE_FILES']),
 
     toggleLinkListCollapsed() {
@@ -504,15 +507,15 @@ export default defineComponent({
         ),
         confirmText: this.$gettext('Delete'),
         onConfirm: () =>
-          this.deleteLink({
-            client: this.$client,
+          this.removeLink({
+            clientService: this.$clientService,
             share: link,
             resource: this.resource
           })
       })
     },
 
-    async deleteLink({ client, share, resource }) {
+    async removeLink({ clientService, share, resource }) {
       let path = resource.path
       // sharing a share root from the share jail -> use resource name as path
       if (this.hasShareJail && path === '/') {
@@ -523,7 +526,13 @@ export default defineComponent({
       const loadIndicators = this.outgoingLinks.filter((l) => !l.indirect).length === 1
 
       try {
-        await this.removeLink({ client, share, path, loadIndicators })
+        await this.deleteLink({
+          clientService,
+          share,
+          path,
+          loadIndicators,
+          vuexStore: this.store
+        })
         this.showMessage({
           title: this.$gettext('Link was deleted successfully')
         })