From 1e4c20073cddfcbdddd621a0021744121d98e7cd Mon Sep 17 00:00:00 2001 From: "GitStart-Cal.com" <121884634+gitstart-calcom@users.noreply.github.com> Date: Fri, 25 Aug 2023 19:56:20 +0800 Subject: [PATCH] chore: fix all `@typescript-eslint/no-non-null-assertion` warnings (#10635) Co-authored-by: gitstart-calcom Co-authored-by: Peer Richelsen Co-authored-by: Keith Williams --- .../getting-started/steps-views/SetupAvailability.tsx | 2 +- apps/web/pages/404.tsx | 1 + apps/web/playwright/fixtures/users.ts | 2 +- packages/lib/hooks/useTypedQuery.ts | 1 + .../trpc/server/routers/viewer/admin/listPaginated.handler.ts | 2 +- .../server/routers/viewer/organizations/create.handler.ts | 4 +++- .../routers/viewer/organizations/listMembers.handler.ts | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx index 12147e2e7d..e895a862e7 100644 --- a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx +++ b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx @@ -22,7 +22,7 @@ const SetupAvailability = (props: ISetupAvailabilityProps) => { const scheduleId = defaultScheduleId === null ? undefined : defaultScheduleId; const queryAvailability = trpc.viewer.availability.schedule.get.useQuery( - { scheduleId }, + { scheduleId: defaultScheduleId ?? undefined }, { enabled: !!scheduleId, } diff --git a/apps/web/pages/404.tsx b/apps/web/pages/404.tsx index 61a6f4a804..978edac7a1 100644 --- a/apps/web/pages/404.tsx +++ b/apps/web/pages/404.tsx @@ -75,6 +75,7 @@ export default function Custom404() { )}` ); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); const isSuccessPage = pathname?.startsWith("/booking"); diff --git a/apps/web/playwright/fixtures/users.ts b/apps/web/playwright/fixtures/users.ts index b2caf0fea5..3dc815cec6 100644 --- a/apps/web/playwright/fixtures/users.ts +++ b/apps/web/playwright/fixtures/users.ts @@ -542,7 +542,7 @@ export async function apiLogin( .then((json) => json.csrfToken); const data = { email: user.email ?? `${user.username}@example.com`, - password: user.password ?? user.username!, + password: user.password ?? user.username, callbackURL: "http://localhost:3000/", redirect: "false", json: "true", diff --git a/packages/lib/hooks/useTypedQuery.ts b/packages/lib/hooks/useTypedQuery.ts index 1d64d56349..ab42038580 100644 --- a/packages/lib/hooks/useTypedQuery.ts +++ b/packages/lib/hooks/useTypedQuery.ts @@ -57,6 +57,7 @@ export function useTypedQuery(schema: T) { search.set(String(key), String(value)); router.replace(`${pathname}?${search.toString()}`); }, + // eslint-disable-next-line react-hooks/exhaustive-deps [parsedQuery, router] ); diff --git a/packages/trpc/server/routers/viewer/admin/listPaginated.handler.ts b/packages/trpc/server/routers/viewer/admin/listPaginated.handler.ts index 3d94300e1a..59924347e0 100644 --- a/packages/trpc/server/routers/viewer/admin/listPaginated.handler.ts +++ b/packages/trpc/server/routers/viewer/admin/listPaginated.handler.ts @@ -56,7 +56,7 @@ export const listPaginatedHandler = async ({ input }: GetOptions) => { let nextCursor: typeof cursor | undefined = undefined; if (users && users.length > limit) { const nextItem = users.pop(); - nextCursor = nextItem!.id; + nextCursor = nextItem?.id; } return { diff --git a/packages/trpc/server/routers/viewer/organizations/create.handler.ts b/packages/trpc/server/routers/viewer/organizations/create.handler.ts index 76a37f547a..2cfabcf5fe 100644 --- a/packages/trpc/server/routers/viewer/organizations/create.handler.ts +++ b/packages/trpc/server/routers/viewer/organizations/create.handler.ts @@ -161,12 +161,14 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => { }, }); + if (!createOwnerOrg.organizationId) throw Error("User not created"); + await prisma.membership.create({ data: { userId: createOwnerOrg.id, role: MembershipRole.OWNER, accepted: true, - teamId: createOwnerOrg.organizationId!, + teamId: createOwnerOrg.organizationId, }, }); diff --git a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts index 2f1d7f7d26..77484e7bee 100644 --- a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts +++ b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts @@ -68,7 +68,7 @@ export const listMembersHandler = async ({ ctx, input }: GetOptions) => { let nextCursor: typeof cursor | undefined = undefined; if (teamMembers && teamMembers.length > limit) { const nextItem = teamMembers.pop(); - nextCursor = nextItem!.id; + nextCursor = nextItem?.id; } const members = teamMembers?.map((member) => {