From 4112ba9b10d6ac32ee4a302b3ba947ed323efb15 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 5 Oct 2025 00:25:18 -0600 Subject: [PATCH] refactor: reorganize user permission checks in AdvancedEnvironmentSelector - Moved the check for user permissions to delete environments to a more logical position in the code. - Removed redundant API query for environment data, streamlining the component's state management. --- .../project/advanced-environment-selector.tsx | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx b/apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx index d10ab655..033231fc 100644 --- a/apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx +++ b/apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx @@ -59,26 +59,10 @@ export const AdvancedEnvironmentSelector = ({ }, ); - const { data: currentUser } = api.user.get.useQuery(); - - // Check if user can delete environments - const canDeleteEnvironments = - currentUser?.role === "owner" || - currentUser?.role === "admin" || - currentUser?.canDeleteEnvironments === true; - // Form states const [name, setName] = useState(""); const [description, setDescription] = useState(""); - // API mutations - const { data: environment } = api.environment.one.useQuery( - { environmentId: currentEnvironmentId || "" }, - { - enabled: !!currentEnvironmentId, - }, - ); - // Get current user's permissions const { data: currentUser } = api.user.get.useQuery(); @@ -88,6 +72,12 @@ export const AdvancedEnvironmentSelector = ({ currentUser?.role === "admin" || currentUser?.canCreateEnvironments === true; + // Check if user can delete environments + const canDeleteEnvironments = + currentUser?.role === "owner" || + currentUser?.role === "admin" || + currentUser?.canDeleteEnvironments === true; + const haveServices = selectedEnvironment && ((selectedEnvironment?.mariadb?.length || 0) > 0 ||