From 66dbd0555834d8c146647904e5f678b79514beb9 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 6 Aug 2022 13:12:11 +0000
Subject: [PATCH] Fixed Job Builder

---
 src/views/jobs/builder/JobBuilder.jsx         | 20 +++++++++----------
 ...ndividualConfirm.jsx => ManualConfirm.jsx} |  6 +++---
 ...ividualSelector.jsx => ManualSelector.jsx} |  4 ++--
 src/views/jobs/builder/PipelineSelector.jsx   |  1 +
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename src/views/jobs/builder/{IndividualConfirm.jsx => ManualConfirm.jsx} (83%)
 rename src/views/jobs/builder/{IndividualSelector.jsx => ManualSelector.jsx} (90%)

diff --git a/src/views/jobs/builder/JobBuilder.jsx b/src/views/jobs/builder/JobBuilder.jsx
index f145e57..e4147ec 100644
--- a/src/views/jobs/builder/JobBuilder.jsx
+++ b/src/views/jobs/builder/JobBuilder.jsx
@@ -16,8 +16,8 @@ import PageviewIcon from "@mui/icons-material/Pageview";
 import ViewColumnIcon from "@mui/icons-material/ViewColumn";
 import ViewCarouselIcon from "@mui/icons-material/ViewCarousel";
 
-import IndividualSelector from "./IndividualSelector.jsx";
-import IndividualConfirm from "./IndividualConfirm.jsx";
+import ManualSelector from "./ManualSelector.jsx";
+import ManualConfirm from "./ManualConfirm.jsx";
 
 import GroupSelector from "./GroupSelector.jsx";
 import GroupConfirm from "./GroupConfirm.jsx";
@@ -37,7 +37,7 @@ export default function JobBuilder() {
     e.preventDefault();
     e.stopPropagation();
     if (!store.simplifiedControls) return setQuickOpen(!quickOpen);
-    setBuilderPage("individualSelect");
+    setBuilderPage("groupSelect");
     setJobDialogOpen(true);
   };
 
@@ -60,25 +60,25 @@ export default function JobBuilder() {
   const actions = [
     { name: "Suite", icon: <ViewCarouselIcon />, page: "groupSelect" },
     { name: "Compound", icon: <ViewColumnIcon />, page: "pipelineSelect" },
-    { name: "Manual", icon: <PageviewIcon />, page: "individualSelect" },
+    { name: "Manual", icon: <PageviewIcon />, page: "manualSelect" },
   ];
 
   const changePage = (page) => () => setBuilderPage(page);
 
   const pages = {
-    individualSelect: (
-      <IndividualSelector
+    manualSelect: (
+      <ManualSelector
         cache={cache}
         setCache={setCache}
         cancel={handleClose()}
-        next={changePage("individualConfirm")}
+        next={changePage("manualConfirm")}
       />
     ),
-    individualConfirm: (
-      <IndividualConfirm
+    manualConfirm: (
+      <ManualConfirm
         cache={cache}
         setCache={setCache}
-        back={changePage("individualSelect")}
+        back={changePage("manualSelect")}
         start={handleClose(true)}
       />
     ),
diff --git a/src/views/jobs/builder/IndividualConfirm.jsx b/src/views/jobs/builder/ManualConfirm.jsx
similarity index 83%
rename from src/views/jobs/builder/IndividualConfirm.jsx
rename to src/views/jobs/builder/ManualConfirm.jsx
index 7908c1e..ded4bbd 100644
--- a/src/views/jobs/builder/IndividualConfirm.jsx
+++ b/src/views/jobs/builder/ManualConfirm.jsx
@@ -3,13 +3,13 @@ import Button from "@mui/material/Button";
 import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 
-function IndividualConfirm(props) {
+function ManualConfirm(props) {
   const { cache, setCache, back, start } = props;
 
   return (
     <React.Fragment>
       <DialogContent>
-        <h3>Individual Confirm?</h3>
+        <h3>Manual Confirm?</h3>
         {JSON.stringify(cache)}
       </DialogContent>
       <DialogActions>
@@ -22,4 +22,4 @@ function IndividualConfirm(props) {
   );
 }
 
-export default IndividualConfirm;
+export default ManualConfirm;
diff --git a/src/views/jobs/builder/IndividualSelector.jsx b/src/views/jobs/builder/ManualSelector.jsx
similarity index 90%
rename from src/views/jobs/builder/IndividualSelector.jsx
rename to src/views/jobs/builder/ManualSelector.jsx
index c9e9ade..35e2765 100644
--- a/src/views/jobs/builder/IndividualSelector.jsx
+++ b/src/views/jobs/builder/ManualSelector.jsx
@@ -3,7 +3,7 @@ import Button from "@mui/material/Button";
 import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 
-function IndividualSelector(props) {
+function ManualSelector(props) {
   const { cache, setCache, cancel, next } = props;
   function makeReq() {
     setCache({
@@ -27,4 +27,4 @@ function IndividualSelector(props) {
   );
 }
 
-export default IndividualSelector;
+export default ManualSelector;
diff --git a/src/views/jobs/builder/PipelineSelector.jsx b/src/views/jobs/builder/PipelineSelector.jsx
index a6d3f45..b893cca 100644
--- a/src/views/jobs/builder/PipelineSelector.jsx
+++ b/src/views/jobs/builder/PipelineSelector.jsx
@@ -44,6 +44,7 @@ function PipelineSelector(props) {
               <Typography
                 component={"span"}
                 style={{ wordBreak: "break-word", margin: "auto 0" }}
+                color={(cache.primarySelectedMappings ?? [[]])[0][0] ===k ? "primary": null}
               >
                 {k}
               </Typography>