Fixes bugs 1, 4, 6 (#1)

Release version 3.1.5 * bugs 1, 4 fixed on android * bug 1 fixed dashboard * Transfer bug fixes on iOS --------- Co-authored-by: William Kwan <[email protected]>
Mobsya · Sep 12, 2024 · e9bcd19 · e9bcd19
1 parent 77abc6e
commit e9bcd19
Show file tree

Hide file tree

Showing 28 changed files with 128 additions and 114 deletions.
diff --git a/...Client/fetchCalls/getAllDevicesIP:Name.ts → ...Client/fetchCalls/getAllDevicesIP_Name.ts b/...Client/fetchCalls/getAllDevicesIP:Name.ts → ...Client/fetchCalls/getAllDevicesIP_Name.ts
diff --git a/...chCalls/getAllDevicesIP:Names.stories.mdx → ...chCalls/getAllDevicesIP_Names.stories.mdx b/...chCalls/getAllDevicesIP:Names.stories.mdx → ...chCalls/getAllDevicesIP_Names.stories.mdx
diff --git a/apps/openwrt-config-dashboard/src/hooks/useLuciRCPjsonClient/stateMachine.tsx b/apps/openwrt-config-dashboard/src/hooks/useLuciRCPjsonClient/stateMachine.tsx
@@ -2,7 +2,7 @@ import React, { createContext, useContext, useEffect, useRef, useState } from 'r
 import { useActor } from '@xstate/react';
 import { Actions, assign, createMachine, DoneInvokeEvent, interpret, send } from 'xstate';
 import { getLoginSid } from './fetchCalls/getLoginToken';
-import { getDevices } from './fetchCalls/getAllDevicesIP:Name';
+import { getDevices } from './fetchCalls/getAllDevicesIP_Name';
 import { getWifiStatus } from './fetchCalls/getWifiStatus';
 import { getInternetStatus } from './fetchCalls/getInternetStatus';
 import { ContextData, Event, ServiceEvent, initialState } from '.';
@@ -144,7 +144,6 @@ const actions = {
       }
 
       const devices = await getDevices({ sid });
-
       resolve({ devices });
     });
   },
@@ -256,6 +255,12 @@ const actions = {
     };
   }),
   updateRobots: assign((context: ContextData, event: Event) => {
+    const idMap = event.data.robots.map((robot: { nodeId: any; }) => robot.nodeId);
+    context.robots.forEach(robot => {
+      if (!idMap.includes(robot.nodeId) && robot.status !== "disconnected") {
+        event.data.robots.push(robot);
+      }
+    });
     return {
       robots: event.data.robots,
       times: context.times + 1,
@@ -609,7 +614,6 @@ export const StateProvider = ({ children }: { children: React.ReactNode }) => {
         );
 
         // console.log('tdmClient', { robots: _nodes });
-
         services[1]({ type: 'updateRobots', data: { robots: _nodes } });
         setTDMActive(true);
         // setRouterData({ ...routerData, robots: _nodes });

diff --git a/apps/thymio-suite-mobile-android/android/app/build.gradle b/apps/thymio-suite-mobile-android/android/app/build.gradle
@@ -81,7 +81,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 300011
-        versionName "3.1.4"
+        versionName "3.1.5"
     }
     signingConfigs {
         debug {

diff --git a/apps/thymio-suite-mobile-android/android/app/src/main/assets/scanner/asset-manifest.json b/apps/thymio-suite-mobile-android/android/app/src/main/assets/scanner/asset-manifest.json
@@ -1,17 +1,17 @@
 {
   "files": {
     "main.css": "./static/css/main.75b0f2c6.css",
-    "main.js": "./static/js/main.d7269370.js",
+    "main.js": "./static/js/main.fc06555d.js",
     "static/js/787.988f181b.chunk.js": "./static/js/787.988f181b.chunk.js",
     "static/media/scratch-description.jpeg": "./static/media/scratch-description.95613845cfb9ab1406dc.jpeg",
     "static/media/vpl3-description.jpeg": "./static/media/vpl3-description.6ab995b25c1695e316d1.jpeg",
     "index.html": "./index.html",
     "main.75b0f2c6.css.map": "./static/css/main.75b0f2c6.css.map",
-    "main.d7269370.js.map": "./static/js/main.d7269370.js.map",
+    "main.fc06555d.js.map": "./static/js/main.fc06555d.js.map",
     "787.988f181b.chunk.js.map": "./static/js/787.988f181b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.75b0f2c6.css",
-    "static/js/main.d7269370.js"
+    "static/js/main.fc06555d.js"
   ]
 }
diff --git a/apps/thymio-suite-mobile-android/android/app/src/main/assets/scanner/index.html b/apps/thymio-suite-mobile-android/android/app/src/main/assets/scanner/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.d7269370.js"></script><link href="./static/css/main.75b0f2c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.fc06555d.js"></script><link href="./static/css/main.75b0f2c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/...hymio-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.d7269370.js b/...hymio-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.d7269370.js
diff --git a/...o-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.d7269370.js.map b/...o-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.d7269370.js.map
diff --git a/...hymio-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.fc06555d.js b/...hymio-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.fc06555d.js
diff --git a/...er/static/js/main.d7269370.js.LICENSE.txt → ...er/static/js/main.fc06555d.js.LICENSE.txt b/...er/static/js/main.d7269370.js.LICENSE.txt → ...er/static/js/main.fc06555d.js.LICENSE.txt
diff --git a/...o-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.fc06555d.js.map b/...o-suite-mobile-android/android/app/src/main/assets/scanner/static/js/main.fc06555d.js.map
diff --git a/apps/thymio-suite-mobile-ios/Gemfile.lock b/apps/thymio-suite-mobile-ios/Gemfile.lock
@@ -3,11 +3,12 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.8)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
@@ -84,6 +85,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby

diff --git a/apps/thymio-suite-mobile-ios/assets/webroot/scanner/asset-manifest.json b/apps/thymio-suite-mobile-ios/assets/webroot/scanner/asset-manifest.json
@@ -1,17 +1,14 @@
 {
   "files": {
-    "main.css": "./static/css/main.75b0f2c6.css",
-    "main.js": "./static/js/main.5329f81c.js",
-    "static/js/787.988f181b.chunk.js": "./static/js/787.988f181b.chunk.js",
+    "main.css": "./static/css/main.83b43609.css",
+    "main.js": "./static/js/main.5ce7bcef.js",
+    "static/js/27.78cd01e5.chunk.js": "./static/js/27.78cd01e5.chunk.js",
     "static/media/scratch-description.jpeg": "./static/media/scratch-description.95613845cfb9ab1406dc.jpeg",
     "static/media/vpl3-description.jpeg": "./static/media/vpl3-description.6ab995b25c1695e316d1.jpeg",
-    "index.html": "./index.html",
-    "main.75b0f2c6.css.map": "./static/css/main.75b0f2c6.css.map",
-    "main.5329f81c.js.map": "./static/js/main.5329f81c.js.map",
-    "787.988f181b.chunk.js.map": "./static/js/787.988f181b.chunk.js.map"
+    "index.html": "./index.html"
   },
   "entrypoints": [
-    "static/css/main.75b0f2c6.css",
-    "static/js/main.5329f81c.js"
+    "static/css/main.83b43609.css",
+    "static/js/main.5ce7bcef.js"
   ]
 }
diff --git a/apps/thymio-suite-mobile-ios/assets/webroot/scanner/index.html b/apps/thymio-suite-mobile-ios/assets/webroot/scanner/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.5329f81c.js"></script><link href="./static/css/main.75b0f2c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.5ce7bcef.js"></script><link href="./static/css/main.83b43609.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/css/main.75b0f2c6.css.map b/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/css/main.75b0f2c6.css.map
diff --git a/...root/scanner/static/css/main.75b0f2c6.css → ...root/scanner/static/css/main.83b43609.css b/...root/scanner/static/css/main.75b0f2c6.css → ...root/scanner/static/css/main.83b43609.css
diff --git a/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/js/27.78cd01e5.chunk.js b/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/js/27.78cd01e5.chunk.js
diff --git a/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/js/787.988f181b.chunk.js b/apps/thymio-suite-mobile-ios/assets/webroot/scanner/static/js/787.988f181b.chunk.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.d7269370.js"></script><link href="./static/css/main.75b0f2c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.fc06555d.js"></script><link href="./static/css/main.75b0f2c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>