feat: add job launcher (#4209)

* feat: add job launcher

* fix: show the popover position correctly (#4223)

---------

Co-authored-by: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com>

Author: andre-code

client/src/components/entities/entities.types.ts

@@ -1,4 +1,5 @@
 export type EntityTypes =
   | "code-repository"
   | "data-connector"
+  | "job-launcher"
   | "session-launcher";

client/src/components/offcanvas/OffcanvasHeaderWithType.tsx

@@ -2,6 +2,7 @@ import cx from "classnames";
 import {
   Database,
   FileCode,
+  Gear,
   PlayCircle,
   QuestionCircle,
 } from "react-bootstrap-icons";
@@ -29,6 +30,8 @@ export default function OffcanvasHeaderWithType({
     <Database className="me-1" />
   ) : entityType === "session-launcher" ? (
     <PlayCircle className="me-1" />
+  ) : entityType === "job-launcher" ? (
+    <Gear className="me-1" />
   ) : entityType === "code-repository" ? (
     <FileCode className="me-1" />
   ) : (
@@ -39,11 +42,13 @@ export default function OffcanvasHeaderWithType({
     ? _entityName
     : entityType === "data-connector"
       ? "Data connector"
-      : entityType === "session-launcher"
-        ? "Session launcher"
-        : entityType === "code-repository"
-          ? "Code repository"
-          : "Unknown";
+      : entityType === "job-launcher"
+        ? "Job launcher"
+        : entityType === "session-launcher"
+          ? "Session launcher"
+          : entityType === "code-repository"
+            ? "Code repository"
+            : "Unknown";
 
   return (
     <div>

client/src/features/admin/SessionEnvironmentAdvancedFields.tsx

@@ -70,6 +70,7 @@ export default function SessionEnvironmentAdvancedFields({
             <AdvancedSettingsFields<SessionEnvironmentForm>
               control={control}
               errors={errors}
+              launcherCategory="session"
             />
           </CollapseBody>
         </Collapse>

client/src/features/admin/UpdateSessionEnvironmentButton.tsx

@@ -106,10 +106,8 @@ function UpdateSessionEnvironmentModal({
             uid: data.uid ?? undefined,
             working_directory: data.working_directory?.trim() || undefined,
             strip_path_prefix: data.strip_path_prefix,
-            ...(commandParsed.data
-              ? { command: commandParsed.data }
-              : { command: null }),
-            ...(argsParsed.data ? { args: argsParsed.data } : { args: null }),
+            command: commandParsed.data ?? undefined,
+            args: argsParsed.data ?? undefined,
           },
         });
     },

client/src/features/sessionsV2/AddSessionLauncherButton.tsx

@@ -21,7 +21,7 @@ import { useCallback, useState } from "react";
 import { PlusLg } from "react-bootstrap-icons";
 import { Button } from "reactstrap";
 
-import NewSessionLauncherModal from "./components/SessionModals/NewSessionLauncherModal";
+import NewLauncherModal from "./components/SessionModals/NewLauncherModal";
 
 export default function AddSessionLauncherButton({
   "data-cy": dataCy,
@@ -38,9 +38,9 @@ export default function AddSessionLauncherButton({
   return (
     <>
       {styleBtn === "iconTextBtn" ? (
-        <Button data-cy={dataCy} onClick={() => toggle()}>
+        <Button data-cy={dataCy} onClick={toggle}>
           <PlusLg className={cx("me-2", "bi")} />
-          Add session
+          Add launcher
         </Button>
       ) : (
         <Button
@@ -52,7 +52,7 @@ export default function AddSessionLauncherButton({
           <PlusLg className="bi" />
         </Button>
       )}
-      <NewSessionLauncherModal isOpen={isOpen} toggle={toggle} />
+      <NewLauncherModal isOpen={isOpen} toggle={toggle} />
     </>
   );
 }

client/src/features/sessionsV2/DeleteSessionLauncherModal.tsx

@@ -25,6 +25,10 @@ import { WarnAlert } from "../../components/Alert";
 import RtkOrDataServicesError from "../../components/errors/RtkOrDataServicesError";
 import type { SessionLauncher } from "./api/sessionLaunchersV2.api";
 import { useDeleteSessionLaunchersByLauncherIdMutation as useDeleteSessionLauncherMutation } from "./api/sessionLaunchersV2.api";
+import {
+  getLauncherCategory,
+  getLauncherCategoryDefinition,
+} from "./session.utils";
 
 interface DeleteSessionLauncherModalProps {
   isOpen: boolean;
@@ -40,6 +44,8 @@ export default function DeleteSessionLauncherModal({
   sessionsLength,
 }: DeleteSessionLauncherModalProps) {
   const [deleteSessionLauncher, result] = useDeleteSessionLauncherMutation();
+  const launcherCategory = getLauncherCategory(launcher);
+  const launcherDefinition = getLauncherCategoryDefinition(launcherCategory);
 
   const onDelete = useCallback(() => {
     deleteSessionLauncher({
@@ -75,32 +81,37 @@ export default function DeleteSessionLauncherModal({
         tag="h2"
         toggle={toggle}
       >
-        Delete session launcher
+        Delete {launcherDefinition.text.inline} launcher
       </ModalHeader>
       <ModalBody>
         {result.error && <RtkOrDataServicesError error={result.error} />}
         <p className="mb-3">
-          Are you sure you want to delete the <b>{launcher.name}</b> session
-          launcher?
+          Are you sure you want to delete the <b>{launcher.name}</b>{" "}
+          {launcherDefinition.text.inline} launcher?
         </p>
         {sessionsLength > 0 && (
           <WarnAlert dismissible={false}>
             <p>
-              You have a session running from this launcher. If you delete this
-              session launcher, that session will continue running, but it
-              become an orphan session and will not be able to be launched again
-              once stopped. If other RenkuLab users are running sessions from
-              this launcher, their sessions will become orphan sessions as well.
+              You have a {launcherDefinition.text.inline} running from this
+              launcher. If you delete this launcher, that{" "}
+              {launcherDefinition.text.inline} will continue running, but it
+              become an orphan {launcherDefinition.text.inline} and will not be
+              able to be launched again once stopped. If other RenkuLab users
+              are running {launcherDefinition.text.inline}s from this launcher,
+              their {launcherDefinition.text.inline}s will become orphan{" "}
+              {launcherDefinition.text.inline}s as well.
             </p>
           </WarnAlert>
         )}
         {sessionsLength === 0 && (
           <WarnAlert dismissible={false}>
             <p>
-              If other RenkuLab users are running sessions from this launcher,
-              their sessions will become orphan sessions. This means that their
-              sessions will continue running, but will not be able to be
-              launched again once stopped.
+              If other RenkuLab users are running{" "}
+              {launcherDefinition.text.inline}s from this launcher, their{" "}
+              {launcherDefinition.text.inline}s will become orphan{" "}
+              {launcherDefinition.text.inline}s. This means that their{" "}
+              {launcherDefinition.text.inline}s will continue running, but will
+              not be able to be launched again once stopped.
             </p>
           </WarnAlert>
         )}
@@ -119,7 +130,7 @@ export default function DeleteSessionLauncherModal({
           role="button"
         >
           <Trash className={cx("bi", "me-1")} />
-          Delete Session launcher
+          Delete {launcherDefinition.text.inline} launcher
         </Button>
       </ModalFooter>
     </Modal>