@robotical/webapp-types 3.15.16 → 3.15.18

package/dist-types/src/application/ApplicationManager/ApplicationManager.js

@@ -408,26 +408,31 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
         if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
         return __awaiter(this, void 0, void 0, function () {
-            var specificUUIDs, isQRVerification, e_1, newRaft, e_2;
+            var verificationMethod, isQRVerification, e_1, newRaft, e_2;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        verificationMethod = { action: "led" };
                         if (!shouldShowQrModal) return [3 /*break*/, 2];
-                        return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal), i18n.t("connection.verification_method"))];
+                        return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal, {
+                                targetRaftType: RaftTypeE.COG,
+                                allowSwitchToMarty: true,
+                            }), i18n.t("connection.verification_method"))];
                     case 1:
-                        specificUUIDs = _a.sent();
-                        return [3 /*break*/, 3];
+                        verificationMethod =
+                            (_a.sent()) || { action: "cancel" };
+                        _a.label = 2;
                     case 2:
-                        specificUUIDs = [];
-                        _a.label = 3;
-                    case 3:
-                        isQRVerification = false;
-                        if (specificUUIDs === false) {
+                        if (!verificationMethod || verificationMethod.action === "cancel") {
                             return [2 /*return*/];
                         }
-                        if (specificUUIDs.length > 0) {
-                            uuids = specificUUIDs;
+                        if (verificationMethod.action === "switch-to-marty") {
+                            return [2 /*return*/, this.connectGenericMarty(afterRaftConnectedCb)];
+                        }
+                        isQRVerification = false;
+                        if (verificationMethod.action === "qr") {
+                            uuids = verificationMethod.uuids;
                             isQRVerification = true;
                         }
                         else {
@@ -435,52 +440,52 @@ var ApplicationManager = /** @class */ (function () {
                                 uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
                             }
                         }
-                        if (!isPhoneApp()) return [3 /*break*/, 11];
+                        if (!isPhoneApp()) return [3 /*break*/, 10];
                         this.lastUUIDsUsed = uuids; // Store the last used UUIDs so when the user presses "Scan Again" in the phone app connection modal, we can use them to start discovery again
-                        _a.label = 4;
-                    case 4:
-                        _a.trys.push([4, 9, , 10]);
-                        if (!isQRVerification) return [3 /*break*/, 6];
+                        _a.label = 3;
+                    case 3:
+                        _a.trys.push([3, 8, , 9]);
+                        if (!isQRVerification) return [3 /*break*/, 5];
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), i18n.t("connection.connecting_msg"), false);
                         this.ricSelectedCb = null;
                         return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
-                    case 5:
+                    case 4:
                         _a.sent();
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
                             _this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }, uuids)];
-                    case 7:
+                    case 6:
                         _a.sent();
-                        _a.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
+                        _a.label = 7;
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
                         e_1 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
-                        return [3 /*break*/, 10];
-                    case 10: return [3 /*break*/, 16];
-                    case 11:
+                        return [3 /*break*/, 9];
+                    case 9: return [3 /*break*/, 15];
+                    case 10:
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), i18n.t("connection.connecting_msg"), false);
-                        _a.label = 12;
-                    case 12:
-                        _a.trys.push([12, 14, , 15]);
+                        _a.label = 11;
+                    case 11:
+                        _a.trys.push([11, 13, , 14]);
                         return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
-                    case 13:
+                    case 12:
                         newRaft = _a.sent();
                         if (newRaft) {
                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
-                        return [3 /*break*/, 15];
-                    case 14:
+                        return [3 /*break*/, 14];
+                    case 13:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 15];
-                    case 15:
-                        secondaryModalState.closeModal();
-                        _a.label = 16;
-                    case 16: return [2 /*return*/];
+                        return [3 /*break*/, 14];
+                    case 14:
+                        secondaryModalState.closeModalWithoutAnimation();
+                        _a.label = 15;
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -749,7 +754,7 @@ var ApplicationManager = /** @class */ (function () {
                                 _this.toaster.error("Make sure the robot is powered on and in range!");
                             }
                             window.applicationManager.stopDiscovery();
-                            secondaryModalState.closeModal();
+                            secondaryModalState.closeModalWithoutAnimation();
                             raftFoundSubscriptionHelper().unsubscribe();
                             clearTimeout(notFoundTimeout);
                         }, 7000);
@@ -770,7 +775,7 @@ var ApplicationManager = /** @class */ (function () {
                                         case 1:
                                             newRaft = _b.sent();
                                             if (!newRaft) return [3 /*break*/, 6];
-                                            secondaryModalState.closeModal();
+                                            secondaryModalState.closeModalWithoutAnimation();
                                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                                             afterRaftConnectedCb(newRaft);
                                             oldColours = newRaft._ledLcdColours;

package/dist-types/src/components/modals/ConnectingLoadingSpinnerModal/index.js

@@ -19,7 +19,7 @@ export default function ConnectingLoadingSpinnerModal(_a) {
     useEffect(function () {
         // close modal after 3 minutes assuming no connection will take that long
         setTimeout(function () {
-            secondaryModalState.closeModal();
+            secondaryModalState.closeModalWithoutAnimation();
         }, 180000);
     }, []);
     return (_jsx("div", __assign({ className: styles.container }, { children: t("connection.connecting_loading") })));

package/dist-types/src/components/modals/LEDLightsOrQRVerificationModal/index.d.ts

@@ -1 +1,7 @@
-export default function LEDLightsOrQRVerificationModal(): import("react/jsx-runtime").JSX.Element;
+import { RaftTypeE } from "../../../types/raft";
+type Props = {
+    targetRaftType: RaftTypeE.COG;
+    allowSwitchToMarty?: boolean;
+};
+export default function LEDLightsOrQRVerificationModal({ targetRaftType, allowSwitchToMarty, }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist-types/src/components/modals/LEDLightsOrQRVerificationModal/index.js

@@ -57,20 +57,15 @@ import { MAIN_BLUE } from "../../../styles/colors";
 import { Scanner, centerText } from '@yudiel/react-qr-scanner';
 import { ConnManager } from "@robotical/roboticaljs";
 import { useTranslation } from "react-i18next";
-export default function LEDLightsOrQRVerificationModal() {
+export default function LEDLightsOrQRVerificationModal(_a) {
     var _this = this;
+    var targetRaftType = _a.targetRaftType, _b = _a.allowSwitchToMarty, allowSwitchToMarty = _b === void 0 ? false : _b;
     var t = useTranslation().t;
-    var _a = useState(true), qrSelected = _a[0], setQRSelected = _a[1];
-    var _b = useState(undefined), serialNoFromQR = _b[0], setSerialNoFromQR = _b[1];
-    var _c = useState(false), isButtonToConnectVisible = _c[0], setIsButtonToConnectVisible = _c[1];
+    var _c = useState(true), qrSelected = _c[0], setQRSelected = _c[1];
+    var _d = useState(undefined), serialNoFromQR = _d[0], setSerialNoFromQR = _d[1];
+    var _e = useState(false), isButtonToConnectVisible = _e[0], setIsButtonToConnectVisible = _e[1];
     useEffect(function () {
         if (serialNoFromQR) {
-            // 00000000202502200000000000000239
-            console.log("serialNoFromQR", serialNoFromQR);
-            console.log("ConnManager.generateServiceFilterUUID(serialNoFromQR)", ConnManager.generateServiceFilterUUID(serialNoFromQR));
-            var dd = ConnManager;
-            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
-            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000202302111d28b4dc5f0d46d5')]);
             setIsButtonToConnectVisible(true);
             setQRSelected(false);
         }
@@ -92,31 +87,32 @@ export default function LEDLightsOrQRVerificationModal() {
     var handleSelect = function (id) {
         if (id === 'qr') {
             setSerialNoFromQR(undefined);
-            setQRSelected(function (prev) { return !prev; });
-            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000202502200000000000000239')]);
+            setIsButtonToConnectVisible(false);
+            setQRSelected(true);
         }
         else {
-            console.log("LED Lights Verification");
-            modalState.closeModalWithoutAnimation([]);
+            var result = { action: "led" };
+            modalState.closeModalWithoutAnimation(result);
         }
     };
     var handleConnect = function () { return __awaiter(_this, void 0, void 0, function () {
+        var result;
         return __generator(this, function (_a) {
             if (serialNoFromQR) {
-                modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
-            }
-            else {
-                // // testing
-                // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000000000000000000000000079')]);
+                result = {
+                    action: "qr",
+                    uuids: [ConnManager.generateServiceFilterUUID(serialNoFromQR)],
+                };
+                modalState.closeModalWithoutAnimation(result);
             }
             return [2 /*return*/];
         });
     }); };
-    return (_jsxs("div", __assign({ className: styles.container }, { children: [_jsxs("div", __assign({ className: styles.bluetoothNotice }, { children: [_jsx(BluetoothSVG, { className: styles.bluetoothIcon, fill: MAIN_BLUE, "aria-hidden": "true", focusable: "false" }), _jsx("span", __assign({ className: styles.bluetoothText }, { children: t("configuration_screen.bluetooth") }))] })), !isButtonToConnectVisible ? _jsx("div", __assign({ className: styles.cards }, { children: options.map(function (_a) {
-                    var id = _a.id, title = _a.title, subtitle = _a.subtitle, icon = _a.icon;
-                    return (_jsxs("div", __assign({ className: qrSelected && id === 'qr' ? [styles.card, styles.qrselected].join(" ") : styles.card, onClick: function () { return handleSelect(id); } }, { children: [_jsx("div", __assign({ className: styles.icon }, { children: icon })), _jsx("h3", __assign({ className: styles.title }, { children: title })), _jsx("p", __assign({ className: styles.subtitle }, { children: subtitle }))] }), id));
-                }) })) :
-                _jsx("div", __assign({ className: styles.cogNote }, { children: _jsxs("strong", { children: ["Don't forget to ", _jsx("span", __assign({ className: styles.cogNoteHighlight }, { children: "turn on" })), " your Cog!"] }) })), qrSelected && _jsx(QRContent, { setSerialNo: setSerialNoFromQR }), _jsxs("div", __assign({ className: styles.buttonsContainer }, { children: [isButtonToConnectVisible && _jsx("button", __assign({ className: styles.connectButton, onClick: handleConnect }, { children: t('connection.qr_connect_button') })), _jsx("button", __assign({ className: styles.cancelButton, onClick: function () { return modalState.closeModal(false); } }, { children: t('connection.cancel') }))] }))] })));
+    return (_jsxs("div", __assign({ className: styles.container }, { children: [_jsxs("div", __assign({ className: styles.robotContext }, { children: [_jsx("p", __assign({ className: styles.robotContextEyebrow }, { children: t("connection.connecting_to", "Connecting to") })), _jsx("h3", __assign({ className: styles.robotContextTitle }, { children: targetRaftType })), allowSwitchToMarty && (_jsx("button", __assign({ type: "button", className: styles.switchRobotButton, onClick: function () { return modalState.closeModal({ action: "switch-to-marty" }); } }, { children: t("connection.connect_marty_instead", "Connect Marty instead") })))] })), _jsxs("div", __assign({ className: styles.bluetoothNotice }, { children: [_jsx(BluetoothSVG, { className: styles.bluetoothIcon, fill: MAIN_BLUE, "aria-hidden": "true", focusable: "false" }), _jsx("span", __assign({ className: styles.bluetoothText }, { children: t("configuration_screen.bluetooth") }))] })), _jsxs("div", { children: [_jsx("p", __assign({ className: styles.robotContextSubtitle }, { children: t("connection.cog_verification_prompt", "Choose how you want to verify your Cog connection.") })), !isButtonToConnectVisible ? _jsx("div", __assign({ className: styles.cards }, { children: options.map(function (_a) {
+                            var id = _a.id, title = _a.title, subtitle = _a.subtitle, icon = _a.icon;
+                            return (_jsxs("div", __assign({ className: qrSelected && id === 'qr' ? [styles.card, styles.qrselected].join(" ") : styles.card, onClick: function () { return handleSelect(id); } }, { children: [_jsx("div", __assign({ className: styles.icon }, { children: icon })), _jsx("h3", __assign({ className: styles.title }, { children: title })), _jsx("p", __assign({ className: styles.subtitle }, { children: subtitle }))] }), id));
+                        }) })) :
+                        _jsx("div", __assign({ className: styles.cogNote }, { children: _jsxs("strong", { children: ["Don't forget to ", _jsx("span", __assign({ className: styles.cogNoteHighlight }, { children: "turn on" })), " your Cog!"] }) }))] }), qrSelected && _jsx(QRContent, { setSerialNo: setSerialNoFromQR }), _jsxs("div", __assign({ className: styles.buttonsContainer }, { children: [isButtonToConnectVisible && _jsx("button", __assign({ className: styles.connectButton, onClick: handleConnect }, { children: t('connection.qr_connect_button') })), _jsx("button", __assign({ className: styles.cancelButton, onClick: function () { return modalState.closeModal({ action: "cancel" }); } }, { children: t('connection.cancel') }))] }))] })));
 }
 function QRContent(_a) {
     var _this = this;

package/dist-types/src/i18n.js

@@ -225,6 +225,17 @@ var resources = {
                 "unplugged_modal_body": "Your Marty is currently in unplugged mode. If you want to dissconect Marty from unplugged mode, please press the \"MODE\"/\"A\" button on the back of Marty and try again!",
                 "unplugged_modal_button": "Got it!",
                 "cancel": "Cancel",
+                "choose_robot_cta": "Choose robot to connect",
+                "choose_robot_prompt": "Choose the robot you want to connect.",
+                "choose_robot_title": "Choose a Robot",
+                "cog_verification_prompt": "Choose how you want to verify your Cog connection.",
+                "connect_another_robot": "Connect another robot",
+                "connect_cog": "Connect Cog",
+                "connect_cog_subtitle": "Choose Bluetooth verification with LED lights or QR.",
+                "connect_marty": "Connect Marty",
+                "connect_marty_instead": "Connect Marty instead",
+                "connect_marty_subtitle": "Connect using Bluetooth.",
+                "connecting_to": "Connecting to",
                 "connecting_loading": "This shouldn't take long!",
                 "connecting_msg": "Connecting...",
                 "led_subtitle": "Check LED signals for verification.",
@@ -308,12 +319,12 @@ var resources = {
                 "blocks": "Blocks",
                 "blocksJr": "Blocks Jr",
                 "controller": "Marty Controller",
-                "games": "Games",
+                "games": "Cog Games",
                 "sensors": "Sensor Dashboard"
             },
             "nav": {
                 "activities": "Activities",
-                "games": "Games",
+                "games": "Cog Games",
                 "home": "Home",
                 "not_connected_robot_msg_for_configuration_page": "Oops! It looks like you’re not connected to a robot. Connect to a robot via bluetooth to access the configuration page"
             },
@@ -1097,7 +1108,7 @@ var resources = {
             },
             "nav": {
                 "activities": "Activiteiten",
-                "games": "Games",
+                "games": "Cog Games",
                 "home": "Thuis",
                 "not_connected_robot_msg_for_configuration_page": "Oeps! Het lijkt erop dat je niet verbonden bent met een robot. Maak verbinding met een robot om toegang te krijgen tot de configuratiepagina"
             },
@@ -1484,12 +1495,12 @@ var resources = {
                 "blocks": "Blocchi",
                 "blocksJr": "Blocchi Jr.",
                 "controller": "Marty Controller",
-                "games": "Giochi",
+                "games": "Cog Giochi",
                 "sensors": "Pannello di controllo del sensore"
             },
             "nav": {
                 "activities": "Attività",
-                "games": "Giochi",
+                "games": "Cog Giochi",
                 "home": "Casa",
                 "not_connected_robot_msg_for_configuration_page": "Oops! Sembra che tu non sia connesso a un robot. Connettiti a un robot per accedere alla pagina di configurazione."
             },

package/dist-types/src/types/connection-flow.d.ts

@@ -0,0 +1,12 @@
+import { RaftTypeE } from "./raft";
+export type RobotSelectionModalResult = RaftTypeE.MARTY | RaftTypeE.COG | false;
+export type CogVerificationModalResult = {
+    action: "cancel";
+} | {
+    action: "led";
+} | {
+    action: "qr";
+    uuids: string[];
+} | {
+    action: "switch-to-marty";
+};

package/dist-types/src/types/connection-flow.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/webapp-types",
-  "version": "3.15.16",
+  "version": "3.15.18",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",