fix page redirection issue

fix page redirection issue fix page redirection issue fix page redirection issue
fluentci-io · Jul 4, 2024 · 158bf6f · 158bf6f
1 parent 1ef6bd8
commit 158bf6f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/webui/src/Components/Header/HeaderWithData.tsx b/webui/src/Components/Header/HeaderWithData.tsx
@@ -124,7 +124,8 @@ const HeaderWithData: FC<HeaderWithDataProps> = () => {
 
   const isOwner =
     (project?.owner === me?.github && project?.owner) ||
-    !import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io");
+    (!import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") &&
+      location.hostname !== "app.fluentci.io");
 
   const breadcrumbs: { title: string; link?: string }[] = [
     {
@@ -167,6 +168,7 @@ const HeaderWithData: FC<HeaderWithDataProps> = () => {
       breadcrumbs={breadcrumbs}
       showRunButton={
         (!import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") &&
+          location.hostname !== "app.fluentci.io" &&
           project?.path !== "empty" &&
           !!actions?.filter((x) => x.enabled).length) ||
         (me?.github === project?.owner &&

diff --git a/webui/src/Components/Navbar/NavbarWithData.tsx b/webui/src/Components/Navbar/NavbarWithData.tsx
@@ -30,8 +30,13 @@ const NavbarWithData: FC = () => {
     }
 
     if (!user && location.host === "app.fluentci.io") {
-      navigate("/auth");
-      return;
+      if (
+        location.pathname.startsWith("/settings") ||
+        location.pathname.startsWith("/link-project")
+      ) {
+        navigate("/auth");
+        return;
+      }
     }
 
     user &&
@@ -43,9 +48,10 @@ const NavbarWithData: FC = () => {
       user={user}
       onSignOut={onSignOut}
       showAccountMenu={!!me}
-      showSignInButton={import.meta.env.VITE_APP_API_URL?.includes(
-        "api.fluentci.io"
-      )}
+      showSignInButton={
+        import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+        location.hostname === "app.fluentci.io"
+      }
     />
   );
 };

diff --git a/webui/src/Containers/Home/MainContent/MainContentWithData.tsx b/webui/src/Containers/Home/MainContent/MainContentWithData.tsx
@@ -81,7 +81,8 @@ const MainContentWithData: FC = () => {
       projects={data?.projects}
       onNewProject={onNewProject}
       displayNewProjectButton={
-        !import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+        (!import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") &&
+          location.hostname !== "app.fluentci.io") ||
         (me?.github === usernameOrOrg && !!usernameOrOrg) ||
         (!!me && !usernameOrOrg)
       }

diff --git a/webui/src/Containers/Project/MainContent/Composer/Action/ActionWithData.tsx b/webui/src/Containers/Project/MainContent/Composer/Action/ActionWithData.tsx
@@ -56,7 +56,8 @@ const ActionWithData: FC<ActionWithDataProps> = (props) => {
       disabled={
         project?.archived === true ||
         (me?.github !== project?.owner &&
-          import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io"))
+          (import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+            location.hostname === "app.fluentci.io"))
       }
     />
   );

diff --git a/webui/src/Containers/Project/MainContent/Settings/DangerZone/DangerZoneWithData.tsx b/webui/src/Containers/Project/MainContent/Settings/DangerZone/DangerZoneWithData.tsx
@@ -113,9 +113,10 @@ const DangerZoneWithData: FC = () => {
 
   return (
     <DangerZone
-      displayRepositorySection={import.meta.env.VITE_APP_API_URL?.includes(
-        "api.fluentci.io"
-      )}
+      displayRepositorySection={
+        import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+        location.hostname === "app.fluentci.io"
+      }
       isPublic={project?.isPrivate !== true}
       isArchived={project?.archived === true}
       onChangeVisibility={onChangeVisibility}

diff --git a/webui/src/Containers/Project/MainContent/Settings/Repository/RepositoryWithData.tsx b/webui/src/Containers/Project/MainContent/Settings/Repository/RepositoryWithData.tsx
@@ -45,9 +45,10 @@ const RepositoryWithData: FC = () => {
       loadingLinkedRepository={loadingLinkedRepository}
       projectId={project?.id}
       orgs={organizationsData?.organizations || []}
-      displayRepositorySection={import.meta.env.VITE_APP_API_URL?.includes(
-        "api.fluentci.io"
-      )}
+      displayRepositorySection={
+        import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+        location.hostname === "app.fluentci.io"
+      }
       loadingUnlink={loadingUnlink}
     />
   );

diff --git a/webui/src/Containers/Project/MainContent/Settings/Settings.tsx b/webui/src/Containers/Project/MainContent/Settings/Settings.tsx
@@ -4,9 +4,9 @@ import Repository from "./Repository";
 import DangerZone from "./DangerZone";
 
 const Settings: FC = () => {
-  const displayRepositorySection = import.meta.env.VITE_APP_API_URL?.includes(
-    "api.fluentci.io"
-  );
+  const displayRepositorySection =
+    import.meta.env.VITE_APP_API_URL?.includes("api.fluentci.io") ||
+    location.hostname === "app.fluentci.io";
   return (
     <>
       <General />