fix: rebase leftovers

Author: RonenMars

src/components/pages/index.ts

@@ -6,4 +6,5 @@ export { External404 } from "@components/pages/external404";
 export { Internal404 } from "@components/pages/internal404";
 export { Intro } from "@components/pages/intro";
 export { Project } from "@components/pages/project";
+export { ProjectExplorerGuard } from "@components/pages/projectExplorerGuard";
 export { TemplateLanding } from "@components/pages/templateLanding";

src/components/pages/project.tsx

@@ -3,8 +3,7 @@ import React, { useEffect, useState } from "react";
 import { Outlet, useParams } from "react-router-dom";
 
 import { EventListenerName } from "@src/enums";
-import { DrawerName } from "@src/enums/components";
-import { triggerEvent, useEventListener } from "@src/hooks";
+import { useEventListener } from "@src/hooks";
 import { useCacheStore, useManualRunStore, useProjectStore, useSharedBetweenProjectsStore } from "@src/store";
 import { UserTrackingUtils } from "@src/utilities";
 
@@ -19,9 +18,10 @@ export const Project = () => {
 	const { fetchManualRunConfiguration } = useManualRunStore();
 	const { projectId } = useParams();
 	const { getProject } = useProjectStore();
-	const { isProjectFilesVisible, setIsProjectFilesVisible, isDrawerOpen } = useSharedBetweenProjectsStore();
+	const { isProjectFilesVisible, setIsProjectFilesVisible } = useSharedBetweenProjectsStore();
 	const [isConnectionLoadingFromChatbot, setIsConnectionLoadingFromChatbot] = useState(false);
 	const [showFiles, setShowFiles] = useState(false);
+
 	const openConnectionFromChatbot = () => {
 		setIsConnectionLoadingFromChatbot(true);
 		setTimeout(() => {
@@ -43,23 +43,18 @@ export const Project = () => {
 	useEffect(() => {
 		if (!projectId) return;
 		loadProject(projectId!);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [projectId]);
 
-		if (
-			!!isDrawerOpen(projectId!, DrawerName.projectSettings) ||
-			isDrawerOpen(projectId!, DrawerName.projectSettings) === undefined
-		) {
-			triggerEvent(EventListenerName.displayProjectConfigSidebar);
-		}
+	useEffect(() => {
+		if (!projectId) return;
 
 		if (!!isProjectFilesVisible[projectId] || isProjectFilesVisible[projectId!] === undefined) {
 			setShowFiles(true);
-			setIsProjectFilesVisible(projectId, true);
-			return;
+		} else {
+			setShowFiles(false);
 		}
-
-		setShowFiles(false);
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [isProjectFilesVisible, projectId]);
+	}, [isProjectFilesVisible, projectId, setIsProjectFilesVisible]);
 
 	const handleShowProjectFiles = () => {
 		if (!projectId) return;

src/components/pages/projectExplorerGuard.tsx

@@ -0,0 +1,44 @@
+import React, { useEffect, useMemo } from "react";
+
+import { Navigate, useLocation, useParams } from "react-router-dom";
+
+import { Project } from "./project";
+import { EventListenerName } from "@src/enums";
+import { DrawerName } from "@src/enums/components";
+import { triggerEvent } from "@src/hooks";
+import { useSharedBetweenProjectsStore } from "@src/store";
+import { extractSettingsPath } from "@src/utilities";
+
+export const ProjectExplorerGuard = () => {
+	const { projectId } = useParams();
+	const location = useLocation();
+	const { settingsPath } = extractSettingsPath(location.pathname);
+	const { isDrawerOpen, setIsProjectFilesVisible, isProjectFilesVisible } = useSharedBetweenProjectsStore();
+
+	const shouldRedirectToSettings = useMemo(() => {
+		if (!projectId) return false;
+
+		const isProjectSettingsDrawerOpen =
+			isDrawerOpen(projectId, DrawerName.projectSettings) || settingsPath !== "settings";
+
+		return !!isProjectSettingsDrawerOpen || isProjectSettingsDrawerOpen === undefined;
+	}, [projectId, isDrawerOpen, settingsPath]);
+
+	useEffect(() => {
+		if (!projectId) return;
+
+		if (shouldRedirectToSettings) {
+			triggerEvent(EventListenerName.displayProjectConfigSidebar);
+		}
+
+		if (!!isProjectFilesVisible[projectId] || isProjectFilesVisible[projectId] === undefined) {
+			setIsProjectFilesVisible(projectId, true);
+		}
+	}, [projectId, shouldRedirectToSettings, isProjectFilesVisible, setIsProjectFilesVisible]);
+
+	if (shouldRedirectToSettings && settingsPath !== "settings") {
+		return <Navigate replace to="settings" />;
+	}
+
+	return <Project />;
+};

src/hooks/tour/useTourActionListener.ts

@@ -49,9 +49,6 @@ export const useTourActionListener = () => {
 		createTourOverlay(activeStep?.overlayAboveDrawer);
 
 		const delayMs = activeStep?.popoverDelayMs ?? 0;
-		console.log("delayMs", delayMs);
-		console.log("activeStep", activeStep);
-		console.log("element", element);
 		if (delayMs > 0) {
 			popoverTimeoutRef.current = setTimeout(() => {
 				setPopoverVisible(true);

src/routes.tsx

@@ -3,14 +3,14 @@ import React from "react";
 import { Navigate } from "react-router-dom";
 
 import { MemberRole } from "@enums";
+import { EditConnection, AddConnection } from "@project-connections";
+import { AddTrigger, EditTrigger } from "@project-triggers";
+import { AddVariable, EditVariable } from "@project-variables";
 import { legacyRoutes } from "@src/routes.legacy";
 
 import { CreateNewProject, DeploymentsTable, EventViewer, ProtectedRoute, SessionsTable } from "@components/organisms";
 import { ProjectSettingsDrawer } from "@components/organisms/configuration";
 import { ProjectSettingsMainView } from "@components/organisms/configuration/configurationView";
-import { AddConnection, EditConnection } from "@components/organisms/configuration/connections";
-import { AddTrigger, EditTrigger } from "@components/organisms/configuration/triggers";
-import { AddVariable, EditVariable } from "@components/organisms/configuration/variables";
 import { TemplatesCatalog } from "@components/organisms/dashboard/templates";
 import { SessionViewer } from "@components/organisms/deployments";
 import { ActivityList, SessionOutputs } from "@components/organisms/deployments/sessions/tabs";
@@ -23,7 +23,15 @@ import {
 import { OrganizationBilling } from "@components/organisms/settings/organization/billing";
 import { ClientConfiguration, Profile, UserOrganizationsTable } from "@components/organisms/settings/user";
 import { EventsList } from "@components/organisms/shared";
-import { ChatPage, CustomError, Dashboard, Internal404, Intro, Project, TemplateLanding } from "@components/pages";
+import {
+	ChatPage,
+	CustomError,
+	Dashboard,
+	Internal404,
+	Intro,
+	ProjectExplorerGuard,
+	TemplateLanding,
+} from "@components/pages";
 import { AppLayout, EventsLayout } from "@components/templates";
 import { ProjectWrapper } from "@components/templates/projectWrapper";
 import { SettingsLayout } from "@components/templates/settingsLayout";
@@ -76,7 +84,7 @@ export const mainRoutes = [
 					{ path: "code", element: <Navigate relative="route" replace to="explorer" /> },
 					{
 						path: "explorer",
-						element: <Project />,
+						element: <ProjectExplorerGuard />,
 						children: [
 							{
 								path: "settings",

tsconfig.json

@@ -26,6 +26,14 @@
 		"paths": {
 			"@assets": ["./src/assets/index"],
 			"@assets/*": ["./src/assets/*"],
+			"@project-config": ["./src/components/organisms/configuration/index"],
+			"@project-config/*": ["./src/components/organisms/configuration/*"],
+			"@project-connections/*": ["./src/components/organisms/configuration/connections/*"],
+			"@project-connections": ["./src/components/organisms/configuration/connections/index"],
+			"@project-triggers": ["./src/components/organisms/configuration/triggers/index"],
+			"@project-triggers/*": ["./src/components/organisms/configuration/triggers/*"],
+			"@project-variables": ["./src/components/organisms/configuration/variables/index"],
+			"@project-variables/*": ["./src/components/organisms/configuration/variables/*"],
 			"@components/*": ["./src/components/*"],
 			"@contexts": ["./src/contexts/index"],
 			"@contexts/*": ["./src/contexts/*"],

vite.config.ts

@@ -165,6 +165,10 @@ export default defineConfig({
 			"@utils": path.resolve(__dirname, "./src/utils"),
 			"@validations": path.resolve(__dirname, "./src/validations"),
 			"tailwind-config": path.resolve(__dirname, "./tailwind.config.cjs"),
+			"@project-config": path.resolve(__dirname, "./src/components/organisms/configuration"),
+			"@project-connections": path.resolve(__dirname, "./src/components/organisms/configuration/connections"),
+			"@project-triggers": path.resolve(__dirname, "./src/components/organisms/configuration/triggers"),
+			"@project-variables": path.resolve(__dirname, "./src/components/organisms/configuration/variables"),
 		},
 	},
 	server: {