From 5ff1bb366cb622b88a3d50239f92dd70c0e109c1 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Thu, 14 Nov 2024 11:14:08 -0500 Subject: [PATCH] chore: misc cleanup (#9206) - Proper error logger usage - Some no-fallthrough warning cleanup --- packages/db-mongodb/package.json | 1 - packages/db-mongodb/src/queries/mock.js | 0 .../src/utilities/buildProjectionFromSelect.ts | 1 - .../src/predefinedMigrations/v2-v3/traverseFields.ts | 3 +-- packages/db-sqlite/src/connect.ts | 1 - packages/db-sqlite/src/schema/build.ts | 2 +- packages/db-sqlite/src/schema/traverseFields.ts | 10 ++++------ .../src/predefinedMigrations/v2-v3/traverseFields.ts | 3 +-- .../src/collections/FormSubmissions/hooks/sendEmail.ts | 7 +++---- .../plugin-search/src/Search/hooks/syncWithSearch.ts | 7 +++++-- packages/ui/src/utilities/buildTableState.ts | 1 - 11 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 packages/db-mongodb/src/queries/mock.js diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 78a5728be..1acccdb50 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -29,7 +29,6 @@ "types": "./src/index.ts", "files": [ "dist", - "mock.js", "predefinedMigrations" ], "scripts": { diff --git a/packages/db-mongodb/src/queries/mock.js b/packages/db-mongodb/src/queries/mock.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts b/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts index 0b6b7eee1..a2ca36258 100644 --- a/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts +++ b/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts @@ -106,7 +106,6 @@ const traverseFields = ({ switch (field.type) { case 'array': case 'group': - case 'tab': { let fieldSelect: SelectType diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts index a315922f2..7f362a8f7 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts @@ -58,8 +58,8 @@ export const traverseFields = (args: Args) => { }) }) } - case 'collapsible': + case 'collapsible': case 'row': { return traverseFields({ ...args, @@ -84,7 +84,6 @@ export const traverseFields = (args: Args) => { } case 'relationship': - case 'upload': { if (typeof field.relationTo === 'string') { if (field.type === 'upload' || !field.hasMany) { diff --git a/packages/db-sqlite/src/connect.ts b/packages/db-sqlite/src/connect.ts index 6662c1dd1..eb3371763 100644 --- a/packages/db-sqlite/src/connect.ts +++ b/packages/db-sqlite/src/connect.ts @@ -1,5 +1,4 @@ import type { DrizzleAdapter } from '@payloadcms/drizzle/types' -import type { LibSQLDatabase } from 'drizzle-orm/libsql' import type { Connect } from 'payload' import { createClient } from '@libsql/client' diff --git a/packages/db-sqlite/src/schema/build.ts b/packages/db-sqlite/src/schema/build.ts index 2b10c61d6..1807747e9 100644 --- a/packages/db-sqlite/src/schema/build.ts +++ b/packages/db-sqlite/src/schema/build.ts @@ -8,7 +8,7 @@ import type { SQLiteTableWithColumns, UniqueConstraintBuilder, } from 'drizzle-orm/sqlite-core' -import type { Field, SanitizedJoins } from 'payload' +import type { Field } from 'payload' import { buildIndexName, createTableName } from '@payloadcms/drizzle' import { relations, sql } from 'drizzle-orm' diff --git a/packages/db-sqlite/src/schema/traverseFields.ts b/packages/db-sqlite/src/schema/traverseFields.ts index ef2b692af..b24eefa68 100644 --- a/packages/db-sqlite/src/schema/traverseFields.ts +++ b/packages/db-sqlite/src/schema/traverseFields.ts @@ -1,7 +1,7 @@ import type { DrizzleAdapter } from '@payloadcms/drizzle/types' import type { Relation } from 'drizzle-orm' import type { IndexBuilder, SQLiteColumnBuilder } from 'drizzle-orm/sqlite-core' -import type { Field, SanitizedJoins, TabAsField } from 'payload' +import type { Field, TabAsField } from 'payload' import { buildIndexName, @@ -472,16 +472,15 @@ export const traverseFields = ({ targetTable[fieldName] = withDefault(integer(columnName, { mode: 'boolean' }), field) break } + case 'code': - case 'email': - case 'textarea': { targetTable[fieldName] = withDefault(text(columnName), field) break } - case 'collapsible': + case 'collapsible': case 'row': { const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull const { @@ -654,7 +653,6 @@ export const traverseFields = ({ } case 'json': - case 'richText': { targetTable[fieldName] = withDefault(text(columnName, { mode: 'json' }), field) break @@ -691,8 +689,8 @@ export const traverseFields = ({ case 'point': { break } - case 'radio': + case 'radio': case 'select': { const options = field.options.map((option) => { if (optionIsObject(option)) { diff --git a/packages/db-vercel-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts b/packages/db-vercel-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts index 2c9eeadb5..025b492ba 100644 --- a/packages/db-vercel-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts +++ b/packages/db-vercel-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts @@ -58,8 +58,8 @@ export const traverseFields = (args: Args) => { }) }) } - case 'collapsible': + case 'collapsible': case 'row': { return traverseFields({ ...args, @@ -84,7 +84,6 @@ export const traverseFields = (args: Args) => { } case 'relationship': - case 'upload': { if (typeof field.relationTo === 'string') { if (field.type === 'upload' || !field.hasMany) { diff --git a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts index 239aeeb7f..5f9506cb4 100644 --- a/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts +++ b/packages/plugin-form-builder/src/collections/FormSubmissions/hooks/sendEmail.ts @@ -87,9 +87,8 @@ export const sendEmail = async ( return emailPromise } catch (err: unknown) { payload.logger.error({ - err: `Error while sending email to address: ${to}. Email not sent: ${JSON.stringify( - err, - )}`, + err, + msg: `Error while sending email to address: ${to}. Email not sent.`, }) } }), @@ -99,7 +98,7 @@ export const sendEmail = async ( } } catch (err: unknown) { const msg = `Error while sending one or more emails in form submission id: ${formSubmissionID}.` - payload.logger.error({ err: msg }) + payload.logger.error({ err, msg }) } } diff --git a/packages/plugin-search/src/Search/hooks/syncWithSearch.ts b/packages/plugin-search/src/Search/hooks/syncWithSearch.ts index 20527c4f7..154300eb2 100644 --- a/packages/plugin-search/src/Search/hooks/syncWithSearch.ts +++ b/packages/plugin-search/src/Search/hooks/syncWithSearch.ts @@ -113,7 +113,10 @@ export const syncWithSearch: SyncWithSearch = async (args) => { where: { id: { in: duplicativeDocIDs } }, }) } catch (err: unknown) { - payload.logger.error(`Error deleting duplicative ${searchSlug} documents.`) + payload.logger.error({ + err, + msg: `Error deleting duplicative ${searchSlug} documents.`, + }) } } @@ -134,7 +137,7 @@ export const syncWithSearch: SyncWithSearch = async (args) => { req, }) } catch (err: unknown) { - payload.logger.error(`Error updating ${searchSlug} document.`) + payload.logger.error({ err, msg: `Error updating ${searchSlug} document.` }) } } if (deleteDrafts && status === 'draft') { diff --git a/packages/ui/src/utilities/buildTableState.ts b/packages/ui/src/utilities/buildTableState.ts index fb5df6bdc..c6a56e5cb 100644 --- a/packages/ui/src/utilities/buildTableState.ts +++ b/packages/ui/src/utilities/buildTableState.ts @@ -213,7 +213,6 @@ export const buildTableState = async ( } const fields = collectionConfig.fields - const clientFields = clientCollectionConfig?.fields || [] let docs = docsFromArgs let data: PaginatedDocs