Merge pull request #236 from opxdelwin/issue-114

[feat] Enable parallel request handling

Author: animator

lib/models/request_model.dart

@@ -29,6 +29,7 @@ class RequestModel {
     this.responseStatus,
     this.message,
     this.responseModel,
+    this.isWorking = false,
   });
 
   final String id;
@@ -47,6 +48,7 @@ class RequestModel {
   final int? responseStatus;
   final String? message;
   final ResponseModel? responseModel;
+  final bool isWorking;
 
   List<NameValueModel>? get enabledRequestHeaders =>
       getEnabledRows(requestHeaders, isHeaderEnabledList);
@@ -106,6 +108,7 @@ class RequestModel {
     int? responseStatus,
     String? message,
     ResponseModel? responseModel,
+    bool? isWorking,
   }) {
     var headers = requestHeaders ?? this.requestHeaders;
     var params = requestParams ?? this.requestParams;
@@ -129,6 +132,7 @@ class RequestModel {
       responseStatus: responseStatus ?? this.responseStatus,
       message: message ?? this.message,
       responseModel: responseModel ?? this.responseModel,
+      isWorking: isWorking ?? this.isWorking,
     );
   }
 

lib/providers/collection_providers.dart

@@ -156,11 +156,20 @@ class CollectionStateNotifier
   }
 
   Future<void> sendRequest(String id) async {
-    ref.read(sentRequestIdStateProvider.notifier).state = id;
     ref.read(codePaneVisibleStateProvider.notifier).state = false;
-    final defaultUriScheme =
-        ref.read(settingsProvider.select((value) => value.defaultUriScheme));
+    final defaultUriScheme = ref.read(
+      settingsProvider.select(
+        (value) => value.defaultUriScheme,
+      ),
+    );
+
     RequestModel requestModel = state![id]!;
+
+    // set current model's isWorking to true and update state
+    var map = {...state!};
+    map[id] = requestModel.copyWith(isWorking: true);
+    state = map;
+
     (http.Response?, Duration?, String?)? responseRec = await request(
       requestModel,
       defaultUriScheme: defaultUriScheme,
@@ -172,6 +181,7 @@ class CollectionStateNotifier
       newRequestModel = requestModel.copyWith(
         responseStatus: -1,
         message: responseRec.$3,
+        isWorking: false,
       );
     } else {
       final responseModel = baseResponseModel.fromResponse(
@@ -183,10 +193,12 @@ class CollectionStateNotifier
         responseStatus: statusCode,
         message: kResponseCodeReasons[statusCode],
         responseModel: responseModel,
+        isWorking: false,
       );
     }
-    ref.read(sentRequestIdStateProvider.notifier).state = null;
-    var map = {...state!};
+
+    // update state with response data
+    map = {...state!};
     map[id] = newRequestModel;
     state = map;
   }

lib/providers/ui_providers.dart

@@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final navRailIndexStateProvider = StateProvider<int>((ref) => 0);
 final selectedIdEditStateProvider = StateProvider<String?>((ref) => null);
-final sentRequestIdStateProvider = StateProvider<String?>((ref) => null);
 final codePaneVisibleStateProvider = StateProvider<bool>((ref) => false);
 final saveDataStateProvider = StateProvider<bool>((ref) => false);
 final clearDataStateProvider = StateProvider<bool>((ref) => false);

lib/screens/home_page/editor_pane/details_card/response_pane.dart

@@ -9,13 +9,14 @@ class ResponsePane extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final selectedId = ref.watch(selectedIdStateProvider);
-    final sentRequestId = ref.watch(sentRequestIdStateProvider);
+    final isWorking = ref.watch(
+            selectedRequestModelProvider.select((value) => value?.isWorking)) ??
+        false;
     final responseStatus = ref.watch(
         selectedRequestModelProvider.select((value) => value?.responseStatus));
     final message = ref
         .watch(selectedRequestModelProvider.select((value) => value?.message));
-    if (sentRequestId != null && sentRequestId == selectedId) {
+    if (isWorking) {
       return const SendingWidget();
     }
     if (responseStatus == null) {

lib/screens/home_page/editor_pane/url_card.dart

@@ -98,10 +98,11 @@ class SendButton extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final selectedId = ref.watch(selectedIdStateProvider);
-    final sentRequestId = ref.watch(sentRequestIdStateProvider);
+    final isWorking = ref.watch(
+        selectedRequestModelProvider.select((value) => value?.isWorking));
+
     return SendRequestButton(
-      selectedId: selectedId,
-      sentRequestId: sentRequestId,
+      isWorking: isWorking ?? false,
       onTap: () {
         ref
             .read(collectionStateNotifierProvider.notifier)

lib/widgets/buttons.dart

@@ -47,36 +47,37 @@ class CopyButton extends StatelessWidget {
 class SendRequestButton extends StatelessWidget {
   const SendRequestButton({
     super.key,
-    required this.selectedId,
-    required this.sentRequestId,
+    required this.isWorking,
     required this.onTap,
   });
 
-  final String? selectedId;
-  final String? sentRequestId;
+  final bool isWorking;
   final void Function() onTap;
 
   @override
   Widget build(BuildContext context) {
-    bool disable = sentRequestId != null;
     return FilledButton(
-      onPressed: disable ? null : onTap,
+      onPressed: isWorking ? null : onTap,
       child: Row(
         mainAxisSize: MainAxisSize.min,
-        children: [
-          Text(
-            disable
-                ? (selectedId == sentRequestId ? kLabelSending : kLabelBusy)
-                : kLabelSend,
-            style: kTextStyleButton,
-          ),
-          if (!disable) kHSpacer10,
-          if (!disable)
-            const Icon(
-              size: 16,
-              Icons.send,
-            ),
-        ],
+        children: isWorking
+            ? const [
+                Text(
+                  kLabelSending,
+                  style: kTextStyleButton,
+                ),
+              ]
+            : const [
+                Text(
+                  kLabelSend,
+                  style: kTextStyleButton,
+                ),
+                kHSpacer10,
+                Icon(
+                  size: 16,
+                  Icons.send,
+                ),
+              ],
       ),
     );
   }

test/widgets/buttons_test.dart

@@ -36,8 +36,7 @@ void main() {
         theme: kThemeDataLight,
         home: Scaffold(
           body: SendRequestButton(
-            selectedId: '1',
-            sentRequestId: null,
+            isWorking: false,
             onTap: () {
               changedValue = 'Send';
             },
@@ -55,40 +54,16 @@ void main() {
     expect(changedValue, 'Send');
   });
 
-  testWidgets('Testing for Send Request button when sentRequestId is not null',
+  testWidgets(
+      'Testing for Send Request button when RequestModel is viewed and is waiting for response',
       (tester) async {
     await tester.pumpWidget(
       MaterialApp(
         title: 'Send Request button',
         theme: kThemeDataLight,
         home: Scaffold(
           body: SendRequestButton(
-            selectedId: '1',
-            sentRequestId: '2',
-            onTap: () {},
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byIcon(Icons.send), findsNothing);
-    expect(find.text(kLabelBusy), findsOneWidget);
-    final button1 = find.byType(FilledButton);
-    expect(button1, findsOneWidget);
-
-    expect(tester.widget<FilledButton>(button1).enabled, isFalse);
-  });
-
-  testWidgets('Testing for Send Request button when sentRequestId = selectedId',
-      (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        title: 'Send Request button',
-        theme: kThemeDataLight,
-        home: Scaffold(
-          body: SendRequestButton(
-            selectedId: '1',
-            sentRequestId: '1',
+            isWorking: true,
             onTap: () {},
           ),
         ),