@wandelbots/wandelbots-js-react-components 2.54.5-pr.feat-jogging-blocked.406.e0dd489 → 2.54.5-pr.feat-upgrade-safety-bar-to-v2.405.d92d77f

package/dist/lib/JoggerConnection.d.ts

@@ -32,7 +32,6 @@ export declare class JoggerConnection {
     tcp: string;
     orientation: JoggerOrientation;
     onError?: (err: unknown) => void;
-    onBlocked?: () => void;
     /**
      * Initialize the jogging connection using jogging endpoint or trajectory endpoint depending on the selected mode.
      *
@@ -94,7 +93,7 @@ export declare class JoggerConnection {
      * axis, either rotating or translating relative to the TCP.
      * Promise resolves only after the motion has completed.
      */
-    runIncrementalCartesianMotion({ currentTcpPose, currentJoints, velocityInRelevantUnits, axis, direction, motion, }: {
+    runIncrementalCartesianMotion({ currentTcpPose, currentJoints, coordSystemId, velocityInRelevantUnits, axis, direction, motion, }: {
         currentTcpPose: Pose;
         currentJoints: Vector3Simple;
         coordSystemId: string;

package/dist/lib/JoggerConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JoggerConnection.d.ts","sourceRoot":"","sources":["../../src/lib/JoggerConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JoggerConnection.d.ts","sourceRoot":"","sources":["../../src/lib/JoggerConnection.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "2.54.5-pr.feat-jogging-blocked.406.e0dd489",
+  "version": "2.54.5-pr.feat-upgrade-safety-bar-to-v2.405.d92d77f",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/jogging/JoggingPanel.tsx

@@ -10,7 +10,6 @@ import { useTranslation } from "react-i18next"
 import { externalizeComponent } from "../../externalizeComponent"
 import { JoggerConnection } from "../../lib/JoggerConnection"
 import { LoadingCover } from "../LoadingCover"
-import { JoggingBlocked } from "./JoggingBlocked"
 import { JoggingCartesianTab } from "./JoggingCartesianTab"
 import { JoggingJointTab } from "./JoggingJointTab"
 import { JoggingStore } from "./JoggingStore"
@@ -183,6 +182,7 @@ const JoggingPanelInner = observer(
             )
           })}
         </Tabs>
+
         {/* Current tab content */}
         <Stack
           flexGrow={1}
@@ -191,8 +191,6 @@ const JoggingPanelInner = observer(
         >
           {renderTabContent()}
         </Stack>
-        {/* Overlay when jogging connection is blocked */}
-        {store.blocked && <JoggingBlocked store={store} />}
       </Stack>
     )
   },

package/src/components/jogging/JoggingStore.ts

@@ -59,9 +59,6 @@ export class JoggingStore {
   /** Locks to prevent UI interactions during certain operations */
   locks = new Set<string>()
 
-  /** Block jogging UI interactions when connection is taken by another jogger */
-  blocked: boolean = false
-
   /**
    * Id of selected coordinate system from among those defined on the API side
    */
@@ -186,21 +183,13 @@ export class JoggingStore {
     this.selectedCoordSystemId = coordSystems[0]?.coordinate_system || "world"
     this.selectedTcpId = tcps[0]?.id || ""
 
-    // Make all properties observable and actions auto-bound
     makeAutoObservable(this, {}, { autoBind: true })
 
-    // Register blocked watching
-    this.jogger.onBlocked = () => {
-      this.block()
-    }
-
     // Load user settings from local storage if available
     this.loadFromLocalStorage()
 
     // Automatically save user settings to local storage when save changes
     this.disposers.push(autorun(() => this.saveToLocalStorage()))
-
-    // Assign joggingStore to window
     ;(window as any).joggingStore = this
   }
 
@@ -449,17 +438,6 @@ export class JoggingStore {
     this.locks.delete(id)
   }
 
-  block() {
-    this.blocked = true
-  }
-
-  unblock() {
-    this.blocked = false
-    if (this.jogger.mode === "jogging") {
-      this.jogger.initializeJoggingWebsocket()
-    }
-  }
-
   /** Lock the UI until the given async callback resolves */
   async withMotionLock(fn: () => Promise<void>) {
     const lockId = uniqueId()

package/src/components/safetyBar/OperationModeIndicator.tsx

@@ -1,5 +1,5 @@
 import { useTheme, type PopoverOrigin } from "@mui/material"
-import type { RobotControllerStateOperationModeEnum } from "@wandelbots/nova-js/v1"
+import type { OperationMode } from "@wandelbots/nova-js/v2"
 import { observer } from "mobx-react-lite"
 import { Trans, useTranslation } from "react-i18next"
 import OperationModeAutomaticIcon from "./icons/operation-mode-automatic.svg"
@@ -8,7 +8,7 @@ import OperationModeManualIcon from "./icons/operation-mode-manual.svg"
 import { IndicatorWithExplanation } from "./IndicatorWithExplanation"
 
 interface OperationModeIndicatorProps {
-  operationMode: RobotControllerStateOperationModeEnum
+  operationMode: OperationMode
   anchorOrigin?: PopoverOrigin
   transformOrigin?: PopoverOrigin
   compact: boolean

package/src/components/safetyBar/SafetyBar.tsx

@@ -1,8 +1,5 @@
 import { Divider, Stack, type PopoverOrigin } from "@mui/material"
-import type {
-  RobotControllerStateOperationModeEnum,
-  RobotControllerStateSafetyStateEnum,
-} from "@wandelbots/nova-js/v1"
+import type { OperationMode, SafetyStateType } from "@wandelbots/nova-js/v2"
 import { observer } from "mobx-react-lite"
 import { externalizeComponent } from "../../externalizeComponent"
 import { ControllerTypeIndicator } from "./ControllerTypeIndicator"
@@ -12,8 +9,8 @@ import { SafetyStateIndicator } from "./SafetyStateIndicator"
 export interface SafetyBarProps {
   isVirtual: boolean
   motionGroupId: string
-  operationMode: RobotControllerStateOperationModeEnum
-  safetyState: RobotControllerStateSafetyStateEnum
+  operationMode: OperationMode
+  safetyState: SafetyStateType
   anchorOrigin?: PopoverOrigin
   transformOrigin?: PopoverOrigin
   compact?: boolean

package/src/components/safetyBar/SafetyStateIndicator.tsx

@@ -1,5 +1,5 @@
 import { useTheme, type PopoverOrigin } from "@mui/material"
-import type { RobotControllerStateSafetyStateEnum } from "@wandelbots/nova-js/v1"
+import type { SafetyStateType } from "@wandelbots/nova-js/v2"
 import { observer } from "mobx-react-lite"
 import { Trans, useTranslation } from "react-i18next"
 import { assertUnreachable } from "../utils/errorHandling"
@@ -11,7 +11,7 @@ import SafetyStateStopIcon from "./icons/safety-state-stop.svg"
 import { IndicatorWithExplanation } from "./IndicatorWithExplanation"
 
 interface SafetyStateIndicatorProps {
-  safetyState: RobotControllerStateSafetyStateEnum
+  safetyState: SafetyStateType
   anchorOrigin?: PopoverOrigin
   transformOrigin?: PopoverOrigin
   compact: boolean

package/src/i18n/locales/de/translations.json

@@ -4,9 +4,6 @@
   "Jogging.Velocity.lb": "Geschwindigkeit",
   "General.degree.variable": "{{amount}}°",
   "General.mm.variable": "{{amount}} mm",
-  "Jogging.Blocked.ti": "Verbindung blockiert",
-  "Jogging.Blocked.lb": "Ein anderer Client kontrolliert das Jogging.",
-  "Jogging.Blocked.Reenable.bt": "Wiederherstellen",
   "Jogging.Cartesian.MotionType.lb": "Bewegungstyp",
   "Jogging.Cartesian.Translation.bt": "Translation",
   "Jogging.Cartesian.Rotation.bt": "Rotation",

package/src/i18n/locales/en/translations.json

@@ -4,9 +4,6 @@
   "Jogging.Velocity.lb": "Velocity",
   "General.degree.variable": "{{amount}}°",
   "General.mm.variable": "{{amount}} mm",
-  "Jogging.Blocked.ti": "Connection blocked",
-  "Jogging.Blocked.lb": "Another client is currently controlling the jogging.",
-  "Jogging.Blocked.Reenable.bt": "Restore Panel",
   "Jogging.Cartesian.MotionType.lb": "Motion type",
   "Jogging.Cartesian.Translation.bt": "Translation",
   "Jogging.Cartesian.Rotation.bt": "Rotation",

package/src/lib/JoggerConnection.ts

@@ -66,7 +66,6 @@ export class JoggerConnection {
   // coordinateSystem?: string
   orientation: JoggerOrientation
   onError?: (err: unknown) => void
-  onBlocked?: () => void
 
   /**
    * Initialize the jogging connection using jogging endpoint or trajectory endpoint depending on the selected mode.
@@ -249,18 +248,12 @@ export class JoggerConnection {
           return
         }
 
-        if (data?.result?.kind === "MOTION_ERROR") {
+        if (
+          (data && "error" in data) ||
+          data?.result?.kind === "MOTION_ERROR"
+        ) {
           clearTimeout(connectionFailedTimeout)
-          if (
-            this.onBlocked &&
-            data?.result?.message.includes(
-              `Movement request rejected. Another client is currently executing a 'Jogging' motion!`,
-            )
-          ) {
-            this.joggingSocket?.dispose()
-            this.onBlocked()
-            return
-          } else if (this.onError) {
+          if (this.onError) {
             this.onError(ev.data)
           } else {
             reject(new Error(ev.data))
@@ -377,7 +370,7 @@ export class JoggerConnection {
   async runIncrementalCartesianMotion({
     currentTcpPose,
     currentJoints,
-    // coordSystemId,
+    coordSystemId,
     velocityInRelevantUnits,
     axis,
     direction,
@@ -632,16 +625,6 @@ export class JoggerConnection {
         )
       }
 
-      if (
-        this.onBlocked &&
-        data.result.message.includes(
-          `Movement request rejected. Another client is currently executing a 'Jogging' motion!`,
-        )
-      ) {
-        this.onBlocked()
-        return
-      }
-
       if (data.result.kind === "INITIALIZE_RECEIVED") {
         messageInitializeMovementResponse(data.result)
       } else if (data.result.kind === "START_RECEIVED") {

package/dist/components/jogging/JoggingBlocked.d.ts

@@ -1,7 +0,0 @@
-import { type JoggingStore } from "./JoggingStore";
-export declare const JoggingBlocked: (({ store }: {
-    store: JoggingStore;
-}) => import("react/jsx-runtime").JSX.Element) & {
-    displayName: string;
-};
-//# sourceMappingURL=JoggingBlocked.d.ts.map

package/dist/components/jogging/JoggingBlocked.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JoggingBlocked.d.ts","sourceRoot":"","sources":["../../../src/components/jogging/JoggingBlocked.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD,eAAO,MAAM,cAAc,eAAwB;IAAE,KAAK,EAAE,YAAY,CAAA;CAAE;;CA+BxE,CAAA"}

package/src/components/jogging/JoggingBlocked.tsx

@@ -1,37 +0,0 @@
-import { Alert, AlertTitle, Backdrop, Button, Stack } from "@mui/material"
-import { observer } from "mobx-react-lite"
-import { useTranslation } from "react-i18next"
-import { type JoggingStore } from "./JoggingStore"
-
-export const JoggingBlocked = observer(({ store }: { store: JoggingStore }) => {
-  const { t } = useTranslation()
-
-  return (
-    <Backdrop
-      open={true}
-      sx={{
-        position: "absolute",
-        zIndex: (theme) => theme.zIndex.drawer + 1,
-        color: "#fff",
-        background: "rgba(15, 15, 15, 0.78)",
-        justifyContent: "flex-start",
-        alignItems: "flex-start",
-      }}
-    >
-      <Stack sx={{ m: 2, width: "100%" }}>
-        <Alert severity="error" sx={{ mb: 2 }}>
-          <AlertTitle>{t("Jogging.Blocked.ti")}</AlertTitle>
-          {t("Jogging.Blocked.lb")}
-        </Alert>
-
-        <Button
-          variant="contained"
-          color="error"
-          onClick={() => store.unblock()}
-        >
-          {t("Jogging.Blocked.Reenable.bt")}
-        </Button>
-      </Stack>
-    </Backdrop>
-  )
-})