@wandelbots/wandelbots-js-react-components 2.54.5-pr.feat-jogging-blocked.406.6849777 → 2.54.5-pr.feat-jogging-blocked.406.356cdd1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +42 -42
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +2111 -2114
- package/dist/index.js.map +1 -1
- package/dist/lib/JoggerConnection.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/jogging/JoggingBlocked.tsx +2 -2
- package/src/components/jogging/JoggingPanel.tsx +1 -1
- package/src/lib/JoggerConnection.ts +4 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoggerConnection.d.ts","sourceRoot":"","sources":["../../src/lib/JoggerConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAG1B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAGV,UAAU,EACV,IAAI,EAEL,MAAM,wBAAwB,CAAA;AAG/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"JoggerConnection.d.ts","sourceRoot":"","sources":["../../src/lib/JoggerConnection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wandelbots/wandelbots-js-react-components",
|
|
3
|
-
"version": "2.54.5-pr.feat-jogging-blocked.406.
|
|
3
|
+
"version": "2.54.5-pr.feat-jogging-blocked.406.356cdd1",
|
|
4
4
|
"description": "React UI toolkit for building applications on top of the Wandelbots platform",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -13,7 +13,7 @@ export const JoggingBlocked = observer(({ store }: { store: JoggingStore }) => {
|
|
|
13
13
|
position: "absolute",
|
|
14
14
|
zIndex: (theme) => theme.zIndex.drawer + 1,
|
|
15
15
|
color: "#fff",
|
|
16
|
-
background: "rgba(15, 15, 15, 0.
|
|
16
|
+
background: "rgba(15, 15, 15, 0.88)",
|
|
17
17
|
justifyContent: "flex-start",
|
|
18
18
|
alignItems: "flex-start",
|
|
19
19
|
}}
|
|
@@ -26,7 +26,7 @@ export const JoggingBlocked = observer(({ store }: { store: JoggingStore }) => {
|
|
|
26
26
|
|
|
27
27
|
<Button
|
|
28
28
|
variant="contained"
|
|
29
|
-
color="
|
|
29
|
+
color="secondary"
|
|
30
30
|
onClick={() => store.unblock()}
|
|
31
31
|
>
|
|
32
32
|
{t("Jogging.Blocked.Reenable.bt")}
|
|
@@ -192,7 +192,7 @@ const JoggingPanelInner = observer(
|
|
|
192
192
|
{renderTabContent()}
|
|
193
193
|
</Stack>
|
|
194
194
|
{/* Overlay when jogging connection is blocked */}
|
|
195
|
-
{
|
|
195
|
+
{store.blocked && <JoggingBlocked store={store} />}
|
|
196
196
|
</Stack>
|
|
197
197
|
)
|
|
198
198
|
},
|
|
@@ -16,6 +16,8 @@ import { MotionStreamConnection } from "./MotionStreamConnection"
|
|
|
16
16
|
|
|
17
17
|
export type Vector3Simple = [number, number, number]
|
|
18
18
|
|
|
19
|
+
const API_ERROR_CONNECTION_BLOCKED = `Movement request rejected. Another client is currently executing a 'Jogging' motion!`
|
|
20
|
+
|
|
19
21
|
export type JoggerConnectionOptions = {
|
|
20
22
|
// The mode of the jogger connection - see type description of JoggerMode for details
|
|
21
23
|
mode?: JoggerMode
|
|
@@ -253,9 +255,7 @@ export class JoggerConnection {
|
|
|
253
255
|
clearTimeout(connectionFailedTimeout)
|
|
254
256
|
if (
|
|
255
257
|
this.onBlocked &&
|
|
256
|
-
data?.result?.message.includes(
|
|
257
|
-
`Movement request rejected. Another client is currently executing a 'Jogging' motion!`,
|
|
258
|
-
)
|
|
258
|
+
data?.result?.message.includes(API_ERROR_CONNECTION_BLOCKED)
|
|
259
259
|
) {
|
|
260
260
|
this.joggingSocket?.dispose()
|
|
261
261
|
this.onBlocked()
|
|
@@ -634,9 +634,7 @@ export class JoggerConnection {
|
|
|
634
634
|
|
|
635
635
|
if (
|
|
636
636
|
this.onBlocked &&
|
|
637
|
-
data.result.message
|
|
638
|
-
`Movement request rejected. Another client is currently executing a 'Jogging' motion!`,
|
|
639
|
-
)
|
|
637
|
+
data.result.message?.includes(API_ERROR_CONNECTION_BLOCKED)
|
|
640
638
|
) {
|
|
641
639
|
this.onBlocked()
|
|
642
640
|
return
|