Merge branch 'main' into feat/build-private-repositories

Author: sgaist

client/src/CatchallApp.tsx

@@ -28,6 +28,7 @@ import LegacyRoot from "./features/legacy/LegacyRoot";
 import LegacyShowDataset from "./features/legacy/LegacyShowDataset";
 import LazyRootV2 from "./features/rootV2/LazyRootV2";
 import { useGetUserQueryState } from "./features/usersV2/api/users.api";
+import { RELATIVE_ROUTES } from "./routing/routes.constants";
 
 /**
  * "Catch all" component
@@ -45,7 +46,7 @@ export default function CatchallApp() {
       />
       <Route path="/datasets/:identifier" element={<LegacyShowDataset />} />
       <Route path="/datasets" element={<LegacyDatasets />} />
-      <Route path="/v1/*" element={<LegacyRoot />} />
+      <Route path={RELATIVE_ROUTES.v1.splat} element={<LegacyRoot />} />
       {user?.isLoggedIn && user.is_admin && (
         <Route
           path="/admin"

client/src/features/help/HelpRelease.tsx

@@ -17,7 +17,6 @@
  */
 
 import { useContext } from "react";
-import { useLocation } from "react-router";
 import { Col, Row } from "reactstrap";
 
 import ExternalLink from "~/components/ExternalLink";
@@ -27,12 +26,7 @@ import { Links } from "~/utils/constants/Docs";
 import { RenkuRepositories } from "~/utils/constants/Repositories";
 import AppContext from "~/utils/context/appContext";
 import { DEFAULT_APP_PARAMS } from "~/utils/context/appParams.constants";
-import { isRenkuLegacy } from "~/utils/helpers/HelperFunctionsV2";
-import {
-  useGetCoreVersionsQuery,
-  useGetDataServicesVersionQuery,
-  useGetKgVersionQuery,
-} from "../versions/versions.api";
+import { useGetDataServicesVersionQuery } from "../versions/versions.api";
 
 function componentDocsUrl(
   componentUrl: string,
@@ -75,22 +69,6 @@ function ComponentAndDevVersion({
   );
 }
 
-function CoreRelease() {
-  const { data, isFetching } = useGetCoreVersionsQuery();
-  if (isFetching) {
-    return <Loader inline size={16} />;
-  }
-  const coreVersion = data?.coreVersions[0];
-  const { taggedVersion, devHash } = parseChartVersion(coreVersion);
-  return (
-    <ComponentAndDevVersion
-      componentUrl={RenkuRepositories.Python}
-      devHash={devHash}
-      taggedVersion={taggedVersion}
-    />
-  );
-}
-
 function DataServicesRelease() {
   const { data, isFetching } = useGetDataServicesVersionQuery();
   if (isFetching) {
@@ -107,22 +85,6 @@ function DataServicesRelease() {
   );
 }
 
-function KgRelease() {
-  const { data, isFetching } = useGetKgVersionQuery();
-  if (isFetching) {
-    return <Loader inline size={16} />;
-  }
-  const kgVersion = data?.version;
-  const { taggedVersion, devHash } = parseChartVersion(kgVersion);
-  return (
-    <ComponentAndDevVersion
-      componentUrl={RenkuRepositories.KnowledgeGraph}
-      devHash={devHash}
-      taggedVersion={taggedVersion}
-    />
-  );
-}
-
 function RenkuRelease() {
   const { params } = useContext(AppContext);
   const chartVersion =
@@ -153,31 +115,6 @@ function UiRelease() {
 }
 
 function ComponentDetails() {
-  const location = useLocation();
-  const isLegacy = isRenkuLegacy(location.pathname);
-
-  if (isLegacy) {
-    return (
-      <>
-        <div className="fw-bold">Renku legacy component versions</div>
-        <ul>
-          <li>
-            UI: <UiRelease />
-          </li>
-          <li>
-            Core: <CoreRelease />
-          </li>
-          <li>
-            Data Services: <DataServicesRelease />
-          </li>
-          <li>
-            Knowledge Graph: <KgRelease />
-          </li>
-        </ul>
-      </>
-    );
-  }
-
   return (
     <>
       <div className="fw-bold">Renku component versions</div>

client/src/features/landing/components/NavBar/RenkuFooterNavBar.tsx

@@ -18,7 +18,7 @@
 
 import cx from "classnames";
 import { useContext } from "react";
-import { Link, useLocation, useMatch } from "react-router";
+import { Link, useMatch } from "react-router";
 
 import { ExternalLink } from "~/components/LegacyExternalLinks";
 import { RENKU_LOGO } from "~/components/navbar/navbar.constants";
@@ -27,7 +27,6 @@ import { parseChartVersion } from "~/features/help/release.utils";
 import { ABSOLUTE_ROUTES } from "~/routing/routes.constants";
 import { Links } from "~/utils/constants/Docs";
 import AppContext from "~/utils/context/appContext";
-import { isRenkuLegacy } from "~/utils/helpers/HelperFunctionsV2";
 
 export default function RenkuFooterNavBar() {
   const matchesShowSessionPage = useMatch(
@@ -86,11 +85,7 @@ function RenkuFooterNavBarInner() {
 }
 
 function FooterNavbarLoggedInLinks() {
-  const location = useLocation();
-  const forceV2 = true;
-  const helpLocation = isRenkuLegacy(location.pathname, forceV2)
-    ? ABSOLUTE_ROUTES.v1.help.root
-    : ABSOLUTE_ROUTES.v2.help.root;
+  const helpLocation = ABSOLUTE_ROUTES.v2.help.root;
   return (
     <>
       <RenkuNavLinkV2 to={helpLocation}>Help</RenkuNavLinkV2>

client/src/features/projectsV2/fields/ProjectVisibilityFormField.tsx

@@ -20,21 +20,15 @@ import cx from "classnames";
 import { Globe, Lock } from "react-bootstrap-icons";
 import type { FieldValues } from "react-hook-form";
 import { Controller } from "react-hook-form";
-import { useLocation } from "react-router";
 import { ButtonGroup, Input, Label } from "reactstrap";
 
-import { isRenkuLegacy } from "../../../utils/helpers/HelperFunctionsV2";
 import type { GenericProjectFormFieldProps } from "./formField.types";
 
-import styles from "./RenkuV1FormFields.module.scss";
-
 export default function ProjectVisibilityFormField<T extends FieldValues>({
   control,
   formId,
   name,
 }: GenericProjectFormFieldProps<T>) {
-  const location = useLocation();
-  const isRenkuV1 = isRenkuLegacy(location.pathname);
   return (
     <div>
       <Label className="form-label" for={`${formId}-project-visibility`}>
@@ -50,23 +44,14 @@ export default function ProjectVisibilityFormField<T extends FieldValues>({
                 <Input
                   aria-describedby="projectVisibilityHelp"
                   type="radio"
-                  className={cx(
-                    isRenkuV1 && styles.RenkuV1btnCheck,
-                    "btn-check"
-                  )}
+                  className="btn-check"
                   id={`${formId}-project-visibility-public`}
                   value="public"
                   checked={field.value === "public"}
-                  onChange={(e) => {
-                    field.onChange(e);
-                  }}
+                  onChange={field.onChange}
                 />
                 <Label
-                  className={cx(
-                    "btn",
-                    isRenkuV1 ? "btn-outline-rk-green" : "btn-outline-primary",
-                    "mb-0"
-                  )}
+                  className={cx("btn", "btn-outline-primary", "mb-0")}
                   data-cy="project-visibility-public"
                   for={`${formId}-project-visibility-public`}
                 >
@@ -76,23 +61,14 @@ export default function ProjectVisibilityFormField<T extends FieldValues>({
                 <Input
                   aria-describedby="projectVisibilityHelp"
                   type="radio"
-                  className={cx(
-                    isRenkuV1 && styles.RenkuV1btnCheck,
-                    "btn-check"
-                  )}
+                  className={cx("btn-check")}
                   id={`${formId}-project-visibility-private`}
                   value="private"
                   checked={field.value === "private"}
-                  onChange={(e) => {
-                    field.onChange(e);
-                  }}
+                  onChange={field.onChange}
                 />
                 <Label
-                  className={cx(
-                    "btn",
-                    isRenkuV1 ? "btn-outline-rk-green" : "btn-outline-primary",
-                    "mb-0"
-                  )}
+                  className={cx("btn", "btn-outline-primary", "mb-0")}
                   data-cy="project-visibility-private"
                   for={`${formId}-project-visibility-private`}
                 >

client/src/features/projectsV2/fields/RenkuV1FormFields.module.scss

@@ -20,14 +20,10 @@ import cx from "classnames";
 import { ArrowCounterclockwise } from "react-bootstrap-icons";
 import type { FieldValues } from "react-hook-form";
 import { Controller } from "react-hook-form";
-import { useLocation } from "react-router";
 import { Button, FormText, Input, InputGroup, Label } from "reactstrap";
 
-import { isRenkuLegacy } from "../../../utils/helpers/HelperFunctionsV2.ts";
 import type { SlugFormFieldProps } from "./formField.types";
 
-import styles from "./RenkuV1FormFields.module.scss";
-
 export default function SlugFormField<T extends FieldValues>({
   compact,
   control,
@@ -37,8 +33,6 @@ export default function SlugFormField<T extends FieldValues>({
   name,
   url,
 }: SlugFormFieldProps<T>) {
-  const location = useLocation();
-  const isRenkuV1 = isRenkuLegacy(location.pathname);
   const content = (
     <Controller
       control={control}
@@ -54,9 +48,7 @@ export default function SlugFormField<T extends FieldValues>({
               className={cx(
                 "form-control",
                 errors.slug && "is-invalid",
-                compact && "p-1",
-                isRenkuV1 && styles.RenkuV1inputGroup,
-                isRenkuV1 && styles.RenkuV1input
+                compact && "p-1"
               )}
               data-cy={`${entityName}-slug-input`}
               id={`${entityName}-slug`}

client/src/features/projectsV2/fields/SlugFormField.tsx

@@ -26,30 +26,25 @@
 import cx from "classnames";
 import { ReactNode } from "react";
 import { ArrowLeft } from "react-bootstrap-icons";
-import { Link, useLocation } from "react-router";
+import { Link } from "react-router";
 
+import { ABSOLUTE_ROUTES } from "~/routing/routes.constants";
 import ContainerWrap from "../components/container/ContainerWrap";
-import rkNotFoundImg from "../styles/assets/not-found.svg";
 import rkNotFoundImgV2 from "../styles/assets/not-foundV2.svg";
-import { isRenkuLegacy } from "../utils/helpers/HelperFunctionsV2";
 
 import "./NotFound.css";
 
 interface NotFoundProps {
   children?: ReactNode;
   description?: string | ReactNode;
-  forceV2?: boolean;
   title?: string;
 }
 
 export default function NotFound({
   title: title_,
   description: description_,
   children,
-  forceV2,
 }: NotFoundProps) {
-  const location = useLocation();
-  const isV2 = forceV2 || !isRenkuLegacy(location.pathname);
   const title = title_ ?? "Page not found";
   const description =
     description_ ??
@@ -62,7 +57,6 @@ export default function NotFound({
       ? "p"
       : "div";
 
-  const homeLink = isV2 ? "/" : "/v1/";
   return (
     <ContainerWrap>
       <div className={cx("d-flex")}>
@@ -76,17 +70,17 @@ export default function NotFound({
               "d-flex",
               "align-items-center",
               "gap-3",
-              isV2 ? "text-primary" : "text-rk-green"
+              "text-primary"
             )}
           >
-            <img src={isV2 ? rkNotFoundImgV2 : rkNotFoundImg} />
+            <img src={rkNotFoundImgV2} />
             {title}
           </h3>
           <Tag data-cy="not-found-description">{description}</Tag>
           <div>
             <Link
-              to={homeLink}
-              className={cx("btn", isV2 ? "btn-primary" : "btn-rk-green")}
+              to={ABSOLUTE_ROUTES.v2.index}
+              className={cx("btn", "btn-primary")}
             >
               <ArrowLeft className={cx("bi", "me-1")} />
               Return to home

client/src/not-found/NotFound.tsx

@@ -164,7 +164,7 @@ export function Layout({ children }: { children: ReactNode }) {
 export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
   if (isRouteErrorResponse(error)) {
     // TODO: Consider rendering the AppRoot here?
-    return <NotFound forceV2={true} />;
+    return <NotFound />;
   }
 
   let message: string = "An unexpected error occurred.";