@robotical/webapp-types 1.1.1 → 3.7.2

package/dist-types/src/application/ApplicationManager/ApplicationManager.d.ts

@@ -42,17 +42,21 @@ export default class ApplicationManager {
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
-    connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void, uuids: string[]): Promise<void>;
+    connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void, uuids?: string[]): Promise<void>;
     /**
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      */
-    disconnectGeneric(raft: RAFT, afterRaftDisconnectedCb?: () => void): Promise<void>;
+    disconnectGeneric(raft: RAFT, afterRaftDisconnectedCb?: () => void, skipConfirmation?: boolean): Promise<void>;
     /**
      * Selects a RAFT in Phone's verification modal
      */
     selectRaft(ricToConnectTo: FOUND_RAFT_ON_DISCOVERY_RESPONSE['foundRIC'], method: RaftConnectionMethod): Promise<RAFT | null>;
-    connectToRIC(method: RaftConnectionMethod, uuids: string[]): Promise<RAFT | null>;
+    connectToRIC(method: RaftConnectionMethod, uuids: string[], withoutVerification?: boolean): Promise<RAFT | null>;
+    /**
+     * Toggles the Sensors Dashboard modal
+     */
+    toggleSensorsDashboard(): void;
     /**
      * Disconnect from RAFT
      */
@@ -67,6 +71,11 @@ export default class ApplicationManager {
      * This is used from the Phone App only
      */
     startDiscovery(ricSelectedCb: (raft: RAFT) => void, uuids: string[]): Promise<void>;
+    /**
+     * Start discovery without verification
+     * This is used from the Phone App only, when the user wants to connect to a RAFT with qr code
+     */
+    startDiscoveryWithoutVerification(uuids: string[], afterRaftConnectedCb: (raft: RAFT) => void): Promise<void>;
     /**
      * Stοp discovery
      * When the user cancels the discovery process without having first connected to a robot

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

@@ -52,6 +52,9 @@ import Toaster from "../../utils/Toaster";
 import { AnalyticsManager } from "../../analytics/AnalyticsManager";
 import { ConnManager } from "@robotical/roboticaljs";
 import ConnectingLoadingSpinnerModal from "../../components/modals/ConnectingLoadingSpinnerModal";
+import draggableModalState from "../../state-observables/modal/DraggableModalState";
+import SensorsDashboardModal from "../../components/modals/ SensorsDashboardModal";
+import LEDLightsOrQRVerificationModal from "../../components/modals/LEDLightsOrQRVerificationModal";
 var SHOW_LOGS = true;
 var TAG = "ApplicationManager";
 var ApplicationManager = /** @class */ (function () {
@@ -132,48 +135,69 @@ var ApplicationManager = /** @class */ (function () {
      */
     ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids) {
         return __awaiter(this, void 0, void 0, function () {
-            var e_1, newRaft, e_2;
+            var specificUUIDs, isQRVerification, e_1, newRaft, e_2;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!isPhoneApp()) return [3 /*break*/, 5];
-                        _a.label = 1;
+                    case 0: return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal), "Verification Method")];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        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)];
+                        specificUUIDs = _a.sent();
+                        isQRVerification = false;
+                        if (specificUUIDs === false) {
+                            return [2 /*return*/];
+                        }
+                        if (specificUUIDs.length > 0) {
+                            uuids = specificUUIDs;
+                            isQRVerification = true;
+                        }
+                        else {
+                            if (!uuids) {
+                                uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
+                            }
+                        }
+                        if (!isPhoneApp()) return [3 /*break*/, 9];
+                        _a.label = 2;
                     case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
+                        _a.trys.push([2, 7, , 8]);
+                        if (!isQRVerification) return [3 /*break*/, 4];
+                        return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
                     case 3:
-                        e_1 = _a.sent();
-                        Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
-                        return [3 /*break*/, 4];
-                    case 4: return [3 /*break*/, 10];
+                        _a.sent();
+                        return [3 /*break*/, 6];
+                    case 4: 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 5:
-                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
+                        _a.sent();
                         _a.label = 6;
-                    case 6:
-                        _a.trys.push([6, 8, , 9]);
-                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids)];
+                    case 6: return [3 /*break*/, 8];
                     case 7:
+                        e_1 = _a.sent();
+                        Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
+                        return [3 /*break*/, 8];
+                    case 8: return [3 /*break*/, 14];
+                    case 9:
+                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
+                        _a.label = 10;
+                    case 10:
+                        _a.trys.push([10, 12, , 13]);
+                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
+                    case 11:
                         newRaft = _a.sent();
                         if (newRaft) {
                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
-                        return [3 /*break*/, 9];
-                    case 8:
+                        return [3 /*break*/, 13];
+                    case 12:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 9];
-                    case 9:
+                        return [3 /*break*/, 13];
+                    case 13:
                         secondaryModalState.closeModal();
-                        _a.label = 10;
-                    case 10: return [2 /*return*/];
+                        _a.label = 14;
+                    case 14: return [2 /*return*/];
                 }
             });
         });
@@ -182,31 +206,34 @@ var ApplicationManager = /** @class */ (function () {
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      */
-    ApplicationManager.prototype.disconnectGeneric = function (raft, afterRaftDisconnectedCb) {
+    ApplicationManager.prototype.disconnectGeneric = function (raft, afterRaftDisconnectedCb, skipConfirmation) {
+        if (skipConfirmation === void 0) { skipConfirmation = false; }
         return __awaiter(this, void 0, void 0, function () {
             var confirmDisconnect, e_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
+                        _a.trys.push([0, 4, , 5]);
+                        if (!!skipConfirmation) return [3 /*break*/, 2];
                         return [4 /*yield*/, modalState.setModal(createElement(DisconnectConfirmationModal), "Are you sure you want to disconnect from your ".concat(raft.getFriendlyName(), "?"))];
                     case 1:
                         confirmDisconnect = _a.sent();
                         if (!confirmDisconnect) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, window.applicationManager.disconnectFromRaft(raft.id)];
-                    case 2:
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, window.applicationManager.disconnectFromRaft(raft.id)];
+                    case 3:
                         _a.sent();
                         if (afterRaftDisconnectedCb) {
                             afterRaftDisconnectedCb();
                         }
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         e_3 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to disconnect from robot: ".concat(e_3));
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -260,7 +287,7 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
-    ApplicationManager.prototype.connectToRIC = function (method, uuids) {
+    ApplicationManager.prototype.connectToRIC = function (method, uuids, withoutVerification) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var wasConnectedObj, raftId, raftType, raft;
@@ -293,13 +320,27 @@ var ApplicationManager = /** @class */ (function () {
                     case 2:
                         _c.sent();
                         // start verification process
-                        modalState.setModal(createElement(VerificationModal, { connectedRAFT_: raft }), "Looking for ".concat(raft.type));
+                        if (!withoutVerification) {
+                            modalState.setModal(createElement(VerificationModal, { connectedRAFT_: raft }), "Looking for ".concat(raft.type));
+                        }
+                        else {
+                            raft.stopVerifyingRaft(true);
+                        }
                         return [2 /*return*/, raft];
                     case 3: return [2 /*return*/, null];
                 }
             });
         });
     };
+    /**
+     * Toggles the Sensors Dashboard modal
+     */
+    ApplicationManager.prototype.toggleSensorsDashboard = function () {
+        if (draggableModalState.modalContent) {
+            return draggableModalState.closeModal();
+        }
+        return draggableModalState.setModal(createElement(SensorsDashboardModal), "Sensor Insights Hub (βETA)", "sensors-dashboard");
+    };
     /**
      * Disconnect from RAFT
      */
@@ -375,6 +416,57 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Start discovery without verification
+     * This is used from the Phone App only, when the user wants to connect to a RAFT with qr code
+     */
+    ApplicationManager.prototype.startDiscoveryWithoutVerification = function (uuids, afterRaftConnectedCb) {
+        return __awaiter(this, void 0, void 0, function () {
+            var foundRICs, wasDiscoveryStarted;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        foundRICs = [];
+                        raftFoundSubscriptionHelper().subscribe(function (_a) {
+                            var discoveredDevice = _a.discoveredDevice;
+                            return __awaiter(_this, void 0, void 0, function () {
+                                var newRaft;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            // connect to the first device found, block the rest
+                                            if (foundRICs.length > 0) {
+                                                return [2 /*return*/];
+                                            }
+                                            foundRICs.push(discoveredDevice);
+                                            return [4 /*yield*/, this.selectRaft(discoveredDevice, RaftConnectionMethod.PHONE_BLE)];
+                                        case 1:
+                                            newRaft = _b.sent();
+                                            if (newRaft) {
+                                                this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
+                                                afterRaftConnectedCb(newRaft);
+                                            }
+                                            else {
+                                                foundRICs = [];
+                                            }
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            });
+                        });
+                        return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_START_DISCOVERY, { uuids: uuids })];
+                    case 1:
+                        wasDiscoveryStarted = _a.sent();
+                        if (!wasDiscoveryStarted) {
+                            return [2 /*return*/, raftFoundSubscriptionHelper().unsubscribe()];
+                        }
+                        raftFoundSubscriptionHelper().unsubscribe();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Stοp discovery
      * When the user cancels the discovery process without having first connected to a robot

package/dist-types/src/application/RAFTs/Cog/Cog.js

@@ -208,7 +208,7 @@ var Cog = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (eventEnum) {
                     case RaftInfoEvents.STATE_INFO:
-                        this.raftStateInfo = data;
+                        this.raftStateInfo = data.stateInfo;
                         break;
                     default:
                         break;

package/dist-types/src/application/RAFTs/Cog/PublishedDataAnalyser.js

@@ -119,7 +119,7 @@ var PublishedDataAnalyser = /** @class */ (function (_super) {
         var _this = this;
         this.pubSub = raftPubSubscriptionHelper(this.cog);
         this.pubSub.subscribe(function (data) {
-            _this.analyse(data);
+            _this.analyse(data.stateInfo);
         });
     };
     PublishedDataAnalyser.prototype.unsubscribeFromPublishedData = function () {
@@ -317,7 +317,7 @@ var ShakeDetector = /** @class */ (function () {
             this.gravityVector = [xAcc, yAcc, zAcc];
             if (this.moveInProgress) {
                 // console.log("move detected");
-                analyser.setMovementType("move");
+                // analyser.setMovementType("move");
             }
             else {
                 // console.log("no move detected");
@@ -326,7 +326,7 @@ var ShakeDetector = /** @class */ (function () {
             this.moveInProgress = false;
             this.shakeInProgress = false;
             this.sensorBundles = [];
-            return this.moveInProgress;
+            return this.shakeInProgress;
         }
         else {
             //console.log("move in progrss. prev state: ", this.moveInProgress);
@@ -351,7 +351,7 @@ var ShakeDetector = /** @class */ (function () {
                         if (this.sensorBundles.length > this.thresholdShakeNumber) {
                             // console.log("Shake detected!");
                             this.sensorBundles = [];
-                            this.shakeInProgress = false;
+                            this.shakeInProgress = true;
                             analyser.setMovementType("shake");
                         }
                     }
@@ -363,11 +363,11 @@ var ShakeDetector = /** @class */ (function () {
                         this.sensorBundles = [];
                         // console.log("resetting shake detector. Move detected");
                         // fire move detector
-                        analyser.setMovementType("move");
+                        analyser.setMovementType("none");
                     }
                 }
             }
-            return this.moveInProgress;
+            return this.shakeInProgress;
             /*
             if (this.sensorBundles.length === 0 || timestamp - this.lastTime > this.interval) {
                 // Check if we should reset based on time since last recorded shake

package/dist-types/src/application/RAFTs/RAFT.js

@@ -284,7 +284,8 @@ var RAFT = /** @class */ (function () {
                     case RaftConnEvent.CONN_VERIFIED_CORRECT:
                         window.applicationManager.analyticsManager.logEvent("connection", { raftType: this.type, systemInfo: this.systemInfo });
                         break;
-                    case RaftConnEvent.CONN_DISCONNECTED:
+                    case RaftConnEvent.CONN_DISCONNECTED: // this runs when the RAFT is disconnected on its own (due to a timeout or other reasons)
+                        window.applicationManager.disconnectGeneric(this, function () { }, true); // disconnects the RAFT and removes it from the connectedRafts list
                         window.applicationManager.analyticsManager.logEvent("disconnection", { raftType: this.type });
                         break;
                     case RaftConnEvent.CONN_ISSUE_DETECTED:
@@ -324,7 +325,7 @@ var RAFT = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (eventEnum) {
                     case RaftInfoEvents.STATE_INFO:
-                        this.raftStateInfo = data;
+                        this.raftStateInfo = data.stateInfo;
                         break;
                     case RaftInfoEvents.SYSTEM_INFO:
                         this.systemInfo = data.systemInfo;

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

@@ -0,0 +1,2 @@
+declare function SensorsDashboardModal(): import("react/jsx-runtime").JSX.Element;
+export default SensorsDashboardModal;

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

@@ -0,0 +1,61 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { createElement, useEffect, useRef, useState } from 'react';
+import SensorsDashboard from '@robotical/sensors-dashboard/dist/App';
+import { ReactComponent as BetaSignSVG } from "../../../assets/beta-sign.svg";
+import modalState from "../../../state-observables/modal/ModalState";
+import DetailedFeedbackModal from '../DetailedFeedbackModal';
+import styles from './styles.module.css';
+function SensorsDashboardModal() {
+    var _a = useState(true), showBetaSign = _a[0], setShowBetaSign = _a[1];
+    var betaSignRef = useRef(null);
+    // if (window.mv2Dashboard) {
+    //     window.mv2Dashboard.setIsModal(true);
+    // }
+    var updateBetaSignVisibility = function () {
+        if (!betaSignRef.current) {
+            return;
+        }
+        var parent = betaSignRef.current.parentElement;
+        if (!parent) {
+            return;
+        }
+        var parentHeight = parent.clientHeight;
+        if (parentHeight > 100) {
+            setShowBetaSign(true);
+        }
+        else {
+            setShowBetaSign(false);
+        }
+    };
+    useEffect(function () {
+        updateBetaSignVisibility();
+        if (!betaSignRef.current) {
+            return;
+        }
+        var resizeObserver = new ResizeObserver(function () {
+            updateBetaSignVisibility();
+        });
+        if (!betaSignRef.current.parentElement) {
+            return;
+        }
+        resizeObserver.observe(betaSignRef.current.parentElement);
+        return function () {
+            resizeObserver.disconnect();
+        };
+    }, [betaSignRef]);
+    return (_jsxs(_Fragment, { children: [_jsx("div", __assign({ style: { visibility: showBetaSign ? "visible" : "hidden" }, className: styles.betaSign, onClick: function () {
+                    return modalState.setModal(createElement(DetailedFeedbackModal), "Anonymous Bug Report");
+                }, ref: betaSignRef }, { children: _jsx(BetaSignSVG, {}) })), _jsx(SensorsDashboard, { isInModal: true })] }));
+}
+export default SensorsDashboardModal;

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

@@ -0,0 +1,5 @@
+type Props = {
+    otherInfoObject?: object;
+};
+export default function DetailedFeedbackModal({ otherInfoObject }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

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

@@ -0,0 +1,37 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from "react";
+import modalState from "../../../state-observables/modal/ModalState";
+import styles from "./styles.module.css";
+import SimpleButton from "../../disposables/buttons/SimpleButton";
+export default function DetailedFeedbackModal(_a) {
+    var otherInfoObject = _a.otherInfoObject;
+    var _b = useState(""), report = _b[0], setReport = _b[1];
+    var _c = useState(""), email = _c[0], setEmail = _c[1];
+    var _d = useState(false), reportSent = _d[0], setReportSent = _d[1];
+    var onReport = function () {
+        if (!report)
+            return;
+        if (!email) {
+            var confirm_1 = window.confirm("We noticed you didn't leave your email. Without it we won't be able to reach out and help you. If you want to leave your email, press cancel and fill in the email field, otherwise press OK to send the report without your email.");
+            if (!confirm_1)
+                return;
+        }
+        var reportWithContact = { text: "".concat(email ? email : "Anonymous", ": ").concat(report) };
+        window.applicationManager.analyticsManager.logEvent("textfeedback", __assign(__assign({}, reportWithContact), otherInfoObject));
+        setReportSent(true);
+        modalState.updateModalProps({ modalTitle: "🚀" });
+        setTimeout(function () { return modalState.closeModal(); }, 1500);
+    };
+    return (_jsx("div", __assign({ className: styles.bugReportModalContainer }, { children: reportSent ? ("Thank you for your feedback!") : (_jsxs(_Fragment, { children: [_jsxs("div", __assign({ className: styles.bugReportModalInfo }, { children: ["Please help up improve Marty! Please let us know if you spot any irregularities/bugs. ", _jsx("strong", __assign({ className: styles.bugReportModalInfoStrong }, { children: "You can optionally leave your contact details so we can reach out and help you" })), ". Thank you!"] })), _jsxs("div", __assign({ className: styles.bugReportModalForm }, { children: [_jsx("textarea", { className: styles.bugReportModalTextInput, placeholder: "Your report...", onChange: function (e) { return setReport(e.target.value); }, value: report }), _jsx("label", __assign({ className: styles.bugReportModalEmailLabel }, { children: "Provide your email if you want us to get back to you with a solution!" })), _jsx("input", { type: "email", className: styles.bugReportModalEmailInput, placeholder: "Email (optional)", onChange: function (e) { return setEmail(e.target.value); }, value: email })] })), _jsxs("div", __assign({ className: styles.bugReportModalButtons }, { children: [_jsx(SimpleButton, { onClick: function () { return modalState.closeModal(); }, title: "Cancel" }), _jsx(SimpleButton, { onClick: onReport, title: "Report" })] }))] })) })));
+}

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

@@ -0,0 +1 @@
+export default function LEDLightsOrQRVerificationModal(): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,141 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
+import modalState from "../../../state-observables/modal/ModalState";
+import styles from "./styles.module.css";
+import { HiOutlineLightBulb } from "react-icons/hi";
+import { MdQrCode } from "react-icons/md";
+//@ts-ignore
+import { Scanner, centerText } from '@yudiel/react-qr-scanner';
+import { ConnManager } from "@robotical/roboticaljs";
+var options = [
+    {
+        id: "qr",
+        title: "QR Code Verification",
+        subtitle: "Scan a QR code to verify.",
+        icon: _jsx(MdQrCode, { size: 32 }),
+    },
+    {
+        id: "led",
+        title: "LED Lights Verification",
+        subtitle: "Check LED signals for verification.",
+        icon: _jsx(HiOutlineLightBulb, { size: 32 }),
+    },
+];
+export default function LEDLightsOrQRVerificationModal() {
+    var _a = useState(true), qrSelected = _a[0], setQRSelected = _a[1];
+    var _b = useState(undefined), serialNoFromQR = _b[0], setSerialNoFromQR = _b[1];
+    useEffect(function () {
+        if (serialNoFromQR) {
+            modalState.closeModal([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
+            // modalState.closeModal([ConnManager.generateServiceFilterUUID('00000000202302111d28b4dc5f0d46d5')]);
+        }
+    }, [serialNoFromQR]);
+    var handleSelect = function (id) {
+        if (id === 'qr') {
+            setQRSelected(function (prev) { return !prev; });
+        }
+        else {
+            modalState.closeModal([]);
+        }
+    };
+    return (_jsxs("div", __assign({ className: styles.container }, { children: [_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));
+                }) })), qrSelected && _jsx(QRContent, { setSerialNo: setSerialNoFromQR }), _jsx("button", __assign({ className: styles.cancelButton, onClick: function () { return modalState.closeModal(false); } }, { children: "Cancel" }))] })));
+}
+function QRContent(_a) {
+    var _this = this;
+    var setSerialNo = _a.setSerialNo;
+    var onQrCodeFound = function (result) { return __awaiter(_this, void 0, void 0, function () {
+        var rawValue, today, serialNo;
+        var _a;
+        return __generator(this, function (_b) {
+            rawValue = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.rawValue;
+            if (!rawValue || !rawValue.includes("CV1-")) {
+                window.applicationManager.toaster.error("No Valid QR Code Found");
+                return [2 /*return*/];
+            }
+            today = new Date();
+            serialNo = "00000000" + today.toISOString().split("T")[0].replaceAll("-", "") + rawValue.split("-").slice(-1)[0].padStart(16, "0");
+            setSerialNo(serialNo);
+            return [2 /*return*/];
+        });
+    }); };
+    return (_jsx("div", __assign({ className: styles.QRcontainer }, { children: _jsx("div", __assign({ className: styles.QRscannerContainer }, { children: _jsx(Scanner, { formats: [
+                    "qr_code",
+                    "micro_qr_code",
+                    "rm_qr_code",
+                    "maxi_code",
+                    "pdf417",
+                    "aztec",
+                    "data_matrix",
+                    "matrix_codes",
+                    "dx_film_edge",
+                    "databar",
+                    "databar_expanded",
+                    "codabar",
+                    "code_39",
+                    "code_93",
+                    "code_128",
+                    "ean_8",
+                    "ean_13",
+                    "itf",
+                    "linear_codes",
+                    "upc_a",
+                    "upc_e",
+                ], allowMultiple: false, scanDelay: 2000, onScan: onQrCodeFound, components: {
+                    audio: true,
+                    onOff: false,
+                    torch: true,
+                    zoom: true,
+                    finder: true,
+                    tracker: centerText, // boundingBox // outline //
+                } }) })) })));
+}

package/dist-types/src/state-observables/modal/DraggableModalState.d.ts

@@ -0,0 +1,16 @@
+import { ModalContentType, ModalEventTopics, ModalObservable, ModalObserver, ModalStateData } from "./ModalObserver";
+declare class DraggableModalState implements ModalObservable {
+    modalContent: ModalContentType | null;
+    modalTitle: string;
+    modalNewWindowLink: string | undefined;
+    private _observers;
+    private onClose?;
+    constructor();
+    setModal(modalContent: ModalContentType, modalTitle: string, newWindowLink?: string, onClose?: () => void): void;
+    closeModal(): void;
+    subscribe(observer: ModalObserver, topics: Array<ModalEventTopics>): void;
+    unsubscribe(observer: ModalObserver): void;
+    publish(eventTopic: ModalEventTopics, eventData?: ModalStateData): void;
+}
+declare const draggableModalState: DraggableModalState;
+export default draggableModalState;

package/dist-types/src/state-observables/modal/DraggableModalState.js

@@ -0,0 +1,52 @@
+var DraggableModalState = /** @class */ (function () {
+    function DraggableModalState() {
+        this._observers = {};
+    }
+    DraggableModalState.prototype.setModal = function (modalContent, modalTitle, newWindowLink, onClose) {
+        this.modalContent = modalContent;
+        this.modalTitle = modalTitle;
+        this.modalNewWindowLink = newWindowLink;
+        this.publish("SetModal", { modalContent: modalContent, modalTitle: modalTitle, newWindowLink: newWindowLink });
+        this.onClose = onClose;
+    };
+    DraggableModalState.prototype.closeModal = function () {
+        var _a;
+        this.modalContent = null;
+        this.modalTitle = "";
+        this.modalNewWindowLink = undefined;
+        this.publish("CloseModal");
+        (_a = this.onClose) === null || _a === void 0 ? void 0 : _a.call(this);
+    };
+    DraggableModalState.prototype.subscribe = function (observer, topics) {
+        for (var _i = 0, topics_1 = topics; _i < topics_1.length; _i++) {
+            var topic = topics_1[_i];
+            if (!this._observers[topic]) {
+                this._observers[topic] = [];
+            }
+            if (this._observers[topic].indexOf(observer) === -1) {
+                this._observers[topic].push(observer);
+            }
+        }
+    };
+    DraggableModalState.prototype.unsubscribe = function (observer) {
+        for (var topic in this._observers) {
+            if (this._observers.hasOwnProperty(topic)) {
+                var index = this._observers[topic].indexOf(observer);
+                if (index !== -1) {
+                    this._observers[topic].splice(index, 1);
+                }
+            }
+        }
+    };
+    DraggableModalState.prototype.publish = function (eventTopic, eventData) {
+        if (this._observers.hasOwnProperty(eventTopic)) {
+            for (var _i = 0, _a = this._observers[eventTopic]; _i < _a.length; _i++) {
+                var observer = _a[_i];
+                observer.notify(eventTopic, eventData);
+            }
+        }
+    };
+    return DraggableModalState;
+}());
+var draggableModalState = new DraggableModalState();
+export default draggableModalState;

package/dist-types/src/wrapper-app/connectors/CogConnector/CogConnector.js

@@ -193,7 +193,7 @@ var CogConnector = /** @class */ (function (_super) {
                                     light: CogPublishedDataGetter.getLightData(stateInfo.deviceManager),
                                     gyroscope: CogPublishedDataGetter.getGyroscopeData(stateInfo.deviceManager)
                                 };
-                                this.publish("raftinfo", RaftInfoEvents.STATE_INFO, "StateInfo", simplifiedInfo);
+                                this.publish("raftinfo", RaftInfoEvents.STATE_INFO, "StateInfo", { stateInfo: simplifiedInfo });
                             }
                         }
                         break;

package/dist-types/src/wrapper-app/connectors/ConnectorFactory.js

@@ -77,7 +77,7 @@ var ConnectorFactory = /** @class */ (function () {
     };
     ConnectorFactory.createConnector = function (raftType, connManager) {
         var systemInfo = connManager.getConnector().getRaftSystemUtils().getCachedSystemInfo();
-        var serialNo = systemInfo === null || systemInfo === void 0 ? void 0 : systemInfo.SerialNo;
+        var serialNo = (systemInfo === null || systemInfo === void 0 ? void 0 : systemInfo.MAC) || (systemInfo === null || systemInfo === void 0 ? void 0 : systemInfo.SerialNo);
         var connector;
         var randomId = serialNo || randomHashGenerator();
         switch (raftType) {

package/package.json

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

package/dist-types/src/application/RAFTs/Cog/PublishedDataGetter.d.ts

@@ -1,23 +0,0 @@
-import { DeviceManager } from "@robotical/raftjs/dist/web/RaftDeviceManager";
-export default class PublishedDataGetter {
-    static getPowerData(deviceManager: DeviceManager): {
-        battV: number;
-        usb: "yes" | "no";
-    } | undefined;
-    static getAccelerometerData(deviceManager: DeviceManager): {
-        ax: number;
-        ay: number;
-        az: number;
-    } | undefined;
-    static getGyroscopeData(deviceManager: DeviceManager): {
-        gx: number;
-        gy: number;
-        gz: number;
-    } | undefined;
-    static getLightData(deviceManager: DeviceManager): {
-        amb0: number;
-        ir0: number;
-        ir1: number;
-        ir2: number;
-    } | undefined;
-}

package/dist-types/src/application/RAFTs/Cog/PublishedDataGetter.js

@@ -1,65 +0,0 @@
-import { deviceAttrGetLatestFormatted } from "@robotical/raftjs";
-/* LIGHT ATTRIBUTES */
-var COG_LIGHT_ATTR_KEY = 'RoboCogLightV1_0';
-var AMB0_KEY = 'amb0';
-var IR0_KEY = 'ir0';
-var IR1_KEY = 'ir1';
-var IR2_KEY = 'ir2';
-/* POWER ATTRIBUTES */
-var COG_POWER_ATTR_KEY = 'RoboCogPowerV1_00';
-var BATTV_KEY = 'battV';
-var USB_KEY = 'UST';
-/* I2CA ATTRIBUTES */
-var COG_I2CA_ATTR_KEY = 'I2CA_6a';
-var AX_KEY = 'ax';
-var AY_KEY = 'ay';
-var AZ_KEY = 'az';
-var GX_KEY = 'gx';
-var GY_KEY = 'gy';
-var GZ_KEY = 'gz';
-var PublishedDataGetter = /** @class */ (function () {
-    function PublishedDataGetter() {
-    }
-    PublishedDataGetter.getPowerData = function (deviceManager) {
-        var powerAttr = deviceManager.getDeviceState(COG_POWER_ATTR_KEY);
-        var battV = deviceAttrGetLatestFormatted(powerAttr === null || powerAttr === void 0 ? void 0 : powerAttr.deviceAttributes[BATTV_KEY]);
-        var usb = deviceAttrGetLatestFormatted(powerAttr === null || powerAttr === void 0 ? void 0 : powerAttr.deviceAttributes[USB_KEY]);
-        return { battV: convertStringToNumber(battV), usb: usb };
-    };
-    PublishedDataGetter.getAccelerometerData = function (deviceManager) {
-        var i2caAttr = deviceManager.getDeviceState(COG_I2CA_ATTR_KEY);
-        if (!i2caAttr)
-            return;
-        var i2ca = i2caAttr.deviceAttributes;
-        var ax = deviceAttrGetLatestFormatted(i2ca[AX_KEY]);
-        var ay = deviceAttrGetLatestFormatted(i2ca[AY_KEY]);
-        var az = deviceAttrGetLatestFormatted(i2ca[AZ_KEY]);
-        return { ax: convertStringToNumber(ax), ay: convertStringToNumber(ay), az: convertStringToNumber(az) };
-    };
-    PublishedDataGetter.getGyroscopeData = function (deviceManager) {
-        var i2caAttr = deviceManager.getDeviceState(COG_I2CA_ATTR_KEY);
-        if (!i2caAttr)
-            return;
-        var i2ca = i2caAttr.deviceAttributes;
-        var gx = deviceAttrGetLatestFormatted(i2ca[GX_KEY]);
-        var gy = deviceAttrGetLatestFormatted(i2ca[GY_KEY]);
-        var gz = deviceAttrGetLatestFormatted(i2ca[GZ_KEY]);
-        return { gx: convertStringToNumber(gx), gy: convertStringToNumber(gy), gz: convertStringToNumber(gz) };
-    };
-    PublishedDataGetter.getLightData = function (deviceManager) {
-        var lightAttr = deviceManager.getDeviceState(COG_LIGHT_ATTR_KEY);
-        if (!lightAttr)
-            return;
-        var light = lightAttr.deviceAttributes;
-        var amb0 = deviceAttrGetLatestFormatted(light[AMB0_KEY]);
-        var ir0 = deviceAttrGetLatestFormatted(light[IR0_KEY]);
-        var ir1 = deviceAttrGetLatestFormatted(light[IR1_KEY]);
-        var ir2 = deviceAttrGetLatestFormatted(light[IR2_KEY]);
-        return { amb0: convertStringToNumber(amb0), ir0: convertStringToNumber(ir0), ir1: convertStringToNumber(ir1), ir2: convertStringToNumber(ir2) };
-    };
-    return PublishedDataGetter;
-}());
-export default PublishedDataGetter;
-var convertStringToNumber = function (str) {
-    return isNaN(+str) ? 0 : +str;
-};