From 9763353d59010461f7ef93d4cb6cadbe1da619a9 Mon Sep 17 00:00:00 2001
From: Vladyslav Matsiiako <matsiiako@gmail.com>
Date: Thu, 13 Jul 2023 16:09:33 -0700
Subject: [PATCH] Fixed routing issues

---
 .../src/components/basic/dialog/AddProjectMemberDialog.tsx   | 4 ++--
 frontend/src/components/basic/dialog/UpgradePlan.tsx         | 5 ++++-
 frontend/src/components/dashboard/AddTagsMenu.tsx            | 2 +-
 .../src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx  | 2 +-
 frontend/src/layouts/AppLayout/components/NavBar/NavBar.tsx  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/basic/dialog/AddProjectMemberDialog.tsx b/frontend/src/components/basic/dialog/AddProjectMemberDialog.tsx
index 2a25c8be6..87004e0e8 100644
--- a/frontend/src/components/basic/dialog/AddProjectMemberDialog.tsx
+++ b/frontend/src/components/basic/dialog/AddProjectMemberDialog.tsx
@@ -83,7 +83,7 @@ const AddProjectMemberDialog = ({
                               <button
                                 type="button"
                                 className="inline-flex justify-center rounded-md py-1 text-sm text-gray-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
-                                onClick={() => router.push(`/settings/org/${router.query.id}`)}
+                                onClick={() => router.push(`/org/${router.query.id}/members`)}
                                 aria-label="add member"
                               />,
                               // eslint-disable-next-line react/jsx-key
@@ -91,7 +91,7 @@ const AddProjectMemberDialog = ({
                                 type="button"
                                 className="ml-1 inline-flex justify-center rounded-md py-1 text-sm text-gray-500 hover:text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
                                 onClick={() =>
-                                  router.push(`/settings/org/${router.query.id}?invite`)
+                                  router.push(`/org/${router.query.id}/members?action=invite`)
                                 }
                                 aria-label="add member"
                               />
diff --git a/frontend/src/components/basic/dialog/UpgradePlan.tsx b/frontend/src/components/basic/dialog/UpgradePlan.tsx
index 2573036eb..0fd9af404 100644
--- a/frontend/src/components/basic/dialog/UpgradePlan.tsx
+++ b/frontend/src/components/basic/dialog/UpgradePlan.tsx
@@ -2,6 +2,8 @@ import { Fragment } from "react";
 import { useRouter } from "next/router";
 import { Dialog, Transition } from "@headlessui/react";
 
+import { useOrganization } from "@app/context";
+
 // REFACTOR: Move all these modals into one reusable one 
 type Props = {
   isOpen?: boolean;
@@ -15,6 +17,7 @@ const UpgradePlanModal = ({
   text,
 }:Props) => {
   const router = useRouter();
+  const { currentOrg } = useOrganization();
 
   return (
     <div>
@@ -61,7 +64,7 @@ const UpgradePlanModal = ({
                     <button
                       type='button'
                       className='inline-flex justify-center rounded-md border border-transparent bg-primary opacity-80 hover:opacity-100 px-4 py-2 text-sm font-medium text-black hover:text-semibold duration-200 focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2'
-                      onClick={() => router.push(`/settings/billing/${localStorage.getItem("projectData.id")}`)}
+                      onClick={() => router.push(`/org/${currentOrg?._id}/billing`)}
                     >
                       Upgrade Now
                     </button>
diff --git a/frontend/src/components/dashboard/AddTagsMenu.tsx b/frontend/src/components/dashboard/AddTagsMenu.tsx
index 4d10f1d8a..e97c979a9 100644
--- a/frontend/src/components/dashboard/AddTagsMenu.tsx
+++ b/frontend/src/components/dashboard/AddTagsMenu.tsx
@@ -50,7 +50,7 @@ const AddTagsMenu = ({ allTags, currentTags, modifyTags, id }: { allTags: Tag[];
           <button
             type="button"
             className='w-full text-left bg-mineshaft-800 hover:bg-primary hover:text-black duration-200 px-2 py-0.5 text-bunker-200 rounded-sm'
-            onClick={() => router.push(`/settings/project/${String(router.query.id)}`)}
+            onClick={() => router.push(`/project/${String(router.query.id)}/settings`)}
           >
             <FontAwesomeIcon icon={faPlus} className="mr-2 text-xs" />Add more tags
           </button>
diff --git a/frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx b/frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
index bf97b6750..fb1a21d40 100644
--- a/frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
+++ b/frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
@@ -17,7 +17,7 @@ export const UpgradePlanModal = ({ text, isOpen, onOpenChange }: Props): JSX.Ele
   const { currentOrg } = useOrganization();
   const { mutateAsync, isLoading } = useGetOrgTrialUrl();
   const link = (subscription && subscription.slug !== null) 
-    ? `/settings/billing/${localStorage.getItem("projectData.id") as string}` 
+    ? `/org/${currentOrg?._id}/billing` 
     : "https://infisical.com/scheduledemo";
   
   const handleUpgradeBtnClick = async () => {
diff --git a/frontend/src/layouts/AppLayout/components/NavBar/NavBar.tsx b/frontend/src/layouts/AppLayout/components/NavBar/NavBar.tsx
index 7c313b0e9..7adb88959 100644
--- a/frontend/src/layouts/AppLayout/components/NavBar/NavBar.tsx
+++ b/frontend/src/layouts/AppLayout/components/NavBar/NavBar.tsx
@@ -180,7 +180,7 @@ export const Navbar = () => {
                   onKeyDown={() => null}
                   role="button"
                   tabIndex={0}
-                  onClick={() => router.push(`/settings/personal/${router.query.id}`)}
+                  onClick={() => router.push("/personal-settings")}
                   className="mx-1 my-1 flex cursor-pointer flex-row items-center rounded-md px-1 hover:bg-white/5"
                 >
                   <div className="flex h-8 w-9 items-center justify-center rounded-full bg-white/10 text-gray-300">