app URL routing

conda-incubator · Apr 9, 2024 · 11eb62d · 11eb62d
1 parent db3d2c4
commit 11eb62d
Show file tree

Hide file tree

Showing 35 changed files with 382 additions and 581 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,26 +1,21 @@
 import { ThemeProvider } from "@mui/material";
 import React from "react";
 import { Provider } from "react-redux";
-import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { RouterProvider } from "react-router-dom";
 
-import { PageLayout } from "./layouts";
 import {
   IPreferences,
   PrefContext,
   prefDefault,
   prefGlobal
 } from "./preferences";
+import { router } from "./routes";
 import { store } from "./store";
 import { condaStoreTheme, grayscaleTheme } from "./theme";
 
 import "../style/index.css";
 
-const router = createBrowserRouter([
-  {
-    path: "/",
-    element: <PageLayout />
-  }
-]);
+
 export interface IAppProps {
   pref?: Partial<IPreferences>;
 }

diff --git a/src/features/environmentCreate/components/EnvironmentCreate.tsx b/src/features/environmentCreate/components/EnvironmentCreate.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
+import { useNavigate, useParams } from "react-router-dom";
 import Box from "@mui/material/Box";
 import Alert from "@mui/material/Alert";
 import { stringify } from "yaml";
@@ -16,23 +17,38 @@ import {
 } from "../../../features/metadata";
 import {
   environmentOpened,
-  closeCreateNewEnvironmentTab
+  closeCreateNewEnvironmentTab,
+  openCreateNewEnvironmentTab
 } from "../../../features/tabs";
 import { useAppDispatch, useAppSelector } from "../../../hooks";
 import { SpecificationCreate, SpecificationReadOnly } from "./Specification";
 import { descriptionChanged, nameChanged } from "../environmentCreateSlice";
 import createLabel from "../../../common/config/labels";
-
-export interface IEnvCreate {
-  environmentNotification: (notification: any) => void;
-}
+import { showNotification } from "../../notification/notificationSlice";
 
 interface ICreateEnvironmentArgs {
   code: { channels: string[]; dependencies: string[] };
 }
 
-export const EnvironmentCreate = ({ environmentNotification }: IEnvCreate) => {
+export const EnvironmentCreate = () => {
   const dispatch = useAppDispatch();
+
+  // Url routing params
+  // If user loads the app at /<namespace_name>/new-environment
+  // This will put the app in the correct state
+  const { namespaceName } = useParams<{
+    namespaceName: string;
+  }>();
+
+  useEffect(() => {
+    if (namespaceName) {
+      dispatch(modeChanged(EnvironmentDetailsModes.CREATE));
+      dispatch(openCreateNewEnvironmentTab(namespaceName));
+    }
+  }, [namespaceName]);
+
+  const navigate = useNavigate();
+
   const { mode } = useAppSelector(state => state.environmentDetails);
   const { name, description } = useAppSelector(
     state => state.environmentCreate
@@ -84,17 +100,12 @@ export const EnvironmentCreate = ({ environmentNotification }: IEnvCreate) => {
       dispatch(
         environmentOpened({
           environment,
-          selectedEnvironmentId: newEnvId,
           canUpdate: true
         })
       );
+      navigate(`/${namespace}/${name}`);
       dispatch(currentBuildIdChanged(data.build_id));
-      environmentNotification({
-        data: {
-          show: true,
-          description: createLabel(name, "create")
-        }
-      });
+      dispatch(showNotification(createLabel(name, "create")));
     } catch (e) {
       setError({
         message: e?.data?.message ?? createLabel(undefined, "error"),

diff --git a/src/features/environmentDetails/components/EnvironmentDetails.tsx b/src/features/environmentDetails/components/EnvironmentDetails.tsx
@@ -1,4 +1,6 @@
 import React, { useEffect, useState } from "react";
+import { skipToken } from "@reduxjs/toolkit/query/react";
+import { useNavigate, useParams } from "react-router-dom";
 import Box from "@mui/material/Box";
 import Alert from "@mui/material/Alert";
 import { stringify } from "yaml";
@@ -8,7 +10,9 @@ import { SpecificationEdit, SpecificationReadOnly } from "./Specification";
 import { useGetBuildQuery } from "../environmentDetailsApiSlice";
 import {
   updateEnvironmentBuildId,
-  environmentClosed
+  environmentClosed,
+  environmentOpened,
+  toggleNewEnvironmentView
 } from "../../../features/tabs";
 import {
   useGetBuildPackagesQuery,
@@ -34,30 +38,67 @@ import artifactList from "../../../utils/helpers/artifact";
 import createLabel from "../../../common/config/labels";
 import { AlertDialog } from "../../../components/Dialog";
 import { useAppDispatch, useAppSelector } from "../../../hooks";
-import { CondaSpecificationPip } from "../../../common/models";
+import {
+  CondaSpecificationPip,
+  Environment,
+  Namespace
+} from "../../../common/models";
 import { useInterval } from "../../../utils/helpers";
+import { showNotification } from "../../notification/notificationSlice";
+import { useScrollRef } from "../../../layouts/PageLayout";
 
-interface IEnvDetails {
-  scrollRef: any;
-  environmentNotification: (notification: any) => void;
-}
 interface IUpdateEnvironmentArgs {
   dependencies: (string | CondaSpecificationPip)[];
   channels: string[];
 }
 
 const INTERVAL_REFRESHING = 5000;
 
-export const EnvironmentDetails = ({
-  scrollRef,
-  environmentNotification
-}: IEnvDetails) => {
+export const EnvironmentDetails = () => {
   const dispatch = useAppDispatch();
+
+  // Url routing params
+  // If user loads the app at /<namespace_name>/<environment_name>
+  // This will put the app in the correct state
+  const { namespaceName, environmentName } = useParams<{
+    namespaceName: string;
+    environmentName: string;
+  }>();
+  const namespaces: Namespace[] = useAppSelector(
+    state => state.namespaces.data
+  );
+  const namespace = namespaces.find(({ name }) => name === namespaceName);
+  const foundNamespace = Boolean(namespace);
+  const environments: Environment[] = useAppSelector(
+    state => state.environments.data
+  );
+  const environment = environments.find(
+    environment =>
+      environment.namespace.name === namespaceName &&
+      environment.name === environmentName
+  );
+  const foundEnvironment = Boolean(environment);
+  useEffect(() => {
+    if (namespace && environment) {
+      dispatch(
+        environmentOpened({
+          environment,
+          canUpdate: namespace.canUpdate
+        })
+      );
+      dispatch(modeChanged(EnvironmentDetailsModes.READ));
+      dispatch(toggleNewEnvironmentView(false));
+    }
+  }, [namespaceName, environmentName, foundNamespace, foundEnvironment]);
+
+  const navigate = useNavigate();
+
   const { mode } = useAppSelector(state => state.environmentDetails);
   const { page, dependencies } = useAppSelector(state => state.dependencies);
   const { selectedEnvironment } = useAppSelector(state => state.tabs);
   const { currentBuild } = useAppSelector(state => state.enviroments);
   const [name, setName] = useState(selectedEnvironment?.name || "");
+  const scrollRef = useScrollRef();
 
   const [descriptionIsUpdated, setDescriptionIsUpdated] = useState(false);
   const [description, setDescription] = useState(
@@ -81,7 +122,7 @@ export const EnvironmentDetails = ({
   const [updateBuildId] = useUpdateBuildIdMutation();
   const [deleteEnvironment] = useDeleteEnvironmentMutation();
 
-  useGetEnviromentBuildsQuery(selectedEnvironment, {
+  useGetEnviromentBuildsQuery(selectedEnvironment ?? skipToken, {
     pollingInterval: INTERVAL_REFRESHING
   });
 
@@ -112,7 +153,7 @@ export const EnvironmentDetails = ({
   };
 
   const loadArtifacts = async () => {
-    if (artifactType.includes("DOCKER_MANIFEST")) {
+    if (!currentBuildId || artifactType.includes("DOCKER_MANIFEST")) {
       return;
     }
 
@@ -122,7 +163,7 @@ export const EnvironmentDetails = ({
   };
 
   const loadDependencies = async () => {
-    if (dependencies.length) {
+    if (!currentBuildId || dependencies.length) {
       return;
     }
 
@@ -171,12 +212,7 @@ export const EnvironmentDetails = ({
       dispatch(modeChanged(EnvironmentDetailsModes.READ));
       setCurrentBuildId(data.build_id);
       dispatch(currentBuildIdChanged(data.build_id));
-      environmentNotification({
-        data: {
-          show: true,
-          description: createLabel(environment, "update")
-        }
-      });
+      dispatch(showNotification(createLabel(environment, "update")));
     } catch (e) {
       setError({
         message:
@@ -187,7 +223,7 @@ export const EnvironmentDetails = ({
         visible: true
       });
     }
-    scrollRef.current.scrollTo(0, 0);
+    scrollRef.current?.scrollTo(0, 0);
   };
 
   const updateBuild = async (buildId: number) => {
@@ -201,12 +237,9 @@ export const EnvironmentDetails = ({
         buildId
       }).unwrap();
       dispatch(updateEnvironmentBuildId(buildId));
-      environmentNotification({
-        data: {
-          show: true,
-          description: createLabel(selectedEnvironment.name, "updateBuild")
-        }
-      });
+      dispatch(
+        showNotification(createLabel(selectedEnvironment.name, "updateBuild"))
+      );
     } catch (e) {
       setError({
         message: createLabel(undefined, "error"),
@@ -232,19 +265,17 @@ export const EnvironmentDetails = ({
           selectedEnvironmentId: selectedEnvironment.id
         })
       );
-      environmentNotification({
-        data: {
-          show: true,
-          description: createLabel(selectedEnvironment.name, "delete")
-        }
-      });
+      dispatch(
+        showNotification(createLabel(selectedEnvironment.name, "delete"))
+      );
+      navigate("/");
     } catch (e) {
       setError({
         message: createLabel(undefined, "error"),
         visible: true
       });
     }
-    scrollRef.current.scrollTo(0, 0);
+    scrollRef.current?.scrollTo(0, 0);
     setShowDialog(false);
   };
 
@@ -255,10 +286,15 @@ export const EnvironmentDetails = ({
     })();
   }, INTERVAL_REFRESHING);
 
+  if (!selectedEnvironment) {
+    return null;
+  }
+
   return (
     <Box sx={{ padding: "15px 12px" }}>
       <EnvironmentDetailsHeader
         envName={name}
+        namespace={namespace?.name}
         onUpdateName={setName}
         showEditButton={selectedEnvironment?.canUpdate}
       />

diff --git a/src/features/environments/components/Environment.tsx b/src/features/environments/components/Environment.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { Link } from "react-router-dom";
 import CircleIcon from "@mui/icons-material/Circle";
 import ListItemIcon from "@mui/material/ListItemIcon";
 import Button from "@mui/material/Button";
@@ -12,13 +13,11 @@ interface IEnvironmentProps {
    * @param selectedEnvironmentId id of the currently selected environment
    */
   environment: EnvironmentModel;
-  onClick: () => void;
   selectedEnvironmentId: number | undefined;
 }
 
 export const Environment = ({
   environment,
-  onClick,
   selectedEnvironmentId
 }: IEnvironmentProps) => {
   const isSelected = selectedEnvironmentId === environment.id;
@@ -44,7 +43,8 @@ export const Environment = ({
         />
       </ListItemIcon>
       <Button
-        onClick={onClick}
+        component={Link}
+        to={`/${environment.namespace.name}/${environment.name}`}
         sx={{
           color: isSelected
             ? theme.palette.primary.main