diff options
Diffstat (limited to 'apps/files_trashbin/src')
3 files changed, 1 insertions, 7 deletions
diff --git a/apps/files_trashbin/src/files_listActions/emptyTrashAction.spec.ts b/apps/files_trashbin/src/files_listActions/emptyTrashAction.spec.ts index ba9697351e8..399c0f60043 100644 --- a/apps/files_trashbin/src/files_listActions/emptyTrashAction.spec.ts +++ b/apps/files_trashbin/src/files_listActions/emptyTrashAction.spec.ts @@ -115,17 +115,14 @@ describe('files_trashbin: file list actions - empty trashbin', () => { it('can cancel the deletion by closing the dialog', async () => { const apiSpy = vi.spyOn(api, 'emptyTrash') - const dialogSpy = vi.spyOn(ncDialogs, 'showInfo') dialogBuilder.build.mockImplementationOnce(() => ({ show: async () => false })) expect(await emptyTrashAction.exec(trashbinView, nodes, root)).toBe(null) expect(apiSpy).not.toBeCalled() - expect(dialogSpy).toBeCalledWith('Deletion cancelled') }) it('can cancel the deletion', async () => { const apiSpy = vi.spyOn(api, 'emptyTrash') - const dialogSpy = vi.spyOn(ncDialogs, 'showInfo') dialogBuilder.build.mockImplementationOnce(() => ({ show: async () => { @@ -136,7 +133,6 @@ describe('files_trashbin: file list actions - empty trashbin', () => { })) expect(await emptyTrashAction.exec(trashbinView, nodes, root)).toBe(null) expect(apiSpy).not.toBeCalled() - expect(dialogSpy).toBeCalledWith('Deletion cancelled') }) it('will trigger the API request if confirmed', async () => { diff --git a/apps/files_trashbin/src/files_listActions/emptyTrashAction.ts b/apps/files_trashbin/src/files_listActions/emptyTrashAction.ts index 67d6c9c373b..2b6ff171adf 100644 --- a/apps/files_trashbin/src/files_listActions/emptyTrashAction.ts +++ b/apps/files_trashbin/src/files_listActions/emptyTrashAction.ts @@ -11,7 +11,6 @@ import { t } from '@nextcloud/l10n' import { DialogSeverity, getDialogBuilder, - showInfo, } from '@nextcloud/dialogs' import { emptyTrash } from '../services/api.ts' import { TRASHBIN_VIEW_ID } from '../files_views/trashbinView.ts' @@ -71,7 +70,6 @@ export const emptyTrashAction = new FileListAction({ return null } - showInfo(t('files_trashbin', 'Deletion cancelled')) return null }, }) diff --git a/apps/files_trashbin/src/files_views/trashbinView.ts b/apps/files_trashbin/src/files_views/trashbinView.ts index 5b547071cc7..f55c6b71595 100644 --- a/apps/files_trashbin/src/files_views/trashbinView.ts +++ b/apps/files_trashbin/src/files_views/trashbinView.ts @@ -7,7 +7,7 @@ import { t } from '@nextcloud/l10n' import { deleted, deletedBy, originalLocation } from './columns.ts' import { getContents } from '../services/trashbin.ts' -import svgDelete from '@mdi/svg/svg/delete.svg?raw' +import svgDelete from '@mdi/svg/svg/delete-outline.svg?raw' export const TRASHBIN_VIEW_ID = 'trashbin' |