refactor(style): update ubo-gui to the latest version and set place…

…holder for all menus
ubopod · Mar 27, 2024 · 9d2de98 · 9d2de98
1 parent fbea428
commit 9d2de98
Show file tree

Hide file tree

Showing 27 changed files with 521 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.11.7
+
+- refactor(style): update `ubo-gui` to the latest version and set placeholder
+  for all menus
+
 ## Version 0.11.6
 
 - chore(debug): setup sentry for error tracking

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ubo-app"
-version = "0.11.6"
+version = "0.11.7"
 description = "Ubo main app, running on device initialization. A platform for running other apps."
 authors = ["Sassan Haradji <sassanh@gmail.com>"]
 license = "Apache-2.0"
@@ -18,10 +18,10 @@ priority = "primary"
 python = "^3.11"
 psutil = "^5.9.8"
 ubo-gui = [
-  { version = "^0.10.2", markers = "extra=='default'", extras = [
+  { version = "^0.10.3", markers = "extra=='default'", extras = [
     'default',
   ] },
-  { version = "^0.10.2", markers = "extra=='dev'", extras = [
+  { version = "^0.10.3", markers = "extra=='dev'", extras = [
     'dev',
   ] },
 ]

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -97,6 +97,12 @@ def _monkeypatch(monkeypatch: pytest.MonkeyPatch) -> None:
         },
     )
 
+    monkeypatch.setattr(
+        socket,
+        'create_connection',
+        lambda *args, **kwargs: Fake(args, kwargs),
+    )
+
     class FakeDockerClient:
         def ping(self: FakeDockerClient) -> bool:
             return False

diff --git a/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-000.jsonc b/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-000.jsonc
@@ -3,7 +3,6 @@
   "_id": "e3e70682c2094cac629f6fbed82c07cd",
   "main": {
     "menu": {
-      "_id": null,
       "items": [
         {
           "background_color": "#68B7FF",
@@ -17,7 +16,6 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [
               {
                 "background_color": "#68B7FF",
@@ -31,8 +29,8 @@
                 "is_short": false,
                 "label": "Apps",
                 "sub_menu": {
-                  "_id": null,
                   "items": [],
+                  "placeholder": "No apps",
                   "title": "Apps"
                 }
               },
@@ -48,7 +46,6 @@
                 "is_short": false,
                 "label": "Settings",
                 "sub_menu": {
-                  "_id": null,
                   "items": [
                     {
                       "background_color": "#68B7FF",
@@ -62,7 +59,6 @@
                       "is_short": false,
                       "label": "WiFi",
                       "sub_menu": {
-                        "_id": null,
                         "items": [
                           {
                             "application": "ubo_app/services/030-wifi/pages/create_wireless_connection.py:CreateWirelessConnectionPage",
@@ -91,10 +87,12 @@
                             "label": "Select"
                           }
                         ],
+                        "placeholder": null,
                         "title": "WiFi Settings"
                       }
                     }
                   ],
+                  "placeholder": "No settings",
                   "title": "Settings"
                 }
               },
@@ -110,7 +108,6 @@
                 "is_short": false,
                 "label": "About",
                 "sub_menu": {
-                  "_id": null,
                   "heading": "Ubo v0.0.0",
                   "items": [
                     {
@@ -126,11 +123,13 @@
                       "label": "Checking for updates..."
                     }
                   ],
+                  "placeholder": null,
                   "sub_heading": "A universal dashboard for your Raspberry Pi",
                   "title": "About"
                 }
               }
             ],
+            "placeholder": null,
             "title": "Main"
           }
         },
@@ -141,8 +140,8 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [],
+            "placeholder": "No notifications",
             "title": "Notifications (not loaded)"
           }
         },
@@ -160,6 +159,7 @@
           "label": "Turn off"
         }
       ],
+      "placeholder": null,
       "title": "Dashboard"
     },
     "path": [

diff --git a/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-001.jsonc b/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-001.jsonc
@@ -3,7 +3,6 @@
   "_id": "e3e70682c2094cac629f6fbed82c07cd",
   "main": {
     "menu": {
-      "_id": null,
       "items": [
         {
           "background_color": "#68B7FF",
@@ -17,7 +16,6 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [
               {
                 "background_color": "#68B7FF",
@@ -31,8 +29,8 @@
                 "is_short": false,
                 "label": "Apps",
                 "sub_menu": {
-                  "_id": null,
                   "items": [],
+                  "placeholder": "No apps",
                   "title": "Apps"
                 }
               },
@@ -48,7 +46,6 @@
                 "is_short": false,
                 "label": "Settings",
                 "sub_menu": {
-                  "_id": null,
                   "items": [
                     {
                       "background_color": "#68B7FF",
@@ -62,7 +59,6 @@
                       "is_short": false,
                       "label": "WiFi",
                       "sub_menu": {
-                        "_id": null,
                         "items": [
                           {
                             "application": "ubo_app/services/030-wifi/pages/create_wireless_connection.py:CreateWirelessConnectionPage",
@@ -91,10 +87,12 @@
                             "label": "Select"
                           }
                         ],
+                        "placeholder": null,
                         "title": "WiFi Settings"
                       }
                     }
                   ],
+                  "placeholder": "No settings",
                   "title": "Settings"
                 }
               },
@@ -110,7 +108,6 @@
                 "is_short": false,
                 "label": "About",
                 "sub_menu": {
-                  "_id": null,
                   "heading": "Ubo v0.0.0",
                   "items": [
                     {
@@ -126,11 +123,13 @@
                       "label": "Checking for updates..."
                     }
                   ],
+                  "placeholder": null,
                   "sub_heading": "A universal dashboard for your Raspberry Pi",
                   "title": "About"
                 }
               }
             ],
+            "placeholder": null,
             "title": "Main"
           }
         },
@@ -141,8 +140,8 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [],
+            "placeholder": "No notifications",
             "title": "Notifications (not loaded)"
           }
         },
@@ -160,6 +159,7 @@
           "label": "Turn off"
         }
       ],
+      "placeholder": null,
       "title": "Dashboard"
     },
     "path": [

diff --git a/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-002.jsonc b/tests/end_to_end/results/test_wireless_flow/wireless_flow/store-002.jsonc
@@ -3,7 +3,6 @@
   "_id": "e3e70682c2094cac629f6fbed82c07cd",
   "main": {
     "menu": {
-      "_id": null,
       "items": [
         {
           "background_color": "#68B7FF",
@@ -17,7 +16,6 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [
               {
                 "background_color": "#68B7FF",
@@ -31,8 +29,8 @@
                 "is_short": false,
                 "label": "Apps",
                 "sub_menu": {
-                  "_id": null,
                   "items": [],
+                  "placeholder": "No apps",
                   "title": "Apps"
                 }
               },
@@ -48,7 +46,6 @@
                 "is_short": false,
                 "label": "Settings",
                 "sub_menu": {
-                  "_id": null,
                   "items": [
                     {
                       "background_color": "#68B7FF",
@@ -62,7 +59,6 @@
                       "is_short": false,
                       "label": "WiFi",
                       "sub_menu": {
-                        "_id": null,
                         "items": [
                           {
                             "application": "ubo_app/services/030-wifi/pages/create_wireless_connection.py:CreateWirelessConnectionPage",
@@ -91,10 +87,12 @@
                             "label": "Select"
                           }
                         ],
+                        "placeholder": null,
                         "title": "WiFi Settings"
                       }
                     }
                   ],
+                  "placeholder": "No settings",
                   "title": "Settings"
                 }
               },
@@ -110,7 +108,6 @@
                 "is_short": false,
                 "label": "About",
                 "sub_menu": {
-                  "_id": null,
                   "heading": "Ubo v0.0.0",
                   "items": [
                     {
@@ -126,11 +123,13 @@
                       "label": "Checking for updates..."
                     }
                   ],
+                  "placeholder": null,
                   "sub_heading": "A universal dashboard for your Raspberry Pi",
                   "title": "About"
                 }
               }
             ],
+            "placeholder": null,
             "title": "Main"
           }
         },
@@ -141,8 +140,8 @@
           "is_short": true,
           "label": "",
           "sub_menu": {
-            "_id": null,
             "items": [],
+            "placeholder": "No notifications",
             "title": "Notifications (not loaded)"
           }
         },
@@ -160,6 +159,7 @@
           "label": "Turn off"
         }
       ],
+      "placeholder": null,
       "title": "Dashboard"
     },
     "path": [