fix: fixed the workspace based object fetching issue

TeeWrath · TeeWrath · commit 3a7d4f5bc72d · 2025-07-22T16:45:58.000+05:30
diff --git a/lib/features/dashboard/providers/dashboard_provider.dart b/lib/features/dashboard/providers/dashboard_provider.dart
@@ -18,15 +18,13 @@ class DashboardProvider extends StateHandler {
   int _tabIndex = 0;
   bool _isLoading = false;
   bool _isInitialized = false;
-  // List<WorkspaceModel> _workspaceList = [];
   Map<String, WorkspaceModel> _workspaceList = {};
 
   // getters
   bool get isDrawerOpen => _isDrawerOpen;
   int get tabIndex => _tabIndex;
   bool get isLoading => _isLoading;
   bool get isInitialized => _isInitialized;
-  // List<WorkspaceModel> get workspaceList => _workspaceList;
   Map<String, WorkspaceModel> get workspaceList => _workspaceList;
 
   List<Map<String, dynamic>> tabItems = [
@@ -72,7 +70,6 @@ class DashboardProvider extends StateHandler {
         return;
       }
 
-      // print(res.id);
       try {
         List<dynamic> _dbWorkspace = await supabase!
             .from('workspace')
@@ -85,14 +82,13 @@ class DashboardProvider extends StateHandler {
             id: workspace["id"],
             owner: workspace["owner"],
             name: workspace["name"],
-            editorIdList: workspace["editorId"] ?? [],
-            viewerIdList: workspace["viewerId"] ?? [],
+            editorIdList: (workspace["editorId"] as List?)?.cast<String>() ?? [],
+            viewerIdList: (workspace["viewerId"] as List?)?.cast<String>() ?? [],
             lastEdited:
                 workspace["last edited"] != null
                     ? DateTime.parse(workspace["last edited"])
                     : DateTime.now(),
           );
-          // print(workspace);
           _workspaceList[newWorkspace.id] = newWorkspace;
         }
       } catch (e) {
@@ -106,6 +102,14 @@ class DashboardProvider extends StateHandler {
     }
   }
 
+  // New method to update workspace name from WorkspaceProvider
+  void updateWorkspaceName(String workspaceId, String newName) {
+    if (_workspaceList.containsKey(workspaceId)) {
+      _workspaceList[workspaceId] = _workspaceList[workspaceId]!.copyWith(name: newName);
+      notifyListeners();
+    }
+  }
+
   Future<void> createNewProject(BuildContext context) async {
     _isLoading = true;
     try {
@@ -114,19 +118,19 @@ class DashboardProvider extends StateHandler {
         _isLoading = false;
         print("User not found");
         notifyListeners();
+        return; // Add return to exit if user is null
       }
-      Map<dynamic, dynamic> newWorkspace = {
+      Map<String, dynamic> newWorkspaceData = { // Use Map<String, dynamic> for clarity
         "id": Uuid().v4(),
-        "owner": res!.id,
+        "owner": res.id,
         "name": "New Project",
-        "editorId": null,
-        "viewerId": null,
+        "editorId": [], // Initialize as empty list if no editors
+        "viewerId": [], // Initialize as empty list if no viewers
       };
 
-      await supabase!.from('workspace').insert(newWorkspace);
+      await supabase!.from('workspace').insert(newWorkspaceData);
 
-      refreshDashboard();
-      // currentWorkspaceId = newWorkspace["id"];
+      await refreshDashboard(); // Use await here
     } catch (e) {
       print("Error creating new project: $e");
     } finally {
@@ -136,4 +140,4 @@ class DashboardProvider extends StateHandler {
   }
 
   void importExistingProject(BuildContext context) {}
-}
+}
diff --git a/lib/features/models/workspace_model.dart b/lib/features/models/workspace_model.dart
@@ -1,6 +1,5 @@
-import 'package:cookethflow/features/models/connection_model.dart';
-import 'package:cookethflow/features/models/node_model.dart';
-import 'package:flutter/widgets.dart';
+// import 'package:cookethflow/features/models/connection_model.dart';
+// import 'package:cookethflow/features/models/node_model.dart';
 
 class WorkspaceModel {
   String id;
@@ -9,8 +8,8 @@ class WorkspaceModel {
   List<String> editorIdList;
   List<String> viewerIdList;
   DateTime? lastEdited;
-  List<NodeModel> nodeList;
-  List<ConnectionModel> connectionList;
+  // List<NodeModel> nodeList;
+  // List<ConnectionModel> connectionList;
 
   WorkspaceModel({
     required this.id,
@@ -19,28 +18,29 @@ class WorkspaceModel {
     required this.editorIdList,
     required this.viewerIdList,
     required this.lastEdited,
-    this.nodeList = const [],
-    this.connectionList = const [],
+    // this.nodeList = const [],
+    // this.connectionList = const [],
   });
 
   WorkspaceModel copyWith({
     String? id,
     String? owner,
+    String? name,
     List<String>? editorIdList,
     List<String>? viewerIdList,
     DateTime? lastEdited,
-    List<NodeModel>? nodeList,
-    List<ConnectionModel>? connectionList,
+    // List<NodeModel>? nodeList,
+    // List<ConnectionModel>? connectionList,
   }) {
     return WorkspaceModel(
       id: id ?? this.id,
       owner: owner ?? this.owner,
-      name: name,
+      name: name ?? this.name,
       editorIdList: editorIdList ?? List.from(this.editorIdList),
       viewerIdList: viewerIdList ?? List.from(this.viewerIdList),
       lastEdited: lastEdited ?? this.lastEdited,
-      nodeList: nodeList ?? List.from(this.nodeList),
-      connectionList: connectionList ?? List.from(this.connectionList),
+      // nodeList: nodeList ?? List.from(this.nodeList),
+      // connectionList: connectionList ?? List.from(this.connectionList),
     );
   }
 
@@ -52,8 +52,8 @@ class WorkspaceModel {
       'editorIdList': editorIdList,
       'viewerIdList': viewerIdList,
       'lastEdited': lastEdited?.toIso8601String(),
-      'nodeList': nodeList.map((node) => node.toJson()).toList(),
-      'connectionList': connectionList.map((conn) => conn.toJson()).toList(),
+      // 'nodeList': nodeList.map((node) => node.toJson()).toList(),
+      // 'connectionList': connectionList.map((conn) => conn.toJson()).toList(),
     };
   }
 
@@ -65,20 +65,20 @@ class WorkspaceModel {
       editorIdList: List<String>.from(json['editorIdList']),
       viewerIdList: List<String>.from(json['viewerIdList']),
       lastEdited: DateTime.parse(json['lastEdited'] as String),
-      nodeList:
-          (json['nodeList'] as List<dynamic>)
-              .map(
-                (nodeJson) =>
-                    NodeModel.fromJson(nodeJson as Map<String, dynamic>),
-              )
-              .toList(),
-      connectionList:
-          (json['connectionList'] as List<dynamic>)
-              .map(
-                (connJson) =>
-                    ConnectionModel.fromJson(connJson as Map<String, dynamic>),
-              )
-              .toList(),
+      // nodeList:
+      //     (json['nodeList'] as List<dynamic>)
+      //         .map(
+      //           (nodeJson) =>
+      //               NodeModel.fromJson(nodeJson as Map<String, dynamic>),
+      //         )
+      //         .toList(),
+      // connectionList:
+      //     (json['connectionList'] as List<dynamic>)
+      //         .map(
+      //           (connJson) =>
+      //               ConnectionModel.fromJson(connJson as Map<String, dynamic>),
+      //         )
+      //         .toList(),
     );
   }
 }
diff --git a/lib/features/workspace/pages/desktop/workspace_desktop.dart b/lib/features/workspace/pages/desktop/workspace_desktop.dart
@@ -1,5 +1,4 @@
 import 'package:cookethflow/core/helpers/responsive_layout.helper.dart' as rh;
-import 'package:cookethflow/core/theme/colors.dart';
 import 'package:cookethflow/features/workspace/pages/canvas_page.dart';
 import 'package:cookethflow/features/workspace/providers/workspace_provider.dart';
 import 'package:cookethflow/features/workspace/widgets/export_project_button.dart';
@@ -10,7 +9,6 @@ import 'package:cookethflow/features/workspace/widgets/zoom_control_button.dart'
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:phosphor_flutter/phosphor_flutter.dart';
 
 class WorkspaceDesktop extends StatelessWidget {
   const WorkspaceDesktop({super.key});
diff --git a/lib/features/workspace/pages/workspace.dart b/lib/features/workspace/pages/workspace.dart
@@ -1,7 +1,6 @@
 import 'package:cookethflow/core/helpers/responsive_layout.helper.dart'
     as responsive_helper;
 import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:cookethflow/features/workspace/pages/desktop/workspace_desktop.dart';
 import 'package:cookethflow/features/workspace/pages/tablet/workspace_tablet.dart';
 import 'package:cookethflow/features/workspace/pages/mobile/workspace_mobile.dart';
diff --git a/lib/features/workspace/providers/workspace_provider.dart b/lib/features/workspace/providers/workspace_provider.dart
diff --git a/lib/features/workspace/widgets/workspace_drawer.dart b/lib/features/workspace/widgets/workspace_drawer.dart
