Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/files/src/actions/deleteAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { showInfo } from '@nextcloud/dialogs'
import { Permission, Node, View, FileAction } from '@nextcloud/files'
import { loadState } from '@nextcloud/initial-state'
import { translate as t } from '@nextcloud/l10n'
import PQueue from 'p-queue'

import CloseSvg from '@mdi/svg/svg/close.svg?raw'
Expand Down Expand Up @@ -64,7 +62,6 @@ export const action = new FileAction({

// If the user cancels the deletion, we don't want to do anything
if (confirm === false) {
showInfo(t('files', 'Deletion cancelled'))
return null
}

Expand All @@ -88,7 +85,6 @@ export const action = new FileAction({

// If the user cancels the deletion, we don't want to do anything
if (confirm === false) {
showInfo(t('files', 'Deletion cancelled'))
return Promise.all(nodes.map(() => null))
}

Expand Down
6 changes: 0 additions & 6 deletions apps/files/src/actions/moveOrCopyAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth
}
} catch (error) {
// User cancelled
showError(t('files', 'Move cancelled'))
return
}
}
Expand Down Expand Up @@ -330,7 +329,6 @@ export const action = new FileAction({
return false
}
if (result === false) {
showInfo(t('files', 'Cancelled move or copy of "{filename}".', { filename: node.displayname }))
return null
}

Expand All @@ -352,10 +350,6 @@ export const action = new FileAction({
const result = await openFilePickerForAction(action, dir, nodes)
// Handle cancellation silently
if (result === false) {
showInfo(nodes.length === 1
? t('files', 'Cancelled move or copy of "{filename}".', { filename: nodes[0].displayname })
: t('files', 'Cancelled move or copy operation'),
)
return nodes.map(() => null)
}

Expand Down
3 changes: 1 addition & 2 deletions apps/files/src/newMenu/newFolder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { basename } from 'path'
import { emit } from '@nextcloud/event-bus'
import { getCurrentUser } from '@nextcloud/auth'
import { Permission, Folder } from '@nextcloud/files'
import { showError, showInfo, showSuccess } from '@nextcloud/dialogs'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n'
import axios from '@nextcloud/axios'

Expand Down Expand Up @@ -51,7 +51,6 @@ export const entry = {
async handler(context: Folder, content: Node[]) {
const name = await newNodeName(t('files', 'New folder'), content)
if (name === null) {
showInfo(t('files', 'New folder creation cancelled'))
return
}
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -71,7 +70,6 @@ export const emptyTrashAction = new FileListAction({
return null
}

showInfo(t('files_trashbin', 'Deletion cancelled'))
return null
},
})
3 changes: 1 addition & 2 deletions apps/systemtags/src/components/SystemTagPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ import { emit } from '@nextcloud/event-bus'
import { getCurrentUser } from '@nextcloud/auth'
import { getLanguage, n, t } from '@nextcloud/l10n'
import { loadState } from '@nextcloud/initial-state'
import { showError, showInfo } from '@nextcloud/dialogs'
import { showError } from '@nextcloud/dialogs'
import debounce from 'debounce'
import domPurify from 'dompurify'
import escapeHTML from 'escape-html'
Expand Down Expand Up @@ -553,7 +553,6 @@ export default defineComponent({

onCancel() {
this.opened = false
showInfo(t('systemtags', 'File tags modification canceled'))
this.$emit('close', null)
},

Expand Down
2 changes: 2 additions & 0 deletions dist/3596-3596.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/3596-3596.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/3596-3596.js.map.license
2 changes: 0 additions & 2 deletions dist/9498-9498.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/9498-9498.js.map

This file was deleted.

1 change: 0 additions & 1 deletion dist/9498-9498.js.map.license

This file was deleted.

4 changes: 2 additions & 2 deletions dist/files-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_trashbin-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_trashbin-init.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/systemtags-init.js.map

Large diffs are not rendered by default.

Loading