refactor(create-robot-forms): 🎉 update launch robot forms with sub co…

…mponents
robolaunch · Aug 7, 2023 · bdec227 · bdec227
1 parent 2e35596
commit bdec227
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 56 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "private": true,
   "dependencies": {
     "@emotion/css": "^11.10.6",

diff --git a/src/components/BuildManagerStepsTable/BuildManagerStepsTable.tsx b/src/components/BuildManagerStepsTable/BuildManagerStepsTable.tsx
@@ -24,7 +24,7 @@ export default function BuildManagerStepsTable({
           workspace: step?.workspace,
           command: step?.command,
           log: step?.buildLog,
-          state: responseBuildManager?.robotClusters,
+          state: step?.buildStatus,
         };
       }),
     [responseBuildManager]
@@ -59,29 +59,12 @@ export default function BuildManagerStepsTable({
         key: "state",
         header: "State",
         align: "left",
-        body: () => {
+        body: (rowData: any) => {
           return (
             <div className="flex flex-col gap-2">
-              {responseBuildManager?.robotClusters?.[0]?.buildManagerStatus && (
-                <div className="flex gap-2">
-                  <span className="text-xs">CI:</span>
-                  <StateCell
-                    state={
-                      responseBuildManager?.robotClusters?.[0]
-                        ?.buildManagerStatus
-                    }
-                  />
-                </div>
-              )}
-              {responseBuildManager?.robotClusters?.[1]?.buildManagerStatus && (
+              {rowData?.state && (
                 <div className="flex gap-2">
-                  <span className="text-xs">P I:</span>
-                  <StateCell
-                    state={
-                      responseBuildManager?.robotClusters?.[1]
-                        ?.buildManagerStatus
-                    }
-                  />
+                  <StateCell state={rowData?.state} />
                 </div>
               )}
             </div>
@@ -98,7 +81,7 @@ export default function BuildManagerStepsTable({
         },
       },
     ],
-    [responseBuildManager?.robotClusters, url?.instanceName]
+    [url?.instanceName]
   );
 
   return (

diff --git a/src/components/Cells/StateCell.tsx b/src/components/Cells/StateCell.tsx
@@ -62,6 +62,7 @@ export default function StateCell({ state, isRobolaunchState }: IStateCell) {
       {state === "running" ||
       state === "Ready" ||
       state === "Connected" ||
+      state === "Completed" ||
       state === "Running" ||
       state === "EnvironmentReady" ? (
         <div className="w-2.5 h-2.5 bg-green-500 rounded-full" />

diff --git a/src/components/CreateForms/CreateRobotFormStep4.tsx b/src/components/CreateForms/CreateRobotFormStep4.tsx
@@ -53,14 +53,14 @@ export default function CreateRobotFormStep4({
         robotDataLaunchIndex ? robotDataLaunchIndex : 0
       ],
     validationSchema: Yup.object({
-      name: Yup.string().required("Required"),
-      workspace: Yup.string().required("Required"),
-      entryPointCmd: Yup.string().required("Required"),
-      instancesName: Yup.array().min(1, "Required"),
+      name: Yup.string().required("Launch manager name is required"),
+      workspace: Yup.string().required("Workspace is required"),
+      entryPointCmd: Yup.string().required("Code is required"),
+      instancesName: Yup.array().min(1, "Instance scope is required"),
       robotLmEnvs: Yup.array().of(
         Yup.object().shape({
-          name: Yup.string().required("Required"),
-          value: Yup.string().required("Required"),
+          name: Yup.string().required("Environment name is required"),
+          value: Yup.string().required("Environment value is required"),
         })
       ),
     }),
@@ -102,10 +102,6 @@ export default function CreateRobotFormStep4({
     },
   });
 
-  useEffect(() => {
-    console.log(formik?.values);
-  }, [formik?.values]);
-
   useEffect(
     () => {
       if (!responseBuildManager) {

diff --git a/src/components/CreateRobotFormBuildStepItem/CreateRobotFormBuildStepItem.tsx b/src/components/CreateRobotFormBuildStepItem/CreateRobotFormBuildStepItem.tsx
@@ -52,26 +52,15 @@ export default function CreateRobotFormBuildStepItem({
               : `Build Step #${buildStepIndex + 1}`}
           </span>
           <div className="flex items-center gap-2 text-xs">
-            {Array.isArray(stepState) && stepState?.[0] && (
+            {buildStep?.buildStatus && (
               <div className="flex gap-1.5">
                 <span
                   title={`Launch State of Cloud Instance`}
                   className="font-medium"
                 >
-                  CI:
+                  Status:
                 </span>
-                <StateCell state={stepState?.[0]} />
-              </div>
-            )}
-            {Array.isArray(stepState) && stepState?.[1] && (
-              <div className="flex gap-1.5">
-                <span
-                  title={`Launch State of Physical Instance`}
-                  className="font-medium"
-                >
-                  PI:
-                </span>
-                <StateCell state={stepState?.[1]} />
+                <StateCell state={buildStep?.buildStatus} />
               </div>
             )}
           </div>

diff --git a/src/components/Terminal/Terminal.tsx b/src/components/Terminal/Terminal.tsx
@@ -18,7 +18,7 @@ export default function Terminal({ value, ref }: ITerminal): ReactElement {
     <TerminalContextProvider>
       <ReactTerminal
         ref={ref}
-        prompt={">>>"}
+        prompt={">"}
         theme={"material-dark"}
         welcomeMessage={
           <Fragment>

diff --git a/src/components/UpdateRobotLaunchsForm/UpdateRobotLaunchsForm.tsx b/src/components/UpdateRobotLaunchsForm/UpdateRobotLaunchsForm.tsx
@@ -82,10 +82,10 @@ export default function UpdateRobotLaunchsForm(): ReactElement {
                             entryPointCmd: "",
                             instancesName: [],
                             robotLmEnvs: [
-                              {
-                                name: "",
-                                value: "",
-                              },
+                              // {
+                              //   name: "",
+                              //   value: "",
+                              // },
                             ],
                           },
                         ],

diff --git a/src/contexts/RobotContext.tsx b/src/contexts/RobotContext.tsx
@@ -62,10 +62,10 @@ export default ({ children }: any) => {
           entryPointCmd: "",
           instancesName: [],
           robotLmEnvs: [
-            {
-              name: "",
-              value: "",
-            },
+            // {
+            //   name: "",
+            //   value: "",
+            // },
           ],
         },
       ],

diff --git a/src/interfaces/robotInterfaces.ts b/src/interfaces/robotInterfaces.ts
@@ -166,6 +166,7 @@ export interface IRobotBuildStep {
   instancesName: any[];
   robotClusters?: any;
   buildLog?: string;
+  buildStatus?: string;
 }
 
 export interface IRobotLaunchSteps {

diff --git a/src/modals/LogsModal.tsx b/src/modals/LogsModal.tsx
@@ -15,6 +15,7 @@ export default function LogsModal({
     <Dialog
       header="Logs"
       visible={true}
+      draggable={false}
       className="w-[50vw]"
       onHide={() => handleCloseModal()}
     >