Skip to content

Available user types filtered based on user role #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
llam36 merged 4 commits into from
Apr 3, 2026
Merged

Available user types filtered based on user role #62

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac7eb86
Available user types filtered based on user role
shaply Nov 17, 2025
c22bc62
Forgot to do linting
shaply Nov 17, 2025
90fbb7b
fix: format
llam36 Feb 20, 2026
cf3c706
Merge branch 'main' into davidgu/bug_adminNotSuperadmin
llam36 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/components/forms/EditUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from "@/lib/actions";
import { zodResolver } from "@hookform/resolvers/zod";
import { SetUserTypeModelTypeEnum } from "juno-sdk/build/main/internal/index";
import { useState } from "react";
import { useState, useMemo } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import * as z from "zod";
Expand All @@ -29,6 +29,7 @@ import {
SelectTrigger,
SelectValue,
} from "../ui/select";
import { useUserSession, UserType } from "../providers/SessionProvider";

export const userTypeMap = {
SUPERADMIN: 0,
Expand All @@ -55,6 +56,23 @@ const EditUserForm = ({
initialUserData: UserColumn;
onUserUpdate?: (updatedUser: UserColumn) => void;
}) => {
const { user: currentUser } = useUserSession();

// Filter available user types based on current user's permissions
// SUPERADMIN can set any type
// ADMIN can only set USER type
// USER shouldn't be able to edit (but we'll still filter just in case)
const availableUserTypes = useMemo(() => {
if (!currentUser) return ["USER"];

if (currentUser.type === UserType.SUPERADMIN) {
return Object.keys(userTypeMap);
} else if (currentUser.type === UserType.ADMIN) {
return ["USER"];
} else {
return ["USER"];
}
}, [currentUser]);
const setUserTypeForm = useForm<z.infer<typeof setUserTypeSchema>>({
resolver: zodResolver(setUserTypeSchema),
defaultValues: {
Expand Down Expand Up @@ -194,7 +212,7 @@ const EditUserForm = ({
<SelectValue placeholder="Select type" />
</SelectTrigger>
<SelectContent>
{Object.keys(userTypeMap).map((type) => (
{availableUserTypes.map((type) => (
<SelectItem key={type} value={type}>
{type}
</SelectItem>
Expand Down
Loading