From 2b65f650630c51817450e517f8307b8761e9fe3c Mon Sep 17 00:00:00 2001
From: Daniel Inge <daninge98@gmail.com>
Date: Fri, 18 Aug 2023 17:33:59 -0400
Subject: [PATCH] Rename things and fix bug in error checking

---
 backend/src/controllers/v2/environmentController.ts    |  6 +++---
 .../components/EnvironmentSection/EnvironmentTable.tsx | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/controllers/v2/environmentController.ts b/backend/src/controllers/v2/environmentController.ts
index 5eb923e7b..4e7d39fab 100644
--- a/backend/src/controllers/v2/environmentController.ts
+++ b/backend/src/controllers/v2/environmentController.ts
@@ -101,14 +101,14 @@ export const reorderWorkspaceEnvironments = async (
   // atomic update the env to avoid conflict
   const workspace = await Workspace.findById(workspaceId).exec();
   if (!workspace) {
-    throw new Error("Failed to create workspace environment");
+    throw BadRequestError({message: "Couldn't load workspace"});
   }
 
   const environmentIndex = workspace.environments.findIndex((env) => env.name === environmentName && env.slug === environmentSlug)
   const otherEnvironmentIndex = workspace.environments.findIndex((env) => env.name === otherEnvironmentName && env.slug === otherEnvironmentSlug)
 
-  if (environmentIndex === undefined || otherEnvironmentIndex === undefined) {
-    throw new Error("environment or otherEnvironment couldn't be found")
+  if (environmentIndex === -1 || otherEnvironmentIndex === -1) {
+    throw BadRequestError({message: "environment or otherEnvironment couldn't be found"})
   }
 
   // swap the order of the environments
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentTable.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentTable.tsx
index bb867da51..e799f9e9a 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentTable.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentTable.tsx
@@ -38,18 +38,18 @@ export const EnvironmentTable = ({ handlePopUpOpen }: Props) => {
   const { createNotification } = useNotificationContext();
   const reorderWsEnvironment = useReorderWsEnvironment();
 
-  const reorderEnvs = async (moveUp: boolean, name: string, slug: string) => {
+  const handleReorderEnv= async (shouldMoveUp: boolean, name: string, slug: string) => {
     try {
       if (!currentWorkspace?._id) return;
 
       const indexOfEnv = currentWorkspace.environments.findIndex((env) => env.name === name && env.slug === slug);
 
       // check that this reordering is possible
-      if (indexOfEnv === 0 && moveUp || indexOfEnv === currentWorkspace.environments.length - 1 && !moveUp) {
+      if (indexOfEnv === 0 && shouldMoveUp || indexOfEnv === currentWorkspace.environments.length - 1 && !shouldMoveUp) {
         return
       }
 
-      const indexToSwap = moveUp ? indexOfEnv - 1 : indexOfEnv + 1
+      const indexToSwap = shouldMoveUp ? indexOfEnv - 1 : indexOfEnv + 1
 
       await reorderWsEnvironment.mutateAsync({
         workspaceID: currentWorkspace._id,
@@ -94,7 +94,7 @@ export const EnvironmentTable = ({ handlePopUpOpen }: Props) => {
                   <IconButton
                     className="mr-3 py-2"
                     onClick={() => {
-                      reorderEnvs(false, name, slug)
+                      handleReorderEnv(false, name, slug)
                     }}
                     colorSchema="primary"
                     variant="plain"
@@ -106,7 +106,7 @@ export const EnvironmentTable = ({ handlePopUpOpen }: Props) => {
                   <IconButton
                     className="mr-3 py-2"
                     onClick={() => {
-                      reorderEnvs(true, name, slug)
+                      handleReorderEnv(true, name, slug)
                     }}
                     colorSchema="primary"
                     variant="plain"