@wandelbots/wandelbots-js-react-components 1.24.4 → 1.24.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "1.24.4",
+  "version": "1.24.6",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/jogging/JoggingOptions.tsx

@@ -54,7 +54,10 @@ export const JoggingOptions = observer(({ store }: { store: JoggingStore }) => {
           >
             {store.coordSystems.map((cs) => (
               <MenuItem key={cs.coordinate_system} value={cs.coordinate_system}>
-                {cs.name || cs.coordinate_system}
+                {/* Distinguish coordinate systems with the same name */}
+                {cs.name && store.coordSystemCountByName[cs.name] > 1
+                  ? `${cs.name} / ${cs.coordinate_system}`
+                  : cs.name || cs.coordinate_system}
               </MenuItem>
             ))}
           </Select>

package/src/components/jogging/JoggingStore.ts

@@ -5,6 +5,7 @@ import type {
   RobotTcp,
 } from "@wandelbots/wandelbots-js"
 import { tryParseJson } from "@wandelbots/wandelbots-js"
+import { countBy } from "lodash-es"
 import keyBy from "lodash-es/keyBy"
 import uniqueId from "lodash-es/uniqueId"
 import {
@@ -169,6 +170,10 @@ export class JoggingStore {
     this.jogger.dispose()
   }
 
+  get coordSystemCountByName() {
+    return countBy(this.coordSystems, (cs) => cs.name)
+  }
+
   async deactivate(opts: { requireManualReactivation?: boolean } = {}) {
     if (this.activationState === "inactive") return
     const websocket = this.jogger.activeWebsocket
@@ -198,7 +203,6 @@ export class JoggingStore {
 
   /** Activate the jogger with current settings */
   async activate(opts: { manual?: boolean } = {}) {
-    console.log("activate!!")
     if (this.manualActivationRequired && !opts.manual) return
 
     runInAction(() => {

package/src/components/robots/SupportedRobot.tsx

@@ -157,19 +157,19 @@ export const SupportedRobot = externalizeComponent(
     }, [isGhost])
 
     switch (modelFromController) {
-      case "UniversalRobots_UR3CB":
+      case "UniversalRobots_UR3":
         Robot = UniversalRobots_UR3CB
         break
       case "UniversalRobots_UR3e":
         Robot = UniversalRobots_UR3e
         break
-      case "UniversalRobots_UR5CB":
+      case "UniversalRobots_UR5":
         Robot = UniversalRobots_UR5CB
         break
       case "UniversalRobots_UR5e":
         Robot = UniversalRobots_UR5e
         break
-      case "UniversalRobots_UR10CB":
+      case "UniversalRobots_UR10":
         Robot = UniversalRobots_UR10CB
         break
       case "UniversalRobots_UR10e":