fix: uncaught types errors in invite members team handler (calcom#16109)

avantika-rawat · Aug 19, 2024 · a091c60 · a091c60
1 parent bba7fc1
commit a091c60
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 9 deletions.
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
@@ -10,6 +10,8 @@
     "lint": "eslint . --ext .ts,.tsx",
     "lint:fix": "eslint . --ext .ts,.tsx --fix",
     "build": "yarn trpc:generate || true",
+    "dev": "yarn build",
+    "dx": "yarn build",
     "trpc:generate": "yarn tsc --project tsconfig.json"
   },
   "dependencies": {

diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/__mocks__/inviteMemberUtils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/__mocks__/inviteMemberUtils.ts
@@ -1,6 +1,8 @@
 import { beforeEach, vi, expect } from "vitest";
 import { mockReset, mockDeep } from "vitest-mock-extended";
 
+import type { MembershipRole } from "@calcom/prisma/enums";
+
 import type * as inviteMemberUtils from "../utils";
 
 vi.mock("../utils", async () => {
@@ -70,16 +72,18 @@ export const inviteMemberutilsScenarios = {
         team: any;
         invitations: {
           usernameOrEmail: string;
+          newRole?: MembershipRole;
         }[];
       }
     ) {
       inviteMemberUtilsMock.findUsersWithInviteStatus.mockImplementation(({ invitations, team }) => {
         const allInvitationsExist = invitations.every((invitation) =>
           forInput.invitations.find((i) => i.usernameOrEmail === invitation.usernameOrEmail)
         );
-        if (forInput.team.id == team.id && allInvitationsExist) return returnVal;
+        if (forInput.team.id == team.id && allInvitationsExist) return Promise.resolve(returnVal);
+        return Promise.resolve([]);
       });
-      return returnVal;
+      return Promise.resolve(returnVal);
     },
   },
   getOrgConnectionInfo: {
@@ -102,7 +106,7 @@ export const expects = {
     teamId,
   }: {
     emails: string[];
-    team;
+    team: any[];
     inviterName: string;
     teamId: number;
     isOrg: boolean;

diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.test.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.test.ts
@@ -242,7 +242,7 @@ describe("inviteMemberHandler", () => {
         ];
 
         const retValueOfFindUsersWithInviteStatus =
-          inviteMemberUtilsScenarios.findUsersWithInviteStatus.useAdvancedMock(
+          await inviteMemberUtilsScenarios.findUsersWithInviteStatus.useAdvancedMock(
             [
               {
                 ...usersToBeInvited[0],

diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts
@@ -62,14 +62,14 @@ const mockedReturnSuccessCheckPerms = {
     isPrivate: false,
     logoUrl: "",
     calVideoLogo: "",
+    isOrganization: false,
   },
 };
 
 const mockedRegularTeam: TeamWithParent = {
   id: 1,
   name: "Team A",
   slug: null,
-  logo: null,
   appLogo: null,
   appIconLogo: null,
   bio: null,
@@ -93,6 +93,7 @@ const mockedRegularTeam: TeamWithParent = {
   bannerUrl: "",
   isPlatform: false,
   smsLockState: "LOCKED",
+  createdByOAuthClientId: null,
 };
 
 const mockedSubTeam = {
@@ -254,6 +255,11 @@ describe("Invite Member Utils", () => {
           isOrganizationConfigured: false,
           isOrganizationVerified: true,
           orgAutoAcceptEmail: "example.com",
+          organizationId: 1,
+          lockEventTypeCreationForUsers: false,
+          adminGetsNoSlotsNotification: false,
+          isAdminReviewed: false,
+          isAdminAPIEnabled: false,
         },
         slug: "abc",
         parent: null,
@@ -279,6 +285,11 @@ describe("Invite Member Utils", () => {
             isOrganizationConfigured: false,
             isOrganizationVerified: false,
             orgAutoAcceptEmail: "example.com",
+            organizationId: 1,
+            lockEventTypeCreationForUsers: false,
+            adminGetsNoSlotsNotification: false,
+            isAdminReviewed: false,
+            isAdminAPIEnabled: false,
           },
         },
       };

diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/types.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/types.ts
@@ -1,4 +1,5 @@
-import type { Team } from "@calcom/prisma/client";
+import type { Team } from "@prisma/client";
+
 import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
 
 import type { TInviteMemberInputSchema } from "./inviteMember.schema";

diff --git a/packages/trpc/tsconfig.json b/packages/trpc/tsconfig.json
@@ -1,12 +1,40 @@
 {
   "extends": "@calcom/tsconfig/react-library.json",
-  "include": ["client", "next", "react", "server"],
+  "paths": {
+    "~/*": ["/*"],
+    "@calcom/app-store": ["../app-store"],
+    "@calcom/app-store/*": ["../app-store/*"],
+    "@calcom/dayjs": ["../dayjs"],
+    "@calcom/dayjs/*": ["../dayjs/*"],
+    "@calcom/features": ["../features"],
+    "@calcom/features/*": ["../features/*"],
+    "@calcom/lib": ["../lib"],
+    "@calcom/lib/*": ["../lib/*"],
+    "@calcom/platform-constants": ["../platform/constants/index.ts"],
+    "@calcom/platform-types": ["../platform/types/index.ts"],
+    "@calcom/platform-utils": ["../platform/utils/index.ts"],
+    "@calcom/prisma": ["../prisma"],
+    "@calcom/prisma/*": ["../prisma/*"]
+  },
+  "include": [
+    "../types/@wojtekmaj__react-daterange-picker.d.ts",
+    "../types/business-days-plugin.d.ts",
+    "../types/next-auth.d.ts",
+    "../types/next.d.ts",
+    "../types/window.d.ts",
+    "client",
+    "next",
+    "react",
+    "server"
+  ],
   "compilerOptions": {
     "isolatedModules": false,
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
+    "experimentalDecorators": true,
     "declarationMap": false,
+    "resolveJsonModule": true,
     "outFile": "types/router.d.ts"
   }
 }
diff --git a/turbo.json b/turbo.json
@@ -128,11 +128,11 @@
       "outputs": ["dist/**", "build/**"]
     },
     "dev": {
-      "dependsOn": ["//#env-check:common", "//#env-check:app-store"],
+      "dependsOn": ["//#env-check:common", "//#env-check:app-store", "^dev"],
       "cache": false
     },
     "dx": {
-      "dependsOn": ["//#env-check:common", "//#env-check:app-store"],
+      "dependsOn": ["//#env-check:common", "//#env-check:app-store", "^dx"],
       "cache": false
     },
     "lint": {