From d64ca14348184e69e4348c8c61bbf88ffcc9937a Mon Sep 17 00:00:00 2001 From: Nicola Krumschmidt Date: Fri, 27 Aug 2021 16:33:30 +0200 Subject: [PATCH] Explicitly set catch parameters to any type (#7654) This fixes not being able to build the repo due to type issues introduced by the Typescript 4.4 option "useUnknownInCatchVariables", which is enabled by default in strict mode. --- api/src/cli/commands/count/index.ts | 2 +- api/src/cli/commands/database/install.ts | 2 +- api/src/cli/commands/database/migrate.ts | 2 +- api/src/cli/commands/init/index.ts | 2 +- api/src/cli/commands/roles/create.ts | 2 +- api/src/cli/commands/users/create.ts | 2 +- api/src/cli/commands/users/passwd.ts | 2 +- api/src/controllers/activity.ts | 4 ++-- api/src/controllers/auth.ts | 4 ++-- api/src/controllers/collections.ts | 2 +- api/src/controllers/fields.ts | 6 ++--- api/src/controllers/files.ts | 10 ++++----- api/src/controllers/folders.ts | 6 ++--- api/src/controllers/items.ts | 6 ++--- api/src/controllers/not-found.ts | 2 +- api/src/controllers/permissions.ts | 6 ++--- api/src/controllers/presets.ts | 6 ++--- api/src/controllers/relations.ts | 4 ++-- api/src/controllers/roles.ts | 6 ++--- api/src/controllers/settings.ts | 2 +- api/src/controllers/users.ts | 8 +++---- api/src/controllers/utils.ts | 2 +- api/src/controllers/webhooks.ts | 6 ++--- api/src/database/index.ts | 4 ++-- .../20210518A-add-foreign-key-constraints.ts | 6 ++--- .../20210519A-add-system-fk-triggers.ts | 12 +++++----- .../migrations/20210802A-replace-groups.ts | 4 ++-- api/src/emitter.ts | 2 +- api/src/extensions.ts | 6 ++--- api/src/middleware/authenticate.ts | 2 +- api/src/middleware/cache.ts | 4 ++-- api/src/middleware/graphql.ts | 2 +- api/src/middleware/rate-limiter.ts | 2 +- api/src/middleware/respond.ts | 2 +- api/src/services/authentication.ts | 2 +- api/src/services/fields.ts | 2 +- api/src/services/files.ts | 6 ++--- api/src/services/graphql.ts | 8 +++---- api/src/services/items.ts | 4 ++-- api/src/services/server.ts | 8 +++---- api/src/utils/get-schema.ts | 4 ++-- api/src/utils/is-jwt.ts | 2 +- api/src/utils/track.ts | 2 +- api/src/webhooks.ts | 2 +- app/src/auth.ts | 2 +- app/src/components/v-upload/v-upload.vue | 4 ++-- app/src/composables/use-folders.ts | 2 +- app/src/composables/use-item/use-item.ts | 10 ++++----- app/src/composables/use-items/use-items.ts | 2 +- app/src/composables/use-template-data.ts | 2 +- .../formatted-json-value.vue | 2 +- app/src/displays/register.ts | 2 +- app/src/hydrate.ts | 2 +- .../system-mfa-setup/system-mfa-setup.vue | 6 ++--- app/src/interfaces/file-image/file-image.vue | 2 +- app/src/interfaces/file/file.vue | 4 ++-- .../input-autocomplete-api.vue | 2 +- app/src/interfaces/list-m2a/list-m2a.vue | 2 +- app/src/interfaces/list-m2m/use-preview.ts | 4 ++-- .../list-o2m-tree-view/list-o2m-tree-view.vue | 2 +- app/src/interfaces/list-o2m/list-o2m.vue | 2 +- app/src/interfaces/map/map.vue | 4 ++-- app/src/interfaces/register.ts | 2 +- .../select-dropdown-m2o.vue | 4 ++-- .../interfaces/translations/translations.vue | 6 ++--- app/src/lang/set-language.ts | 2 +- app/src/layouts/calendar/index.ts | 2 +- app/src/layouts/map/index.ts | 2 +- app/src/layouts/register.ts | 2 +- app/src/modules/activity/routes/item.vue | 2 +- .../components/navigation-bookmark.vue | 4 ++-- .../modules/collections/routes/collection.vue | 6 ++--- app/src/modules/docs/components/markdown.vue | 2 +- .../modules/files/components/add-folder.vue | 2 +- .../files/components/folder-picker.vue | 2 +- .../files/components/navigation-folder.vue | 6 ++--- app/src/modules/files/routes/collection.vue | 4 ++-- app/src/modules/files/routes/item.vue | 2 +- app/src/modules/register.ts | 2 +- .../settings/composables/use-project-info.ts | 2 +- .../data-model/field-detail/field-detail.vue | 4 ++-- .../fields/components/field-select.vue | 2 +- .../routes/data-model/new-collection.vue | 2 +- .../routes/presets/collection/collection.vue | 2 +- .../presets-info-sidebar-detail.vue | 2 +- .../modules/settings/routes/presets/item.vue | 6 ++--- .../modules/settings/routes/roles/add-new.vue | 2 +- .../settings/routes/roles/collection.vue | 2 +- .../item/components/permissions-overview.vue | 6 ++--- .../roles/item/composables/use-permissions.ts | 6 ++--- .../composables/use-update-permissions.ts | 12 +++++----- .../permissions-detail/components/actions.vue | 2 +- .../permissions-detail/permissions-detail.vue | 2 +- app/src/modules/users/routes/collection.vue | 2 +- app/src/modules/users/routes/item.vue | 2 +- .../routes/accept-invite/accept-invite.vue | 2 +- .../components/continue-as/continue-as.vue | 2 +- .../components/login-form/login-form.vue | 2 +- app/src/routes/login/components/sso-links.vue | 2 +- app/src/routes/reset-password/request.vue | 2 +- app/src/routes/reset-password/reset.vue | 2 +- app/src/stores/collections.ts | 4 ++-- app/src/stores/fields.ts | 8 +++---- app/src/stores/settings.ts | 2 +- app/src/stores/user.ts | 2 +- app/src/utils/geometry/basemap.ts | 2 +- app/src/utils/upload-file/upload-file.ts | 2 +- app/src/utils/upload-files/upload-files.ts | 2 +- .../comments-sidebar-detail/comment-input.vue | 2 +- .../comment-item-header.vue | 2 +- .../comments-sidebar-detail/comment-item.vue | 2 +- .../comments-sidebar-detail.vue | 2 +- .../components/drawer-batch/drawer-batch.vue | 2 +- .../components/drawer-item/drawer-item.vue | 4 ++-- .../file-lightbox/file-lightbox.vue | 2 +- .../components/image-editor/image-editor.vue | 4 ++-- .../revisions-drawer-detail.vue | 2 +- .../components/user-popover/user-popover.vue | 2 +- .../components/users-invite/users-invite.vue | 2 +- .../src/cli/commands/instance/disconnect.ts | 2 +- packages/cli/src/core/command.ts | 4 ++-- packages/cli/src/index.ts | 2 +- .../drive-azure/src/AzureBlobWebServices.ts | 20 ++++++++--------- packages/drive-gcs/src/GoogleCloudStorage.ts | 20 ++++++++--------- .../src/AmazonWebServicesS3Storage.ts | 16 +++++++------- packages/drive/src/LocalFileSystemStorage.ts | 22 +++++++++---------- .../tests/LocalFileSystemStorage.test.ts | 8 +++---- packages/drive/tests/exceptions.test.ts | 14 ++++++------ .../gatsby-source-directus/gatsby-node.js | 2 +- packages/schema/src/dialects/postgres.ts | 2 +- .../sdk/src/base/transport/axios-transport.ts | 2 +- packages/sdk/tests/base/auth.test.ts | 6 ++--- .../sdk/tests/base/transport/axios.test.ts | 8 +++---- 133 files changed, 266 insertions(+), 266 deletions(-) diff --git a/api/src/cli/commands/count/index.ts b/api/src/cli/commands/count/index.ts index 62a7021eef..21f5c28c86 100644 --- a/api/src/cli/commands/count/index.ts +++ b/api/src/cli/commands/count/index.ts @@ -17,7 +17,7 @@ export default async function count(collection: string): Promise { console.log(count); database.destroy(); process.exit(0); - } catch (err) { + } catch (err: any) { console.error(err); database.destroy(); process.exit(1); diff --git a/api/src/cli/commands/database/install.ts b/api/src/cli/commands/database/install.ts index 48fbc1c105..1af69813d1 100644 --- a/api/src/cli/commands/database/install.ts +++ b/api/src/cli/commands/database/install.ts @@ -12,7 +12,7 @@ export default async function start(): Promise { await runMigrations(database, 'latest'); database.destroy(); process.exit(0); - } catch (err) { + } catch (err: any) { console.log(err); database.destroy(); process.exit(1); diff --git a/api/src/cli/commands/database/migrate.ts b/api/src/cli/commands/database/migrate.ts index 8c5b32a17f..1367e904a4 100644 --- a/api/src/cli/commands/database/migrate.ts +++ b/api/src/cli/commands/database/migrate.ts @@ -18,7 +18,7 @@ export default async function migrate(direction: 'latest' | 'up' | 'down'): Prom } database.destroy(); process.exit(); - } catch (err) { + } catch (err: any) { console.log(err); database.destroy(); process.exit(1); diff --git a/api/src/cli/commands/init/index.ts b/api/src/cli/commands/init/index.ts index ed5aca4dad..476a9f7914 100644 --- a/api/src/cli/commands/init/index.ts +++ b/api/src/cli/commands/init/index.ts @@ -48,7 +48,7 @@ export default async function init(): Promise { try { await runSeed(db); await runMigrations(db, 'latest'); - } catch (err) { + } catch (err: any) { console.log(); console.log('Something went wrong while seeding the database:'); console.log(); diff --git a/api/src/cli/commands/roles/create.ts b/api/src/cli/commands/roles/create.ts index ab60884feb..a77f7bf675 100644 --- a/api/src/cli/commands/roles/create.ts +++ b/api/src/cli/commands/roles/create.ts @@ -20,7 +20,7 @@ export default async function rolesCreate({ role: name, admin }: { role: string; console.log(id); database.destroy(); process.exit(0); - } catch (err) { + } catch (err: any) { console.error(err); process.exit(1); } diff --git a/api/src/cli/commands/users/create.ts b/api/src/cli/commands/users/create.ts index 348eca565e..892b6ede14 100644 --- a/api/src/cli/commands/users/create.ts +++ b/api/src/cli/commands/users/create.ts @@ -28,7 +28,7 @@ export default async function usersCreate({ console.log(id); database.destroy(); process.exit(0); - } catch (err) { + } catch (err: any) { console.error(err); process.exit(1); } diff --git a/api/src/cli/commands/users/passwd.ts b/api/src/cli/commands/users/passwd.ts index ca40cbfba5..0d262951f6 100644 --- a/api/src/cli/commands/users/passwd.ts +++ b/api/src/cli/commands/users/passwd.ts @@ -28,7 +28,7 @@ export default async function usersPasswd({ email, password }: { email?: string; await database.destroy(); process.exit(user ? 0 : 1); - } catch (err) { + } catch (err: any) { console.error(err); process.exit(1); } diff --git a/api/src/controllers/activity.ts b/api/src/controllers/activity.ts index e5fe4d1f30..398e883889 100644 --- a/api/src/controllers/activity.ts +++ b/api/src/controllers/activity.ts @@ -99,7 +99,7 @@ router.post( res.locals.payload = { data: record || null, }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -138,7 +138,7 @@ router.patch( res.locals.payload = { data: record || null, }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/auth.ts b/api/src/controllers/auth.ts index 4c37c1654d..ab41d3729a 100644 --- a/api/src/controllers/auth.ts +++ b/api/src/controllers/auth.ts @@ -177,7 +177,7 @@ router.post( try { await service.requestPasswordReset(req.body.email, req.body.reset_url || null); return next(); - } catch (err) { + } catch (err: any) { if (err instanceof InvalidPayloadException) { throw err; } else { @@ -320,7 +320,7 @@ router.get( authResponse = await authenticationService.authenticate({ email, }); - } catch (error) { + } catch (error: any) { emitStatus('fail'); logger.warn(error); diff --git a/api/src/controllers/collections.ts b/api/src/controllers/collections.ts index 03d4731556..1868f4e56f 100644 --- a/api/src/controllers/collections.ts +++ b/api/src/controllers/collections.ts @@ -88,7 +88,7 @@ router.patch( try { const collection = await collectionsService.readOne(req.params.collection); res.locals.payload = { data: collection || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/fields.ts b/api/src/controllers/fields.ts index 732e6a589c..8409a1c71c 100644 --- a/api/src/controllers/fields.ts +++ b/api/src/controllers/fields.ts @@ -101,7 +101,7 @@ router.post( try { const createdField = await service.readOne(req.params.collection, field.field); res.locals.payload = { data: createdField || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -138,7 +138,7 @@ router.patch( results.push(updatedField); res.locals.payload = { data: results || null }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -193,7 +193,7 @@ router.patch( try { const updatedField = await service.readOne(req.params.collection, req.params.field); res.locals.payload = { data: updatedField || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/files.ts b/api/src/controllers/files.ts index 16110a0b9c..9fe6753ab1 100644 --- a/api/src/controllers/files.ts +++ b/api/src/controllers/files.ts @@ -73,7 +73,7 @@ const multipartHandler = asyncHandler(async (req, res, next) => { const primaryKey = await service.uploadOne(fileStream, payloadWithRequiredFields, existingPrimaryKey); savedFiles.push(primaryKey); tryDone(); - } catch (error) { + } catch (error: any) { busboy.emit('error', error); } }); @@ -127,7 +127,7 @@ router.post( data: record, }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -164,7 +164,7 @@ router.post( try { const record = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: record || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -242,7 +242,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -269,7 +269,7 @@ router.patch( try { const record = await service.readOne(req.params.pk, req.sanitizedQuery); res.locals.payload = { data: record || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/folders.ts b/api/src/controllers/folders.ts index 46c44cf878..049e8afae0 100644 --- a/api/src/controllers/folders.ts +++ b/api/src/controllers/folders.ts @@ -37,7 +37,7 @@ router.post( const record = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: record }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -114,7 +114,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -140,7 +140,7 @@ router.patch( try { const record = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: record || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/items.ts b/api/src/controllers/items.ts index 9d2a6f68b5..c0e1fe8ad4 100644 --- a/api/src/controllers/items.ts +++ b/api/src/controllers/items.ts @@ -42,7 +42,7 @@ router.post( const result = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: result || null }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -144,7 +144,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -177,7 +177,7 @@ router.patch( try { const result = await service.readOne(updatedPrimaryKey, req.sanitizedQuery); res.locals.payload = { data: result || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/not-found.ts b/api/src/controllers/not-found.ts index 09d94d62a4..9d1d30fd74 100644 --- a/api/src/controllers/not-found.ts +++ b/api/src/controllers/not-found.ts @@ -20,7 +20,7 @@ const notFound: RequestHandler = async (req, res, next) => { return next(); } next(new RouteNotFoundException(req.path)); - } catch (err) { + } catch (err: any) { next(err); } }; diff --git a/api/src/controllers/permissions.ts b/api/src/controllers/permissions.ts index cd4137c4a0..b26b40f389 100644 --- a/api/src/controllers/permissions.ts +++ b/api/src/controllers/permissions.ts @@ -37,7 +37,7 @@ router.post( const item = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: item }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -116,7 +116,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -142,7 +142,7 @@ router.patch( try { const item = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: item || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/presets.ts b/api/src/controllers/presets.ts index f9cd9a248e..b1cff328a4 100644 --- a/api/src/controllers/presets.ts +++ b/api/src/controllers/presets.ts @@ -37,7 +37,7 @@ router.post( const record = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: record }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -115,7 +115,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -141,7 +141,7 @@ router.patch( try { const record = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: record }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/relations.ts b/api/src/controllers/relations.ts index 878d422985..a4a2b91efd 100644 --- a/api/src/controllers/relations.ts +++ b/api/src/controllers/relations.ts @@ -90,7 +90,7 @@ router.post( try { const createdRelation = await service.readOne(req.body.collection, req.body.field); res.locals.payload = { data: createdRelation || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -135,7 +135,7 @@ router.patch( try { const updatedField = await service.readOne(req.params.collection, req.params.field); res.locals.payload = { data: updatedField || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/roles.ts b/api/src/controllers/roles.ts index f852abefa8..8b47ecf05b 100644 --- a/api/src/controllers/roles.ts +++ b/api/src/controllers/roles.ts @@ -37,7 +37,7 @@ router.post( const item = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: item }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -106,7 +106,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -132,7 +132,7 @@ router.patch( try { const item = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: item || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/settings.ts b/api/src/controllers/settings.ts index 98115b6041..5a22694249 100644 --- a/api/src/controllers/settings.ts +++ b/api/src/controllers/settings.ts @@ -35,7 +35,7 @@ router.patch( try { const record = await service.readSingleton(req.sanitizedQuery); res.locals.payload = { data: record || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/users.ts b/api/src/controllers/users.ts index b148471f72..241c2135d5 100644 --- a/api/src/controllers/users.ts +++ b/api/src/controllers/users.ts @@ -38,7 +38,7 @@ router.post( const item = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: item }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -86,7 +86,7 @@ router.get( try { const item = await service.readOne(req.accountability.user, req.sanitizedQuery); res.locals.payload = { data: item || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { res.locals.payload = { data: { id: req.accountability.user } }; return next(); @@ -177,7 +177,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -203,7 +203,7 @@ router.patch( try { const item = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: item || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/controllers/utils.ts b/api/src/controllers/utils.ts index ec64b628fd..abb4343002 100644 --- a/api/src/controllers/utils.ts +++ b/api/src/controllers/utils.ts @@ -103,7 +103,7 @@ router.post( busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => { try { await service.import(req.params.collection, mimetype, fileStream); - } catch (err) { + } catch (err: any) { return next(err); } diff --git a/api/src/controllers/webhooks.ts b/api/src/controllers/webhooks.ts index edca81dfeb..9eef455ed7 100644 --- a/api/src/controllers/webhooks.ts +++ b/api/src/controllers/webhooks.ts @@ -37,7 +37,7 @@ router.post( const item = await service.readOne(savedKeys[0], req.sanitizedQuery); res.locals.payload = { data: item }; } - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -106,7 +106,7 @@ router.patch( try { const result = await service.readMany(keys, req.sanitizedQuery); res.locals.payload = { data: result }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } @@ -132,7 +132,7 @@ router.patch( try { const item = await service.readOne(primaryKey, req.sanitizedQuery); res.locals.payload = { data: item || null }; - } catch (error) { + } catch (error: any) { if (error instanceof ForbiddenException) { return next(); } diff --git a/api/src/database/index.ts b/api/src/database/index.ts index b2bd5037f2..41cdedae6f 100644 --- a/api/src/database/index.ts +++ b/api/src/database/index.ts @@ -137,7 +137,7 @@ export async function validateDBConnection(database?: Knex): Promise { } else { await database.raw('SELECT 1'); } - } catch (error) { + } catch (error: any) { logger.error(`Can't connect to the database.`); logger.error(error); process.exit(1); @@ -178,7 +178,7 @@ export async function validateMigrations(): Promise { ); return requiredVersions.every((version) => completedVersions.includes(version)); - } catch (error) { + } catch (error: any) { logger.error(`Database migrations cannot be found`); logger.error(error); throw process.exit(1); diff --git a/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts b/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts index d27efecc2e..60e24386c1 100644 --- a/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts +++ b/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts @@ -68,7 +68,7 @@ export async function up(knex: Knex): Promise { await knex(constraint.many_collection) .update({ [constraint.many_field]: null }) .whereIn(currentPrimaryKeyField, ids); - } catch (err) { + } catch (err: any) { logger.error( `${constraint.many_collection}.${constraint.many_field} contains illegal foreign keys which couldn't be set to NULL. Please fix these references and rerun this migration to complete the upgrade.` ); @@ -111,7 +111,7 @@ export async function up(knex: Knex): Promise { builder.onDelete('SET NULL'); } }); - } catch (err) { + } catch (err: any) { logger.warn( `Couldn't add foreign key constraint for ${constraint.many_collection}.${constraint.many_field}<->${constraint.one_collection}` ); @@ -140,7 +140,7 @@ export async function down(knex: Knex): Promise { await knex.schema.alterTable(relation.many_collection, (table) => { table.dropForeign([relation.many_field]); }); - } catch (err) { + } catch (err: any) { logger.warn( `Couldn't drop foreign key constraint for ${relation.many_collection}.${relation.many_field}<->${relation.one_collection}` ); diff --git a/api/src/database/migrations/20210519A-add-system-fk-triggers.ts b/api/src/database/migrations/20210519A-add-system-fk-triggers.ts index 2cf58f6a0c..e682eb023e 100644 --- a/api/src/database/migrations/20210519A-add-system-fk-triggers.ts +++ b/api/src/database/migrations/20210519A-add-system-fk-triggers.ts @@ -99,7 +99,7 @@ export async function up(knex: Knex): Promise { await knex.schema.alterTable(update.table, (table) => { table.dropForeign([constraint.column], existingForeignKey?.constraint_name || undefined); }); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`); logger.warn(err); } @@ -114,7 +114,7 @@ export async function up(knex: Knex): Promise { // Knex uses a default convention for index names: `table_column_type` table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`); }); - } catch (err) { + } catch (err: any) { logger.warn( `Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}` ); @@ -126,7 +126,7 @@ export async function up(knex: Knex): Promise { await knex.schema.alterTable(update.table, (table) => { table.foreign(constraint.column).references(constraint.references).onDelete(constraint.on_delete); }); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`); logger.warn(err); } @@ -141,7 +141,7 @@ export async function down(knex: Knex): Promise { await knex.schema.alterTable(update.table, (table) => { table.dropForeign([constraint.column]); }); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`); logger.warn(err); } @@ -156,7 +156,7 @@ export async function down(knex: Knex): Promise { // Knex uses a default convention for index names: `table_column_type` table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`); }); - } catch (err) { + } catch (err: any) { logger.warn( `Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}` ); @@ -168,7 +168,7 @@ export async function down(knex: Knex): Promise { await knex.schema.alterTable(update.table, (table) => { table.foreign(constraint.column).references(constraint.references); }); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`); logger.warn(err); } diff --git a/api/src/database/migrations/20210802A-replace-groups.ts b/api/src/database/migrations/20210802A-replace-groups.ts index 7ae9e05373..8cd924752a 100644 --- a/api/src/database/migrations/20210802A-replace-groups.ts +++ b/api/src/database/migrations/20210802A-replace-groups.ts @@ -14,7 +14,7 @@ export async function up(knex: Knex): Promise { if (options.icon) newOptions.headerIcon = options.icon; if (options.color) newOptions.headerColor = options.color; - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't convert previous options from field ${dividerGroup.collection}.${dividerGroup.field}`); logger.warn(err); } @@ -27,7 +27,7 @@ export async function up(knex: Knex): Promise { options: JSON.stringify(newOptions), }) .where('id', '=', dividerGroup.id); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't update ${dividerGroup.collection}.${dividerGroup.field} to new group interface`); logger.warn(err); } diff --git a/api/src/emitter.ts b/api/src/emitter.ts index 8329626ffc..79397dee46 100644 --- a/api/src/emitter.ts +++ b/api/src/emitter.ts @@ -18,7 +18,7 @@ const emitter = new EventEmitter2({ export async function emitAsyncSafe(name: string, ...args: any[]): Promise { try { return await emitter.emitAsync(name, ...args); - } catch (err) { + } catch (err: any) { logger.warn(`An error was thrown while executing hook "${name}"`); logger.warn(err); } diff --git a/api/src/extensions.ts b/api/src/extensions.ts index 9344e5ad22..1772c0029f 100644 --- a/api/src/extensions.ts +++ b/api/src/extensions.ts @@ -41,7 +41,7 @@ export async function initializeExtensions(): Promise { try { await ensureExtensionDirs(env.EXTENSIONS_PATH, env.SERVE_APP ? EXTENSION_TYPES : API_EXTENSION_TYPES); extensions = await getExtensions(); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't load extensions`); logger.warn(err); } @@ -142,7 +142,7 @@ function registerHooks(hooks: Extension[]) { for (const hook of hooks) { try { registerHook(hook); - } catch (error) { + } catch (error: any) { logger.warn(`Couldn't register hook "${hook.name}"`); logger.warn(error); } @@ -181,7 +181,7 @@ function registerEndpoints(endpoints: Extension[], router: Router) { for (const endpoint of endpoints) { try { registerEndpoint(endpoint); - } catch (error) { + } catch (error: any) { logger.warn(`Couldn't register endpoint "${endpoint.name}"`); logger.warn(error); } diff --git a/api/src/middleware/authenticate.ts b/api/src/middleware/authenticate.ts index 8e6abe3b52..ab786dd7bb 100644 --- a/api/src/middleware/authenticate.ts +++ b/api/src/middleware/authenticate.ts @@ -28,7 +28,7 @@ const authenticate: RequestHandler = asyncHandler(async (req, res, next) => { try { payload = jwt.verify(req.token, env.SECRET as string) as { id: string }; - } catch (err) { + } catch (err: any) { if (err instanceof TokenExpiredError) { throw new InvalidCredentialsException('Token expired.'); } else if (err instanceof JsonWebTokenError) { diff --git a/api/src/middleware/cache.ts b/api/src/middleware/cache.ts index 747db06885..52fe344c1b 100644 --- a/api/src/middleware/cache.ts +++ b/api/src/middleware/cache.ts @@ -23,7 +23,7 @@ const checkCacheMiddleware: RequestHandler = asyncHandler(async (req, res, next) try { cachedData = await cache.get(key); - } catch (err) { + } catch (err: any) { logger.warn(err, `[cache] Couldn't read key ${key}. ${err.message}`); return next(); } @@ -33,7 +33,7 @@ const checkCacheMiddleware: RequestHandler = asyncHandler(async (req, res, next) try { cacheExpiryDate = (await cache.get(`${key}__expires_at`)) as number | null; - } catch (err) { + } catch (err: any) { logger.warn(err, `[cache] Couldn't read key ${`${key}__expires_at`}. ${err.message}`); return next(); } diff --git a/api/src/middleware/graphql.ts b/api/src/middleware/graphql.ts index 8f1346356a..c2b6b411b5 100644 --- a/api/src/middleware/graphql.ts +++ b/api/src/middleware/graphql.ts @@ -40,7 +40,7 @@ export const parseGraphQL: RequestHandler = asyncHandler(async (req, res, next) try { document = parse(new Source(query)); - } catch (err) { + } catch (err: any) { throw new InvalidPayloadException(`GraphQL schema validation error.`, { graphqlErrors: [err], }); diff --git a/api/src/middleware/rate-limiter.ts b/api/src/middleware/rate-limiter.ts index 0c59b6b01f..6e715e2f3d 100644 --- a/api/src/middleware/rate-limiter.ts +++ b/api/src/middleware/rate-limiter.ts @@ -18,7 +18,7 @@ if (env.RATE_LIMITER_ENABLED === true) { checkRateLimit = asyncHandler(async (req, res, next) => { try { await rateLimiter.consume(req.ip, 1); - } catch (rateLimiterRes) { + } catch (rateLimiterRes: any) { if (rateLimiterRes instanceof Error) throw rateLimiterRes; res.set('Retry-After', String(rateLimiterRes.msBeforeNext / 1000)); diff --git a/api/src/middleware/respond.ts b/api/src/middleware/respond.ts index 072f3db411..385943bba3 100644 --- a/api/src/middleware/respond.ts +++ b/api/src/middleware/respond.ts @@ -25,7 +25,7 @@ export const respond: RequestHandler = asyncHandler(async (req, res) => { try { await cache.set(key, res.locals.payload, ms(env.CACHE_TTL as string)); await cache.set(`${key}__expires_at`, Date.now() + ms(env.CACHE_TTL as string)); - } catch (err) { + } catch (err: any) { logger.warn(err, `[cache] Couldn't set key ${key}. ${err}`); } diff --git a/api/src/services/authentication.ts b/api/src/services/authentication.ts index 0cea5d194e..14930455bf 100644 --- a/api/src/services/authentication.ts +++ b/api/src/services/authentication.ts @@ -121,7 +121,7 @@ export class AuthenticationService { try { await loginAttemptsLimiter.consume(user.id); - } catch (err) { + } catch { await this.knex('directus_users').update({ status: 'suspended' }).where({ id: user.id }); user.status = 'suspended'; diff --git a/api/src/services/fields.ts b/api/src/services/fields.ts index 6aabdc8482..18b2f643c1 100644 --- a/api/src/services/fields.ts +++ b/api/src/services/fields.ts @@ -277,7 +277,7 @@ export class FieldsService { if (!field.schema) return; this.addColumnToTable(table, field, existingColumn); }); - } catch (err) { + } catch (err: any) { throw await translateDatabaseError(err); } } diff --git a/api/src/services/files.ts b/api/src/services/files.ts index 4dc1eebe79..10a8080fe1 100644 --- a/api/src/services/files.ts +++ b/api/src/services/files.ts @@ -63,7 +63,7 @@ export class FilesService extends ItemsService { try { await storage.disk(data.storage).put(payload.filename_disk, stream, payload.type); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't save file ${payload.filename_disk}`); logger.warn(err); throw new ServiceUnavailableException(`Couldn't save file ${payload.filename_disk}`, { service: 'files' }); @@ -105,7 +105,7 @@ export class FilesService extends ItemsService { if (payload.metadata?.iptc?.Keywords) { payload.tags = payload.metadata.iptc.Keywords; } - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't extract metadata from file`); logger.warn(err); } @@ -156,7 +156,7 @@ export class FilesService extends ItemsService { fileResponse = await axios.get(importURL, { responseType: 'stream', }); - } catch (err) { + } catch (err: any) { logger.warn(`Couldn't fetch file from url "${importURL}"`); logger.warn(err); throw new ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, { diff --git a/api/src/services/graphql.ts b/api/src/services/graphql.ts index dc20f4d71c..64f56c2cbb 100644 --- a/api/src/services/graphql.ts +++ b/api/src/services/graphql.ts @@ -157,7 +157,7 @@ export class GraphQLService { variableValues: variables, operationName, }); - } catch (err) { + } catch (err: any) { throw new InvalidPayloadException('GraphQL execution error.', { graphqlErrors: [err.message] }); } @@ -970,7 +970,7 @@ export class GraphQLService { return { ids: keys }; } } - } catch (err) { + } catch (err: any) { this.formatError(err); } } @@ -1007,7 +1007,7 @@ export class GraphQLService { } return true; - } catch (err) { + } catch (err: any) { throw this.formatError(err); } } @@ -1506,7 +1506,7 @@ export class GraphQLService { try { await service.requestPasswordReset(args.email, args.reset_url || null); - } catch (err) { + } catch (err: any) { if (err instanceof InvalidPayloadException) { throw err; } diff --git a/api/src/services/items.ts b/api/src/services/items.ts index ce0b95324f..979fb448fc 100644 --- a/api/src/services/items.ts +++ b/api/src/services/items.ts @@ -135,7 +135,7 @@ export class ItemsService implements AbstractSer try { const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField); primaryKey = primaryKey ?? result[0]; - } catch (err) { + } catch (err: any) { throw await translateDatabaseError(err); } @@ -442,7 +442,7 @@ export class ItemsService implements AbstractSer if (Object.keys(payloadWithTypeCasting).length > 0) { try { await trx(this.collection).update(payloadWithTypeCasting).whereIn(primaryKeyField, keys); - } catch (err) { + } catch (err: any) { throw await translateDatabaseError(err); } } diff --git a/api/src/services/server.ts b/api/src/services/server.ts index 827e6c7db4..c371ddf447 100644 --- a/api/src/services/server.ts +++ b/api/src/services/server.ts @@ -209,7 +209,7 @@ export class ServerService { try { await cache!.set(`health-${checkID}`, true, 5); await cache!.delete(`health-${checkID}`); - } catch (err) { + } catch (err: any) { checks['cache:responseTime'][0].status = 'error'; checks['cache:responseTime'][0].output = err; } finally { @@ -249,7 +249,7 @@ export class ServerService { try { await rateLimiter.consume(`health-${checkID}`, 1); await rateLimiter.delete(`health-${checkID}`); - } catch (err) { + } catch (err: any) { checks['rateLimiter:responseTime'][0].status = 'error'; checks['rateLimiter:responseTime'][0].output = err; } finally { @@ -289,7 +289,7 @@ export class ServerService { await disk.put(`health-${checkID}`, 'check'); await disk.get(`health-${checkID}`); await disk.delete(`health-${checkID}`); - } catch (err) { + } catch (err: any) { checks[`storage:${location}:responseTime`][0].status = 'error'; checks[`storage:${location}:responseTime`][0].output = err; } finally { @@ -323,7 +323,7 @@ export class ServerService { try { await mailer.verify(); - } catch (err) { + } catch (err: any) { checks['email:connection'][0].status = 'error'; checks['email:connection'][0].output = err; } diff --git a/api/src/utils/get-schema.ts b/api/src/utils/get-schema.ts index 077e3a4d33..80a9eda1cd 100644 --- a/api/src/utils/get-schema.ts +++ b/api/src/utils/get-schema.ts @@ -32,7 +32,7 @@ export async function getSchema(options?: { try { cachedSchema = (await schemaCache.get('schema')) as SchemaOverview; - } catch (err) { + } catch (err: any) { logger.warn(err, `[schema-cache] Couldn't retrieve cache. ${err}`); } @@ -47,7 +47,7 @@ export async function getSchema(options?: { result, typeof env.CACHE_SCHEMA === 'string' ? ms(env.CACHE_SCHEMA) : undefined ); - } catch (err) { + } catch (err: any) { logger.warn(err, `[schema-cache] Couldn't save cache. ${err}`); } } diff --git a/api/src/utils/is-jwt.ts b/api/src/utils/is-jwt.ts index 819d7405be..d6f41524ce 100644 --- a/api/src/utils/is-jwt.ts +++ b/api/src/utils/is-jwt.ts @@ -15,7 +15,7 @@ export default function isJWT(string: string): boolean { atob(parts[0]); atob(parts[1]); atob(parts[2]); - } catch (err) { + } catch (err: any) { logger.error(err); return false; } diff --git a/api/src/utils/track.ts b/api/src/utils/track.ts index 2838db2a63..c0bccc57c0 100644 --- a/api/src/utils/track.ts +++ b/api/src/utils/track.ts @@ -13,7 +13,7 @@ export async function track(event: string): Promise { try { await axios.post('https://telemetry.directus.io/', info); - } catch (err) { + } catch (err: any) { if (env.NODE_ENV === 'development') { logger.error(err); } diff --git a/api/src/webhooks.ts b/api/src/webhooks.ts index d39d42be80..12f33f0a55 100644 --- a/api/src/webhooks.ts +++ b/api/src/webhooks.ts @@ -61,7 +61,7 @@ function createHandler(webhook: Webhook): ListenerFn { method: webhook.method, data: webhook.data ? webhookPayload : null, }); - } catch (error) { + } catch (error: any) { logger.warn(`Webhook "${webhook.name}" (id: ${webhook.id}) failed`); logger.warn(error); } diff --git a/app/src/auth.ts b/app/src/auth.ts index 8e02695d4e..860a5bb905 100644 --- a/app/src/auth.ts +++ b/app/src/auth.ts @@ -92,7 +92,7 @@ export async function refresh({ navigate }: LogoutOptions = { navigate: true }): appStore.authenticated = true; return accessToken; - } catch (error) { + } catch (error: any) { await logout({ navigate, reason: LogoutReason.SESSION_EXPIRED }); } } diff --git a/app/src/components/v-upload/v-upload.vue b/app/src/components/v-upload/v-upload.vue index cf48d2ccc7..8b2385f7d0 100644 --- a/app/src/components/v-upload/v-upload.vue +++ b/app/src/components/v-upload/v-upload.vue @@ -200,7 +200,7 @@ export default defineComponent({ uploadedFile && emit('input', uploadedFile); } - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { uploading.value = false; @@ -301,7 +301,7 @@ export default defineComponent({ activeDialog.value = null; url.value = ''; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/composables/use-folders.ts b/app/src/composables/use-folders.ts index 1cd82c97ba..e52fb88fc1 100644 --- a/app/src/composables/use-folders.ts +++ b/app/src/composables/use-folders.ts @@ -61,7 +61,7 @@ export default function useFolders(): UsableFolders { folders.value = response.data.data; nestedFolders.value = nestFolders(response.data.data); - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/composables/use-item/use-item.ts b/app/src/composables/use-item/use-item.ts index cbfca15db3..549213d2c8 100644 --- a/app/src/composables/use-item/use-item.ts +++ b/app/src/composables/use-item/use-item.ts @@ -99,7 +99,7 @@ export function useItem(collection: Ref, primaryKey: Ref, primaryKey: Ref VALIDATION_TYPES.includes(err?.extensions?.code)) @@ -203,7 +203,7 @@ export function useItem(collection: Ref, primaryKey: Ref err?.extensions?.code === 'FAILED_VALIDATION') @@ -253,7 +253,7 @@ export function useItem(collection: Ref, primaryKey: Ref, primaryKey: Ref, query: Query, fetchOnIn } getItemCount(); - } catch (err) { + } catch (err: any) { error.value = err; } finally { clearTimeout(loadingTimeout); diff --git a/app/src/composables/use-template-data.ts b/app/src/composables/use-template-data.ts index 417e0a80bc..3c4b1b439c 100644 --- a/app/src/composables/use-template-data.ts +++ b/app/src/composables/use-template-data.ts @@ -43,7 +43,7 @@ export default function useTemplateData( }); templateData.value = result.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/displays/formatted-json-value/formatted-json-value.vue b/app/src/displays/formatted-json-value/formatted-json-value.vue index 1ba7695785..15e420cefe 100644 --- a/app/src/displays/formatted-json-value/formatted-json-value.vue +++ b/app/src/displays/formatted-json-value/formatted-json-value.vue @@ -50,7 +50,7 @@ export default defineComponent({ } else { return [render(props.format || '', props.value)]; } - } catch (error) { + } catch { return null; } }); diff --git a/app/src/displays/register.ts b/app/src/displays/register.ts index 94ef6b5b9a..ca2fc63fe2 100644 --- a/app/src/displays/register.ts +++ b/app/src/displays/register.ts @@ -15,7 +15,7 @@ export async function registerDisplays(app: App): Promise { : await import(/* @vite-ignore */ `${getRootPath()}extensions/displays/index.js`); displays.push(...customDisplays.default); - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(`Couldn't load custom displays`); // eslint-disable-next-line no-console diff --git a/app/src/hydrate.ts b/app/src/hydrate.ts index 5af4461667..43328ff4b8 100644 --- a/app/src/hydrate.ts +++ b/app/src/hydrate.ts @@ -66,7 +66,7 @@ export async function hydrate(stores = useStores()): Promise { } appStore.basemap = getBasemapSources()[0].name; - } catch (error) { + } catch (error: any) { appStore.error = error; } finally { appStore.hydrating = false; diff --git a/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue b/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue index cc1882f325..d31c95f945 100644 --- a/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue +++ b/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue @@ -155,7 +155,7 @@ export default defineComponent({ await qrcode.toCanvas(document.getElementById(canvasID), url); tfaGenerated.value = true; error.value = null; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -184,7 +184,7 @@ export default defineComponent({ otp.value = ''; secret.value = ''; error.value = null; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -200,7 +200,7 @@ export default defineComponent({ tfaEnabled.value = false; disableActive.value = false; otp.value = ''; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/interfaces/file-image/file-image.vue b/app/src/interfaces/file-image/file-image.vue index e97bbb328e..e245817020 100644 --- a/app/src/interfaces/file-image/file-image.vue +++ b/app/src/interfaces/file-image/file-image.vue @@ -178,7 +178,7 @@ export default defineComponent({ } else { image.value = response.data.data; } - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/interfaces/file/file.vue b/app/src/interfaces/file/file.vue index 65681cf702..92f25861d3 100644 --- a/app/src/interfaces/file/file.vue +++ b/app/src/interfaces/file/file.vue @@ -250,7 +250,7 @@ export default defineComponent({ } else { file.value = response.data.data; } - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; @@ -303,7 +303,7 @@ export default defineComponent({ activeDialog.value = null; url.value = ''; emit('input', file.value?.id); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/interfaces/input-autocomplete-api/input-autocomplete-api.vue b/app/src/interfaces/input-autocomplete-api/input-autocomplete-api.vue index 6a683b58b1..f4721f8917 100644 --- a/app/src/interfaces/input-autocomplete-api/input-autocomplete-api.vue +++ b/app/src/interfaces/input-autocomplete-api/input-autocomplete-api.vue @@ -109,7 +109,7 @@ export default defineComponent({ .map((result: Record) => (props.valuePath ? get(result, props.valuePath) : result)) .filter((val: unknown) => val); } - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(err); } diff --git a/app/src/interfaces/list-m2a/list-m2a.vue b/app/src/interfaces/list-m2a/list-m2a.vue index d5af8b9a3c..d65b6c80be 100644 --- a/app/src/interfaces/list-m2a/list-m2a.vue +++ b/app/src/interfaces/list-m2a/list-m2a.vue @@ -495,7 +495,7 @@ export default defineComponent({ [collection]: responses[i].data.data, }; } - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/interfaces/list-m2m/use-preview.ts b/app/src/interfaces/list-m2m/use-preview.ts index 753108e89c..1ee00c082f 100644 --- a/app/src/interfaces/list-m2m/use-preview.ts +++ b/app/src/interfaces/list-m2m/use-preview.ts @@ -92,7 +92,7 @@ export default function usePreview( .concat(...newItems); items.value = responseData; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -180,7 +180,7 @@ export default function usePreview( // Add all items that already had the id of it's related item return data.concat(...getNewSelectedItems(), ...updatedItems); - } catch (err) { + } catch (err: any) { error.value = err; } return []; diff --git a/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue b/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue index a093dca065..37ce0acb70 100644 --- a/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue +++ b/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue @@ -168,7 +168,7 @@ export default defineComponent({ }); stagedValues.value = response.data.data?.[relation.value.meta!.one_field!] ?? []; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/interfaces/list-o2m/list-o2m.vue b/app/src/interfaces/list-o2m/list-o2m.vue index 3390f741d0..421816233e 100644 --- a/app/src/interfaces/list-o2m/list-o2m.vue +++ b/app/src/interfaces/list-o2m/list-o2m.vue @@ -352,7 +352,7 @@ export default defineComponent({ return item; }) .concat(...newItems); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/interfaces/map/map.vue b/app/src/interfaces/map/map.vue index fc4e4d8a2f..837932b462 100644 --- a/app/src/interfaces/map/map.vue +++ b/app/src/interfaces/map/map.vue @@ -139,7 +139,7 @@ export default defineComponent({ try { parse = getParser({ geometryFormat, geometryField: 'value' }); serialize = getSerializer({ geometryFormat, geometryField: 'value' }); - } catch (error) { + } catch (error: any) { geometryOptionsError.value = error; } @@ -326,7 +326,7 @@ export default defineComponent({ } else { fitDataBounds({ duration: 0 }); } - } catch (error) { + } catch (error: any) { geometryParsingError.value = error; } } diff --git a/app/src/interfaces/register.ts b/app/src/interfaces/register.ts index d5a6d46ae0..1fa7bc9106 100644 --- a/app/src/interfaces/register.ts +++ b/app/src/interfaces/register.ts @@ -16,7 +16,7 @@ export async function registerInterfaces(app: App): Promise { : await import(/* @vite-ignore */ `${getRootPath()}extensions/interfaces/index.js`); interfaces.push(...customInterfaces.default); - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(`Couldn't load custom interfaces`); // eslint-disable-next-line no-console diff --git a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue index 3857d9a96b..e6107f0a0e 100644 --- a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue +++ b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue @@ -255,7 +255,7 @@ export default defineComponent({ }); currentItem.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; @@ -301,7 +301,7 @@ export default defineComponent({ }); items.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/interfaces/translations/translations.vue b/app/src/interfaces/translations/translations.vue index 8c1398e8d5..4e885dc59a 100644 --- a/app/src/interfaces/translations/translations.vue +++ b/app/src/interfaces/translations/translations.vue @@ -208,7 +208,7 @@ export default defineComponent({ try { const response = await api.get(`/items/${languagesCollection.value}`, { params: { fields, limit: -1 } }); languages.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; @@ -299,7 +299,7 @@ export default defineComponent({ }); keyMap.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -424,7 +424,7 @@ export default defineComponent({ ...existingEdit, }; }); - } catch (err) { + } catch (err: any) { error.value = err; previewItems.value = []; } finally { diff --git a/app/src/lang/set-language.ts b/app/src/lang/set-language.ts index ca40d6ccf5..2820415c2b 100644 --- a/app/src/lang/set-language.ts +++ b/app/src/lang/set-language.ts @@ -25,7 +25,7 @@ export async function setLanguage(lang: Language): Promise { const translations = await import(`./translations/${lang}.yaml`); i18n.global.mergeLocaleMessage(lang, translations); loadedLanguages.push(lang); - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(err); } diff --git a/app/src/layouts/calendar/index.ts b/app/src/layouts/calendar/index.ts index c77966d886..adc8dd2bc8 100644 --- a/app/src/layouts/calendar/index.ts +++ b/app/src/layouts/calendar/index.ts @@ -223,7 +223,7 @@ export default defineLayout({ try { await api.patch(`${endpoint}/${info.event.id}`, itemChanges); - } catch (err) { + } catch (err: any) { unexpectedError(err); } }, diff --git a/app/src/layouts/map/index.ts b/app/src/layouts/map/index.ts index 50bde5b430..247662b0f8 100644 --- a/app/src/layouts/map/index.ts +++ b/app/src/layouts/map/index.ts @@ -230,7 +230,7 @@ export default defineLayout({ if (!cameraOptions.value || shouldUpdateCamera.value) { geojsonBounds.value = geojson.value.bbox; } - } catch (error) { + } catch (error: any) { geojsonLoading.value = false; geojsonError.value = error; geojson.value = { type: 'FeatureCollection', features: [] }; diff --git a/app/src/layouts/register.ts b/app/src/layouts/register.ts index 92fabe8538..35f82b1960 100644 --- a/app/src/layouts/register.ts +++ b/app/src/layouts/register.ts @@ -16,7 +16,7 @@ export async function registerLayouts(app: App): Promise { : await import(/* @vite-ignore */ `${getRootPath()}extensions/layouts/index.js`); layouts.push(...customLayouts.default); - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(`Couldn't load custom layouts`); // eslint-disable-next-line no-console diff --git a/app/src/modules/activity/routes/item.vue b/app/src/modules/activity/routes/item.vue index 53a2e88118..a281c07c3e 100644 --- a/app/src/modules/activity/routes/item.vue +++ b/app/src/modules/activity/routes/item.vue @@ -118,7 +118,7 @@ export default defineComponent({ }); item.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/modules/collections/components/navigation-bookmark.vue b/app/src/modules/collections/components/navigation-bookmark.vue index 78a5945354..d41553b5ae 100644 --- a/app/src/modules/collections/components/navigation-bookmark.vue +++ b/app/src/modules/collections/components/navigation-bookmark.vue @@ -120,7 +120,7 @@ export default defineComponent({ }); renameActive.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { renameSaving.value = false; @@ -151,7 +151,7 @@ export default defineComponent({ if (navigateTo) { router.push(navigateTo); } - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { deleteSaving.value = false; diff --git a/app/src/modules/collections/routes/collection.vue b/app/src/modules/collections/routes/collection.vue index 5f46343f12..a77f4f49ba 100644 --- a/app/src/modules/collections/routes/collection.vue +++ b/app/src/modules/collections/routes/collection.vue @@ -460,7 +460,7 @@ export default defineComponent({ selection.value = []; confirmDelete.value = false; - } catch (err) { + } catch (err: any) { error.value = err; } finally { deleting.value = false; @@ -484,7 +484,7 @@ export default defineComponent({ selection.value = []; await layoutState.value?.refresh?.(); - } catch (err) { + } catch (err: any) { error.value = err; } finally { archiving.value = false; @@ -525,7 +525,7 @@ export default defineComponent({ router.push(`/collections/${newBookmark.collection}?bookmark=${newBookmark.id}`); bookmarkDialogActive.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { creatingBookmark.value = false; diff --git a/app/src/modules/docs/components/markdown.vue b/app/src/modules/docs/components/markdown.vue index 38c7ded51e..bbc45a9259 100644 --- a/app/src/modules/docs/components/markdown.vue +++ b/app/src/modules/docs/components/markdown.vue @@ -27,7 +27,7 @@ const md = new MarkdownIt({ if (lang && hljs.getLanguage(lang)) { try { return hljs.highlight(str, { language: lang }).value; - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn('There was an error highlighting in Markdown'); // eslint-disable-next-line no-console diff --git a/app/src/modules/files/components/add-folder.vue b/app/src/modules/files/components/add-folder.vue index 1bef74a02a..2317d424e9 100644 --- a/app/src/modules/files/components/add-folder.vue +++ b/app/src/modules/files/components/add-folder.vue @@ -75,7 +75,7 @@ export default defineComponent({ newFolderName.value = null; router.push({ path: `/files/folders/${newFolder.data.data.id}` }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; diff --git a/app/src/modules/files/components/folder-picker.vue b/app/src/modules/files/components/folder-picker.vue index aeca13e2f2..f7196a4687 100644 --- a/app/src/modules/files/components/folder-picker.vue +++ b/app/src/modules/files/components/folder-picker.vue @@ -129,7 +129,7 @@ export default defineComponent({ }); folders.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/files/components/navigation-folder.vue b/app/src/modules/files/components/navigation-folder.vue index fe45c06ac1..7ef614a544 100644 --- a/app/src/modules/files/components/navigation-folder.vue +++ b/app/src/modules/files/components/navigation-folder.vue @@ -183,7 +183,7 @@ export default defineComponent({ await api.patch(`/folders/${props.folder.id}`, { name: renameValue.value, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { renameSaving.value = false; @@ -207,7 +207,7 @@ export default defineComponent({ await api.patch(`/folders/${props.folder.id}`, { parent: moveValue.value, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { moveSaving.value = false; @@ -279,7 +279,7 @@ export default defineComponent({ } deleteActive.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { await fetchFolders(); diff --git a/app/src/modules/files/routes/collection.vue b/app/src/modules/files/routes/collection.vue index eb32036620..68d486751c 100644 --- a/app/src/modules/files/routes/collection.vue +++ b/app/src/modules/files/routes/collection.vue @@ -360,7 +360,7 @@ export default defineComponent({ selection.value = []; confirmDelete.value = false; - } catch (err) { + } catch (err: any) { error.value = err; } finally { deleting.value = false; @@ -435,7 +435,7 @@ export default defineComponent({ await nextTick(); await refresh(); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { moveToDialogActive.value = false; diff --git a/app/src/modules/files/routes/item.vue b/app/src/modules/files/routes/item.vue index cc0b9bf3a6..5be81d714c 100644 --- a/app/src/modules/files/routes/item.vue +++ b/app/src/modules/files/routes/item.vue @@ -453,7 +453,7 @@ export default defineComponent({ type: 'success', icon: 'folder_move', }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { moveToDialogActive.value = false; diff --git a/app/src/modules/register.ts b/app/src/modules/register.ts index bbe3a23f12..c7e231f16c 100644 --- a/app/src/modules/register.ts +++ b/app/src/modules/register.ts @@ -20,7 +20,7 @@ export async function loadModules(): Promise { : await import(/* @vite-ignore */ `${getRootPath()}extensions/modules/index.js`); modules.push(...customModules.default); - } catch (err) { + } catch (err: any) { // eslint-disable-next-line no-console console.warn(`Couldn't load custom modules`); // eslint-disable-next-line no-console diff --git a/app/src/modules/settings/composables/use-project-info.ts b/app/src/modules/settings/composables/use-project-info.ts index f0720df833..22a04795c4 100644 --- a/app/src/modules/settings/composables/use-project-info.ts +++ b/app/src/modules/settings/composables/use-project-info.ts @@ -78,7 +78,7 @@ export function useProjectInfo(): UsableProjectInfo { try { const response = await api.get('/server/info'); info.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue index d48d035d1d..ebf8e5e89b 100644 --- a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue +++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue @@ -434,7 +434,7 @@ export default defineComponent({ router.push(`/settings/data-model/${props.collection}`); clearLocalStore(); - } catch (err) { + } catch (err: any) { if (err?.response?.data?.errors?.[0]?.extensions?.code === 'CONTAINS_NULL_VALUES') { nullValueOverride.value = state.fieldData?.schema?.default_value || null; nullValuesDialog.value = true; @@ -486,7 +486,7 @@ export default defineComponent({ nullValuesDialog.value = false; return saveField(); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { nullOverrideSaving.value = false; diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue index 970cc9683e..9f1d5ffdda 100644 --- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue +++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue @@ -288,7 +288,7 @@ export default defineComponent({ }); duplicateActive.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { duplicating.value = false; diff --git a/app/src/modules/settings/routes/data-model/new-collection.vue b/app/src/modules/settings/routes/data-model/new-collection.vue index c04f8cba08..592ce2b654 100644 --- a/app/src/modules/settings/routes/data-model/new-collection.vue +++ b/app/src/modules/settings/routes/data-model/new-collection.vue @@ -248,7 +248,7 @@ export default defineComponent({ }); router.push(`/settings/data-model/${collectionName.value}`); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; diff --git a/app/src/modules/settings/routes/presets/collection/collection.vue b/app/src/modules/settings/routes/presets/collection/collection.vue index d63465b729..e1b6354dae 100644 --- a/app/src/modules/settings/routes/presets/collection/collection.vue +++ b/app/src/modules/settings/routes/presets/collection/collection.vue @@ -209,7 +209,7 @@ export default defineComponent({ }, }); presetsRaw.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/presets/collection/components/presets-info-sidebar-detail.vue b/app/src/modules/settings/routes/presets/collection/components/presets-info-sidebar-detail.vue index 2ab2a2b52a..c81254e63c 100644 --- a/app/src/modules/settings/routes/presets/collection/components/presets-info-sidebar-detail.vue +++ b/app/src/modules/settings/routes/presets/collection/components/presets-info-sidebar-detail.vue @@ -49,7 +49,7 @@ export default defineComponent({ bookmarksCount.value = response.data.meta.filter_count as number; presetsCount.value = (response.data.meta.total_count as number) - bookmarksCount.value; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/presets/item.vue b/app/src/modules/settings/routes/presets/item.vue index e10118c230..d397dda655 100644 --- a/app/src/modules/settings/routes/presets/item.vue +++ b/app/src/modules/settings/routes/presets/item.vue @@ -238,7 +238,7 @@ export default defineComponent({ await presetsStore.hydrate(); edits.value = {}; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; @@ -259,7 +259,7 @@ export default defineComponent({ try { await api.delete(`/presets/${props.id}`); router.push(`/settings/presets`); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { deleting.value = false; @@ -391,7 +391,7 @@ export default defineComponent({ const response = await api.get(`/presets/${props.id}`); preset.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/roles/add-new.vue b/app/src/modules/settings/routes/roles/add-new.vue index e1a6f2d4ff..3423ef6924 100644 --- a/app/src/modules/settings/routes/roles/add-new.vue +++ b/app/src/modules/settings/routes/roles/add-new.vue @@ -80,7 +80,7 @@ export default defineComponent({ } router.push(`/settings/roles/${roleResponse.data.data.id}`); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; diff --git a/app/src/modules/settings/routes/roles/collection.vue b/app/src/modules/settings/routes/roles/collection.vue index 17f0b18213..887189ef66 100644 --- a/app/src/modules/settings/routes/roles/collection.vue +++ b/app/src/modules/settings/routes/roles/collection.vue @@ -148,7 +148,7 @@ export default defineComponent({ }; }), ]; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue b/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue index 75cf91f046..91a15ee907 100644 --- a/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue +++ b/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue @@ -154,7 +154,7 @@ export default defineComponent({ const response = await api.get('/permissions', { params }); permissions.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; @@ -173,7 +173,7 @@ export default defineComponent({ if (permission.id === id) return response.data.data; return permission; }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { refreshing.value = refreshing.value.filter((inProgressID) => inProgressID !== id); @@ -213,7 +213,7 @@ export default defineComponent({ await fetchPermissions(); resetActive.value = false; - } catch (err) { + } catch (err: any) { resetError.value = err; } finally { resetting.value = false; diff --git a/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts b/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts index d1d55c970c..8ef45188df 100644 --- a/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts +++ b/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts @@ -42,7 +42,7 @@ export default function usePermissions(role: Ref): UsablePermissions { }); permissions.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -60,7 +60,7 @@ export default function usePermissions(role: Ref): UsablePermissions { } await fetchPermissions(); - } catch (err) { + } catch (err: any) { error.value = err; } } @@ -76,7 +76,7 @@ export default function usePermissions(role: Ref): UsablePermissions { } await fetchPermissions(); - } catch (err) { + } catch (err: any) { error.value = err; } } diff --git a/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts b/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts index b092182cf1..4d1b769c0d 100644 --- a/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts +++ b/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts @@ -48,7 +48,7 @@ export default function useUpdatePermissions( permissions: {}, validation: {}, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { await refresh?.(); @@ -64,7 +64,7 @@ export default function useUpdatePermissions( permissions: {}, validation: {}, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { await refresh?.(); @@ -84,7 +84,7 @@ export default function useUpdatePermissions( try { await api.delete(`/permissions/${permission.id}`); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { await refresh?.(); @@ -117,7 +117,7 @@ export default function useUpdatePermissions( permissions: {}, validation: {}, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } } else { @@ -130,7 +130,7 @@ export default function useUpdatePermissions( permissions: {}, validation: {}, }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } } @@ -148,7 +148,7 @@ export default function useUpdatePermissions( try { await api.delete('/permissions', { data: permissions.value.map((p) => p.id) }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { await refresh?.(); diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue index ffee9ce89b..5a760486b3 100644 --- a/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue +++ b/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue @@ -48,7 +48,7 @@ export default defineComponent({ emit('refresh'); router.push(`/settings/roles/${props.roleKey || 'public'}`); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue b/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue index 6bca8e7e7e..9d6d5a4941 100644 --- a/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue +++ b/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue @@ -195,7 +195,7 @@ export default defineComponent({ const response = await api.get(`/permissions/${props.permissionKey}`); permission.value = response.data.data; - } catch (err) { + } catch (err: any) { if (err?.response?.status === 403) { router.push(`/settings/roles/${props.roleKey || 'public'}`); } else { diff --git a/app/src/modules/users/routes/collection.vue b/app/src/modules/users/routes/collection.vue index 4872a7314e..4ce8956781 100644 --- a/app/src/modules/users/routes/collection.vue +++ b/app/src/modules/users/routes/collection.vue @@ -278,7 +278,7 @@ export default defineComponent({ selection.value = []; confirmDelete.value = false; - } catch (err) { + } catch (err: any) { error.value = err; } finally { deleting.value = false; diff --git a/app/src/modules/users/routes/item.vue b/app/src/modules/users/routes/item.vue index 187cd47e1f..74084db234 100644 --- a/app/src/modules/users/routes/item.vue +++ b/app/src/modules/users/routes/item.vue @@ -474,7 +474,7 @@ export default defineComponent({ : null; roleName.value = response.data.data?.role?.name; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/routes/accept-invite/accept-invite.vue b/app/src/routes/accept-invite/accept-invite.vue index 199fc376de..1e49617636 100644 --- a/app/src/routes/accept-invite/accept-invite.vue +++ b/app/src/routes/accept-invite/accept-invite.vue @@ -77,7 +77,7 @@ export default defineComponent({ }); done.value = true; - } catch (err) { + } catch (err: any) { error.value = err; } finally { creating.value = false; diff --git a/app/src/routes/login/components/continue-as/continue-as.vue b/app/src/routes/login/components/continue-as/continue-as.vue index 6cda5b23e9..f1954cdc93 100644 --- a/app/src/routes/login/components/continue-as/continue-as.vue +++ b/app/src/routes/login/components/continue-as/continue-as.vue @@ -51,7 +51,7 @@ export default defineComponent({ name.value = userName(response.data.data); lastPage.value = response.data.data.last_page; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/routes/login/components/login-form/login-form.vue b/app/src/routes/login/components/login-form/login-form.vue index 36f9099617..a9f6eaaccb 100644 --- a/app/src/routes/login/components/login-form/login-form.vue +++ b/app/src/routes/login/components/login-form/login-form.vue @@ -90,7 +90,7 @@ export default defineComponent({ // Stores are hydrated after login const lastPage = userStore.currentUser?.last_page; router.push(lastPage || '/collections'); - } catch (err) { + } catch (err: any) { if (err.response?.data?.errors?.[0]?.extensions?.code === 'INVALID_OTP' && requiresTFA.value === false) { requiresTFA.value = true; } else { diff --git a/app/src/routes/login/components/sso-links.vue b/app/src/routes/login/components/sso-links.vue index d48ceb4fa2..d5f2879060 100644 --- a/app/src/routes/login/components/sso-links.vue +++ b/app/src/routes/login/components/sso-links.vue @@ -40,7 +40,7 @@ export default defineComponent({ link: `${getRootPath()}auth/oauth/${providerName.toLowerCase()}?redirect=${window.location.href}`, }; }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/routes/reset-password/request.vue b/app/src/routes/reset-password/request.vue index 50b51384f2..f524da269d 100644 --- a/app/src/routes/reset-password/request.vue +++ b/app/src/routes/reset-password/request.vue @@ -50,7 +50,7 @@ export default defineComponent({ }); done.value = true; - } catch (err) { + } catch (err: any) { error.value = err; } finally { sending.value = false; diff --git a/app/src/routes/reset-password/reset.vue b/app/src/routes/reset-password/reset.vue index 4b5480381c..ff9c63d0a0 100644 --- a/app/src/routes/reset-password/reset.vue +++ b/app/src/routes/reset-password/reset.vue @@ -66,7 +66,7 @@ export default defineComponent({ }); done.value = true; - } catch (err) { + } catch (err: any) { error.value = err; } finally { resetting.value = false; diff --git a/app/src/stores/collections.ts b/app/src/stores/collections.ts index 2d02e85c16..1e506eaee0 100644 --- a/app/src/stores/collections.ts +++ b/app/src/stores/collections.ts @@ -91,7 +91,7 @@ export const useCollectionsStore = defineStore({ type: 'success', title: i18n.global.t('update_collection_success'), }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } }, @@ -103,7 +103,7 @@ export const useCollectionsStore = defineStore({ type: 'success', title: i18n.global.t('delete_collection_success'), }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } }, diff --git a/app/src/stores/fields.ts b/app/src/stores/fields.ts index 751a0ec110..57ca335512 100644 --- a/app/src/stores/fields.ts +++ b/app/src/stores/fields.ts @@ -139,7 +139,7 @@ export const useFieldsStore = defineStore({ }); return field; - } catch (err) { + } catch (err: any) { // reset the changes if the api sync failed this.fields = stateClone; unexpectedError(err); @@ -169,7 +169,7 @@ export const useFieldsStore = defineStore({ return field; }); - } catch (err) { + } catch (err: any) { // reset the changes if the api sync failed this.fields = stateClone; unexpectedError(err); @@ -211,7 +211,7 @@ export const useFieldsStore = defineStore({ this.translateFields(); } - } catch (err) { + } catch (err: any) { // reset the changes if the api sync failed this.fields = stateClone; unexpectedError(err); @@ -227,7 +227,7 @@ export const useFieldsStore = defineStore({ try { await api.delete(`/fields/${collectionKey}/${fieldKey}`); - } catch (err) { + } catch (err: any) { this.fields = stateClone; unexpectedError(err); } diff --git a/app/src/stores/settings.ts b/app/src/stores/settings.ts index 4c4ddf750d..6f467d1c40 100644 --- a/app/src/stores/settings.ts +++ b/app/src/stores/settings.ts @@ -35,7 +35,7 @@ export const useSettingsStore = defineStore({ title: i18n.global.t('settings_update_success'), type: 'success', }); - } catch (err) { + } catch (err: any) { this.settings = settingsCopy; unexpectedError(err); } diff --git a/app/src/stores/user.ts b/app/src/stores/user.ts index bfd67dbc90..01a49bf786 100644 --- a/app/src/stores/user.ts +++ b/app/src/stores/user.ts @@ -32,7 +32,7 @@ export const useUserStore = defineStore({ }); this.currentUser = data.data; - } catch (error) { + } catch (error: any) { this.error = error; } finally { this.loading = false; diff --git a/app/src/utils/geometry/basemap.ts b/app/src/utils/geometry/basemap.ts index ba3d7d7bd9..a7c4d2f0e8 100644 --- a/app/src/utils/geometry/basemap.ts +++ b/app/src/utils/geometry/basemap.ts @@ -93,7 +93,7 @@ function setMapboxAccessToken(styleURL: string): void { const token = url.searchParams.get('access_token'); if (token) maplibre.accessToken = token; } - } catch (e) { + } catch { return; } } diff --git a/app/src/utils/upload-file/upload-file.ts b/app/src/utils/upload-file/upload-file.ts index bbd2205210..ab04253030 100644 --- a/app/src/utils/upload-file/upload-file.ts +++ b/app/src/utils/upload-file/upload-file.ts @@ -47,7 +47,7 @@ export default async function uploadFile( emitter.emit(Events.upload); return response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } diff --git a/app/src/utils/upload-files/upload-files.ts b/app/src/utils/upload-files/upload-files.ts index b947c729c0..5af5e2f166 100644 --- a/app/src/utils/upload-files/upload-files.ts +++ b/app/src/utils/upload-files/upload-files.ts @@ -36,7 +36,7 @@ export default async function uploadFiles( } return uploadedFiles; - } catch (err) { + } catch (err: any) { unexpectedError(err); } } diff --git a/app/src/views/private/components/comments-sidebar-detail/comment-input.vue b/app/src/views/private/components/comments-sidebar-detail/comment-input.vue index ca960f7423..1f3747cc1a 100644 --- a/app/src/views/private/components/comments-sidebar-detail/comment-input.vue +++ b/app/src/views/private/components/comments-sidebar-detail/comment-input.vue @@ -74,7 +74,7 @@ export default defineComponent({ title: t('post_comment_success'), type: 'success', }); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; diff --git a/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue b/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue index 9d5c6fa780..8d75f46dd5 100644 --- a/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue +++ b/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue @@ -117,7 +117,7 @@ export default defineComponent({ await api.delete(`/activity/comment/${props.activity.id}`); await props.refresh(); confirmDelete.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { deleting.value = false; diff --git a/app/src/views/private/components/comments-sidebar-detail/comment-item.vue b/app/src/views/private/components/comments-sidebar-detail/comment-item.vue index ca4f1b2638..22aebafb4c 100644 --- a/app/src/views/private/components/comments-sidebar-detail/comment-item.vue +++ b/app/src/views/private/components/comments-sidebar-detail/comment-item.vue @@ -86,7 +86,7 @@ export default defineComponent({ comment: edits.value, }); await props.refresh(); - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { savingEdits.value = false; diff --git a/app/src/views/private/components/comments-sidebar-detail/comments-sidebar-detail.vue b/app/src/views/private/components/comments-sidebar-detail/comments-sidebar-detail.vue index 5b14fab0f8..faa41e65ed 100644 --- a/app/src/views/private/components/comments-sidebar-detail/comments-sidebar-detail.vue +++ b/app/src/views/private/components/comments-sidebar-detail/comments-sidebar-detail.vue @@ -117,7 +117,7 @@ export default defineComponent({ } activity.value = orderBy(activityGrouped, ['date'], ['desc']); - } catch (error) { + } catch (error: any) { error.value = error; } finally { loading.value = false; diff --git a/app/src/views/private/components/drawer-batch/drawer-batch.vue b/app/src/views/private/components/drawer-batch/drawer-batch.vue index 2ad32eec6a..10672e0962 100644 --- a/app/src/views/private/components/drawer-batch/drawer-batch.vue +++ b/app/src/views/private/components/drawer-batch/drawer-batch.vue @@ -125,7 +125,7 @@ export default defineComponent({ internalActive.value = false; internalEdits.value = {}; - } catch (err) { + } catch (err: any) { validationErrors.value = err.response.data.errors .filter((err: APIError) => VALIDATION_TYPES.includes(err?.extensions?.code)) .map((err: APIError) => { diff --git a/app/src/views/private/components/drawer-item/drawer-item.vue b/app/src/views/private/components/drawer-item/drawer-item.vue index 66bd0ae860..a3acd898f9 100644 --- a/app/src/views/private/components/drawer-item/drawer-item.vue +++ b/app/src/views/private/components/drawer-item/drawer-item.vue @@ -302,7 +302,7 @@ export default defineComponent({ const response = await api.get(endpoint, { params: { fields } }); item.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; @@ -325,7 +325,7 @@ export default defineComponent({ ...(item.value || {}), [junctionFieldInfo.value.field]: response.data.data, }; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/views/private/components/file-lightbox/file-lightbox.vue b/app/src/views/private/components/file-lightbox/file-lightbox.vue index 0def231cf8..455ce4976c 100644 --- a/app/src/views/private/components/file-lightbox/file-lightbox.vue +++ b/app/src/views/private/components/file-lightbox/file-lightbox.vue @@ -99,7 +99,7 @@ export default defineComponent({ }); file.value = response.data.data; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/views/private/components/image-editor/image-editor.vue b/app/src/views/private/components/image-editor/image-editor.vue index c695c26993..7ac836ccd6 100644 --- a/app/src/views/private/components/image-editor/image-editor.vue +++ b/app/src/views/private/components/image-editor/image-editor.vue @@ -242,7 +242,7 @@ export default defineComponent({ }); imageData.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; @@ -269,7 +269,7 @@ export default defineComponent({ await api.patch(`/files/${props.id}`, formData); emit('refresh'); internalActive.value = false; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { saving.value = false; diff --git a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue index b0d085b63e..17b8c7088c 100644 --- a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue +++ b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue @@ -217,7 +217,7 @@ export default defineComponent({ revisionsByDate.value = orderBy(revisionsGrouped, ['date'], ['desc']); revisions.value = orderBy(response.data.data, ['activity.timestamp'], ['desc']); revisionsCount.value = response.data.meta.filter_count; - } catch (err) { + } catch (err: any) { unexpectedError(err); } finally { loading.value = false; diff --git a/app/src/views/private/components/user-popover/user-popover.vue b/app/src/views/private/components/user-popover/user-popover.vue index 23002ac7cd..90b49e5e7f 100644 --- a/app/src/views/private/components/user-popover/user-popover.vue +++ b/app/src/views/private/components/user-popover/user-popover.vue @@ -96,7 +96,7 @@ export default defineComponent({ }, }); data.value = response.data.data; - } catch (err) { + } catch (err: any) { error.value = err; } finally { loading.value = false; diff --git a/app/src/views/private/components/users-invite/users-invite.vue b/app/src/views/private/components/users-invite/users-invite.vue index c8d84dac3e..b883f82f95 100644 --- a/app/src/views/private/components/users-invite/users-invite.vue +++ b/app/src/views/private/components/users-invite/users-invite.vue @@ -94,7 +94,7 @@ export default defineComponent({ emails.value = ''; emit('update:modelValue', false); - } catch (err) { + } catch (err: any) { uniqueValidationErrors.value = err?.response?.data?.errors?.filter((error: APIError) => { return error.extensions?.code === 'RECORD_NOT_UNIQUE'; }); diff --git a/packages/cli/src/cli/commands/instance/disconnect.ts b/packages/cli/src/cli/commands/instance/disconnect.ts index e152f9d63d..5dd1b705bf 100644 --- a/packages/cli/src/cli/commands/instance/disconnect.ts +++ b/packages/cli/src/cli/commands/instance/disconnect.ts @@ -50,7 +50,7 @@ export default command( storage: new InstanceStorage(params.name, config.system), }); await sdk.auth.logout(); - } catch (_) { + } catch { // pass } diff --git a/packages/cli/src/core/command.ts b/packages/cli/src/core/command.ts index 4cdb475865..43f243c881 100644 --- a/packages/cli/src/core/command.ts +++ b/packages/cli/src/core/command.ts @@ -75,7 +75,7 @@ export function command(argv: string[]): Promise { intermediateStream.emit('error', error); }); - } catch (error) { + } catch (error: any) { intermediateStream.emit('error', error); } @@ -226,7 +226,7 @@ export class AzureBlobWebServicesStorage extends Storage { const result = await blockBlobClient.upload(content, content.length); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -245,7 +245,7 @@ export class AzureBlobWebServicesStorage extends Storage { path: (blob.name as string).substring(this.$root.length), }; } - } catch (e) { + } catch (e: any) { throw handleError(e, prefix); } } diff --git a/packages/drive-gcs/src/GoogleCloudStorage.ts b/packages/drive-gcs/src/GoogleCloudStorage.ts index eac52646a7..49d5391c51 100644 --- a/packages/drive-gcs/src/GoogleCloudStorage.ts +++ b/packages/drive-gcs/src/GoogleCloudStorage.ts @@ -81,7 +81,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await srcFile.copy(destFile); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, src); } } @@ -93,7 +93,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await this._file(location).delete(); return { raw: result, wasDeleted: true }; - } catch (e) { + } catch (e: any) { const error = handleError(e, location); if (error instanceof FileNotFound) { @@ -118,7 +118,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await this._file(location).exists(); return { exists: result[0], raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -131,7 +131,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await this._file(location).download(); return { content: result[0].toString(encoding), raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -143,7 +143,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await this._file(location).download(); return { content: result[0], raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -159,7 +159,7 @@ export class GoogleCloudStorage extends Storage { expires: Date.now() + expiry * 1000, }); return { signedUrl: result[0], raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -175,7 +175,7 @@ export class GoogleCloudStorage extends Storage { modified: new Date(result[0].updated), raw: result, }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -206,7 +206,7 @@ export class GoogleCloudStorage extends Storage { try { const result = await srcFile.move(destFile); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, src); } } @@ -227,7 +227,7 @@ export class GoogleCloudStorage extends Storage { const result = await file.save(content, { resumable: false }); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -255,7 +255,7 @@ export class GoogleCloudStorage extends Storage { path: file.name.substring(this.$root.length), }; } - } catch (e) { + } catch (e: any) { throw handleError(e, prefix); } } while (nextQuery); diff --git a/packages/drive-s3/src/AmazonWebServicesS3Storage.ts b/packages/drive-s3/src/AmazonWebServicesS3Storage.ts index 4e1bede2db..59b1bf0404 100644 --- a/packages/drive-s3/src/AmazonWebServicesS3Storage.ts +++ b/packages/drive-s3/src/AmazonWebServicesS3Storage.ts @@ -76,7 +76,7 @@ export class AmazonWebServicesS3Storage extends Storage { try { const result = await this.$driver.copyObject(params).promise(); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, src, this.$bucket); } } @@ -93,7 +93,7 @@ export class AmazonWebServicesS3Storage extends Storage { const result = await this.$driver.deleteObject(params).promise(); // Amazon does not inform the client if anything was deleted. return { raw: result, wasDeleted: null }; - } catch (e) { + } catch (e: any) { throw handleError(e, location, this.$bucket); } } @@ -116,7 +116,7 @@ export class AmazonWebServicesS3Storage extends Storage { try { const result = await this.$driver.headObject(params).promise(); return { exists: true, raw: result }; - } catch (e) { + } catch (e: any) { if (e.statusCode === 404) { return { exists: false, raw: e }; } else { @@ -152,7 +152,7 @@ export class AmazonWebServicesS3Storage extends Storage { const body = result.Body as Buffer; return { content: body, raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location, this.$bucket); } } @@ -174,7 +174,7 @@ export class AmazonWebServicesS3Storage extends Storage { const result = await this.$driver.getSignedUrlPromise('getObject', params); return { signedUrl: result, raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location, this.$bucket); } } @@ -194,7 +194,7 @@ export class AmazonWebServicesS3Storage extends Storage { modified: result.LastModified as Date, raw: result, }; - } catch (e) { + } catch (e: any) { throw handleError(e, location, this.$bucket); } } @@ -265,7 +265,7 @@ export class AmazonWebServicesS3Storage extends Storage { try { const result = await this.$driver.upload(params).promise(); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location, this.$bucket); } } @@ -299,7 +299,7 @@ export class AmazonWebServicesS3Storage extends Storage { path: path.substring(this.$root.length), }; } - } catch (e) { + } catch (e: any) { throw handleError(e, prefix, this.$bucket); } } while (continuationToken); diff --git a/packages/drive/src/LocalFileSystemStorage.ts b/packages/drive/src/LocalFileSystemStorage.ts index 61683e28fc..5f668ef5f4 100644 --- a/packages/drive/src/LocalFileSystemStorage.ts +++ b/packages/drive/src/LocalFileSystemStorage.ts @@ -47,7 +47,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.appendFile(this._fullPath(location), content); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -59,7 +59,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.copy(this._fullPath(src), this._fullPath(dest)); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, `${src} -> ${dest}`); } } @@ -71,7 +71,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.unlink(this._fullPath(location)); return { raw: result, wasDeleted: true }; - } catch (e) { + } catch (e: any) { const error = handleError(e, location); if (error instanceof FileNotFound) { @@ -96,7 +96,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.pathExists(this._fullPath(location)); return { exists: result, raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -108,7 +108,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.readFile(this._fullPath(location), encoding); return { content: result, raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -120,7 +120,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.readFile(this._fullPath(location)); return { content: result, raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -136,7 +136,7 @@ export class LocalFileSystemStorage extends Storage { modified: stat.mtime, raw: stat, }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -158,7 +158,7 @@ export class LocalFileSystemStorage extends Storage { try { const result = await fse.move(this._fullPath(src), this._fullPath(dest)); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, `${src} -> ${dest}`); } } @@ -171,7 +171,7 @@ export class LocalFileSystemStorage extends Storage { const { content: actualContent } = await this.get(location, 'utf-8'); return this.put(location, `${content}${actualContent}`); - } catch (e) { + } catch (e: any) { if (e instanceof FileNotFound) { return this.put(location, content); } @@ -197,7 +197,7 @@ export class LocalFileSystemStorage extends Storage { const result = await fse.outputFile(fullPath, content); return { raw: result }; - } catch (e) { + } catch (e: any) { throw handleError(e, location); } } @@ -230,7 +230,7 @@ export class LocalFileSystemStorage extends Storage { } } } - } catch (e) { + } catch (e: any) { if (e.code !== 'ENOENT') { throw handleError(e, originalPrefix); } diff --git a/packages/drive/tests/LocalFileSystemStorage.test.ts b/packages/drive/tests/LocalFileSystemStorage.test.ts index 7a4afac38b..339596f590 100644 --- a/packages/drive/tests/LocalFileSystemStorage.test.ts +++ b/packages/drive/tests/LocalFileSystemStorage.test.ts @@ -139,7 +139,7 @@ describe('Local Driver', () => { const { exists } = await storage.exists('i_will_be_deleted'); expect(exists).toBe(false); - } catch (error) { + } catch (error: any) { if (!isWindowsDefenderError(error)) { throw error; } @@ -255,7 +255,7 @@ describe('Local Driver', () => { try { await storage.get('non_existing', 'utf-8'); - } catch (error) { + } catch (error: any) { expect(error).toBeInstanceOf(CE.FileNotFound); } }); @@ -374,8 +374,8 @@ describe('Local Driver', () => { try { await streamToString(readStream); - } catch ({ code }) { - expect(code).toStrictEqual('ENOENT'); + } catch (err: any) { + expect(err.code).toStrictEqual('ENOENT'); } }); diff --git a/packages/drive/tests/exceptions.test.ts b/packages/drive/tests/exceptions.test.ts index c3941483d2..8675196297 100644 --- a/packages/drive/tests/exceptions.test.ts +++ b/packages/drive/tests/exceptions.test.ts @@ -13,7 +13,7 @@ describe('AuthorizationRequired', function () { it('sets the raw exception object', function () { try { throw new AuthorizationRequired(new Error('test'), '/some/path'); - } catch (err) { + } catch (err: any) { expect(err.raw).toBeDefined(); expect(err.raw.message).toBe('test'); } @@ -24,7 +24,7 @@ describe('DriverNotSupported', function () { it('driver should be set', function () { try { throw DriverNotSupported.driver('alibaba'); - } catch (err) { + } catch (err: any) { expect(err.driver).toBeDefined(); expect(err.driver).toBe('alibaba'); } @@ -35,7 +35,7 @@ describe('DriverNotSupported', function () { it('driver should be set', function () { try { throw DriverNotSupported.driver('alibaba'); - } catch (err) { + } catch (err: any) { expect(err.driver).toBeDefined(); expect(err.driver).toBe('alibaba'); } @@ -80,7 +80,7 @@ describe('NoSuchBucket', function () { it('constructor', function () { try { throw new NoSuchBucket(new Error('test'), 'bucket'); - } catch (err) { + } catch (err: any) { expect(err.raw).toBeDefined(); expect(err.raw.message).toBe('test'); expect(err.status).toBe(500); @@ -93,7 +93,7 @@ describe('PermissionMissing', function () { it('constructor', function () { try { throw new PermissionMissing(new Error('test'), 'bucket'); - } catch (err) { + } catch (err: any) { expect(err.raw).toBeDefined(); expect(err.raw.message).toBe('test'); expect(err.status).toBe(500); @@ -106,7 +106,7 @@ describe('UnknownException', function () { it('constructor', function () { try { throw new UnknownException(new Error('test'), 'ERR_CODE', __filename); - } catch (err) { + } catch (err: any) { expect(err.raw).toBeDefined(); expect(err.raw.message).toBe('test'); expect(err.message).toContain(__filename); @@ -121,7 +121,7 @@ describe('WrongKeyPath ', function () { it('constructor', function () { try { throw new WrongKeyPath(new Error('test'), 'some/path'); - } catch (err) { + } catch (err: any) { expect(err.raw).toBeDefined(); expect(err.raw.message).toBe('test'); expect(err.message).toContain('some/path'); diff --git a/packages/gatsby-source-directus/gatsby-node.js b/packages/gatsby-source-directus/gatsby-node.js index 93f5e681df..db47499c2a 100644 --- a/packages/gatsby-source-directus/gatsby-node.js +++ b/packages/gatsby-source-directus/gatsby-node.js @@ -36,7 +36,7 @@ function normalizeEndpoint(endpoint, query = {}) { graphql: graphql.toString(), base: base.toString(), }; - } catch (err) { + } catch { return null; } } diff --git a/packages/schema/src/dialects/postgres.ts b/packages/schema/src/dialects/postgres.ts index 3741277713..9a598560a3 100644 --- a/packages/schema/src/dialects/postgres.ts +++ b/packages/schema/src/dialects/postgres.ts @@ -111,7 +111,7 @@ export default class Postgres extends KnexPostgres implements SchemaInspector { } try { await this.knex.raw('select postgis_version()'); - } catch (error) { + } catch { return columns; } diff --git a/packages/sdk/src/base/transport/axios-transport.ts b/packages/sdk/src/base/transport/axios-transport.ts index 23009fd2c8..f5e205d2f4 100644 --- a/packages/sdk/src/base/transport/axios-transport.ts +++ b/packages/sdk/src/base/transport/axios-transport.ts @@ -132,7 +132,7 @@ export class AxiosTransport implements ITransport { } return content; - } catch (err) { + } catch (err: any) { if (!err || err instanceof Error === false) { throw err; } diff --git a/packages/sdk/tests/base/auth.test.ts b/packages/sdk/tests/base/auth.test.ts index 5788a4861a..2700f2eaa4 100644 --- a/packages/sdk/tests/base/auth.test.ts +++ b/packages/sdk/tests/base/auth.test.ts @@ -45,7 +45,7 @@ describe('auth', function () { } ); fail('Should have failed'); - } catch (err) { + } catch (err: any) { expect(err).toBeInstanceOf(InvalidRefreshTime); } }); @@ -86,7 +86,7 @@ describe('auth', function () { password: 'invalid_password', }); fail('Should have thrown due to error response'); - } catch (err) { + } catch { // } @@ -114,7 +114,7 @@ describe('auth', function () { try { await sdk.auth.static('token'); fail('Should have thrown due to error response'); - } catch (err) { + } catch { // } diff --git a/packages/sdk/tests/base/transport/axios.test.ts b/packages/sdk/tests/base/transport/axios.test.ts index 811c671bfa..3d14c0a52c 100644 --- a/packages/sdk/tests/base/transport/axios.test.ts +++ b/packages/sdk/tests/base/transport/axios.test.ts @@ -50,7 +50,7 @@ describe('axios transport', function () { try { await transport[method](route); fail(); - } catch (err) { + } catch (err: any) { expect(err).toBeInstanceOf(TransportError); } }); @@ -74,7 +74,7 @@ describe('axios transport', function () { try { await transport[method](route); fail(); - } catch (err) { + } catch (err: any) { const terr = err as TransportError; expect(terr).toBeInstanceOf(TransportError); expect(terr.response?.status).toBe(403); @@ -95,7 +95,7 @@ describe('axios transport', function () { try { await transport[method](route); fail(); - } catch (err) { + } catch (err: any) { const terr = err as TransportError; expect(terr).toBeInstanceOf(TransportError); expect(terr.response).toBeUndefined(); @@ -123,7 +123,7 @@ describe('axios transport', function () { try { await transport.get('/route'); fail(); - } catch (err) { + } catch (err: any) { const terr = err as TransportError; expect(terr).toBeInstanceOf(TransportError); expect(terr.response).toBeUndefined();