updated datatypes

Author: badnikhil

lib/screens/history/history_widgets/his_request_pane.dart

@@ -21,15 +21,15 @@ class HistoryRequestPane extends ConsumerWidget {
     final codePaneVisible = ref.watch(historyCodePaneVisibleStateProvider);
     final apiType = ref.watch(selectedHistoryRequestModelProvider
         .select((value) => value?.metaData.apiType));
-    final headersMap = ref.watch(selectedHistoryRequestModelProvider
-            .select((value) => value?.httpRequestModel.headersMap)) ??
-        {};
-    final headerLength = headersMap.length;
+    final headers = ref.watch(selectedHistoryRequestModelProvider
+            .select((value) => value?.httpRequestModel.headers)) ??
+        [];
+    final headerLength = headers.length;
 
-    final paramsMap = ref.watch(selectedHistoryRequestModelProvider
-            .select((value) => value?.httpRequestModel.paramsMap)) ??
-        {};
-    final paramLength = paramsMap.length;
+    final params = ref.watch(selectedHistoryRequestModelProvider
+            .select((value) => value?.httpRequestModel.params)) ??
+        [];
+    final paramLength = params.length;
 
     final hasBody = ref.watch(selectedHistoryRequestModelProvider
             .select((value) => value?.httpRequestModel.hasBody)) ??
@@ -69,11 +69,11 @@ class HistoryRequestPane extends ConsumerWidget {
           ],
           children: [
             RequestDataTable(
-              rows: paramsMap,
+              rows: params, 
               keyName: kNameURLParam,
             ),
             RequestDataTable(
-              rows: headersMap,
+              rows: headers, 
               keyName: kNameHeader,
             ),
             const HisRequestBody(),
@@ -97,7 +97,7 @@ class HistoryRequestPane extends ConsumerWidget {
           ],
           children: [
             RequestDataTable(
-              rows: headersMap,
+              rows: headers, 
               keyName: kNameHeader,
             ),
             const HisRequestBody(),
@@ -145,8 +145,7 @@ class HisRequestBody extends ConsumerWidget {
                 ContentType.formdata => Padding(
                     padding: kPh4,
                     child: RequestFormDataTable(
-                        rows: requestModel?.formData ?? []),
-                  ),
+                        rows: requestModel?.formData ?? [])),
                 ContentType.json => Padding(
                     padding: kPt5o10,
                     child: JsonTextFieldEditor(

lib/widgets/table_request.dart

@@ -2,6 +2,7 @@ import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:data_table_2/data_table_2.dart';
 import 'package:apidash/consts.dart';
+import 'package:apidash_core/apidash_core.dart'; 
 import 'field_read_only.dart';
 
 class RequestDataTable extends StatelessWidget {
@@ -12,7 +13,7 @@ class RequestDataTable extends StatelessWidget {
     this.valueName,
   });
 
-  final Map<String, dynamic> rows;
+  final List<NameValueModel> rows;
   final String? keyName;
   final String? valueName;
 
@@ -55,31 +56,29 @@ class RequestDataTable extends StatelessWidget {
       ),
     );
 
-    final List<DataRow> dataRows = rows.entries
-        .map<DataRow>(
-          (MapEntry<String, dynamic> entry) => DataRow(
-            cells: <DataCell>[
-              const DataCell(kHSpacer5),
-              DataCell(
-                ReadOnlyTextField(
-                  initialValue: entry.key,
-                  decoration: fieldDecoration,
-                ),
-              ),
-              const DataCell(
-                Text('='),
-              ),
-              DataCell(
-                ReadOnlyTextField(
-               initialValue: entry.value is String ? entry.value : entry.value.toString(),
-                  decoration: fieldDecoration,
-                ),
-              ),
-              const DataCell(kHSpacer5),
-            ],
+    final List<DataRow> dataRows = rows.map<DataRow>((NameValueModel row) {
+      return DataRow(
+        cells: <DataCell>[
+          const DataCell(kHSpacer5),
+          DataCell(
+            ReadOnlyTextField(
+              initialValue: row.name,
+              decoration: fieldDecoration,
+            ),
           ),
-        )
-        .toList();
+          const DataCell(
+            Text('='),
+          ),
+          DataCell(
+            ReadOnlyTextField(
+              initialValue: row.value,
+              decoration: fieldDecoration,
+            ),
+          ),
+          const DataCell(kHSpacer5),
+        ],
+      );
+    }).toList();
 
     return Container(
       margin: kP10,
@@ -106,4 +105,4 @@ class RequestDataTable extends StatelessWidget {
       ),
     );
   }
-}
+}

test/widgets/table_request_test.dart

@@ -1,15 +1,16 @@
 import 'package:apidash/widgets/widgets.dart';
+import 'package:apidash_core/apidash_core.dart';
 import 'package:data_table_2/data_table_2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   dataTableShowLogs = false;
   testWidgets('Testing RequestDataTable', (WidgetTester tester) async {
-    final Map<String, String> sampleData = {
-      'Key1': 'Value1',
-      'Key2': 'Value2',
-    };
+    final List<NameValueModel> sampleData = [
+      const NameValueModel(name: 'key1', value: 'Value1'),
+      const NameValueModel(name: 'key2', value: 'value2'),
+    ];
 
     await tester.pumpWidget(
       MaterialApp(
@@ -22,12 +23,13 @@ void main() {
         ),
       ),
     );
+
     expect(find.byType(DataTable2), findsOneWidget);
-    expect(find.byType(ReadOnlyTextField), findsNWidgets(4));
+    expect(find.byType(ReadOnlyTextField), findsNWidgets(4)); 
 
-    expect(find.text('Key1'), findsOneWidget);
+    expect(find.text('key1'), findsOneWidget);
     expect(find.text('Value1'), findsOneWidget);
-    expect(find.text('Key2'), findsOneWidget);
-    expect(find.text('Value2'), findsOneWidget);
+    expect(find.text('key2'), findsOneWidget);
+    expect(find.text('value2'), findsOneWidget);
   });
-}
+}