feat(version): release 0.25.9 version

robolaunch · Dec 21, 2023 · f3b9b7c · f3b9b7c
1 parent 81d58de
commit f3b9b7c
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
       <img src="https://img.shields.io/badge/nodejs-18.18.2-dgreen" alt="node">
     </a>
     <a href="https://github.com/robolaunch/ui/releases">
-      <img src="https://img.shields.io/badge/release-v0.24.8-red" alt="release">
+      <img src="https://img.shields.io/badge/release-v0.24.9-red" alt="release">
     </a>
         <a href="#">
       <img src="https://img.shields.io/badge/language-typescript-blue" alt="language">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.25.8",
+  "version": "0.25.9",
   "private": true,
   "scripts": {
     "dev": "react-scripts start",

diff --git a/src/components/RosTopicListWidget/RosTopicListWidget.tsx b/src/components/RosTopicListWidget/RosTopicListWidget.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useEffect, useState } from "react";
+import { ReactElement, useEffect, useState } from "react";
 import ROSLIB from "roslib";
 import { AiOutlineUnorderedList } from "react-icons/ai";
 import RosWidgetLayout from "../../layouts/RosWidgetLayout";
@@ -14,24 +14,41 @@ export default function RosTopicListWidget({
   id,
   handleRemoveWidget,
 }: IRosTopicListWidget): ReactElement {
-  const [topicList, setTopicList] = useState<string[]>([]);
+  const [topicList, setTopicList] = useState<any>([]);
 
   useEffect(() => {
-    const getTopics = new ROSLIB.Service({
-      ros: ros,
-      name: "/rosapi/topics",
-      serviceType: "rosapi/Topics",
-    });
-    // @ts-ignore
-    const request = new ROSLIB.ServiceRequest();
-    getTopics.callService(request, function (result) {
-      result.topics.map((topic: string, key: number) =>
-        setTopicList((prev: any) => [
-          ...prev,
-          { name: topic, type: result.types[key] },
-        ]),
-      );
-    });
+    function getTopics() {
+      if (ros) {
+        const getTopics = new ROSLIB.Service({
+          ros: ros,
+          name: "/rosapi/topics",
+          serviceType: "rosapi/Topics",
+        });
+
+        const request = new ROSLIB.ServiceRequest({});
+        getTopics.callService(request, async function (result) {
+          const resultTopicsList = await result?.topics?.map(
+            (topic: string, key: number) => {
+              return {
+                name: topic,
+                type: result?.types[key],
+              };
+            },
+          );
+
+          if (resultTopicsList?.length !== topicList?.length) {
+            setTopicList(resultTopicsList);
+          }
+        });
+      }
+    }
+
+    getTopics();
+    const timer = setInterval(() => getTopics(), 10000);
+    return () => {
+      clearInterval(timer);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [ros]);
 
   return (

diff --git a/src/contexts/RobotContext.tsx b/src/contexts/RobotContext.tsx
@@ -5,6 +5,7 @@ import useFunctions from "../hooks/useFunctions";
 import { useParams } from "react-router-dom";
 import useMain from "../hooks/useMain";
 import ROSLIB from "roslib";
+import { useAppSelector } from "../hooks/redux";
 
 export const RobotContext: any = createContext<any>(null);
 
@@ -53,6 +54,8 @@ export default ({ children }: any) => {
     vdi: null,
   });
 
+  const { urls } = useAppSelector((state) => state.robot);
+
   function handleReducer(state: any, action: any) {
     switch (action.type) {
       case "ros":
@@ -221,11 +224,11 @@ export default ({ children }: any) => {
       isSettedCookie &&
       responseRobot?.bridgeIngressEndpoint?.split("://")[0] === "wss"
         ? new ROSLIB.Ros({
-            url: responseRobot?.bridgeIngressEndpoint,
+            url: urls?.ros || responseRobot?.bridgeIngressEndpoint,
           })
         : null;
 
-    setRos(ros);
+    setRos(rosClient);
 
     rosClient?.on("connection", function () {
       connectionsReducer?.ros === null &&
@@ -249,43 +252,41 @@ export default ({ children }: any) => {
 
   // ROS Topic Setter
   useEffect(() => {
-    !envApplication && getTopics();
+    function getTopics() {
+      if (ros && isSettedCookie && !envApplication) {
+        const getTopics = new ROSLIB.Service({
+          ros: ros,
+          name: "/rosapi/topics",
+          serviceType: "rosapi/Topics",
+        });
 
-    const timer = setInterval(() => {
-      !envApplication && getTopics();
-    }, 10000);
+        const request = new ROSLIB.ServiceRequest({});
+        getTopics.callService(request, async function (result) {
+          const resultTopicsList = await result?.topics?.map(
+            (topic: string, key: number) => {
+              return {
+                name: topic,
+                type: result?.types[key],
+              };
+            },
+          );
+
+          if (resultTopicsList?.length !== topicList?.length) {
+            setTopicList(resultTopicsList);
+          }
+        });
+      }
+    }
+
+    getTopics();
+
+    const timer = setInterval(() => getTopics(), 10000);
 
     return () => {
       clearInterval(timer);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ros]);
-
-  function getTopics() {
-    if (ros && isSettedCookie && !envApplication) {
-      const getTopics = new ROSLIB.Service({
-        ros: ros,
-        name: "/rosapi/topics",
-        serviceType: "rosapi/Topics",
-      });
-      // @ts-ignore
-      const request = new ROSLIB.ServiceRequest();
-      getTopics.callService(request, async function (result) {
-        const resultTopicsList = await result?.topics?.map(
-          (topic: string, key: number) => {
-            return {
-              name: topic,
-              type: result?.types[key],
-            };
-          },
-        );
-
-        if (resultTopicsList?.length !== topicList?.length) {
-          setTopicList(resultTopicsList);
-        }
-      });
-    }
-  }
+  }, [ros, isSettedCookie]);
   // ROS Topic Setter
 
   // VDI - vIDE Test Connection

diff --git a/src/toolkit/RobotSlice.ts b/src/toolkit/RobotSlice.ts
@@ -380,7 +380,7 @@ export const RobotSlice = createSlice({
     urls: {
       vdi: isProduction ? "" : "ws://localhost:8080/",
       ide: isProduction ? "" : "",
-      ros: isProduction ? "" : "",
+      ros: isProduction ? "" : "ws://172.16.44.189:9090",
     },
   },
   reducers: {},