Refactor for clear response button

matte23n · Mar 17, 2024 · 9b40763 · 9b40763
1 parent da46216
commit 9b40763
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 53 deletions.
diff --git a/lib/models/request_model.dart b/lib/models/request_model.dart
@@ -94,12 +94,13 @@ class RequestModel {
 
   RequestModel duplicate({
     required String id,
+    String? name,
   }) {
     return RequestModel(
       id: id,
       method: method,
       url: url,
-      name: "$name (copy)",
+      name: name ?? "${this.name} (copy)",
       description: description,
       requestHeaders: requestHeaders != null ? [...requestHeaders!] : null,
       requestParams: requestParams != null ? [...requestParams!] : null,

diff --git a/lib/providers/collection_providers.dart b/lib/providers/collection_providers.dart
@@ -96,26 +96,15 @@ class CollectionStateNotifier
     state = map;
   }
 
-  void clearResponse(String id) {
-    var map = {...state!};
-    map[id] = RequestModel(
+  void clearResponse(String? id) {
+    if (id == null || state?[id] == null) return;
+    var currentModel = state![id]!;
+    final newModel = currentModel.duplicate(
       id: id,
-      method: state![id]!.method,
-      url: state![id]!.url,
-      name: state![id]!.name,
-      description: state![id]!.description,
-      requestTabIndex: state![id]!.requestTabIndex,
-      requestHeaders: state![id]!.requestHeaders,
-      requestParams: state![id]!.requestParams,
-      isHeaderEnabledList: state![id]!.isHeaderEnabledList,
-      isParamEnabledList: state![id]!.isParamEnabledList,
-      requestBodyContentType: state![id]!.requestBodyContentType,
-      requestBody: state![id]!.requestBody,
-      requestFormDataList: state![id]!.requestFormDataList,
-      responseStatus: null,
-      message: null,
-      responseModel: null,
+      name: currentModel.name,
     );
+    var map = {...state!};
+    map[id] = newModel;
     state = map;
   }
 
@@ -157,21 +146,22 @@ class CollectionStateNotifier
     ResponseModel? responseModel,
   }) {
     final newModel = state![id]!.copyWith(
-        method: method,
-        url: url,
-        name: name,
-        description: description,
-        requestTabIndex: requestTabIndex,
-        requestHeaders: requestHeaders,
-        requestParams: requestParams,
-        isHeaderEnabledList: isHeaderEnabledList,
-        isParamEnabledList: isParamEnabledList,
-        requestBodyContentType: requestBodyContentType,
-        requestBody: requestBody,
-        requestFormDataList: requestFormDataList,
-        responseStatus: responseStatus,
-        message: message,
-        responseModel: responseModel);
+      method: method,
+      url: url,
+      name: name,
+      description: description,
+      requestTabIndex: requestTabIndex,
+      requestHeaders: requestHeaders,
+      requestParams: requestParams,
+      isHeaderEnabledList: isHeaderEnabledList,
+      isParamEnabledList: isParamEnabledList,
+      requestBodyContentType: requestBodyContentType,
+      requestBody: requestBody,
+      requestFormDataList: requestFormDataList,
+      responseStatus: responseStatus,
+      message: message,
+      responseModel: responseModel,
+    );
     //print(newModel);
     var map = {...state!};
     map[id] = newModel;

diff --git a/lib/screens/home_page/editor_pane/details_card/response_pane.dart b/lib/screens/home_page/editor_pane/details_card/response_pane.dart
@@ -34,6 +34,7 @@ class ResponseDetails extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    var sm = ScaffoldMessenger.of(context);
     final responseStatus = ref.watch(
         selectedRequestModelProvider.select((value) => value?.responseStatus));
     final message = ref
@@ -46,6 +47,14 @@ class ResponseDetails extends ConsumerWidget {
           responseStatus: responseStatus,
           message: message,
           time: responseModel?.time,
+          onClearResponse: () {
+            final selectedRequest = ref.read(selectedRequestModelProvider);
+            ref
+                .read(collectionStateNotifierProvider.notifier)
+                .clearResponse(selectedRequest?.id);
+            sm.hideCurrentSnackBar();
+            sm.showSnackBar(getSnackBar('Response cleared'));
+          },
         ),
         const Expanded(
           child: ResponseTabs(),

diff --git a/lib/widgets/buttons.dart b/lib/widgets/buttons.dart
@@ -1,7 +1,5 @@
-import 'package:apidash/providers/providers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:apidash/utils/utils.dart';
 import 'package:apidash/consts.dart';
@@ -238,28 +236,21 @@ class SaveButton extends StatelessWidget {
   }
 }
 
-class ClearResponseButton extends ConsumerWidget {
-  const ClearResponseButton({super.key});
+class ClearResponseButton extends StatelessWidget {
+  const ClearResponseButton({
+    super.key,
+    this.onPressed,
+  });
+
+  final VoidCallback? onPressed;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    var sm = ScaffoldMessenger.of(context);
+  Widget build(BuildContext context) {
     return Tooltip(
       message: 'Clear response',
       child: TextButton(
         style: TextButton.styleFrom(minimumSize: const Size(40, 40)),
-        onPressed: () {
-          final selectedId = ref.watch(selectedIdStateProvider);
-          ref
-              .read(collectionStateNotifierProvider.notifier)
-              .clearResponse(selectedId!);
-          sm.hideCurrentSnackBar();
-          sm.showSnackBar(
-            const SnackBar(
-              content: Text('Response cleared'),
-            ),
-          );
-        },
+        onPressed: onPressed,
         child: const Icon(
           Icons.delete,
           size: 20,

diff --git a/lib/widgets/response_widgets.dart b/lib/widgets/response_widgets.dart
@@ -55,11 +55,13 @@ class ResponsePaneHeader extends StatelessWidget {
     this.responseStatus,
     this.message,
     this.time,
+    this.onClearResponse,
   });
 
   final int? responseStatus;
   final String? message;
   final Duration? time;
+  final VoidCallback? onClearResponse;
 
   @override
   Widget build(BuildContext context) {
@@ -117,7 +119,9 @@ class ResponsePaneHeader extends StatelessWidget {
                   ),
             ),
             kHSpacer10,
-            const ClearResponseButton()
+            ClearResponseButton(
+              onPressed: onClearResponse,
+            )
           ],
         ),
       ),