From 3e8ac3338ac1ce5f47e2439fe373bda732aad010 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 19 Apr 2026 14:44:25 +0200 Subject: [PATCH] chore: fix ESLint issues for rules added in ESLint v10 Signed-off-by: Ferdinand Thiessen --- apps/dav/src/components/AbsenceForm.vue | 2 +- apps/files/src/store/renaming.ts | 6 ++--- .../src/components/SharingInput.vue | 4 ++-- apps/files_sharing/src/mixins/ShareDetails.js | 2 +- apps/files_versions/src/utils/versions.ts | 6 ++--- .../components/WebAuthn/WebAuthnAddDevice.vue | 2 +- .../src/service/WebAuthnRegistrationSerice.ts | 6 ++--- apps/systemtags/src/services/api.ts | 14 +++++------ apps/systemtags/src/services/files.ts | 6 ++--- core/src/OC/dialogs.js | 2 +- core/src/OC/util.js | 3 +-- core/src/jquery/ocdialog.js | 5 ---- cypress/support/commands.ts | 24 +++++++++---------- 13 files changed, 38 insertions(+), 44 deletions(-) diff --git a/apps/dav/src/components/AbsenceForm.vue b/apps/dav/src/components/AbsenceForm.vue index c0b1b6ac3d9..4782e0c9d3d 100644 --- a/apps/dav/src/components/AbsenceForm.vue +++ b/apps/dav/src/components/AbsenceForm.vue @@ -149,7 +149,7 @@ export default { ShareType.User, ] - let request = null + let request try { request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), { params: { diff --git a/apps/files/src/store/renaming.ts b/apps/files/src/store/renaming.ts index 9bdd256d731..9128773f9e0 100644 --- a/apps/files/src/store/renaming.ts +++ b/apps/files/src/store/renaming.ts @@ -126,7 +126,7 @@ export const useRenamingStore = defineStore('renaming', () => { if (isAxiosError(error)) { // TODO: 409 means current folder does not exist, redirect ? if (error?.response?.status === 404) { - throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName })) + throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName }), { cause: error }) } else if (error?.response?.status === 412) { throw new Error(t( 'files', @@ -135,11 +135,11 @@ export const useRenamingStore = defineStore('renaming', () => { newName, dir: basename(renamingNode.value!.dirname), }, - )) + ), { cause: error }) } } // Unknown error - throw new Error(t('files', 'Could not rename "{oldName}"', { oldName })) + throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }), { cause: error }) } finally { Vue.set(node, 'status', undefined) isRenaming.value = false diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index 7f3d81980c9..17677e90de3 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -231,7 +231,7 @@ export default { shareType.push(...remoteTypes) } - let request = null + let request try { request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), { params: { @@ -321,7 +321,7 @@ export default { async getRecommendations() { this.loading = true - let request = null + let request try { request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees_recommended'), { params: { diff --git a/apps/files_sharing/src/mixins/ShareDetails.js b/apps/files_sharing/src/mixins/ShareDetails.js index e91b3f2fe77..8c716e74e13 100644 --- a/apps/files_sharing/src/mixins/ShareDetails.js +++ b/apps/files_sharing/src/mixins/ShareDetails.js @@ -11,7 +11,7 @@ import logger from '../services/logger.ts' export default { methods: { async openSharingDetails(shareRequestObject) { - let share = {} + let share // handle externalResults from OCA.Sharing.ShareSearch // TODO : Better name/interface for handler required // For example `externalAppCreateShareHook` with proper documentation diff --git a/apps/files_versions/src/utils/versions.ts b/apps/files_versions/src/utils/versions.ts index f818779b0ec..47943b15901 100644 --- a/apps/files_versions/src/utils/versions.ts +++ b/apps/files_versions/src/utils/versions.ts @@ -98,11 +98,11 @@ export async function restoreVersion(version: Version) { */ function formatVersion(version: Required, node: INode): Version { const mtime = Date.parse(version.lastmod) - let previewUrl = '' + let previewUrl: string if (mtime === node.mtime?.getTime()) { // Version is the current one previewUrl = generateUrl('/core/preview?fileId={fileId}&c={fileEtag}&x=250&y=250&forceIcon=0&a=0&forceIcon=1&mimeFallback=1', { - fileId: node.fileid, + fileId: node.id, fileEtag: node.attributes.etag, }) } else { @@ -113,7 +113,7 @@ function formatVersion(version: Required, node: INode): Version { } return { - fileId: node.fileid!.toString(), + fileId: node.id!, // If version-label is defined make sure it is a string (prevent issue if the label is a number an PHP returns a number then) label: version.props['version-label'] ? String(version.props['version-label']) : '', author: version.props['version-author'] ? String(version.props['version-author']) : null, diff --git a/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue b/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue index 1f7fa5024ab..4d22d1d6cc4 100644 --- a/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue +++ b/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue @@ -170,7 +170,7 @@ export default { this.$emit('added', device) } catch (err) { logger.error('Error persisting webauthn registration', { error: err }) - throw new Error(t('settings', 'Server error while trying to complete WebAuthn device registration')) + throw new Error(t('settings', 'Server error while trying to complete WebAuthn device registration'), { cause: err }) } }, diff --git a/apps/settings/src/service/WebAuthnRegistrationSerice.ts b/apps/settings/src/service/WebAuthnRegistrationSerice.ts index bfb2135fdb5..6e4c0c6b939 100644 --- a/apps/settings/src/service/WebAuthnRegistrationSerice.ts +++ b/apps/settings/src/service/WebAuthnRegistrationSerice.ts @@ -28,11 +28,11 @@ export async function startRegistration() { } catch (e) { logger.error(e as Error) if (isAxiosError(e)) { - throw new Error(t('settings', 'Could not register device: Network error')) + throw new Error(t('settings', 'Could not register device: Network error'), { cause: e }) } else if ((e as Error).name === 'InvalidStateError') { - throw new Error(t('settings', 'Could not register device: Probably already registered')) + throw new Error(t('settings', 'Could not register device: Probably already registered'), { cause: e }) } - throw new Error(t('settings', 'Could not register device')) + throw new Error(t('settings', 'Could not register device'), { cause: e }) } } diff --git a/apps/systemtags/src/services/api.ts b/apps/systemtags/src/services/api.ts index 9c040c785bd..c4a533532f9 100644 --- a/apps/systemtags/src/services/api.ts +++ b/apps/systemtags/src/services/api.ts @@ -43,7 +43,7 @@ export async function fetchTags(): Promise { return parseTags(tags) } catch (error) { logger.error(t('systemtags', 'Failed to load tags'), { error }) - throw new Error(t('systemtags', 'Failed to load tags')) + throw new Error(t('systemtags', 'Failed to load tags'), { cause: error }) } } @@ -62,7 +62,7 @@ export async function fetchTag(tagId: number): Promise { return parseTags([tag])[0]! } catch (error) { logger.error(t('systemtags', 'Failed to load tag'), { error }) - throw new Error(t('systemtags', 'Failed to load tag')) + throw new Error(t('systemtags', 'Failed to load tag'), { cause: error }) } } @@ -76,7 +76,7 @@ export async function fetchLastUsedTagIds(): Promise { return lastUsedTagIds.map(Number) } catch (error) { logger.error(t('systemtags', 'Failed to load last used tags'), { error }) - throw new Error(t('systemtags', 'Failed to load last used tags')) + throw new Error(t('systemtags', 'Failed to load last used tags'), { cause: error }) } } @@ -103,10 +103,10 @@ export async function createTag(tag: Tag | ServerTag): Promise { } catch (error) { if ((error as WebDAVClientError)?.response?.status === 409) { logger.error(t('systemtags', 'A tag with the same name already exists'), { error }) - throw new Error(t('systemtags', 'A tag with the same name already exists')) + throw new Error(t('systemtags', 'A tag with the same name already exists'), { cause: error }) } logger.error(t('systemtags', 'Failed to create tag'), { error }) - throw new Error(t('systemtags', 'Failed to create tag')) + throw new Error(t('systemtags', 'Failed to create tag'), { cause: error }) } } @@ -137,7 +137,7 @@ export async function updateTag(tag: TagWithId): Promise { emit('systemtags:tag:updated', tag) } catch (error) { logger.error(t('systemtags', 'Failed to update tag'), { error }) - throw new Error(t('systemtags', 'Failed to update tag')) + throw new Error(t('systemtags', 'Failed to update tag'), { cause: error }) } } @@ -153,7 +153,7 @@ export async function deleteTag(tag: TagWithId): Promise { emit('systemtags:tag:deleted', tag) } catch (error) { logger.error(t('systemtags', 'Failed to delete tag'), { error }) - throw new Error(t('systemtags', 'Failed to delete tag')) + throw new Error(t('systemtags', 'Failed to delete tag'), { cause: error }) } } diff --git a/apps/systemtags/src/services/files.ts b/apps/systemtags/src/services/files.ts index fbe270a71f8..a7c7e4fcfc5 100644 --- a/apps/systemtags/src/services/files.ts +++ b/apps/systemtags/src/services/files.ts @@ -28,7 +28,7 @@ export async function fetchTagsForFile(fileId: number): Promise { return parseTags(tags) } catch (error) { logger.error(t('systemtags', 'Failed to load tags for file'), { error }) - throw new Error(t('systemtags', 'Failed to load tags for file')) + throw new Error(t('systemtags', 'Failed to load tags for file'), { cause: error }) } } @@ -66,7 +66,7 @@ export async function setTagForFile(tag: TagWithId | ServerTagWithId, fileId: nu }) } catch (error) { logger.error(t('systemtags', 'Failed to set tag for file'), { error }) - throw new Error(t('systemtags', 'Failed to set tag for file')) + throw new Error(t('systemtags', 'Failed to set tag for file'), { cause: error }) } } @@ -82,6 +82,6 @@ export async function deleteTagForFile(tag: TagWithId, fileId: number): Promise< await davClient.deleteFile(path) } catch (error) { logger.error(t('systemtags', 'Failed to delete tag for file'), { error }) - throw new Error(t('systemtags', 'Failed to delete tag for file')) + throw new Error(t('systemtags', 'Failed to delete tag for file'), { cause: error }) } } diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index 46d97965a3d..26b001dc8a6 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -510,7 +510,7 @@ const Dialogs = { for (let j = 0; j < H2; j++) { for (let i = 0; i < W2; i++) { const x2 = (i + j * W2) * 4 - let weight = 0 + let weight let weights = 0 let weights_alpha = 0 let gx_r = 0 diff --git a/core/src/OC/util.js b/core/src/OC/util.js index 42ee94141f5..b0570579938 100644 --- a/core/src/OC/util.js +++ b/core/src/OC/util.js @@ -64,8 +64,6 @@ export default { } const s = string.toLowerCase().trim() - let bytes = null - const bytesArray = { b: 1, k: 1024, @@ -80,6 +78,7 @@ export default { p: 1024 * 1024 * 1024 * 1024 * 1024, } + let bytes const matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i) if (matches !== null) { bytes = parseFloat(s) diff --git a/core/src/jquery/ocdialog.js b/core/src/jquery/ocdialog.js index 9729c895685..bbf28b0c3f3 100644 --- a/core/src/jquery/ocdialog.js +++ b/core/src/jquery/ocdialog.js @@ -207,11 +207,6 @@ $.widget('oc.ocdialog', { } const self = this - let contentDiv = $('#content') - if (contentDiv.length === 0) { - // nextcloud-vue compatibility - contentDiv = $('.content') - } this.overlay = $('
') .addClass('oc-dialog-dim') .insertBefore(this.$dialog) diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 84947bc25c8..49a95e8f132 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -88,9 +88,9 @@ Cypress.Commands.add('setFileAsFavorite', (user: User, target: string, favorite `, }) cy.log(`Created directory ${target}`, response) - } catch (error) { - cy.log('error', error) - throw new Error('Unable to process fixture') + } catch (cause) { + cy.log('error', cause) + throw new Error('Unable to process fixture', { cause }) } }) }) @@ -111,9 +111,9 @@ Cypress.Commands.add('mkdir', (user: User, target: string) => { }) cy.log(`Created directory ${target}`, response) return response - } catch (error) { - cy.log('error', error) - throw new Error('Unable to create directory') + } catch (cause) { + cy.log('error', cause) + throw new Error('Unable to create directory', { cause }) } }) }) @@ -133,9 +133,9 @@ Cypress.Commands.add('rm', (user: User, target: string) => { }, }) cy.log(`delete file or directory ${target}`, response) - } catch (error) { - cy.log('error', error) - throw new Error('Unable to delete file or directory') + } catch (cause) { + cy.log('error', cause) + throw new Error('Unable to delete file or directory', { cause }) } }) }) @@ -174,9 +174,9 @@ Cypress.Commands.add('uploadContent', (user: User, blob: Blob, mimeType: string, }) cy.log(`Uploaded content as ${fileName}`, response) return response - } catch (error) { - cy.log('error', error) - throw new Error('Unable to process fixture') + } catch (cause) { + cy.log('error', cause) + throw new Error('Unable to process fixture', { cause }) } }) })