Skip to content

Commit 6db75dc

Browse files
committed
chore: fix ESLint issues for rules added in ESLint v10
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 18c739b commit 6db75dc

11 files changed

Lines changed: 37 additions & 38 deletions

File tree

apps/dav/src/components/AbsenceForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default {
149149
ShareType.User,
150150
]
151151
152-
let request = null
152+
let request
153153
try {
154154
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
155155
params: {

apps/files/src/store/renaming.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const useRenamingStore = defineStore('renaming', () => {
126126
if (isAxiosError(error)) {
127127
// TODO: 409 means current folder does not exist, redirect ?
128128
if (error?.response?.status === 404) {
129-
throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName }))
129+
throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName }), { cause: error })
130130
} else if (error?.response?.status === 412) {
131131
throw new Error(t(
132132
'files',
@@ -135,11 +135,11 @@ export const useRenamingStore = defineStore('renaming', () => {
135135
newName,
136136
dir: basename(renamingNode.value!.dirname),
137137
},
138-
))
138+
), { cause: error })
139139
}
140140
}
141141
// Unknown error
142-
throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }))
142+
throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }), { cause: error })
143143
} finally {
144144
Vue.set(node, 'status', undefined)
145145
isRenaming.value = false

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export default {
231231
shareType.push(...remoteTypes)
232232
}
233233
234-
let request = null
234+
let request
235235
try {
236236
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
237237
params: {
@@ -321,7 +321,7 @@ export default {
321321
async getRecommendations() {
322322
this.loading = true
323323
324-
let request = null
324+
let request
325325
try {
326326
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees_recommended'), {
327327
params: {

apps/files_sharing/src/mixins/ShareDetails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import logger from '../services/logger.ts'
1111
export default {
1212
methods: {
1313
async openSharingDetails(shareRequestObject) {
14-
let share = {}
14+
let share
1515
// handle externalResults from OCA.Sharing.ShareSearch
1616
// TODO : Better name/interface for handler required
1717
// For example `externalAppCreateShareHook` with proper documentation

apps/files_versions/src/utils/versions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ export async function restoreVersion(version: Version) {
9898
*/
9999
function formatVersion(version: Required<FileStat>, node: INode): Version {
100100
const mtime = Date.parse(version.lastmod)
101-
let previewUrl = ''
102101

102+
let previewUrl: string
103103
if (mtime === node.mtime?.getTime()) { // Version is the current one
104104
previewUrl = generateUrl('/core/preview?fileId={fileId}&c={fileEtag}&x=250&y=250&forceIcon=0&a=0&forceIcon=1&mimeFallback=1', {
105-
fileId: node.fileid,
105+
fileId: node.id,
106106
fileEtag: node.attributes.etag,
107107
})
108108
} else {
@@ -113,7 +113,7 @@ function formatVersion(version: Required<FileStat>, node: INode): Version {
113113
}
114114

115115
return {
116-
fileId: node.fileid!.toString(),
116+
fileId: node.id!,
117117
// 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)
118118
label: version.props['version-label'] ? String(version.props['version-label']) : '',
119119
author: version.props['version-author'] ? String(version.props['version-author']) : null,

apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export default {
170170
this.$emit('added', device)
171171
} catch (err) {
172172
logger.error('Error persisting webauthn registration', { error: err })
173-
throw new Error(t('settings', 'Server error while trying to complete WebAuthn device registration'))
173+
throw new Error(t('settings', 'Server error while trying to complete WebAuthn device registration'), { cause: err })
174174
}
175175
},
176176

apps/settings/src/service/WebAuthnRegistrationSerice.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ export async function startRegistration() {
2828
} catch (e) {
2929
logger.error(e as Error)
3030
if (isAxiosError(e)) {
31-
throw new Error(t('settings', 'Could not register device: Network error'))
31+
throw new Error(t('settings', 'Could not register device: Network error'), { cause: e })
3232
} else if ((e as Error).name === 'InvalidStateError') {
33-
throw new Error(t('settings', 'Could not register device: Probably already registered'))
33+
throw new Error(t('settings', 'Could not register device: Probably already registered'), { cause: e })
3434
}
35-
throw new Error(t('settings', 'Could not register device'))
35+
throw new Error(t('settings', 'Could not register device'), { cause: e })
3636
}
3737
}
3838

apps/systemtags/src/services/api.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export async function fetchTags(): Promise<TagWithId[]> {
4343
return parseTags(tags)
4444
} catch (error) {
4545
logger.error(t('systemtags', 'Failed to load tags'), { error })
46-
throw new Error(t('systemtags', 'Failed to load tags'))
46+
throw new Error(t('systemtags', 'Failed to load tags'), { cause: error })
4747
}
4848
}
4949

@@ -62,7 +62,7 @@ export async function fetchTag(tagId: number): Promise<TagWithId> {
6262
return parseTags([tag])[0]!
6363
} catch (error) {
6464
logger.error(t('systemtags', 'Failed to load tag'), { error })
65-
throw new Error(t('systemtags', 'Failed to load tag'))
65+
throw new Error(t('systemtags', 'Failed to load tag'), { cause: error })
6666
}
6767
}
6868

@@ -76,7 +76,7 @@ export async function fetchLastUsedTagIds(): Promise<number[]> {
7676
return lastUsedTagIds.map(Number)
7777
} catch (error) {
7878
logger.error(t('systemtags', 'Failed to load last used tags'), { error })
79-
throw new Error(t('systemtags', 'Failed to load last used tags'))
79+
throw new Error(t('systemtags', 'Failed to load last used tags'), { cause: error })
8080
}
8181
}
8282

@@ -103,10 +103,10 @@ export async function createTag(tag: Tag | ServerTag): Promise<number> {
103103
} catch (error) {
104104
if ((error as WebDAVClientError)?.response?.status === 409) {
105105
logger.error(t('systemtags', 'A tag with the same name already exists'), { error })
106-
throw new Error(t('systemtags', 'A tag with the same name already exists'))
106+
throw new Error(t('systemtags', 'A tag with the same name already exists'), { cause: error })
107107
}
108108
logger.error(t('systemtags', 'Failed to create tag'), { error })
109-
throw new Error(t('systemtags', 'Failed to create tag'))
109+
throw new Error(t('systemtags', 'Failed to create tag'), { cause: error })
110110
}
111111
}
112112

@@ -137,7 +137,7 @@ export async function updateTag(tag: TagWithId): Promise<void> {
137137
emit('systemtags:tag:updated', tag)
138138
} catch (error) {
139139
logger.error(t('systemtags', 'Failed to update tag'), { error })
140-
throw new Error(t('systemtags', 'Failed to update tag'))
140+
throw new Error(t('systemtags', 'Failed to update tag'), { cause: error })
141141
}
142142
}
143143

@@ -153,7 +153,7 @@ export async function deleteTag(tag: TagWithId): Promise<void> {
153153
emit('systemtags:tag:deleted', tag)
154154
} catch (error) {
155155
logger.error(t('systemtags', 'Failed to delete tag'), { error })
156-
throw new Error(t('systemtags', 'Failed to delete tag'))
156+
throw new Error(t('systemtags', 'Failed to delete tag'), { cause: error })
157157
}
158158
}
159159

apps/systemtags/src/services/files.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export async function fetchTagsForFile(fileId: number): Promise<TagWithId[]> {
2828
return parseTags(tags)
2929
} catch (error) {
3030
logger.error(t('systemtags', 'Failed to load tags for file'), { error })
31-
throw new Error(t('systemtags', 'Failed to load tags for file'))
31+
throw new Error(t('systemtags', 'Failed to load tags for file'), { cause: error })
3232
}
3333
}
3434

@@ -66,7 +66,7 @@ export async function setTagForFile(tag: TagWithId | ServerTagWithId, fileId: nu
6666
})
6767
} catch (error) {
6868
logger.error(t('systemtags', 'Failed to set tag for file'), { error })
69-
throw new Error(t('systemtags', 'Failed to set tag for file'))
69+
throw new Error(t('systemtags', 'Failed to set tag for file'), { cause: error })
7070
}
7171
}
7272

@@ -82,6 +82,6 @@ export async function deleteTagForFile(tag: TagWithId, fileId: number): Promise<
8282
await davClient.deleteFile(path)
8383
} catch (error) {
8484
logger.error(t('systemtags', 'Failed to delete tag for file'), { error })
85-
throw new Error(t('systemtags', 'Failed to delete tag for file'))
85+
throw new Error(t('systemtags', 'Failed to delete tag for file'), { cause: error })
8686
}
8787
}

core/src/OC/util.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ export default {
6464
}
6565

6666
const s = string.toLowerCase().trim()
67-
let bytes = null
68-
6967
const bytesArray = {
7068
b: 1,
7169
k: 1024,
@@ -80,6 +78,7 @@ export default {
8078
p: 1024 * 1024 * 1024 * 1024 * 1024,
8179
}
8280

81+
let bytes
8382
const matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i)
8483
if (matches !== null) {
8584
bytes = parseFloat(s)

0 commit comments

Comments
 (0)