Admins can view all regions and switch at will

Author: matt-aitken

apps/webapp/app/presenters/v3/RegionsPresenter.server.ts

@@ -12,10 +12,19 @@ export type Region = {
   location?: string;
   staticIPs?: string | null;
   isDefault: boolean;
+  isHidden: boolean;
 };
 
 export class RegionsPresenter extends BasePresenter {
-  public async call({ userId, projectSlug }: { userId: User["id"]; projectSlug: Project["slug"] }) {
+  public async call({
+    userId,
+    projectSlug,
+    isAdmin = false,
+  }: {
+    userId: User["id"];
+    projectSlug: Project["slug"];
+    isAdmin?: boolean;
+  }) {
     const project = await this._replica.project.findFirst({
       select: {
         id: true,
@@ -56,16 +65,18 @@ export class RegionsPresenter extends BasePresenter {
         cloudProvider: true,
         location: true,
         staticIPs: true,
+        hidden: true,
       },
-      where:
-        // Hide hidden unless they're allowed to use them
+      where: isAdmin
+        ? undefined
+        : // Hide hidden unless they're allowed to use them
         project.allowedMasterQueues.length > 0
-          ? {
-              masterQueue: { in: project.allowedMasterQueues },
-            }
-          : {
-              hidden: false,
-            },
+        ? {
+            masterQueue: { in: project.allowedMasterQueues },
+          }
+        : {
+            hidden: false,
+          },
       orderBy: {
         name: "asc",
       },
@@ -79,6 +90,7 @@ export class RegionsPresenter extends BasePresenter {
       location: region.location ?? undefined,
       staticIPs: region.staticIPs ?? undefined,
       isDefault: region.id === defaultWorkerInstanceGroupId,
+      isHidden: region.hidden,
     }));
 
     if (project.defaultWorkerGroupId) {
@@ -90,6 +102,7 @@ export class RegionsPresenter extends BasePresenter {
           cloudProvider: true,
           location: true,
           staticIPs: true,
+          hidden: true,
         },
         where: { id: project.defaultWorkerGroupId },
       });
@@ -109,6 +122,7 @@ export class RegionsPresenter extends BasePresenter {
           location: defaultWorkerGroup.location ?? undefined,
           staticIPs: defaultWorkerGroup.staticIPs ?? undefined,
           isDefault: true,
+          isHidden: defaultWorkerGroup.hidden,
         });
       }
     }

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx

@@ -46,10 +46,11 @@ import {
 } from "~/components/primitives/Table";
 import { TextLink } from "~/components/primitives/TextLink";
 import { useOrganization } from "~/hooks/useOrganizations";
+import { useHasAdminAccess } from "~/hooks/useUser";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { findProjectBySlug } from "~/models/project.server";
 import { type Region, RegionsPresenter } from "~/presenters/v3/RegionsPresenter.server";
-import { requireUserId } from "~/services/session.server";
+import { requireUser, requireUserId } from "~/services/session.server";
 import {
   docsPath,
   EnvironmentParamSchema,
@@ -60,14 +61,15 @@ import {
 import { SetDefaultRegionService } from "~/v3/services/setDefaultRegion.server";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
   const { projectParam } = ProjectParamSchema.parse(params);
 
   const presenter = new RegionsPresenter();
   const [error, result] = await tryCatch(
     presenter.call({
-      userId,
+      userId: user.id,
       projectSlug: projectParam,
+      isAdmin: user.admin || user.isImpersonating,
     })
   );
 
@@ -86,10 +88,10 @@ const FormSchema = z.object({
 });
 
 export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
   const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
 
-  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
 
   const redirectPath = regionsPath(
     { slug: organizationSlug },
@@ -113,6 +115,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
     service.call({
       projectId: project.id,
       regionId: parsedFormData.data.regionId,
+      isAdmin: user.admin || user.isImpersonating,
     })
   );
 
@@ -126,6 +129,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 export default function Page() {
   const { regions, isPaying } = useTypedLoaderData<typeof loader>();
   const organization = useOrganization();
+  const isAdmin = useHasAdminAccess();
 
   return (
     <PageContainer>
@@ -162,6 +166,7 @@ export default function Page() {
                       <TableHeaderCell>Cloud Provider</TableHeaderCell>
                       <TableHeaderCell>Location</TableHeaderCell>
                       <TableHeaderCell>Static IPs</TableHeaderCell>
+                      {isAdmin && <TableHeaderCell>Admin</TableHeaderCell>}
                       <TableHeaderCell
                         alignment="right"
                         tooltip={
@@ -240,6 +245,9 @@ export default function Page() {
                                 "Not available"
                               )}
                             </TableCell>
+                            {isAdmin && (
+                              <TableCell>{region.isHidden ? "Hidden" : "Visible"}</TableCell>
+                            )}
                             {region.isDefault ? (
                               <TableCell alignment="right">
                                 <Badge variant="small" className="inline-grid">
@@ -259,8 +267,9 @@ export default function Page() {
                         );
                       })
                     )}
+
                     <TableRow className="h-[3.125rem]">
-                      <TableCell colSpan={4}>
+                      <TableCell colSpan={isAdmin ? 5 : 4}>
                         <Paragraph variant="extra-small">Suggest a new region</Paragraph>
                       </TableCell>
                       <TableCellMenu

apps/webapp/app/v3/services/setDefaultRegion.server.ts

@@ -1,7 +1,15 @@
 import { BaseService, ServiceValidationError } from "./baseService.server";
 
 export class SetDefaultRegionService extends BaseService {
-  public async call({ projectId, regionId }: { projectId: string; regionId: string }) {
+  public async call({
+    projectId,
+    regionId,
+    isAdmin = false,
+  }: {
+    projectId: string;
+    regionId: string;
+    isAdmin?: boolean;
+  }) {
     const workerGroup = await this._prisma.workerInstanceGroup.findFirst({
       where: {
         id: regionId,
@@ -23,12 +31,14 @@ export class SetDefaultRegionService extends BaseService {
     }
 
     // If their project is restricted, only allow them to set default regions that are allowed
-    if (project.allowedMasterQueues.length > 0) {
-      if (!project.allowedMasterQueues.includes(workerGroup.masterQueue)) {
-        throw new ServiceValidationError("You're not allowed to set this region as default");
+    if (!isAdmin) {
+      if (project.allowedMasterQueues.length > 0) {
+        if (!project.allowedMasterQueues.includes(workerGroup.masterQueue)) {
+          throw new ServiceValidationError("You're not allowed to set this region as default");
+        }
+      } else if (workerGroup.hidden) {
+        throw new ServiceValidationError("This region is not available to you");
       }
-    } else if (workerGroup.hidden) {
-      throw new ServiceValidationError("This region is not available to you");
     }
 
     await this._prisma.project.update({