From 3a7ae7179639f2bf46f0c57ce49d5682eba104d1 Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sat, 16 Mar 2024 15:01:47 +0530 Subject: [PATCH 1/5] feat: automatic row adding --- .../request_pane/request_form_data.dart | 63 +++++++------------ .../request_pane/request_headers.dart | 59 +++++++---------- .../request_pane/request_params.dart | 58 +++++++---------- 3 files changed, 68 insertions(+), 112 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index 5d518e22..f77133e7 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -27,6 +27,8 @@ class _FormDataBodyState extends ConsumerState { @override Widget build(BuildContext context) { final selectedId = ref.watch(selectedIdStateProvider); + ref.watch(selectedRequestModelProvider + .select((value) => value?.requestFormDataList?.length)); var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList; rows = formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows; @@ -47,18 +49,21 @@ class _FormDataBodyState extends ConsumerState { initialValue: rows[idx].name, hintText: " Add Key", onChanged: (value) { - rows[idx] = rows[idx].copyWith( - name: value, - ); + rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, formDataType: rows[idx].type, onFormDataTypeChanged: (value) { + bool hasChanged = rows[idx].type != value; rows[idx] = rows[idx].copyWith( type: value ?? FormDataType.text, ); rows[idx] = rows[idx].copyWith(value: ""); + if (idx == rows.length - 1 && hasChanged) { + rows.add(kFormDataEmptyModel); + } setState(() {}); _onFieldChange(selectedId!); }, @@ -137,6 +142,7 @@ class _FormDataBodyState extends ConsumerState { hintText: " Add Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -169,45 +175,22 @@ class _FormDataBodyState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(daviModelRows), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - setState(() { - rows.add(kFormDataEmptyModel); - }); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Form Data", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(daviModelRows), ), ), - ), - ], + ], + ), ); } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index 503355f8..a6524b23 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -81,7 +81,12 @@ class EditRequestHeadersState extends ConsumerState { initialValue: rows[idx].name, hintText: "Add Header Name", onChanged: (value) { + isRowEnabledList[idx] = true; rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -109,6 +114,10 @@ class EditRequestHeadersState extends ConsumerState { hintText: " Add Header Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -144,44 +153,22 @@ class EditRequestHeadersState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Header", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), ), ), - ), - ], + ], + ), ); } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 6e3aca4b..f602200d 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -83,6 +83,10 @@ class EditRequestURLParamsState extends ConsumerState { hintText: "Add URL Parameter", onChanged: (value) { rows[idx] = rows[idx].copyWith(name: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -110,6 +114,10 @@ class EditRequestURLParamsState extends ConsumerState { hintText: "Add Value", onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); + if (idx == rows.length - 1) { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(true); + } _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -145,44 +153,22 @@ class EditRequestURLParamsState extends ConsumerState { ), ], ); - return Stack( - children: [ - Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), - ), - ), - ], - ), - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(bottom: 30), - child: ElevatedButton.icon( - onPressed: () { - rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); - _onFieldChange(selectedId!); - }, - icon: const Icon(Icons.add), - label: const Text( - "Add Param", - style: kTextStyleButton, - ), + return Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), ), ), - ), - ], + ], + ), ); } } From e42165061737b299b7597992328977cfef44d5df Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sat, 16 Mar 2024 16:29:35 +0530 Subject: [PATCH 2/5] fix: checkbox empty selection --- .../request_pane/request_headers.dart | 33 +++++++++++------- .../request_pane/request_params.dart | 34 ++++++++++++------- lib/widgets/checkbox.dart | 2 +- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index a6524b23..560955c0 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -40,14 +40,16 @@ class EditRequestHeadersState extends ConsumerState { ref.watch(selectedRequestModelProvider .select((value) => value?.requestHeaders?.length)); var rH = ref.read(selectedRequestModelProvider)?.requestHeaders; - rows = (rH == null || rH.isEmpty) + bool isHeadersEmpty = rH == null || rH.isEmpty; + rows = (isHeadersEmpty) ? [ kNameValueEmptyModel, ] : rH; - isRowEnabledList = - ref.read(selectedRequestModelProvider)?.isHeaderEnabledList ?? - List.filled(rows.length, true, growable: true); + isRowEnabledList = ref + .read(selectedRequestModelProvider) + ?.isHeaderEnabledList ?? + List.filled(rows.length, isHeadersEmpty ? false : true, growable: true); DaviModel model = DaviModel( rows: rows, @@ -60,12 +62,17 @@ class EditRequestHeadersState extends ConsumerState { return CheckBox( keyId: "$selectedId-$idx-headers-c-$seed", value: isRowEnabledList[idx], - onChanged: (value) { - setState(() { - isRowEnabledList[idx] = value!; - }); - _onFieldChange(selectedId!); - }, + onChanged: rows.length == 1 && + idx == 0 && + rows[idx].name.isEmpty && + rows[idx].value.isEmpty + ? null + : (value) { + setState(() { + isRowEnabledList[idx] = value!; + }); + _onFieldChange(selectedId!); + }, colorScheme: Theme.of(context).colorScheme, ); }, @@ -85,7 +92,7 @@ class EditRequestHeadersState extends ConsumerState { rows[idx] = rows[idx].copyWith(name: value); if (idx == rows.length - 1) { rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -116,7 +123,7 @@ class EditRequestHeadersState extends ConsumerState { rows[idx] = rows[idx].copyWith(value: value); if (idx == rows.length - 1) { rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -140,7 +147,7 @@ class EditRequestHeadersState extends ConsumerState { rows = [ kNameValueEmptyModel, ]; - isRowEnabledList = [true]; + isRowEnabledList = [false]; }); } else { rows.removeAt(row.index); diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index f602200d..3bb018cb 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -41,14 +41,16 @@ class EditRequestURLParamsState extends ConsumerState { ref.watch(selectedRequestModelProvider .select((value) => value?.requestParams?.length)); var rP = ref.read(selectedRequestModelProvider)?.requestParams; - rows = (rP == null || rP.isEmpty) + bool isParamsEmpty = rP == null || rP.isEmpty; + rows = (isParamsEmpty) ? [ kNameValueEmptyModel, ] : rP; - isRowEnabledList = - ref.read(selectedRequestModelProvider)?.isParamEnabledList ?? - List.filled(rows.length, true, growable: true); + isRowEnabledList = ref + .read(selectedRequestModelProvider) + ?.isParamEnabledList ?? + List.filled(rows.length, isParamsEmpty ? false : true, growable: true); DaviModel model = DaviModel( rows: rows, @@ -61,12 +63,16 @@ class EditRequestURLParamsState extends ConsumerState { return CheckBox( keyId: "$selectedId-$idx-params-c-$seed", value: isRowEnabledList[idx], - onChanged: (value) { - setState(() { - isRowEnabledList[idx] = value!; - }); - _onFieldChange(selectedId!); - }, + onChanged: idx + 1 == rows.length && + rows[idx].name.isEmpty && + rows[idx].value.isEmpty + ? null + : (value) { + setState(() { + isRowEnabledList[idx] = value!; + }); + _onFieldChange(selectedId!); + }, colorScheme: Theme.of(context).colorScheme, ); }, @@ -84,8 +90,9 @@ class EditRequestURLParamsState extends ConsumerState { onChanged: (value) { rows[idx] = rows[idx].copyWith(name: value); if (idx == rows.length - 1) { + isRowEnabledList[idx] = true; rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -115,8 +122,9 @@ class EditRequestURLParamsState extends ConsumerState { onChanged: (value) { rows[idx] = rows[idx].copyWith(value: value); if (idx == rows.length - 1) { + isRowEnabledList[idx] = true; rows.add(kNameValueEmptyModel); - isRowEnabledList.add(true); + isRowEnabledList.add(false); } _onFieldChange(selectedId!); }, @@ -140,7 +148,7 @@ class EditRequestURLParamsState extends ConsumerState { rows = [ kNameValueEmptyModel, ]; - isRowEnabledList = [true]; + isRowEnabledList = [false]; }); } else { rows.removeAt(row.index); diff --git a/lib/widgets/checkbox.dart b/lib/widgets/checkbox.dart index 22c3869f..53adf496 100644 --- a/lib/widgets/checkbox.dart +++ b/lib/widgets/checkbox.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class CheckBox extends StatelessWidget { final String keyId; final bool value; - final ValueChanged onChanged; + final ValueChanged? onChanged; final ColorScheme? colorScheme; const CheckBox({ super.key, From 711e3bd74d018401556704469306e27d94cd16fd Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Sun, 17 Mar 2024 18:27:13 +0530 Subject: [PATCH 3/5] fix: add buttons back --- .../request_pane/request_form_data.dart | 65 ++++++++++++------- .../request_pane/request_headers.dart | 50 ++++++++++---- .../request_pane/request_params.dart | 50 ++++++++++---- 3 files changed, 115 insertions(+), 50 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index f77133e7..cec94eab 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -18,12 +18,20 @@ class _FormDataBodyState extends ConsumerState { late int seed; final random = Random.secure(); late List rows; + @override void initState() { super.initState(); seed = random.nextInt(kRandMax); } + void _onFieldChange(String selectedId) { + ref.read(collectionStateNotifierProvider.notifier).update( + selectedId, + requestFormDataList: rows, + ); + } + @override Widget build(BuildContext context) { final selectedId = ref.watch(selectedIdStateProvider); @@ -168,36 +176,49 @@ class _FormDataBodyState extends ConsumerState { rows.removeAt(row.index); } _onFieldChange(selectedId!); - setState(() {}); }, ); }, ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(daviModelRows), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(daviModelRows), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kFormDataEmptyModel); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Form Data", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } - - void _onFieldChange(String selectedId) { - ref.read(collectionStateNotifierProvider.notifier).update( - selectedId, - requestFormDataList: rows, - ); - } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index 560955c0..f77fda32 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -160,22 +160,44 @@ class EditRequestHeadersState extends ConsumerState { ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(false); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Header", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } } diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 3bb018cb..dfc78c50 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -161,22 +161,44 @@ class EditRequestURLParamsState extends ConsumerState { ), ], ); - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - borderRadius: kBorderRadius12, - ), - margin: kP10, - child: Column( - children: [ - Expanded( - child: DaviTheme( - data: kTableThemeData, - child: Davi(model), + return Stack( + children: [ + Container( + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.background, + borderRadius: kBorderRadius12, + ), + margin: kP10, + child: Column( + children: [ + Expanded( + child: DaviTheme( + data: kTableThemeData, + child: Davi(model), + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: const EdgeInsets.only(bottom: 30), + child: ElevatedButton.icon( + onPressed: () { + rows.add(kNameValueEmptyModel); + isRowEnabledList.add(false); + _onFieldChange(selectedId!); + }, + icon: const Icon(Icons.add), + label: const Text( + "Add Param", + style: kTextStyleButton, + ), ), ), - ], - ), + ), + ], ); } } From a2c20eedc153ef58412378be0a14eb5de6e3bc4a Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Mon, 18 Mar 2024 01:17:18 +0530 Subject: [PATCH 4/5] fix: empty row when rows exist --- .../request_pane/request_form_data.dart | 80 +++++++++-------- .../request_pane/request_headers.dart | 86 ++++++++++--------- .../request_pane/request_params.dart | 86 +++++++++++-------- 3 files changed, 139 insertions(+), 113 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index cec94eab..b3d8f67c 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -17,7 +17,7 @@ class FormDataWidget extends ConsumerStatefulWidget { class _FormDataBodyState extends ConsumerState { late int seed; final random = Random.secure(); - late List rows; + late List formRows; @override void initState() { @@ -28,7 +28,7 @@ class _FormDataBodyState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestFormDataList: rows, + requestFormDataList: formRows.sublist(0, formRows.length - 1), ); } @@ -37,12 +37,17 @@ class _FormDataBodyState extends ConsumerState { final selectedId = ref.watch(selectedIdStateProvider); ref.watch(selectedRequestModelProvider .select((value) => value?.requestFormDataList?.length)); - var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList; - rows = - formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows; + var rF = ref.read(selectedRequestModelProvider)?.requestFormDataList; + bool isFormDataEmpty = rF == null || rF.isEmpty; + List rows = (isFormDataEmpty) + ? [ + kFormDataEmptyModel, + ] + : rF; + formRows = isFormDataEmpty ? rows : rows + [kFormDataEmptyModel]; DaviModel daviModelRows = DaviModel( - rows: rows, + rows: formRows, columns: [ DaviColumn( cellPadding: kpsV5, @@ -50,27 +55,28 @@ class _FormDataBodyState extends ConsumerState { grow: 4, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == formRows.length; return Theme( data: Theme.of(context), child: FormDataField( keyId: "$selectedId-$idx-form-v-$seed", - initialValue: rows[idx].name, + initialValue: formRows[idx].name, hintText: " Add Key", onChanged: (value) { - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(name: value); + if (isLast) formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, - formDataType: rows[idx].type, + formDataType: formRows[idx].type, onFormDataTypeChanged: (value) { - bool hasChanged = rows[idx].type != value; - rows[idx] = rows[idx].copyWith( + bool hasChanged = formRows[idx].type != value; + formRows[idx] = formRows[idx].copyWith( type: value ?? FormDataType.text, ); - rows[idx] = rows[idx].copyWith(value: ""); - if (idx == rows.length - 1 && hasChanged) { - rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(value: ""); + if (idx == formRows.length - 1 && hasChanged) { + formRows.add(kFormDataEmptyModel); } setState(() {}); _onFieldChange(selectedId!); @@ -97,7 +103,8 @@ class _FormDataBodyState extends ConsumerState { cellPadding: kpsV5, cellBuilder: (_, row) { int idx = row.index; - return rows[idx].type == FormDataType.file + bool isLast = idx + 1 == formRows.length; + return formRows[idx].type == FormDataType.file ? Align( alignment: Alignment.centerLeft, child: Row( @@ -122,7 +129,7 @@ class _FormDataBodyState extends ConsumerState { if (pickedResult != null && pickedResult.files.isNotEmpty && pickedResult.files.first.path != null) { - rows[idx] = rows[idx].copyWith( + formRows[idx] = formRows[idx].copyWith( value: pickedResult.files.first.path!, ); setState(() {}); @@ -130,9 +137,9 @@ class _FormDataBodyState extends ConsumerState { } }, label: Text( - (rows[idx].type == FormDataType.file && - rows[idx].value.isNotEmpty) - ? rows[idx].value.toString() + (formRows[idx].type == FormDataType.file && + formRows[idx].value.isNotEmpty) + ? formRows[idx].value.toString() : "Select File", textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, @@ -146,11 +153,11 @@ class _FormDataBodyState extends ConsumerState { ) : CellField( keyId: "$selectedId-$idx-form-v-$seed", - initialValue: rows[idx].value, + initialValue: formRows[idx].value, hintText: " Add Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) rows.add(kFormDataEmptyModel); + formRows[idx] = formRows[idx].copyWith(value: value); + if (isLast) formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, colorScheme: Theme.of(context).colorScheme, @@ -162,21 +169,24 @@ class _FormDataBodyState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == formRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (formRows.length == 2) { + setState(() { + formRows = [kFormDataEmptyModel]; + }); + } else { + formRows.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [kFormDataEmptyModel]; - }); - } else { - rows.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -207,7 +217,7 @@ class _FormDataBodyState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kFormDataEmptyModel); + formRows.add(kFormDataEmptyModel); _onFieldChange(selectedId!); }, icon: const Icon(Icons.add), diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index f77fda32..e5b0df59 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -15,10 +15,10 @@ class EditRequestHeaders extends ConsumerStatefulWidget { } class EditRequestHeadersState extends ConsumerState { - final random = Random.secure(); - late List rows; - late List isRowEnabledList; late int seed; + final random = Random.secure(); + late List headerRows; + late List isRowEnabledList; @override void initState() { @@ -29,8 +29,9 @@ class EditRequestHeadersState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestHeaders: rows, - isHeaderEnabledList: isRowEnabledList, + requestHeaders: headerRows.sublist(0, headerRows.length - 1), + isHeaderEnabledList: + isRowEnabledList.sublist(0, headerRows.length - 1), ); } @@ -41,31 +42,30 @@ class EditRequestHeadersState extends ConsumerState { .select((value) => value?.requestHeaders?.length)); var rH = ref.read(selectedRequestModelProvider)?.requestHeaders; bool isHeadersEmpty = rH == null || rH.isEmpty; - rows = (isHeadersEmpty) + List rows = (isHeadersEmpty) ? [ kNameValueEmptyModel, ] : rH; - isRowEnabledList = ref - .read(selectedRequestModelProvider) - ?.isHeaderEnabledList ?? - List.filled(rows.length, isHeadersEmpty ? false : true, growable: true); + headerRows = isHeadersEmpty ? rows : rows + [kNameValueEmptyModel]; + isRowEnabledList = + ref.read(selectedRequestModelProvider)?.isHeaderEnabledList ?? + List.filled(rH?.length ?? 0, true, growable: true); + isRowEnabledList.add(false); DaviModel model = DaviModel( - rows: rows, + rows: headerRows, columns: [ DaviColumn( name: 'Checkbox', width: 30, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return CheckBox( keyId: "$selectedId-$idx-headers-c-$seed", value: isRowEnabledList[idx], - onChanged: rows.length == 1 && - idx == 0 && - rows[idx].name.isEmpty && - rows[idx].value.isEmpty + onChanged: isLast ? null : (value) { setState(() { @@ -83,15 +83,16 @@ class EditRequestHeadersState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return HeaderField( keyId: "$selectedId-$idx-headers-k-$seed", - initialValue: rows[idx].name, + initialValue: headerRows[idx].name, hintText: "Add Header Name", onChanged: (value) { - isRowEnabledList[idx] = true; - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) { - rows.add(kNameValueEmptyModel); + headerRows[idx] = headerRows[idx].copyWith(name: value); + if (isLast) { + isRowEnabledList[idx] = true; + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -115,14 +116,16 @@ class EditRequestHeadersState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == headerRows.length; return CellField( keyId: "$selectedId-$idx-headers-v-$seed", - initialValue: rows[idx].value, + initialValue: headerRows[idx].value, hintText: " Add Header Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) { - rows.add(kNameValueEmptyModel); + headerRows[idx] = headerRows[idx].copyWith(value: value); + if (isLast) { + isRowEnabledList[idx] = true; + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -136,25 +139,28 @@ class EditRequestHeadersState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == headerRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (headerRows.length == 2) { + setState(() { + headerRows = [ + kNameValueEmptyModel, + ]; + isRowEnabledList = [false]; + }); + } else { + headerRows.removeAt(row.index); + isRowEnabledList.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [ - kNameValueEmptyModel, - ]; - isRowEnabledList = [false]; - }); - } else { - rows.removeAt(row.index); - isRowEnabledList.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -185,7 +191,7 @@ class EditRequestHeadersState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kNameValueEmptyModel); + headerRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); _onFieldChange(selectedId!); }, diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index dfc78c50..a306b46b 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -16,10 +16,10 @@ class EditRequestURLParams extends ConsumerStatefulWidget { } class EditRequestURLParamsState extends ConsumerState { - final random = Random.secure(); - late List rows; - late List isRowEnabledList; late int seed; + final random = Random.secure(); + late List paramRows; + late List isRowEnabledList; @override void initState() { @@ -30,9 +30,14 @@ class EditRequestURLParamsState extends ConsumerState { void _onFieldChange(String selectedId) { ref.read(collectionStateNotifierProvider.notifier).update( selectedId, - requestParams: rows, - isParamEnabledList: isRowEnabledList, + requestParams: paramRows.sublist(0, paramRows.length - 1), + isParamEnabledList: isRowEnabledList.sublist(0, paramRows.length - 1), ); + debugPrint("URL Params Updated"); + for (var i = 0; i < paramRows.length - 1; i++) { + debugPrint( + "URL Param $i: (${paramRows[i].name}=${paramRows[i].value}) ==> ${isRowEnabledList[i]}"); + } } @override @@ -42,30 +47,30 @@ class EditRequestURLParamsState extends ConsumerState { .select((value) => value?.requestParams?.length)); var rP = ref.read(selectedRequestModelProvider)?.requestParams; bool isParamsEmpty = rP == null || rP.isEmpty; - rows = (isParamsEmpty) + List rows = (isParamsEmpty) ? [ kNameValueEmptyModel, ] : rP; - isRowEnabledList = ref - .read(selectedRequestModelProvider) - ?.isParamEnabledList ?? - List.filled(rows.length, isParamsEmpty ? false : true, growable: true); + paramRows = isParamsEmpty ? rows : rows + [kNameValueEmptyModel]; + isRowEnabledList = + ref.read(selectedRequestModelProvider)?.isParamEnabledList ?? + List.filled(rP?.length ?? 0, true, growable: true); + isRowEnabledList.add(false); DaviModel model = DaviModel( - rows: rows, + rows: paramRows, columns: [ DaviColumn( name: 'Checkbox', width: 30, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CheckBox( keyId: "$selectedId-$idx-params-c-$seed", value: isRowEnabledList[idx], - onChanged: idx + 1 == rows.length && - rows[idx].name.isEmpty && - rows[idx].value.isEmpty + onChanged: isLast ? null : (value) { setState(() { @@ -83,15 +88,16 @@ class EditRequestURLParamsState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CellField( keyId: "$selectedId-$idx-params-k-$seed", - initialValue: rows[idx].name, + initialValue: paramRows[idx].name, hintText: "Add URL Parameter", onChanged: (value) { - rows[idx] = rows[idx].copyWith(name: value); - if (idx == rows.length - 1) { + paramRows[idx] = paramRows[idx].copyWith(name: value); + if (isLast) { isRowEnabledList[idx] = true; - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -115,15 +121,16 @@ class EditRequestURLParamsState extends ConsumerState { grow: 1, cellBuilder: (_, row) { int idx = row.index; + bool isLast = idx + 1 == paramRows.length; return CellField( keyId: "$selectedId-$idx-params-v-$seed", - initialValue: rows[idx].value, + initialValue: paramRows[idx].value, hintText: "Add Value", onChanged: (value) { - rows[idx] = rows[idx].copyWith(value: value); - if (idx == rows.length - 1) { + paramRows[idx] = paramRows[idx].copyWith(value: value); + if (isLast) { isRowEnabledList[idx] = true; - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); } _onFieldChange(selectedId!); @@ -137,25 +144,28 @@ class EditRequestURLParamsState extends ConsumerState { pinStatus: PinStatus.none, width: 30, cellBuilder: (_, row) { + bool isLast = row.index + 1 == paramRows.length; return InkWell( + onTap: isLast + ? null + : () { + seed = random.nextInt(kRandMax); + if (paramRows.length == 2) { + setState(() { + paramRows = [ + kNameValueEmptyModel, + ]; + isRowEnabledList = [false]; + }); + } else { + paramRows.removeAt(row.index); + isRowEnabledList.removeAt(row.index); + } + _onFieldChange(selectedId!); + }, child: Theme.of(context).brightness == Brightness.dark ? kIconRemoveDark : kIconRemoveLight, - onTap: () { - seed = random.nextInt(kRandMax); - if (rows.length == 1) { - setState(() { - rows = [ - kNameValueEmptyModel, - ]; - isRowEnabledList = [false]; - }); - } else { - rows.removeAt(row.index); - isRowEnabledList.removeAt(row.index); - } - _onFieldChange(selectedId!); - }, ); }, ), @@ -186,7 +196,7 @@ class EditRequestURLParamsState extends ConsumerState { padding: const EdgeInsets.only(bottom: 30), child: ElevatedButton.icon( onPressed: () { - rows.add(kNameValueEmptyModel); + paramRows.add(kNameValueEmptyModel); isRowEnabledList.add(false); _onFieldChange(selectedId!); }, From fb36f05792d32e881e583d702499b6a03736a5aa Mon Sep 17 00:00:00 2001 From: DenserMeerkat Date: Mon, 18 Mar 2024 01:22:16 +0530 Subject: [PATCH 5/5] refactor: remove debugPrint --- .../details_card/request_pane/request_params.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index a306b46b..319330ba 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -33,11 +33,6 @@ class EditRequestURLParamsState extends ConsumerState { requestParams: paramRows.sublist(0, paramRows.length - 1), isParamEnabledList: isRowEnabledList.sublist(0, paramRows.length - 1), ); - debugPrint("URL Params Updated"); - for (var i = 0; i < paramRows.length - 1; i++) { - debugPrint( - "URL Param $i: (${paramRows[i].name}=${paramRows[i].value}) ==> ${isRowEnabledList[i]}"); - } } @override