Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get hidden node bug #724

Merged
merged 1 commit into from
Dec 25, 2023
Merged

Get hidden node bug #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions project/FrontEnd/collaborative_science_platform/lib/providers/node_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class NodeProvider with ChangeNotifier {
}
}

Future<void> getNode(int id) async {
Future<void> getNode(int id, String token) async {
clearAll();
Uri url = Uri.parse("${Constants.apiUrl}/get_node/");
if (id > -1) {
Expand All @@ -154,8 +154,13 @@ class NodeProvider with ChangeNotifier {

final Map<String, String> headers = {
"Accept": "application/json",
"content-type": "application/json"
"content-type": "application/json",
};

if (token.isNotEmpty) {
headers.addAll({"Authorization": "Token $token"});
}

try {
final response = await http.get(url, headers: headers);
if (response.statusCode == 200) {
Expand Down
4 changes: 3 additions & 1 deletion project/FrontEnd/collaborative_science_platform/lib/screens/graph_page/graph_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:collaborative_science_platform/exceptions/node_details_exceptions.dart';
import 'package:collaborative_science_platform/models/node_details_page/node_detailed.dart';
import 'package:collaborative_science_platform/providers/auth.dart';
import 'package:collaborative_science_platform/providers/node_provider.dart';
import 'package:collaborative_science_platform/screens/graph_page/mobile_graph_page.dart';
import 'package:collaborative_science_platform/screens/graph_page/web_graph_page.dart';
Expand Down Expand Up @@ -55,6 +56,7 @@ class _GraphPageState extends State<GraphPage> {
void getNode() async {
try {
final nodeProvider = Provider.of<NodeProvider>(context, listen: false);
final auth = Provider.of<Auth>(context);
setState(() {
error = false;
isLoading = true;
Expand All @@ -67,7 +69,7 @@ class _GraphPageState extends State<GraphPage> {
return;
}
}
await nodeProvider.getNode(widget.nodeId);
await nodeProvider.getNode(widget.nodeId, auth.isSignedIn ? auth.user!.token : "");
setState(() {
node = nodeProvider.nodeDetailed!;
});
Expand Down
4 changes: 3 additions & 1 deletion ...ntEnd/collaborative_science_platform/lib/screens/graph_page/widgets/graph_node_popup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'dart:ui';
import 'package:collaborative_science_platform/exceptions/node_details_exceptions.dart';
import 'package:collaborative_science_platform/helpers/node_helper.dart';
import 'package:collaborative_science_platform/models/node_details_page/node_detailed.dart';
import 'package:collaborative_science_platform/providers/auth.dart';
import 'package:collaborative_science_platform/providers/node_provider.dart';
import 'package:collaborative_science_platform/screens/graph_page/graph_page.dart';
import 'package:collaborative_science_platform/screens/node_details_page/node_details_page.dart';
Expand Down Expand Up @@ -43,6 +44,7 @@ class _NodeDetailsPopupState extends State<NodeDetailsPopup> {
void getNode() async {
try {
final nodeProvider = Provider.of<NodeProvider>(context, listen: false);
final auth = Provider.of<Auth>(context);
setState(() {
error = false;
isLoading = true;
Expand All @@ -56,7 +58,7 @@ class _NodeDetailsPopupState extends State<NodeDetailsPopup> {
return;
}
}
await nodeProvider.getNode(widget.nodeId);
await nodeProvider.getNode(widget.nodeId, auth.isSignedIn ? auth.user!.token : "");
setState(() {
node = nodeProvider.nodeDetailed!;
isLoading = false;
Expand Down
3 changes: 2 additions & 1 deletion ...ntEnd/collaborative_science_platform/lib/screens/node_details_page/node_details_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ class _NodeDetailsPageState extends State<NodeDetailsPage> {
void getNodeDetails() async {
try {
final nodeDetailsProvider = Provider.of<NodeProvider>(context);
final auth = Provider.of<Auth>(context);
setState(() {
error = false;
isLoading = true;
});
await nodeDetailsProvider.getNode(widget.nodeID);
await nodeDetailsProvider.getNode(widget.nodeID, auth.isSignedIn ? auth.user!.token : "");
setState(() {
node = (nodeDetailsProvider.nodeDetailed ?? {} as NodeDetailed);
});
Expand Down
Loading