Fixed a critical issue that caused an infinite loading loop when a de…

…fault dashboard was assigned to a user. (#102)
thingsboard · Aug 1, 2024 · 75d77a4 · 75d77a4
1 parent 8782f3d
commit 75d77a4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/lib/core/context/tb_context.dart b/lib/core/context/tb_context.dart
@@ -413,13 +413,13 @@ class TbContext implements PopEntry {
         if (defaultDashboardId != null) {
           bool fullscreen = _userForceFullscreen();
           if (!fullscreen) {
-            await navigateToDashboard(defaultDashboardId, animate: false);
             navigateTo(
               '/home',
               replace: true,
               closeDashboard: false,
               transition: TransitionType.none,
             );
+            await navigateToDashboard(defaultDashboardId, animate: false);
           } else {
             navigateTo(
               '/fullscreenDashboard/$defaultDashboardId',

diff --git a/lib/modules/dashboard/dashboard.dart b/lib/modules/dashboard/dashboard.dart
@@ -155,10 +155,11 @@ class _DashboardState extends TbContextState<Dashboard> {
           }
         };
         if (!UniversalPlatform.isWeb) {
-          var controller = await _controller.future;
-          await controller.postWebMessage(
-              message: WebMessage(data: jsonEncode(windowMessage)),
-              targetOrigin: Uri.parse('*'));
+          _controller.future.then((controller) {
+            controller.postWebMessage(
+                message: WebMessage(data: jsonEncode(windowMessage)),
+                targetOrigin: Uri.parse('*'));
+          });
         }
       }
     }
@@ -170,6 +171,10 @@ class _DashboardState extends TbContextState<Dashboard> {
         await _toggleRightLayout();
         return false;
       }
+      if (!_controller.isCompleted) {
+        return false;
+      }
+
       var controller = await _controller.future;
       if (await controller.canGoBack()) {
         await controller.goBack();
@@ -205,34 +210,36 @@ class _DashboardState extends TbContextState<Dashboard> {
     dashboardLoading.value = true;
     InAppWebViewController? controller;
     if (!UniversalPlatform.isWeb) {
-      controller = await _controller.future;
-    }
-    var windowMessage = <String, dynamic>{
-      'type': 'openDashboardMessage',
-      'data': <String, dynamic>{'dashboardId': dashboardId}
-    };
-    if (state != null) {
-      windowMessage['data']['state'] = state;
-    }
-    if (widget._home == true) {
-      windowMessage['data']['embedded'] = true;
-    }
-    if (hideToolbar == true) {
-      windowMessage['data']['hideToolbar'] = true;
-    }
-    var webMessage = WebMessage(data: jsonEncode(windowMessage));
-    if (!UniversalPlatform.isWeb) {
-      await controller!
-          .postWebMessage(message: webMessage, targetOrigin: Uri.parse('*'));
+      _controller.future.then((controller) {
+        var windowMessage = <String, dynamic>{
+          'type': 'openDashboardMessage',
+          'data': <String, dynamic>{'dashboardId': dashboardId}
+        };
+        if (state != null) {
+          windowMessage['data']['state'] = state;
+        }
+        if (widget._home == true) {
+          windowMessage['data']['embedded'] = true;
+        }
+        if (hideToolbar == true) {
+          windowMessage['data']['hideToolbar'] = true;
+        }
+        var webMessage = WebMessage(data: jsonEncode(windowMessage));
+        if (!UniversalPlatform.isWeb) {
+          controller.postWebMessage(
+              message: webMessage, targetOrigin: Uri.parse('*'));
+        }
+      });
     }
   }
 
   Future<void> _toggleRightLayout() async {
-    var controller = await _controller.future;
-    var windowMessage = <String, dynamic>{'type': 'toggleDashboardLayout'};
-    var webMessage = WebMessage(data: jsonEncode(windowMessage));
-    await controller.postWebMessage(
-        message: webMessage, targetOrigin: Uri.parse('*'));
+    _controller.future.then((controller) {
+      var windowMessage = <String, dynamic>{'type': 'toggleDashboardLayout'};
+      var webMessage = WebMessage(data: jsonEncode(windowMessage));
+      controller.postWebMessage(
+          message: webMessage, targetOrigin: Uri.parse('*'));
+    });
   }
 
   Future<void> tryLocalNavigation(String? path) async {

diff --git a/lib/modules/dashboard/main_dashboard_page.dart b/lib/modules/dashboard/main_dashboard_page.dart
@@ -134,7 +134,6 @@ class _MainDashboardPageState extends TbContextState<MainDashboardPage>
         builder: (context, value, _) {
           return Dashboard(
             tbContext,
-            key: UniqueKey(),
             activeByDefault: false,
             titleCallback: (title) {
               dashboardTitleValue.value = title;