@robotical/webapp-types 3.10.0 → 3.10.2

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

@@ -71,7 +71,7 @@ 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[], shouldShowQrModal?: boolean): Promise<void>;
     /**
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)

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

@@ -359,7 +359,7 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.connectGenericMarty = function (afterRaftConnectedCb) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID])];
+                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false)];
             });
         });
     };
@@ -375,15 +375,23 @@ var ApplicationManager = /** @class */ (function () {
      * 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
      */
-    ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids) {
+    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 _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal), "Verification Method")];
+                    case 0:
+                        if (!shouldShowQrModal) return [3 /*break*/, 2];
+                        return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal), "Verification Method")];
                     case 1:
                         specificUUIDs = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        specificUUIDs = [];
+                        _a.label = 3;
+                    case 3:
                         isQRVerification = false;
                         if (specificUUIDs === false) {
                             return [2 /*return*/];
@@ -397,51 +405,51 @@ var ApplicationManager = /** @class */ (function () {
                                 uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
                             }
                         }
-                        if (!isPhoneApp()) return [3 /*break*/, 9];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 7, , 8]);
-                        if (!isQRVerification) return [3 /*break*/, 4];
+                        if (!isPhoneApp()) return [3 /*break*/, 11];
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 9, , 10]);
+                        if (!isQRVerification) return [3 /*break*/, 6];
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
                         this.ricSelectedCb = null;
                         return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
-                    case 3:
+                    case 5:
                         _a.sent();
-                        return [3 /*break*/, 6];
-                    case 4: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
+                        return [3 /*break*/, 8];
+                    case 6: 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:
-                        _a.sent();
-                        _a.label = 6;
-                    case 6: return [3 /*break*/, 8];
                     case 7:
+                        _a.sent();
+                        _a.label = 8;
+                    case 8: return [3 /*break*/, 10];
+                    case 9:
                         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:
+                        return [3 /*break*/, 10];
+                    case 10: return [3 /*break*/, 16];
+                    case 11:
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
-                        _a.label = 10;
-                    case 10:
-                        _a.trys.push([10, 12, , 13]);
+                        _a.label = 12;
+                    case 12:
+                        _a.trys.push([12, 14, , 15]);
                         return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
-                    case 11:
+                    case 13:
                         newRaft = _a.sent();
                         if (newRaft) {
                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 15];
+                    case 14:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 13];
-                    case 13:
+                        return [3 /*break*/, 15];
+                    case 15:
                         secondaryModalState.closeModal();
-                        _a.label = 14;
-                    case 14: return [2 /*return*/];
+                        _a.label = 16;
+                    case 16: return [2 /*return*/];
                 }
             });
         });

package/package.json

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