From 993eea1dee520aa84d0284a8af30ce85c3d52e96 Mon Sep 17 00:00:00 2001
From: elraro <elraro@elraro.eu>
Date: Sun, 4 Aug 2024 17:19:06 +0200
Subject: [PATCH] chore: upgraded mqtt and fixed bug

---
 backend/package.json                          |  2 +-
 .../connectivity/WifiConnectivityPage.tsx     | 35 -------------------
 package-lock.json                             | 22 ++++++------
 3 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index d3d71edc..a6439d7d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,7 +60,7 @@
     "hashlru": "git+https://npm@github.com/Hypfer/hashlru#3.0.0",
     "is-in-subnet": "4.0.1",
     "jstoxml": "3.2.10",
-    "mqtt": "5.5.5",
+    "mqtt": "5.9.1",
     "nested-object-assign": "1.0.4",
     "nested-property": "4.0.0",
     "openapi-validator-middleware": "3.2.6",
diff --git a/frontend/src/options/connectivity/WifiConnectivityPage.tsx b/frontend/src/options/connectivity/WifiConnectivityPage.tsx
index f4253de0..6f67fdde 100644
--- a/frontend/src/options/connectivity/WifiConnectivityPage.tsx
+++ b/frontend/src/options/connectivity/WifiConnectivityPage.tsx
@@ -301,46 +301,11 @@ const WifiConnectivity = (): React.ReactElement => {
                                 setConfirmationDialogOpen(true);
                             }}
                         >
-<<<<<<< HEAD:frontend/src/options/connectivity/WifiConnectivity.tsx
-                            <Typography color="info">
-                                To connect your robot to a different Wi-Fi network, you need to do a Wi-Fi reset.
-                                <br/><br/>
-                                Note that the procedure is different depending on your model of robot, so please refer to the relevant documentation to figure out how to do that.
-                                After having done that, simply connect to the Wi-Fi AP provided by the robot and then either use the Congatudo Webinterface
-                                or the Companion app to enter new Wi-Fi credentials.
-                            </Typography>
-                        </InfoBox>
-                    }
-
-                    <Divider sx={{mt: 1}} style={{marginTop: "1rem", marginBottom: "1rem"}}/>
-
-                    {
-                        properties.provisionedReconfigurationSupported &&
-                        <Grid container>
-                            <Grid item style={{marginLeft: "auto"}}>
-                                <LoadingButton
-                                    loading={configurationUpdating}
-                                    color="primary"
-                                    variant="outlined"
-                                    disabled={!(configurationModified && newSSID && newPSK)}
-                                    onClick={() => {
-                                        setConfirmationDialogOpen(true);
-                                    }}
-                                >
-                                    Save configuration
-                                </LoadingButton>
-                            </Grid>
-                        </Grid>
-                    }
-                </Box>
-            </Grid>
-=======
                             Save configuration
                         </LoadingButton>
                     </Grid>
                 </Grid>
             }
->>>>>>> d8714dde (feat(ui): Loading animation cleanup):frontend/src/options/connectivity/WifiConnectivityPage.tsx
             <ConfirmationDialog
                 title="Apply new Wi-Fi configuration?"
                 text=""
diff --git a/package-lock.json b/package-lock.json
index 3ce3a3fd..69b93acb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
         "hashlru": "git+https://npm@github.com/Hypfer/hashlru#3.0.0",
         "is-in-subnet": "4.0.1",
         "jstoxml": "3.2.10",
-        "mqtt": "5.5.5",
+        "mqtt": "5.9.1",
         "nested-object-assign": "1.0.4",
         "nested-property": "4.0.0",
         "openapi-validator-middleware": "3.2.6",
@@ -143,9 +143,9 @@
       }
     },
     "backend/node_modules/mqtt": {
-      "version": "5.5.5",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.5.5.tgz",
-      "integrity": "sha512-vWglkVfumjnI53/tV+RMWbDuQL4ldGqc/wFX2EHkMy9sSV7Q0TQK+HcAtmg2QupI8DpcyNpoe2mNhaO/H4ILUg==",
+      "version": "5.9.1",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.9.1.tgz",
+      "integrity": "sha512-FMENfSUMfCSUCnkuUVAL4U01795SUEfrX0NZ53HNr1r2VNpwKhR5Au9viq9WCFGtgrDAmsll4fkloqFCFgStYA==",
       "dependencies": {
         "@types/readable-stream": "^4.0.5",
         "@types/ws": "^8.5.9",
@@ -163,7 +163,7 @@
         "rfdc": "^1.3.0",
         "split2": "^4.2.0",
         "worker-timers": "^7.1.4",
-        "ws": "^8.14.2"
+        "ws": "^8.17.1"
       },
       "bin": {
         "mqtt": "build/bin/mqtt.js",
@@ -230,8 +230,9 @@
       }
     },
     "backend/node_modules/ws": {
-      "version": "8.16.0",
-      "license": "MIT",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -6644,7 +6645,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001572",
+      "version": "1.0.30001647",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001647.tgz",
+      "integrity": "sha512-n83xdNiyeNcHpzWY+1aFbqCK7LuLfBricc4+alSQL2Xb6OR3XpnQAmlDG+pQcdTfiHRuLcQ96VOfrPSGiNJYSg==",
       "funding": [
         {
           "type": "opencollective",
@@ -6658,8 +6661,7 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "CC-BY-4.0"
+      ]
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",