refactor(robot-context): 🎉 update robot sub components for context logic

robolaunch · Aug 11, 2023 · d603215 · d603215
1 parent 44b6b92
commit d603215
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "dependencies": {
     "@emotion/css": "^11.10.6",

diff --git a/src/components/CodeEditor/CodeEditor.tsx b/src/components/CodeEditor/CodeEditor.tsx
@@ -3,23 +3,17 @@ import CardLayout from "../../layouts/CardLayout";
 import { FullScreen, useFullScreenHandle } from "react-full-screen";
 import { BsFullscreen, BsFullscreenExit } from "react-icons/bs";
 import { useAppSelector } from "../../hooks/redux";
+import useRobot from "../../hooks/useRobot";
 
-interface ICodeEditor {
-  activeTab: string;
-  responseRobot: any;
-  setIsSettedCookie: any;
-}
-
-export default function CodeEditor({
-  activeTab,
-  responseRobot,
-  setIsSettedCookie,
-}: ICodeEditor): ReactElement {
+export default function CodeEditor(): ReactElement {
   const [activeTabCodeEditor, setActiveTabCodeEditor] = useState<
     "Cloud IDE" | "Physical IDE"
   >("Cloud IDE");
 
   const handleFullScreen = useFullScreenHandle();
+
+  const { activeTab, responseRobot, setIsSettedCookie } = useRobot();
+
   const { urls } = useAppSelector((state) => state.robot);
 
   const codeEditorTabs = [

diff --git a/src/pages/RobotPage/RobotPage.tsx b/src/pages/RobotPage/RobotPage.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useState } from "react";
+import React, { ReactElement } from "react";
 import HiddenVDIFrame from "../../components/HiddenVDIFrame/HiddenVDIFrame";
 import TaskManagementLayout from "../../layouts/TaskManagementLayout";
 import RosConnector from "../../components/RosConnector/RosConnector";
@@ -17,14 +17,7 @@ import useRobot from "../../hooks/useRobot";
 import Overview from "./Overview/Overview";
 
 export default function RobotPage(): ReactElement {
-  const {
-    activeTab,
-    setActiveTab,
-    responseRobot,
-    ros,
-    topicList,
-    setIsSettedCookie,
-  } = useRobot();
+  const { activeTab, setActiveTab, responseRobot } = useRobot();
 
   const { urls } = useAppSelector((state) => state.robot);
 
@@ -83,8 +76,6 @@ export default function RobotPage(): ReactElement {
             case "Teleoperation":
               return (
                 <Teleoperation
-                  ros={ros}
-                  topicList={topicList}
                   vdiIngressEndpoint={
                     urls?.vdi || responseRobot?.vdiIngressEndpoint
                   }
@@ -120,11 +111,7 @@ export default function RobotPage(): ReactElement {
               );
           }
         })()}
-        <CodeEditor
-          activeTab={activeTab}
-          responseRobot={responseRobot}
-          setIsSettedCookie={setIsSettedCookie}
-        />
+        <CodeEditor />
       </div>
       <RosConnector />
       <HiddenVDIFrame />

diff --git a/src/pages/RobotPage/Teleoperation/Teleoperation.tsx b/src/pages/RobotPage/Teleoperation/Teleoperation.tsx
@@ -13,17 +13,14 @@ import "gridstack/dist/gridstack-extra.css";
 import "gridstack/dist/gridstack.min.css";
 import { GridStack } from "gridstack";
 import ROSLIB from "roslib";
+import useRobot from "../../../hooks/useRobot";
 
 interface ITeleoperation {
-  ros: any;
-  topicList: string[];
   vdiIngressEndpoint: string;
   handleForceUpdate: (page: IrobotPages["activeTab"]) => void;
 }
 
 export default function Teleoperation({
-  ros,
-  topicList,
   vdiIngressEndpoint,
   handleForceUpdate,
 }: ITeleoperation): ReactElement {
@@ -39,6 +36,7 @@ export default function Teleoperation({
   const [selectableTopic, setSelectableTopic] = useState<any>([]);
   const [selectedTopic, setSelectedTopic] = useState<string>("");
   const handleFullScreen = useFullScreenHandle();
+  const { ros, topicList } = useRobot();
 
   // GRID
   useEffect(() => {