refactor some actions

Author: brendan-kellam

packages/web/src/actions.ts

@@ -2,7 +2,8 @@ import { cookies } from "next/headers";
 import { auth } from "@/auth";
 import { HOME_VIEW_COOKIE_NAME } from "@/lib/constants";
 import { HomeView } from "@/hooks/useHomeView";
-import { getConnectionStats, getOrgAccountRequests } from "@/actions";
+import { getConnectionStats } from "@/actions";
+import { getOrgAccountRequests } from "@/features/userManagement/actions";
 import { isServiceError } from "@/lib/utils";
 import { ServiceErrorException } from "@/lib/serviceError";
 import { __unsafePrisma } from "@/prisma";

packages/web/src/app/(app)/@sidebar/components/defaultSidebar/index.tsx

@@ -21,7 +21,6 @@ import { SubmitJoinRequest } from "./components/submitJoinRequest";
 import { env } from "@sourcebot/shared";
 import { hasEntitlement, isAnonymousAccessEnabled } from "@/lib/entitlements";
 import { GcpIapAuth } from "./components/gcpIapAuth";
-import { getMemberApprovalRequired } from "@/actions";
 import { JoinOrganizationCard } from "@/app/components/joinOrganizationCard";
 import { LogoutEscapeHatch } from "@/app/components/logoutEscapeHatch";
 import { GitHubStarToast } from "./components/githubStarToast";
@@ -74,8 +73,7 @@ export default async function Layout(props: LayoutProps) {
         // the join organization card to allow them to join the org if seat capacity is freed up. This card handles checking if the org has available seats.
         // 2. The org requires member approval, and they haven't been approved yet. In this case, we allow them to submit a request to join the org.
         if (!membership) {
-            const memberApprovalRequired = await getMemberApprovalRequired();
-            if (!memberApprovalRequired) {
+            if (!org.memberApprovalRequired) {
                 return (
                     <div className="min-h-screen flex items-center justify-center p-6">
                         <LogoutEscapeHatch className="absolute top-0 right-0 p-6" />

packages/web/src/app/(app)/layout.tsx

@@ -3,7 +3,8 @@ import { Metadata } from "next"
 import { redirect } from "next/navigation";
 import { auth } from "@/auth";
 import { isServiceError } from "@/lib/utils";
-import { getConnectionStats, getOrgAccountRequests } from "@/actions";
+import { getConnectionStats } from "@/actions";
+import { getOrgAccountRequests } from "@/features/userManagement/actions";
 import { ServiceErrorException } from "@/lib/serviceError";
 import { OrgRole } from "@prisma/client";
 import { env } from "@sourcebot/shared";

packages/web/src/app/(app)/settings/layout.tsx

@@ -8,10 +8,10 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { useCallback, useState } from "react";
 import { z } from "zod";
-import { PlusCircleIcon, Loader2, AlertCircle, AlertTriangle } from "lucide-react";
+import { PlusCircleIcon, Loader2, AlertTriangle } from "lucide-react";
 import { OrgRole } from "@prisma/client";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog";
-import { createInvites } from "@/actions";
+import { createInvites } from "@/features/userManagement/actions";
 import { isServiceError } from "@/lib/utils";
 import { useToast } from "@/components/hooks/use-toast";
 import { useRouter } from "next/navigation";

packages/web/src/app/(app)/settings/members/components/inviteMemberCard.tsx

@@ -11,7 +11,7 @@ import { createPathWithQueryParams, isServiceError } from "@/lib/utils";
 import { UserAvatar } from "@/components/userAvatar";
 import { Copy, MoreVertical, Search } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
-import { cancelInvite } from "@/actions";
+import { cancelInvite } from "@/features/userManagement/actions";
 import { useRouter } from "next/navigation";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 interface Invite {

packages/web/src/app/(app)/settings/members/components/invitesList.tsx

@@ -10,7 +10,7 @@ import { isServiceError } from "@/lib/utils";
 import { UserAvatar } from "@/components/userAvatar";
 import { CheckCircle, Search, XCircle } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
-import { approveAccountRequest, rejectAccountRequest } from "@/actions";
+import { rejectAccountRequest, approveAccountRequest } from "@/features/userManagement/actions";
 import { useRouter } from "next/navigation";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 

packages/web/src/app/(app)/settings/members/components/requestsList.tsx

@@ -1,11 +1,10 @@
 import { MembersList } from "./components/membersList";
-import { getOrgMembers } from "@/actions";
+import { getOrgMembers, getOrgInvites, getOrgAccountRequests } from "@/features/userManagement/actions";
 import { isServiceError } from "@/lib/utils";
 import { InviteMemberCard } from "./components/inviteMemberCard";
 import { Tabs, TabsContent } from "@/components/ui/tabs";
 import { TabSwitcher } from "@/components/ui/tab-switcher";
 import { InvitesList } from "./components/invitesList";
-import { getOrgInvites, getMe, getOrgAccountRequests } from "@/actions";
 import { ServiceErrorException } from "@/lib/serviceError";
 import { hasEntitlement } from "@/lib/entitlements";
 import { RequestsList } from "./components/requestsList";
@@ -22,18 +21,13 @@ type MembersSettingsPageProps = {
     }>
 }
 
-export default authenticatedPage<MembersSettingsPageProps>(async ({ org, role }, props) => {
+export default authenticatedPage<MembersSettingsPageProps>(async ({ org, role, user }, props) => {
     const searchParams = await props.searchParams;
 
     const {
         tab
     } = searchParams;
 
-    const me = await getMe();
-    if (isServiceError(me)) {
-        throw new ServiceErrorException(me);
-    }
-
     const members = await getOrgMembers();
     if (isServiceError(members)) {
         throw new ServiceErrorException(members);
@@ -132,7 +126,7 @@ export default authenticatedPage<MembersSettingsPageProps>(async ({ org, role },
                 <TabsContent value="members">
                     <MembersList
                         members={members}
-                        currentUserId={me.id}
+                        currentUserId={user.id}
                         currentUserRole={role}
                         orgName={org.name}
                         hasOrgManagement={await hasEntitlement('org-management')}

packages/web/src/app/(app)/settings/members/page.tsx

@@ -1,15 +1,15 @@
 "use server";
 
-import { isServiceError } from "@/lib/utils";
-import { notAuthenticated, notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
-import { sew } from "@/middleware/sew";
+import { createAudit } from "@/ee/features/audit/audit";
 import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
-import { StatusCodes } from "http-status-codes";
+import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
 import { ErrorCode } from "@/lib/errorCodes";
+import { notAuthenticated, notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
+import { isServiceError } from "@/lib/utils";
+import { sew } from "@/middleware/sew";
 import { getAuthenticatedUser } from "@/middleware/withAuth";
 import { __unsafePrisma } from "@/prisma";
-import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
-import { createAudit } from "@/ee/features/audit/audit";
+import { StatusCodes } from "http-status-codes";
 
 export const joinOrganization = async (inviteLinkId?: string) => sew(async () => {
     const authResult = await getAuthenticatedUser();
@@ -180,4 +180,3 @@ export const getInviteInfo = async (inviteId: string) => sew(async () => {
         }
     };
 });
-