upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-19 02:38:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(files_sharing): adjust for @nextcloud/files v4

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2026-02-11 18:24:58 +01:00
parent 7ef66a6199
commit bb1d814e04
No known key found for this signature in database
GPG key ID: 7E849AE05218500F
6 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/files_sharing/src/files_actions/acceptShareAction.spec.ts
View file

@ -144,13 +144,12 @@ describe('Accept share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file = new File({
id: 1,
id: 123,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
@ -176,13 +175,12 @@ describe('Accept share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file = new File({
id: 1,
id: 123,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
remote: 3,
share_type: ShareType.User,
},
@ -209,26 +207,24 @@ describe('Accept share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file1 = new File({
id: 1,
id: 123,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
})
const file2 = new File({
id: 2,
id: 456,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 456,
share_type: ShareType.User,
},
root: '/files/admin',
@ -257,13 +253,12 @@ describe('Accept share action execute tests', () => {
})
const file = new File({
id: 1,
id: 123,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',

2
apps/files_sharing/src/files_actions/acceptShareAction.ts
View file

@ -25,7 +25,7 @@ export const action: IFileAction = {
const isRemote = !!node.attributes.remote
const url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/pending/{id}', {
shareBase: isRemote ? 'remote_shares' : 'shares',
id: node.attributes.id,
id: node.id,
})
await axios.post(url)

15
apps/files_sharing/src/files_actions/rejectShareAction.spec.ts
View file

@ -188,13 +188,12 @@ describe('Reject share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
@ -220,13 +219,12 @@ describe('Reject share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
remote: 3,
share_type: ShareType.User,
},
@ -253,26 +251,24 @@ describe('Reject share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file1 = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
})
const file2 = new File({
id: 2,
id: '456',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 456,
share_type: ShareType.User,
},
root: '/files/admin',
@ -301,13 +297,12 @@ describe('Reject share action execute tests', () => {
})
const file = new File({
id: 1,
id: 123,
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',

2
apps/files_sharing/src/files_actions/rejectShareAction.ts
View file

@ -42,7 +42,7 @@ export const action: IFileAction = {
const node = nodes[0]
const isRemote = !!node.attributes.remote
const shareBase = isRemote ? 'remote_shares' : 'shares'
const id = node.attributes.id
const id = node.id
let url: string
if (node.attributes.accepted === 0) {
url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/pending/{id}', {

12
apps/files_sharing/src/files_actions/restoreShareAction.spec.ts
View file

@ -145,13 +145,12 @@ describe('Restore share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
@ -177,26 +176,24 @@ describe('Restore share action execute tests', () => {
vi.spyOn(eventBus, 'emit')
const file1 = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',
})
const file2 = new File({
id: 2,
id: '456',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 456,
share_type: ShareType.User,
},
root: '/files/admin',
@ -224,13 +221,12 @@ describe('Restore share action execute tests', () => {
.mockImplementation(() => { throw new Error('Mock error') })
const file = new File({
id: 1,
id: '123',
source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt',
owner: 'admin',
mime: 'text/plain',
permissions: Permission.READ,
attributes: {
id: 123,
share_type: ShareType.User,
},
root: '/files/admin',

2
apps/files_sharing/src/files_actions/restoreShareAction.ts
View file

@ -24,7 +24,7 @@ export const action: IFileAction = {
try {
const node = nodes[0]
const url = generateOcsUrl('apps/files_sharing/api/v1/deletedshares/{id}', {
id: node.attributes.id,
id: node.id,
})
await axios.post(url)