From d06ed4d7cbc6117078e4cb46fdb60f17560db148 Mon Sep 17 00:00:00 2001 From: =?utf8?q?John=20Molakvo=C3=A6?= Date: Fri, 26 Jan 2024 18:09:37 +0100 Subject: [PATCH] fix(files): disable `Unshare` until proper fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/files/src/actions/deleteAction.spec.ts | 9 +++++---- apps/files/src/actions/deleteAction.ts | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/files/src/actions/deleteAction.spec.ts b/apps/files/src/actions/deleteAction.spec.ts index f1aee5bdcba..afc7ec5b921 100644 --- a/apps/files/src/actions/deleteAction.spec.ts +++ b/apps/files/src/actions/deleteAction.spec.ts @@ -71,10 +71,11 @@ describe('Delete action conditions tests', () => { expect(action.displayName([file], trashbinView)).toBe('Delete permanently') }) - test('Shared node values', () => { - jest.spyOn(auth, 'getCurrentUser').mockReturnValue(null) - expect(action.displayName([file2], view)).toBe('Unshare') - }) + // TODO: Fix this test + // test('Shared node values', () => { + // jest.spyOn(auth, 'getCurrentUser').mockReturnValue(null) + // expect(action.displayName([file2], view)).toBe('Unshare') + // }) test('Shared and owned nodes values', () => { expect(action.displayName([file, file2], view)).toBe('Delete and unshare') diff --git a/apps/files/src/actions/deleteAction.ts b/apps/files/src/actions/deleteAction.ts index 29f1cf86c9b..9e7fae71d47 100644 --- a/apps/files/src/actions/deleteAction.ts +++ b/apps/files/src/actions/deleteAction.ts @@ -46,9 +46,10 @@ export const action = new FileAction({ return t('files', 'Delete and unshare') } - if (isAllUnshare(nodes)) { - return t('files', 'Unshare') - } + // Temporary disabled until fixed on 28.0.3 + // if (isAllUnshare(nodes)) { + // return t('files', 'Unshare') + // } return view.id === 'trashbin' ? t('files', 'Delete permanently') -- 2.39.5