Bufix: Environment dropdown navigation giving 404 when navigating from application page

Author: karthiknatarajan

app/utils/routes/environment.go

@@ -26,6 +26,10 @@ func EnvironmentNew() string {
 	return fmt.Sprintf("%s/new", EnvironmentBase)
 }
 
+func EnvironmentNewCtx(ctx context.Context) string {
+	return fmt.Sprintf("%s/%s", ProjectCtx(ctx), EnvironmentNew())
+}
+
 func EnvironmentCtx(ctx context.Context) string {
 	environment, _ := request.EnvironmentFrom(ctx)
 	return fmt.Sprintf("%s/environment/%d", ProjectCtx(ctx), environment.UID)

app/web/views/components/venvironment/dropdown.templ

@@ -21,7 +21,10 @@ templ Dropdown(envs []*types.Environment, selectedEnv int64) {
 							<div class="min-w-full table">
 								for _, env := range envs {
 									<div class="relative flex select-none items-center rounded-sm text-xs outline-none hover:bg-overlay-hover hover:text-strong data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 cursor-pointer w-full">
-										<a class="w-full flex items-center justify-between mx-2 my-1.5" href={ routes.EnvironmentUID(env.UID) }>
+										<a
+											class="w-full flex items-center justify-between mx-2 my-1.5"
+											href={ routes.EnvironmentCtxUID(ctx, env.UID) }
+										>
 											<span class="truncate max-w-60">{ env.Name }</span>
 											if env.UID== selectedEnv {
 												<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6 9 17l-5-5"></path></svg>
@@ -45,7 +48,7 @@ templ Dropdown(envs []*types.Environment, selectedEnv int64) {
 					>
 						<a
 							class="w-full flex items-center gap-2"
-							href={ routes.ProjectEnvironment }
+							href={ routes.ProjectCtx(ctx) + "/" + routes.ProjectEnvironment }
 						>
 							<p>Manage Environments</p>
 						</a>
@@ -64,7 +67,7 @@ templ Dropdown(envs []*types.Environment, selectedEnv int64) {
 					>
 						<a
 							class="w-full flex items-center gap-2"
-							href={ routes.EnvironmentNew() }
+							href={ routes.EnvironmentNewCtx(ctx) }
 						>
 							<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-plus"><path d="M5 12h14"></path><path d="M12 5v14"></path></svg>
 							<p>New Environment</p>