From d1e858b9a20878243242e07271c2268b2a60a248 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 30 Jan 2024 11:32:08 +0100
Subject: [PATCH 1/2] refactor: remove share status in favour of syncEnabled

---
 .../components/Shares/SharedWithMeSection.vue |  24 ++---
 .../src/views/shares/SharedViaLink.vue        |   4 +-
 .../src/views/shares/SharedWithMe.vue         |   4 +-
 .../src/views/shares/SharedWithOthers.vue     |   4 +-
 .../unit/views/shares/SharedWithMe.spec.ts    |  14 +--
 .../web-client/src/helpers/share/functions.ts |  25 +++--
 .../src/helpers/share/functionsNG.ts          |  14 +--
 .../web-client/src/helpers/share/index.ts     |   1 -
 .../web-client/src/helpers/share/status.ts    |   5 -
 .../web-client/src/helpers/share/types.ts     |  15 +--
 .../web-pkg/src/components/AppBar/AppBar.vue  |  12 +--
 .../components/FilesList/ContextActions.vue   |  16 +--
 .../components/FilesList/ResourceTable.vue    |  23 ++--
 .../src/composables/actions/files/index.ts    |   4 +-
 .../actions/files/useFileActions.ts           |  20 ++--
 .../files/useFileActionsCopyQuicklink.ts      |  13 +--
 ...eShare.ts => useFileActionsDisableSync.ts} |  49 ++++-----
 ...ptShare.ts => useFileActionsEnableSync.ts} |  47 +++-----
 .../actions/files/useFileActionsNavigate.ts   |   8 +-
 .../actions/files/useFileActionsShowShares.ts |  10 +-
 .../files/useFileActionsToggleHideShare.ts    |  36 +++----
 .../src/helpers/share/triggerShareAction.ts   |  46 ++------
 .../FilesList/ContextActions.spec.ts          |   4 +-
 .../FilesList/ResourceTable.spec.ts           |   1 +
 .../files/useFileActionsAcceptShare.spec.ts   |  20 ++--
 .../helpers/share/triggerShareAction.spec.ts  | 101 ------------------
 .../src/components/Topbar/Notifications.vue   |   3 +-
 .../FilesPageElement/fileActionsMenu.js       |   4 +-
 .../pageObjects/sharedWithMePage.js           |   2 +-
 .../features/smoke/groupActions.feature       |   2 +-
 .../features/smoke/shares/share.feature       |  16 ++-
 tests/e2e/cucumber/steps/ui/shares.ts         |  20 ++--
 .../objects/app-files/share/actions.ts        |  16 +--
 .../support/objects/app-files/share/index.ts  |  12 +--
 34 files changed, 204 insertions(+), 391 deletions(-)
 delete mode 100644 packages/web-client/src/helpers/share/status.ts
 rename packages/web-pkg/src/composables/actions/files/{useFileActionsDeclineShare.ts => useFileActionsDisableSync.ts} (66%)
 rename packages/web-pkg/src/composables/actions/files/{useFileActionsAcceptShare.ts => useFileActionsEnableSync.ts} (68%)
 delete mode 100644 packages/web-pkg/tests/unit/helpers/share/triggerShareAction.spec.ts

diff --git a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
index 8223bf05f02..3ac71e4e626 100644
--- a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
+++ b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
@@ -17,7 +17,6 @@
     <resource-table
       v-else
       v-model:selectedIds="selectedResourcesIds"
-      :data-test-share-status="shareStatus"
       :is-side-bar-open="isSideBarOpen"
       :fields-displayed="displayedFields"
       sidebar-closed
@@ -33,13 +32,13 @@
       @row-mounted="rowMounted"
       @sort="sortHandler"
     >
-      <template #status="{ resource }">
+      <template #syncEnabled="{ resource }">
         <div
-          :key="resource.getDomSelector() + resource.status"
+          :key="resource.getDomSelector()"
           class="oc-text-nowrap oc-flex oc-flex-middle oc-flex-right"
         >
           <oc-icon
-            v-if="getShowSyncedIcon(resource)"
+            v-if="resource.syncEnabled"
             v-oc-tooltip="$gettext('Synced with your devices')"
             name="loop-right"
             class="sync-enabled"
@@ -104,12 +103,11 @@ import { VisibilityObserver } from '@ownclouders/web-pkg'
 import { SortDir, useGetMatchingSpace } from '@ownclouders/web-pkg'
 import { createLocationSpaces } from '@ownclouders/web-pkg'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
+import { IncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { ContextActions } from '@ownclouders/web-pkg'
 import { NoContentMessage } from '@ownclouders/web-pkg'
 import { useSelectedResources } from '@ownclouders/web-pkg'
 import { RouteLocationNamedRaw } from 'vue-router'
-import { Resource } from '@ownclouders/web-client/src/helpers'
 import { CreateTargetRouteOptions } from '@ownclouders/web-pkg'
 import { createFileRouteOptions } from '@ownclouders/web-pkg'
 
@@ -134,13 +132,9 @@ export default defineComponent({
       default: ''
     },
     items: {
-      type: Array as PropType<ShareResource[]>,
+      type: Array as PropType<IncomingShareResource[]>,
       required: true
     },
-    shareStatus: {
-      type: Number,
-      default: ShareStatus.accepted
-    },
     sortBy: {
       type: String,
       required: false,
@@ -228,13 +222,12 @@ export default defineComponent({
   },
 
   data: () => ({
-    ShareStatus,
     showMore: false
   }),
 
   computed: {
     displayedFields() {
-      return ['name', 'status', 'owner', 'sdate', 'sharedWith']
+      return ['name', 'syncEnabled', 'owner', 'sdate', 'sharedWith']
     },
     countFiles() {
       return this.items.filter((s) => s.type !== 'folder').length
@@ -259,7 +252,7 @@ export default defineComponent({
     visibilityObserver.disconnect()
   },
   methods: {
-    rowMounted(resource: Resource, component) {
+    rowMounted(resource: IncomingShareResource, component) {
       const loadPreview = async () => {
         const preview = await this.$previewService.loadPreview(
           {
@@ -284,9 +277,6 @@ export default defineComponent({
         onExit: debounced.cancel
       })
     },
-    getShowSyncedIcon(resource: ShareResource) {
-      return resource.status === ShareStatus.accepted
-    },
     toggleShowMore() {
       this.showMore = !this.showMore
     }
diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
index db4e8b42ab2..2125e969c38 100644
--- a/packages/web-app-files/src/views/shares/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -88,7 +88,7 @@ import { Resource } from '@ownclouders/web-client'
 import { useGetMatchingSpace } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { storeToRefs } from 'pinia'
-import { ShareResource } from '@ownclouders/web-client/src/helpers'
+import { OutgoingShareResource } from '@ownclouders/web-client/src/helpers'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -118,7 +118,7 @@ export default defineComponent({
     const { totalResourcesCount } = storeToRefs(resourcesStore)
 
     const { loadResourcesTask, selectedResourcesIds, paginatedResources } =
-      useResourcesViewDefaults<ShareResource, any, any[]>()
+      useResourcesViewDefaults<OutgoingShareResource, any, any[]>()
 
     resourcesStore.$onAction((action) => {
       if (action.name !== 'updateResourceField') {
diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
index afe37d60954..ef4926c8f5a 100644
--- a/packages/web-app-files/src/views/shares/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -115,7 +115,7 @@ import { useGroupingSettings } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { useGettext } from 'vue3-gettext'
 import { useOpenWithDefaultApp, defaultFuseOptions } from '@ownclouders/web-pkg'
-import { ShareResource, ShareTypes } from '@ownclouders/web-client/src/helpers'
+import { IncomingShareResource, ShareTypes } from '@ownclouders/web-client/src/helpers'
 import { uniq } from 'lodash-es'
 
 export default defineComponent({
@@ -146,7 +146,7 @@ export default defineComponent({
       isSideBarOpen,
       paginatedResources,
       scrollToResourceFromRoute
-    } = useResourcesViewDefaults<ShareResource, any, any>()
+    } = useResourcesViewDefaults<IncomingShareResource, any, any>()
 
     const { $gettext } = useGettext()
 
diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
index 837ffda0b18..94a2deba7ae 100644
--- a/packages/web-app-files/src/views/shares/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
@@ -110,7 +110,7 @@ import { Resource } from '@ownclouders/web-client'
 import { useGroupingSettings } from '@ownclouders/web-pkg'
 import { useGetMatchingSpace } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
-import { ShareResource, ShareTypes } from '@ownclouders/web-client/src/helpers'
+import { OutgoingShareResource, ShareTypes } from '@ownclouders/web-client/src/helpers'
 import { storeToRefs } from 'pinia'
 
 const visibilityObserver = new VisibilityObserver()
@@ -140,7 +140,7 @@ export default defineComponent({
     const { updateResourceField } = resourcesStore
     const { totalResourcesCount } = storeToRefs(resourcesStore)
 
-    const resourcesViewDefaults = useResourcesViewDefaults<ShareResource, any, any[]>()
+    const resourcesViewDefaults = useResourcesViewDefaults<OutgoingShareResource, any, any[]>()
     const { sortBy, sortDir, loadResourcesTask, selectedResourcesIds, paginatedResources } =
       resourcesViewDefaults
 
diff --git a/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts b/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
index b4a95078b42..5be5c888b4e 100644
--- a/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
+++ b/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
@@ -12,7 +12,7 @@ import { defaultStubs, RouteLocation } from 'web-test-helpers'
 import { useSortMock } from 'web-app-files/tests/mocks/useSortMock'
 import { mock } from 'vitest-mock-extended'
 import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
-import { ShareTypes, ShareResource } from '@ownclouders/web-client/src/helpers'
+import { ShareTypes, IncomingShareResource } from '@ownclouders/web-client/src/helpers'
 
 vi.mock('web-app-files/src/composables/resourcesViewDefaults')
 vi.mock('@ownclouders/web-pkg', async (importOriginal) => ({
@@ -84,8 +84,8 @@ describe('SharedWithMe view', () => {
         const shareType2 = ShareTypes.group
         const { wrapper } = getMountedWrapper({
           files: [
-            mock<ShareResource>({ shareTypes: [shareType1.value] }),
-            mock<ShareResource>({ shareTypes: [shareType2.value] })
+            mock<IncomingShareResource>({ shareTypes: [shareType1.value] }),
+            mock<IncomingShareResource>({ shareTypes: [shareType2.value] })
           ]
         })
         const filterItems = wrapper.findComponent<any>('.share-type-filter').props('items')
@@ -99,11 +99,11 @@ describe('SharedWithMe view', () => {
         const collaborator2 = { id: 'user2', displayName: 'user2' }
         const { wrapper } = getMountedWrapper({
           files: [
-            mock<ShareResource>({
+            mock<IncomingShareResource>({
               sharedBy: collaborator1,
               shareTypes: [ShareTypes.user.value]
             }),
-            mock<ShareResource>({
+            mock<IncomingShareResource>({
               sharedBy: collaborator2,
               shareTypes: [ShareTypes.user.value]
             })
@@ -122,12 +122,12 @@ describe('SharedWithMe view', () => {
       it('filters shares accordingly by name', async () => {
         const { wrapper } = getMountedWrapper({
           files: [
-            mock<ShareResource>({
+            mock<IncomingShareResource>({
               name: 'share1',
               hidden: false,
               shareTypes: [ShareTypes.user.value]
             }),
-            mock<ShareResource>({
+            mock<IncomingShareResource>({
               name: 'share2',
               hidden: false,
               shareTypes: [ShareTypes.user.value]
diff --git a/packages/web-client/src/helpers/share/functions.ts b/packages/web-client/src/helpers/share/functions.ts
index 73363a6eed6..1e8d9a8cfdf 100644
--- a/packages/web-client/src/helpers/share/functions.ts
+++ b/packages/web-client/src/helpers/share/functions.ts
@@ -10,16 +10,23 @@ import {
 import { ShareTypes } from './type'
 import path from 'path'
 import { SHARE_JAIL_ID, SpaceResource, buildWebDavSpacesPath } from '../space'
-import { ShareStatus } from './status'
 import { SharePermissions } from './permission'
 import { buildSpaceShare } from './space'
 import { LinkShareRoles, PeopleShareRoles } from './role'
-import { ShareResource, Share } from './types'
+import { ShareResource, Share, OutgoingShareResource, IncomingShareResource } from './types'
 
 export const isShareResource = (resource: Resource): resource is ShareResource => {
   return Object.hasOwn(resource, 'sharedWith')
 }
 
+export const isOutgoingShareResource = (resource: Resource): resource is OutgoingShareResource => {
+  return isShareResource(resource) && resource.outgoing
+}
+
+export const isIncomingShareResource = (resource: Resource): resource is IncomingShareResource => {
+  return isShareResource(resource) && !resource.outgoing
+}
+
 /**
  * Transforms given shares into a resource format and returns only their unique occurences
  *
@@ -160,12 +167,13 @@ export function buildSharedResource(
     shareTypes: [parseInt(share.share_type)],
     owner: { id: share.uid_owner, displayName: share.displayname_owner },
     sharedBy: { id: share.uid_owner, displayName: share.displayname_owner },
-    sharedWith: share.sharedWith || []
+    sharedWith: share.sharedWith || [],
+    outgoing: !incomingShares
   }
 
   if (incomingShares) {
-    resource.status = parseInt(share.state)
-    resource.hidden = share.hidden === 'true' || share.hidden === true
+    ;(resource as IncomingShareResource).syncEnabled = parseInt(share.state) === 0
+    ;(resource as IncomingShareResource).hidden = share.hidden === 'true' || share.hidden === true
     resource.name = isRemoteShare ? share.name : path.basename(share.file_target)
     if (isRemoteShare) {
       resource.path = '/'
@@ -179,13 +187,12 @@ export function buildSharedResource(
       resource.path = share.file_target
       resource.webDavPath = buildWebDavFilesPath(share.share_with, share.file_target)
     }
-    resource.canDownload = () => parseInt(share.state) === ShareStatus.accepted
+    resource.canDownload = () => parseInt(share.state) === 0
     resource.canShare = () => SharePermissions.share.enabled(share.permissions)
-    resource.canRename = () => parseInt(share.state) === ShareStatus.accepted
+    resource.canRename = () => parseInt(share.state) === 0
     resource.canBeDeleted = () => SharePermissions.delete.enabled(share.permissions)
     resource.canEditTags = () =>
-      parseInt(share.state) === ShareStatus.accepted &&
-      SharePermissions.update.enabled(share.permissions)
+      parseInt(share.state) === 0 && SharePermissions.update.enabled(share.permissions)
   } else {
     resource.name = isRemoteShare ? share.name : path.basename(share.path)
     resource.path = share.path
diff --git a/packages/web-client/src/helpers/share/functionsNG.ts b/packages/web-client/src/helpers/share/functionsNG.ts
index 1f8cdc5d8d0..09821eae501 100644
--- a/packages/web-client/src/helpers/share/functionsNG.ts
+++ b/packages/web-client/src/helpers/share/functionsNG.ts
@@ -1,9 +1,8 @@
 import { extractDomSelector, extractExtensionFromFile, extractStorageId } from '../resource'
 import { ShareTypes } from './type'
 import { SHARE_JAIL_ID, buildWebDavSpacesPath } from '../space'
-import { ShareStatus } from './status'
 import { DriveItem, UnifiedRoleDefinition, User } from '../../generated'
-import { GraphSharePermission, ShareResource } from './types'
+import { GraphSharePermission, IncomingShareResource, OutgoingShareResource } from './types'
 import { urlJoin } from '../../utils'
 
 export const getShareResourceRoles = ({
@@ -64,7 +63,7 @@ export function buildIncomingShareResource({
 }: {
   driveItem: DriveItem
   graphRoles: UnifiedRoleDefinition[]
-}): ShareResource {
+}): IncomingShareResource {
   const resourceName = driveItem.name || driveItem.remoteItem.name
   const storageId = extractStorageId(driveItem.remoteItem.id)
   const permission = driveItem.remoteItem?.permissions[0]
@@ -74,7 +73,7 @@ export function buildIncomingShareResource({
   const shareRoles = getShareResourceRoles({ driveItem, graphRoles })
   const sharePermissions = getShareResourcePermissions({ driveItem, shareRoles })
 
-  const resource: ShareResource = {
+  const resource: IncomingShareResource = {
     id,
     shareId: id,
     path: '/',
@@ -98,11 +97,11 @@ export function buildIncomingShareResource({
     isFolder: !!driveItem.remoteItem.folder,
     type: !!driveItem.remoteItem.folder ? 'folder' : 'file',
     mimeType: driveItem.remoteItem.file?.mimeType || 'httpd/unix-directory',
-    status: permission?.['@client.synchronize'] ? ShareStatus.accepted : ShareStatus.declined,
     syncEnabled: permission?.['@client.synchronize'],
     hidden: permission?.['@ui.hidden'],
     shareRoles,
     sharePermissions,
+    outgoing: false,
     canRename: () => !!permission?.['@client.synchronize'],
     canDownload: () => sharePermissions.includes(GraphSharePermission.readBasic),
     canUpload: () => sharePermissions.includes(GraphSharePermission.createUpload),
@@ -127,11 +126,11 @@ export function buildOutgoingShareResource({
 }: {
   driveItem: DriveItem
   user: User
-}): ShareResource {
+}): OutgoingShareResource {
   const storageId = extractStorageId(driveItem.id)
   const path = urlJoin(driveItem.parentReference.path, driveItem.name)
 
-  const resource: ShareResource = {
+  const resource: OutgoingShareResource = {
     id: driveItem.permissions[0].id,
     shareId: driveItem.permissions[0].id,
     path,
@@ -171,6 +170,7 @@ export function buildOutgoingShareResource({
     isFolder: !!driveItem.folder,
     type: !!driveItem.folder ? 'folder' : 'file',
     mimeType: driveItem.file?.mimeType || 'httpd/unix-directory',
+    outgoing: true,
     canRename: () => true,
     canDownload: () => true,
     canUpload: () => true,
diff --git a/packages/web-client/src/helpers/share/index.ts b/packages/web-client/src/helpers/share/index.ts
index baf34f688ff..17db180001a 100644
--- a/packages/web-client/src/helpers/share/index.ts
+++ b/packages/web-client/src/helpers/share/index.ts
@@ -3,6 +3,5 @@ export * from './functions'
 export * from './permission'
 export * from './role'
 export * from './space'
-export * from './status'
 export * from './type'
 export * from './types'
diff --git a/packages/web-client/src/helpers/share/status.ts b/packages/web-client/src/helpers/share/status.ts
deleted file mode 100644
index 8b7f39ad425..00000000000
--- a/packages/web-client/src/helpers/share/status.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum ShareStatus {
-  accepted = 0,
-  pending = 1,
-  declined = 2
-}
diff --git a/packages/web-client/src/helpers/share/types.ts b/packages/web-client/src/helpers/share/types.ts
index b45ae931614..6330404ee77 100644
--- a/packages/web-client/src/helpers/share/types.ts
+++ b/packages/web-client/src/helpers/share/types.ts
@@ -22,15 +22,18 @@ export enum GraphSharePermission {
 export interface ShareResource extends Resource {
   sharedWith: Array<{ shareType: number } & Identity>
   sharedBy: Identity
+  outgoing: boolean
 
-  syncEnabled?: boolean
-  shareRoles?: UnifiedRoleDefinition[]
-  sharePermissions?: GraphSharePermission[]
-  hidden?: boolean
-
-  status?: number // FIXME: remove in favour of syncEnabled
   share?: any // FIXME: type DriveItem OR remove? do we want to expose the share on each resource?
 }
+export interface OutgoingShareResource extends ShareResource {}
+
+export interface IncomingShareResource extends ShareResource {
+  hidden: boolean
+  syncEnabled: boolean
+  shareRoles: UnifiedRoleDefinition[]
+  sharePermissions: GraphSharePermission[]
+}
 
 /** @deprecated */
 export interface Share {
diff --git a/packages/web-pkg/src/components/AppBar/AppBar.vue b/packages/web-pkg/src/components/AppBar/AppBar.vue
index 729ad414442..97c92aae0b7 100644
--- a/packages/web-pkg/src/components/AppBar/AppBar.vue
+++ b/packages/web-pkg/src/components/AppBar/AppBar.vue
@@ -76,9 +76,9 @@ import ViewOptions from '../ViewOptions.vue'
 import { isLocationCommonActive, isLocationTrashActive } from '../../router'
 import { FolderView } from '../../ui/types'
 import {
-  useFileActionsAcceptShare,
+  useFileActionsEnableSync,
   useFileActionsCopy,
-  useFileActionsDeclineShare,
+  useFileActionsDisableSync,
   useFileActionsDelete,
   useFileActionsDownloadArchive,
   useFileActionsDownloadFile,
@@ -155,11 +155,11 @@ export default defineComponent({
     const resourcesStore = useResourcesStore()
     const { selectedResources } = storeToRefs(resourcesStore)
 
-    const { actions: acceptShareActions } = useFileActionsAcceptShare()
+    const { actions: enableSyncActions } = useFileActionsEnableSync()
     const { actions: hideShareActions } = useFileActionsToggleHideShare()
     const { actions: copyActions } = useFileActionsCopy()
     const { actions: duplicateActions } = useSpaceActionsDuplicate()
-    const { actions: declineShareActions } = useFileActionsDeclineShare()
+    const { actions: disableSyncActions } = useFileActionsDisableSync()
     const { actions: deleteActions } = useFileActionsDelete()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
@@ -181,8 +181,8 @@ export default defineComponent({
     const batchActions = computed(() => {
       let actions = [
         ...unref(hideShareActions),
-        ...unref(acceptShareActions),
-        ...unref(declineShareActions),
+        ...unref(enableSyncActions),
+        ...unref(disableSyncActions),
         ...unref(downloadArchiveActions),
         ...unref(downloadFileActions),
         ...unref(moveActions),
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index fdc836f4e14..9d176031ac7 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -18,9 +18,9 @@ import {
   useFileActionsPaste,
   useFileActionsShowDetails,
   useFileActionsShowShares,
-  useFileActionsAcceptShare,
+  useFileActionsEnableSync,
   useFileActionsCopy,
-  useFileActionsDeclineShare,
+  useFileActionsDisableSync,
   useFileActionsDelete,
   useFileActionsDownloadArchive,
   useFileActionsEmptyTrashBin,
@@ -50,11 +50,11 @@ export default defineComponent({
   setup(props) {
     const { editorActions } = useFileActions()
 
-    const { actions: acceptShareActions } = useFileActionsAcceptShare()
+    const { actions: enableSyncActions } = useFileActionsEnableSync()
     const { actions: hideShareActions } = useFileActionsToggleHideShare()
     const { actions: copyActions } = useFileActionsCopy()
     const { actions: createQuickLinkActions } = useFileActionsCopyQuickLink()
-    const { actions: declineShareActions } = useFileActionsDeclineShare()
+    const { actions: disableSyncActions } = useFileActionsDisableSync()
     const { actions: deleteActions } = useFileActionsDelete()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
@@ -83,8 +83,8 @@ export default defineComponent({
     const actionOptions = toRef(props, 'actionOptions') as Ref<FileActionOptions>
     const menuItemsBatchActions = computed(() =>
       [
-        ...unref(acceptShareActions),
-        ...unref(declineShareActions),
+        ...unref(enableSyncActions),
+        ...unref(disableSyncActions),
         ...unref(downloadArchiveActions),
         ...unref(moveActions),
         ...unref(copyActions),
@@ -120,8 +120,8 @@ export default defineComponent({
         ...unref(renameActions),
         ...unref(createSpaceFromResourceActions),
         ...unref(restoreActions),
-        ...unref(acceptShareActions),
-        ...unref(declineShareActions),
+        ...unref(enableSyncActions),
+        ...unref(disableSyncActions),
         ...unref(hideShareActions),
         ...unref(setSpaceImageActions),
         ...unref(setSpaceReadmeActions),
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index b2c6b20c316..ae3d936c8a4 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -96,9 +96,9 @@
       </div>
       <slot name="additionalResourceContent" :resource="item" />
     </template>
-    <template #status="{ item }">
-      <!-- @slot Status column -->
-      <slot name="status" :resource="item" />
+    <template #syncEnabled="{ item }">
+      <!-- @slot syncEnabled column -->
+      <slot name="syncEnabled" :resource="item" />
     </template>
     <template #size="{ item }">
       <resource-size :size="item.size || Number.NaN" />
@@ -227,7 +227,11 @@ import { defineComponent, PropType, computed, unref, ref, ComputedRef } from 'vu
 import { useWindowSize } from '@vueuse/core'
 import { Resource } from '@ownclouders/web-client'
 import { extractDomSelector, SpaceResource } from '@ownclouders/web-client/src/helpers'
-import { ShareStatus, ShareTypes, isShareResource } from '@ownclouders/web-client/src/helpers/share'
+import {
+  ShareTypes,
+  isIncomingShareResource,
+  isShareResource
+} from '@ownclouders/web-client/src/helpers/share'
 
 import {
   SortDir,
@@ -289,7 +293,7 @@ export default defineComponent({
      * - modificationDate: The date of the last modification of the resource
      * - shareDate: The date when the share was created
      * - deletionDate: The date when the resource has been deleted
-     * - status: The status of the share. Contains also actions to accept/decline the share
+     * - status: The sync status of the share
      * - opensInNewWindow: Open the link in a new window
      */
     resources: {
@@ -642,7 +646,7 @@ export default defineComponent({
             width: 'shrink'
           },
           {
-            name: 'status',
+            name: 'syncEnabled',
             title: this.$gettext('Status'),
             type: 'slot',
             alignH: 'right',
@@ -1000,11 +1004,8 @@ export default defineComponent({
         return false
       }
 
-      // TODO: remove as soon as pending & declined shares are accessible
-      if (
-        isShareResource(resource) &&
-        [ShareStatus.pending, ShareStatus.declined].includes(resource.status)
-      ) {
+      // TODO: remove as soon as unsynced shares are accessible
+      if (isIncomingShareResource(resource) && !resource.syncEnabled) {
         return false
       }
 
diff --git a/packages/web-pkg/src/composables/actions/files/index.ts b/packages/web-pkg/src/composables/actions/files/index.ts
index d78dcc8bae0..7bbde527210 100644
--- a/packages/web-pkg/src/composables/actions/files/index.ts
+++ b/packages/web-pkg/src/composables/actions/files/index.ts
@@ -1,10 +1,10 @@
 export * from './useFileActions'
 export * from './useFileActionsSetReadme'
-export * from './useFileActionsAcceptShare'
+export * from './useFileActionsEnableSync'
 export * from './useFileActionsToggleHideShare'
 export * from './useFileActionsCopy'
 export * from './useFileActionsCopyQuicklink'
-export * from './useFileActionsDeclineShare'
+export * from './useFileActionsDisableSync'
 export * from './useFileActionsDelete'
 export * from './useFileActionsDownloadArchive'
 export * from './useFileActionsDownloadFile'
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActions.ts b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
index 7545544f244..99322a5c723 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
@@ -1,7 +1,7 @@
 import kebabCase from 'lodash-es/kebabCase'
-import { ShareStatus, isShareResource } from '@ownclouders/web-client/src/helpers/share'
+import { isIncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { routeToContextQuery } from '../../appDefaults'
-import { isLocationSharesActive, isLocationTrashActive } from '../../../router'
+import { isLocationTrashActive } from '../../../router'
 import { computed, unref } from 'vue'
 import { useRouter } from '../../router'
 import { useGettext } from 'vue3-gettext'
@@ -15,10 +15,10 @@ import {
 } from '../../actions'
 
 import {
-  useFileActionsAcceptShare,
+  useFileActionsEnableSync,
   useFileActionsToggleHideShare,
   useFileActionsCopy,
-  useFileActionsDeclineShare,
+  useFileActionsDisableSync,
   useFileActionsDelete,
   useFileActionsDownloadArchive,
   useFileActionsDownloadFile,
@@ -53,11 +53,11 @@ export const useFileActions = () => {
   const resourcesStore = useResourcesStore()
   const { currentFolder } = storeToRefs(resourcesStore)
 
-  const { actions: acceptShareActions } = useFileActionsAcceptShare()
+  const { actions: enableSyncActions } = useFileActionsEnableSync()
   const { actions: hideShareActions } = useFileActionsToggleHideShare()
   const { actions: copyActions } = useFileActionsCopy()
   const { actions: deleteActions } = useFileActionsDelete()
-  const { actions: declineShareActions } = useFileActionsDeclineShare()
+  const { actions: disableSyncActions } = useFileActionsDisableSync()
   const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
   const { actions: downloadFileActions } = useFileActionsDownloadFile()
   const { actions: favoriteActions } = useFileActionsFavorite()
@@ -78,9 +78,9 @@ export const useFileActions = () => {
     ...unref(renameActions),
     ...unref(createSpaceFromResource),
     ...unref(restoreActions),
-    ...unref(acceptShareActions),
+    ...unref(enableSyncActions),
     ...unref(hideShareActions),
-    ...unref(declineShareActions),
+    ...unref(disableSyncActions),
     ...unref(favoriteActions),
     ...unref(navigateActions)
   ])
@@ -119,9 +119,7 @@ export const useFileActions = () => {
             if (
               !unref(isSearchActive) &&
               (isLocationTrashActive(router, 'files-trash-generic') ||
-                (isLocationSharesActive(router, 'files-shares-with-me') &&
-                  isShareResource(resources[0]) &&
-                  resources[0].status !== ShareStatus.accepted))
+                (isIncomingShareResource(resources[0]) && !resources[0].syncEnabled))
             ) {
               return false
             }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
index 9e2c48c79fc..75608cdb460 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
@@ -1,14 +1,11 @@
 import {
   Share,
-  ShareStatus,
   ShareTypes,
   buildShare,
-  isShareResource
+  isIncomingShareResource
 } from '@ownclouders/web-client/src/helpers/share'
-import { isLocationSharesActive } from '../../../router'
 import { computed, unref } from 'vue'
 import { useClientService } from '../../clientService'
-import { useRouter } from '../../router'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { useCanShare } from '../../shares'
@@ -19,7 +16,6 @@ import { useMessages } from '../../piniaStores'
 
 export const useFileActionsCopyQuickLink = () => {
   const { showMessage, showErrorMessage } = useMessages()
-  const router = useRouter()
   const language = useGettext()
   const { $gettext } = language
   const clientService = useClientService()
@@ -89,11 +85,10 @@ export const useFileActionsCopyQuickLink = () => {
         if (resources.length !== 1) {
           return false
         }
-        if (isLocationSharesActive(router, 'files-shares-with-me')) {
-          if (isShareResource(resources[0]) && resources[0].status !== ShareStatus.accepted) {
-            return false
-          }
+        if (isIncomingShareResource(resources[0]) && !resources[0].syncEnabled) {
+          return false
         }
+
         return canShare(resources[0])
       },
       componentType: 'button',
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDisableSync.ts
similarity index 66%
rename from packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
rename to packages/web-pkg/src/composables/actions/files/useFileActionsDisableSync.ts
index cecdeeb04fc..5794afad4f2 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDisableSync.ts
@@ -5,34 +5,26 @@ import {
   createLocationShares
 } from '../../../router'
 import PQueue from 'p-queue'
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
+import { IncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
-import {
-  useMessages,
-  useSpacesStore,
-  useCapabilityStore,
-  useConfigStore,
-  useResourcesStore
-} from '../../piniaStores'
+import { useMessages, useConfigStore, useResourcesStore } from '../../piniaStores'
 
-export const useFileActionsDeclineShare = () => {
+export const useFileActionsDisableSync = () => {
   const { showMessage, showErrorMessage } = useMessages()
-  const capabilityStore = useCapabilityStore()
   const router = useRouter()
   const { $gettext, $ngettext } = useGettext()
 
   const clientService = useClientService()
   const loadingService = useLoadingService()
   const configStore = useConfigStore()
-  const spacesStore = useSpacesStore()
-  const { upsertResource } = useResourcesStore()
+  const { updateResourceField } = useResourcesStore()
 
-  const handler = async ({ resources }: FileActionOptions<ShareResource>) => {
+  const handler = async ({ resources }: FileActionOptions<IncomingShareResource>) => {
     const errors = []
     const triggerPromises = []
     const triggerQueue = new PQueue({
@@ -42,18 +34,17 @@ export const useFileActionsDeclineShare = () => {
       triggerPromises.push(
         triggerQueue.add(async () => {
           try {
-            const share = await triggerShareAction({
+            await triggerShareAction({
               resource,
-              status: ShareStatus.declined,
-              hasResharing: capabilityStore.sharingResharing,
-              hasShareJail: capabilityStore.spacesShareJail,
-              client: clientService.owncloudSdk,
-              spaces: spacesStore.spaces,
-              fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
+              status: 2,
+              client: clientService.owncloudSdk
+            })
+
+            updateResourceField<IncomingShareResource, any>({
+              id: resource.id,
+              field: 'syncEnabled',
+              value: false
             })
-            if (share) {
-              upsertResource(share)
-            }
           } catch (error) {
             console.error(error)
             errors.push(error)
@@ -88,9 +79,9 @@ export const useFileActionsDeclineShare = () => {
     })
   }
 
-  const actions = computed((): FileAction<ShareResource>[] => [
+  const actions = computed((): FileAction<IncomingShareResource>[] => [
     {
-      name: 'decline-share',
+      name: 'disable-sync',
       icon: 'spam-3',
       handler: (args) => loadingService.addTask(() => handler(args)),
       label: () => $gettext('Disable sync'),
@@ -112,14 +103,10 @@ export const useFileActionsDeclineShare = () => {
           return false
         }
 
-        // decline (= unsync) is only available for accepted (= synced) shares
-        const declineDisabled = resources.some((resource) => {
-          return resource.status !== ShareStatus.accepted
-        })
-        return !declineDisabled
+        return resources.some((resource) => resource.syncEnabled)
       },
       componentType: 'button',
-      class: 'oc-files-actions-decline-share-trigger'
+      class: 'oc-files-actions-disable-sync-trigger'
     }
   ])
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsEnableSync.ts
similarity index 68%
rename from packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
rename to packages/web-pkg/src/composables/actions/files/useFileActionsEnableSync.ts
index fada49a65ec..4d2b9fa6954 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsEnableSync.ts
@@ -1,7 +1,7 @@
 import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
 
 import PQueue from 'p-queue'
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
+import { IncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { isLocationSharesActive, isLocationSpacesActive } from '../../../router'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
@@ -9,29 +9,21 @@ import { useRouter } from '../../router'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
-import {
-  useMessages,
-  useSpacesStore,
-  useCapabilityStore,
-  useConfigStore,
-  useResourcesStore
-} from '../../piniaStores'
+import { useMessages, useConfigStore, useResourcesStore } from '../../piniaStores'
 
-export const useFileActionsAcceptShare = () => {
+export const useFileActionsEnableSync = () => {
   const { showMessage, showErrorMessage } = useMessages()
-  const capabilityStore = useCapabilityStore()
   const router = useRouter()
   const { $gettext, $ngettext } = useGettext()
 
   const clientService = useClientService()
   const loadingService = useLoadingService()
   const configStore = useConfigStore()
-  const spacesStore = useSpacesStore()
 
   const resourcesStore = useResourcesStore()
-  const { upsertResource } = resourcesStore
+  const { updateResourceField } = resourcesStore
 
-  const handler = async ({ resources }: FileActionOptions<ShareResource>) => {
+  const handler = async ({ resources }: FileActionOptions<IncomingShareResource>) => {
     const errors = []
     const triggerPromises = []
     const triggerQueue = new PQueue({
@@ -41,18 +33,16 @@ export const useFileActionsAcceptShare = () => {
       triggerPromises.push(
         triggerQueue.add(async () => {
           try {
-            const share = await triggerShareAction({
+            await triggerShareAction({
               resource,
-              status: ShareStatus.accepted,
-              hasResharing: capabilityStore.sharingResharing,
-              hasShareJail: capabilityStore.spacesShareJail,
-              client: clientService.owncloudSdk,
-              spaces: spacesStore.spaces,
-              fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
+              status: 0,
+              client: clientService.owncloudSdk
+            })
+            updateResourceField<IncomingShareResource, any>({
+              id: resource.id,
+              field: 'syncEnabled',
+              value: true
             })
-            if (share) {
-              upsertResource(share)
-            }
           } catch (error) {
             console.error(error)
             errors.push(error)
@@ -88,9 +78,9 @@ export const useFileActionsAcceptShare = () => {
     })
   }
 
-  const actions = computed((): FileAction<ShareResource>[] => [
+  const actions = computed((): FileAction<IncomingShareResource>[] => [
     {
-      name: 'accept-share',
+      name: 'enable-sync',
       icon: 'check',
       handler: (args) => loadingService.addTask(() => handler(args)),
       label: () => $gettext('Enable sync'),
@@ -112,13 +102,10 @@ export const useFileActionsAcceptShare = () => {
           return false
         }
 
-        const acceptDisabled = resources.some((resource) => {
-          return resource.status === ShareStatus.accepted
-        })
-        return !acceptDisabled
+        return resources.some((resource) => !resource.syncEnabled)
       },
       componentType: 'button',
-      class: 'oc-files-actions-accept-share-trigger'
+      class: 'oc-files-actions-enable-sync-trigger'
     }
   ])
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
index c511867308a..4dc1e9dc4ce 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
@@ -6,7 +6,7 @@ import {
   isLocationSharesActive,
   isLocationTrashActive
 } from '../../../router'
-import { ShareStatus, isShareResource } from '@ownclouders/web-client/src/helpers/share'
+import { isIncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import merge from 'lodash-es/merge'
 import { isShareSpaceResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { createFileRouteOptions } from '../../../helpers/router'
@@ -59,11 +59,7 @@ export const useFileActionsNavigate = () => {
           return false
         }
 
-        if (
-          isLocationSharesActive(router, 'files-shares-with-me') &&
-          isShareResource(resources[0]) &&
-          resources[0].status !== ShareStatus.accepted
-        ) {
+        if (isIncomingShareResource(resources[0]) && !resources[0].syncEnabled) {
           return false
         }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
index 7d6f9fd75d5..14f6cdd7f17 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
@@ -1,5 +1,5 @@
-import { isLocationSharesActive, isLocationTrashActive } from '../../../router'
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
+import { isLocationTrashActive } from '../../../router'
+import { ShareResource, isIncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { eventBus } from '../../../services'
 import { SideBarEventTopics } from '../../sideBar'
 import { computed, unref } from 'vue'
@@ -40,10 +40,8 @@ export const useFileActionsShowShares = () => {
         if (resources.length !== 1) {
           return false
         }
-        if (isLocationSharesActive(router, 'files-shares-with-me')) {
-          if (resources[0].status !== ShareStatus.accepted) {
-            return false
-          }
+        if (isIncomingShareResource(resources[0]) && !resources[0].syncEnabled) {
+          return false
         }
         return canShare(resources[0])
       },
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
index 7bdaa688951..566a059b15a 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
@@ -8,28 +8,20 @@ import { useRouter } from '../../router'
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
-import {
-  useMessages,
-  useSpacesStore,
-  useCapabilityStore,
-  useConfigStore,
-  useResourcesStore
-} from '../../piniaStores'
-import { ShareResource } from '@ownclouders/web-client/src/helpers'
+import { useMessages, useConfigStore, useResourcesStore } from '../../piniaStores'
+import { IncomingShareResource } from '@ownclouders/web-client/src/helpers'
 
 export const useFileActionsToggleHideShare = () => {
   const { showMessage, showErrorMessage } = useMessages()
-  const capabilityStore = useCapabilityStore()
   const router = useRouter()
   const { $gettext } = useGettext()
 
   const clientService = useClientService()
   const loadingService = useLoadingService()
   const configStore = useConfigStore()
-  const spacesStore = useSpacesStore()
-  const { upsertResource, resetSelection } = useResourcesStore()
+  const { updateResourceField, resetSelection } = useResourcesStore()
 
-  const handler = async ({ resources }: FileActionOptions<ShareResource>) => {
+  const handler = async ({ resources }: FileActionOptions<IncomingShareResource>) => {
     const errors = []
     const triggerPromises = []
     const triggerQueue = new PQueue({
@@ -41,19 +33,17 @@ export const useFileActionsToggleHideShare = () => {
       triggerPromises.push(
         triggerQueue.add(async () => {
           try {
-            const share = await triggerShareAction({
+            await triggerShareAction({
               resource,
-              status: resource.status,
+              status: resource.syncEnabled ? 0 : 2,
               hidden,
-              hasResharing: capabilityStore.sharingResharing,
-              hasShareJail: capabilityStore.spacesShareJail,
-              client: clientService.owncloudSdk,
-              spaces: spacesStore.spaces,
-              fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
+              client: clientService.owncloudSdk
+            })
+            updateResourceField<IncomingShareResource, any>({
+              id: resource.id,
+              field: 'hidden',
+              value: hidden
             })
-            if (share) {
-              upsertResource(share)
-            }
           } catch (error) {
             console.error(error)
             errors.push(error)
@@ -83,7 +73,7 @@ export const useFileActionsToggleHideShare = () => {
     })
   }
 
-  const actions = computed((): FileAction<ShareResource>[] => [
+  const actions = computed((): FileAction<IncomingShareResource>[] => [
     {
       name: 'toggle-hide-share',
       icon: 'eye-off', // FIXME: change icon based on hidden status
diff --git a/packages/web-pkg/src/helpers/share/triggerShareAction.ts b/packages/web-pkg/src/helpers/share/triggerShareAction.ts
index fd9e407d0f5..65fc619eea3 100644
--- a/packages/web-pkg/src/helpers/share/triggerShareAction.ts
+++ b/packages/web-pkg/src/helpers/share/triggerShareAction.ts
@@ -1,30 +1,18 @@
-import { SpaceResource } from '@ownclouders/web-client/src'
-import {
-  aggregateResourceShares,
-  ShareResource,
-  ShareStatus
-} from '@ownclouders/web-client/src/helpers/share'
+import { ShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { HttpError } from '@ownclouders/web-client/src/errors'
 import { OwnCloudSdk } from '@ownclouders/web-client/src/types'
 
+/** @deprecated */
 export async function triggerShareAction({
   resource,
   status,
-  hasResharing,
-  hasShareJail,
   client,
-  hidden = undefined,
-  spaces = [],
-  fullShareOwnerPaths = false
+  hidden = undefined
 }: {
   resource: ShareResource
-  status: ShareStatus
-  hasResharing: boolean
-  hasShareJail: boolean
+  status: number
   client: OwnCloudSdk
   hidden?: boolean
-  spaces?: SpaceResource[]
-  fullShareOwnerPaths?: boolean
 }) {
   const method = _getRequestMethod(status, hidden)
   if (!method) {
@@ -37,43 +25,27 @@ export async function triggerShareAction({
   }
 
   // exec share action
-  let response = await client.requests.ocs({ service: 'apps/files_sharing', action, method })
+  const response = await client.requests.ocs({ service: 'apps/files_sharing', action, method })
 
   // exit on failure
   if (response.status !== 200) {
     throw new HttpError(response.statusText, response)
   }
 
-  // get updated share from response and transform & return it
-  if (parseInt(response.headers.get('content-length')) > 0) {
-    response = await response.json()
-    if ((response as any).ocs.data.length > 0) {
-      const share = (response as any).ocs.data[0]
-      return aggregateResourceShares({
-        shares: [share],
-        spaces,
-        incomingShares: true,
-        allowSharePermission: hasResharing,
-        hasShareJail,
-        fullShareOwnerPaths
-      })[0]
-    }
-  }
-
   return null
 }
 
-function _getRequestMethod(status: ShareStatus, hidden: boolean) {
+function _getRequestMethod(status: number, hidden: boolean) {
   if (hidden !== undefined) {
     // setting the hidden state is always done via PUT
     return 'PUT'
   }
   switch (status) {
-    case ShareStatus.accepted:
+    case 0:
       return 'POST'
-    case ShareStatus.declined:
+    case 2:
       return 'DELETE'
-    case ShareStatus.pending:
+    case 1:
       return 'POST'
     default:
       return null
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
index 4205582a5c1..a12034e89f5 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
@@ -4,7 +4,7 @@ import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import ContextActions from '../../../../src/components/FilesList/ContextActions.vue'
 
 import {
-  useFileActionsAcceptShare,
+  useFileActionsEnableSync,
   useFileActionsCopyQuickLink,
   useFileActionsRename,
   useFileActionsCopy
@@ -31,7 +31,7 @@ describe.skip('ContextActions', () => {
 
     it('render enabled actions', () => {
       const enabledComposables = [
-        useFileActionsAcceptShare,
+        useFileActionsEnableSync,
         useFileActionsCopyQuickLink,
         useFileActionsRename,
         useFileActionsCopy
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
index fc7559b5443..9d74148ecae 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
@@ -104,6 +104,7 @@ const resourcesWithAllFields = [
     owner,
     sharedWith,
     shareTypes: [],
+    syncEnabled: true,
     canRename: vi.fn,
     getDomSelector: () => extractDomSelector('forest')
   },
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
index 6d3750f1b41..d7da5094038 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
@@ -1,7 +1,7 @@
 import { mock } from 'vitest-mock-extended'
 import { unref } from 'vue'
-import { useFileActionsAcceptShare } from '../../../../../src/composables/actions/files/useFileActionsAcceptShare'
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
+import { useFileActionsEnableSync } from '../../../../../src/composables/actions/files/useFileActionsEnableSync'
+import { IncomingShareResource } from '@ownclouders/web-client/src/helpers/share'
 import { defaultComponentMocks, getComposableWrapper, RouteLocation } from 'web-test-helpers'
 
 const sharesWithMeLocation = 'files-shares-with-me'
@@ -11,15 +11,14 @@ describe('acceptShare', () => {
   describe('computed property "actions"', () => {
     describe('isEnabled property of returned element', () => {
       it.each([
-        { resources: [{ status: ShareStatus.pending }] as ShareResource[], expectedStatus: true },
-        { resources: [{ status: ShareStatus.declined }] as ShareResource[], expectedStatus: true },
-        { resources: [{ status: ShareStatus.accepted }] as ShareResource[], expectedStatus: false }
+        { resources: [{ syncEnabled: false }] as IncomingShareResource[], expectedStatus: true },
+        { resources: [{ syncEnabled: true }] as IncomingShareResource[], expectedStatus: false }
       ])(
-        `should be set according to the resource share status if the route name is "${sharesWithMeLocation}"`,
+        `should be set according to the resource syncEnabled state if the route name is "${sharesWithMeLocation}"`,
         (inputData) => {
           getWrapper({
             setup: () => {
-              const { actions } = useFileActionsAcceptShare()
+              const { actions } = useFileActionsEnableSync()
 
               const resources = inputData.resources
               expect(unref(actions)[0].isEnabled({ space: null, resources })).toBe(
@@ -30,16 +29,15 @@ describe('acceptShare', () => {
         }
       )
       it.each([
-        { status: ShareStatus.pending } as ShareResource,
-        { status: ShareStatus.declined } as ShareResource,
-        { status: ShareStatus.accepted } as ShareResource
+        { syncEnabled: false } as IncomingShareResource,
+        { syncEnabled: true } as IncomingShareResource
       ])(
         `should be set as false if the route name is other than "${sharesWithMeLocation}"`,
         (resource) => {
           getWrapper({
             routeName: sharesWithOthersLocation,
             setup: () => {
-              const { actions } = useFileActionsAcceptShare()
+              const { actions } = useFileActionsEnableSync()
 
               expect(
                 unref(actions)[0].isEnabled({ space: null, resources: [resource] })
diff --git a/packages/web-pkg/tests/unit/helpers/share/triggerShareAction.spec.ts b/packages/web-pkg/tests/unit/helpers/share/triggerShareAction.spec.ts
deleted file mode 100644
index 187253dadb7..00000000000
--- a/packages/web-pkg/tests/unit/helpers/share/triggerShareAction.spec.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { triggerShareAction } from '../../../../src/helpers/share/triggerShareAction'
-
-import { ShareResource, ShareStatus } from '@ownclouders/web-client/src/helpers/share'
-import { OwnCloudSdk } from '@ownclouders/web-client/src/types'
-import { mock, mockDeep } from 'vitest-mock-extended'
-
-vi.unmock('axios')
-const client = mockDeep<OwnCloudSdk>()
-
-vi.mock('@ownclouders/web-client/src/helpers/share/functions', () => ({
-  aggregateResourceShares: ({ shares }) => shares
-}))
-
-describe('method triggerShareAction', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-  })
-
-  it('throws error if invalid share status given', async () => {
-    const statusText = 'invalid new share status'
-    await expect(
-      triggerShareAction({
-        resource: null,
-        status: 3 as any,
-        hasResharing: true,
-        hasShareJail: false,
-        client: null
-      })
-    ).rejects.toThrow(statusText)
-  })
-
-  it('throws error if share action response status is not 200', async () => {
-    const statusText = 'status is not 200'
-    client.requests.ocs.mockImplementation(() =>
-      Promise.resolve(
-        mockDeep<Response>({
-          status: 404,
-          statusText
-        })
-      )
-    )
-    await expect(
-      triggerShareAction({
-        resource: mock<ShareResource>({ share: { id: 1 } }),
-        status: ShareStatus.accepted,
-        hasResharing: true,
-        hasShareJail: false,
-        client
-      })
-    ).rejects.toThrow(statusText)
-  })
-
-  it('silently fails when the response has a content-length header value of 0', async () => {
-    client.requests.ocs.mockImplementation(() =>
-      Promise.resolve(
-        mockDeep<Response>({
-          status: 200,
-          headers: (() => {
-            const headers = new Headers()
-            headers.append('content-length', '0')
-            return headers
-          })()
-        })
-      )
-    )
-    await expect(
-      triggerShareAction({
-        resource: mock<ShareResource>({ share: { id: 1 } }),
-        status: ShareStatus.accepted,
-        hasResharing: true,
-        hasShareJail: false,
-        client
-      })
-    ).resolves.toBeNull()
-  })
-
-  it('returns a resource of type share if content-length header is present and valid', async () => {
-    client.requests.ocs.mockImplementation(() => {
-      const responseMock = mockDeep<Response>({
-        status: 200,
-        headers: (() => {
-          const headers = new Headers()
-          headers.append('content-length', '1')
-          return headers
-        })()
-      })
-      responseMock.json.mockImplementation(() => Promise.resolve({ ocs: { data: [{ id: 1 }] } }))
-      return Promise.resolve(responseMock)
-    })
-
-    await expect(
-      triggerShareAction({
-        resource: mock<ShareResource>({ share: { id: 1 } }),
-        status: ShareStatus.accepted,
-        hasResharing: true,
-        hasShareJail: false,
-        client
-      })
-    ).resolves.toMatchObject({ id: 1 })
-  })
-})
diff --git a/packages/web-runtime/src/components/Topbar/Notifications.vue b/packages/web-runtime/src/components/Topbar/Notifications.vue
index cd24c124737..1ee5db51308 100644
--- a/packages/web-runtime/src/components/Topbar/Notifications.vue
+++ b/packages/web-runtime/src/components/Topbar/Notifications.vue
@@ -90,7 +90,6 @@
 import { onMounted, onUnmounted, ref, unref } from 'vue'
 import isEmpty from 'lodash-es/isEmpty'
 import { eventBus, useCapabilityStore, useSpacesStore } from '@ownclouders/web-pkg'
-import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import NotificationBell from './NotificationBell.vue'
 import { Notification } from '../../helpers/notifications'
 import {
@@ -269,7 +268,7 @@ export default {
           const { state, path, file_target: fileTarget } = item as any
 
           // accepted federated share
-          if (state === ShareStatus.accepted && fileTarget) {
+          if (state === 0 && fileTarget) {
             eventBus.publish('app.files.list.load')
             return
           }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
index ba86501ae50..168f0150dc3 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
@@ -226,11 +226,11 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     acceptShareButtonInAccordion: {
-      selector: '//button[contains(@class, "oc-files-actions-accept-share-trigger")]',
+      selector: '//button[contains(@class, "oc-files-actions-enable-sync-trigger")]',
       locateStrategy: 'xpath'
     },
     declineShareButtonInAccordion: {
-      selector: '//button[contains(@class, "oc-files-actions-decline-share-trigger")]',
+      selector: '//button[contains(@class, "oc-files-actions-disable-sync-trigger")]',
       locateStrategy: 'xpath'
     },
     previewButtonInAccordion: {
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index 63c732a3da1..83bb66200cc 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -144,7 +144,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     batchDeclineSharesButton: {
-      selector: '.oc-files-actions-decline-share-trigger'
+      selector: '.oc-files-actions-disable-sync-trigger'
     }
   }
 }
diff --git a/tests/e2e/cucumber/features/smoke/groupActions.feature b/tests/e2e/cucumber/features/smoke/groupActions.feature
index da2ff3e717a..2d0165bbbc7 100644
--- a/tests/e2e/cucumber/features/smoke/groupActions.feature
+++ b/tests/e2e/cucumber/features/smoke/groupActions.feature
@@ -60,6 +60,6 @@ Feature: Group actions
     And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
 
-    And "Brian" accepts all pending shares using the batch actions
+    And "Brian" enables the sync for all shares using the batch actions
     And "Alice" logs out
     And "Brian" logs out
diff --git a/tests/e2e/cucumber/features/smoke/shares/share.feature b/tests/e2e/cucumber/features/smoke/shares/share.feature
index 7ebe0c1d298..2125f1ed675 100644
--- a/tests/e2e/cucumber/features/smoke/shares/share.feature
+++ b/tests/e2e/cucumber/features/smoke/shares/share.feature
@@ -29,16 +29,15 @@ Feature: share
 
     And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
-    And "Brian" accepts the following share
+    And "Brian" enables the sync for the following share
       | name                   |
       | folder_to_shared       |
       | folder_to_customShared |
     Then "Brian" should not see a sync status for the folder "shared_folder"
-    When "Brian" accepts the following share from the context menu
+    When "Brian" enables the sync for the following share from the context menu
       | name          |
       | shared_folder |
-    And "Brian" creates quick link of the resource "shared_folder" with password "%public%" from the context menu
-    And "Brian" declines the following share from the context menu
+    And "Brian" disables the sync for all shares using the context menu
       | name          |
       | shared_folder |
     And "Brian" renames the following resource
@@ -97,18 +96,17 @@ Feature: share
     And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     Then "Brian" should not see a sync status for the file "shareToBrian.txt"
-    When "Brian" accepts the following share
+    When "Brian" enables the sync for the following share
       | name             |
       | shareToBrian.txt |
       | shareToBrian.md  |
       | testavatar.jpeg  |
       | simple.pdf       |
     Then "Brian" should not see a sync status for the file "sharedFile.txt"
-    When "Brian" accepts the following share from the context menu
+    When "Brian" enables the sync for the following share from the context menu
       | name           |
       | sharedFile.txt |
-    And "Brian" creates quick link of the resource "sharedFile.txt" with password "%public%" from the context menu
-    And "Brian" declines the following share from the context menu
+    And "Brian" disables the sync for all shares using the context menu
       | name           |
       | sharedFile.txt |
     And "Brian" edits the following resources
@@ -163,7 +161,7 @@ Feature: share
     And  "Alice" logs out
 
     And "Brian" navigates to the shared with me page
-    And "Brian" accepts the following share
+    And "Brian" enables the sync for the following share
       | name       |
       | new.txt    |
       | myfolder   |
diff --git a/tests/e2e/cucumber/steps/ui/shares.ts b/tests/e2e/cucumber/steps/ui/shares.ts
index b63f22f7536..9b8390231e0 100644
--- a/tests/e2e/cucumber/steps/ui/shares.ts
+++ b/tests/e2e/cucumber/steps/ui/shares.ts
@@ -50,13 +50,13 @@ When(
 )
 
 When(
-  '{string} accepts the following share(s)',
+  '{string} enables the sync for the following share(s)',
   async function (this: World, stepUser: string, stepTable: DataTable) {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const shareObject = new objects.applicationFiles.Share({ page })
 
     for (const info of stepTable.hashes()) {
-      await shareObject.accept({ resource: info.name })
+      await shareObject.enableSync({ resource: info.name })
     }
   }
 )
@@ -136,46 +136,46 @@ When(
 )
 
 When(
-  '{string} declines the following share(s)',
+  '{string} disables the sync for the following share(s)',
   async function (this: World, stepUser: string, stepTable: DataTable): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const shareObject = new objects.applicationFiles.Share({ page })
 
     for (const resource of stepTable.hashes()) {
-      await shareObject.declineShare({ resource: resource.name })
+      await shareObject.disableSync({ resource: resource.name })
     }
   }
 )
 
 When(
-  '{string} accepts the following share(s) from the context menu',
+  '{string} enables the sync for the following share(s) from the context menu',
   async function (this: World, stepUser: string, stepTable: DataTable): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const shareObject = new objects.applicationFiles.Share({ page })
 
     for (const resource of stepTable.hashes()) {
-      await shareObject.accept({ resource: resource.name, via: 'CONTEXT_MENU' })
+      await shareObject.enableSync({ resource: resource.name, via: 'CONTEXT_MENU' })
     }
   }
 )
 
 When(
-  '{string} accepts all pending shares using the batch actions',
+  '{string} enables the sync for all shares using the batch actions',
   async function (this: World, stepUser: string): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const shareObject = new objects.applicationFiles.Share({ page })
-    await shareObject.acceptAll()
+    await shareObject.syncAll()
   }
 )
 
 When(
-  '{string} declines the following share from the context menu',
+  '{string} disables the sync for all shares using the context menu',
   async function (this: World, stepUser: string, stepTable: DataTable): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const shareObject = new objects.applicationFiles.Share({ page })
 
     for (const resource of stepTable.hashes()) {
-      await shareObject.declineShare({ resource: resource.name, via: 'CONTEXT_MENU' })
+      await shareObject.disableSync({ resource: resource.name, via: 'CONTEXT_MENU' })
     }
   }
 )
diff --git a/tests/e2e/support/objects/app-files/share/actions.ts b/tests/e2e/support/objects/app-files/share/actions.ts
index 4c2700e1121..93f2bc8f213 100644
--- a/tests/e2e/support/objects/app-files/share/actions.ts
+++ b/tests/e2e/support/objects/app-files/share/actions.ts
@@ -20,7 +20,7 @@ const publicLinkInputField =
   '//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]' +
   '/following-sibling::div//p[contains(@class,"oc-files-file-link-url")]'
 const selecAllCheckbox = '#resource-table-select-all'
-const acceptButton = '.oc-files-actions-accept-share-trigger'
+const acceptButton = '.oc-files-actions-enable-sync-trigger'
 const pendingShareItem =
   '//div[@id="files-shared-with-me-pending-section"]//tr[contains(@class,"oc-tbody-tr")]'
 const passwordInput = '.oc-modal-body input.oc-text-input'
@@ -87,12 +87,12 @@ export interface ShareStatusArgs extends Omit<ShareArgs, 'recipients'> {
   via?: 'STATUS' | 'CONTEXT_MENU'
 }
 
-export const acceptShare = async (args: ShareStatusArgs): Promise<void> => {
+export const enableSync = async (args: ShareStatusArgs): Promise<void> => {
   const { resource, page } = args
-  await clickActionInContextMenu({ page, resource }, 'accept-share')
+  await clickActionInContextMenu({ page, resource }, 'enable-sync')
 }
 
-export const acceptAllShare = async ({ page }: { page: Page }): Promise<void> => {
+export const syncAllShares = async ({ page }: { page: Page }): Promise<void> => {
   await page.locator(selecAllCheckbox).click()
   const numberOfPendingShares = await page.locator(pendingShareItem).count()
   const checkResponses = []
@@ -110,9 +110,9 @@ export const acceptAllShare = async ({ page }: { page: Page }): Promise<void> =>
   await Promise.all([...checkResponses, page.locator(acceptButton).click()])
 }
 
-export const declineShare = async (args: ShareStatusArgs): Promise<void> => {
+export const disableSync = async (args: ShareStatusArgs): Promise<void> => {
   const { page, resource } = args
-  await clickActionInContextMenu({ page, resource }, 'decline-share')
+  await clickActionInContextMenu({ page, resource }, 'disable-sync')
 }
 
 export const clickActionInContextMenu = async (
@@ -123,7 +123,7 @@ export const clickActionInContextMenu = async (
   await page.locator(util.format(actionMenuDropdownButton, resource)).click()
 
   switch (action) {
-    case 'accept-share':
+    case 'enable-sync':
       await Promise.all([
         page.waitForResponse(
           (resp) =>
@@ -137,7 +137,7 @@ export const clickActionInContextMenu = async (
     case 'copy-quicklink':
       await page.locator(util.format(actionsTriggerButton, resource, action)).click()
       break
-    case 'decline-share':
+    case 'disable-sync':
       await Promise.all([
         page.waitForResponse(
           (resp) =>
diff --git a/tests/e2e/support/objects/app-files/share/index.ts b/tests/e2e/support/objects/app-files/share/index.ts
index 0e4152dbb0c..9c6899a10c3 100644
--- a/tests/e2e/support/objects/app-files/share/index.ts
+++ b/tests/e2e/support/objects/app-files/share/index.ts
@@ -16,16 +16,16 @@ export class Share {
     await this.#page.goto(startUrl)
   }
 
-  async accept(args: Omit<po.ShareStatusArgs, 'page'>): Promise<void> {
-    await po.acceptShare({ ...args, page: this.#page })
+  async enableSync(args: Omit<po.ShareStatusArgs, 'page'>): Promise<void> {
+    await po.enableSync({ ...args, page: this.#page })
   }
 
-  async declineShare(args: Omit<po.ShareStatusArgs, 'page'>): Promise<void> {
-    await po.declineShare({ ...args, page: this.#page })
+  async disableSync(args: Omit<po.ShareStatusArgs, 'page'>): Promise<void> {
+    await po.disableSync({ ...args, page: this.#page })
   }
 
-  async acceptAll(): Promise<void> {
-    await po.acceptAllShare({ page: this.#page })
+  async syncAll(): Promise<void> {
+    await po.syncAllShares({ page: this.#page })
   }
 
   async changeShareeRole(args: Omit<po.ShareArgs, 'page'>): Promise<void> {

From 8fcd572f822656dd7a7fc86c49aeed44b1c0fb12 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 31 Jan 2024 10:20:46 +0100
Subject: [PATCH 2/2] fix: resources property description

---
 packages/web-pkg/src/components/FilesList/ResourceTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index ae3d936c8a4..3f0346fc02c 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -293,7 +293,7 @@ export default defineComponent({
      * - modificationDate: The date of the last modification of the resource
      * - shareDate: The date when the share was created
      * - deletionDate: The date when the resource has been deleted
-     * - status: The sync status of the share
+     * - syncEnabled: The sync status of the share
      * - opensInNewWindow: Open the link in a new window
      */
     resources: {