flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-08-06 13:51:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Ashita Prasad
2024-02-08 06:06:00 +05:30
parent 70fe111540
commit 5bdbb0b101
7 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
View File

@ -26,7 +26,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeId = ref.watch(activeIdStateProvider); final selectedId = ref.watch(activeIdStateProvider);
var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList; var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList;
rows = rows =
formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows; formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows;
@ -43,14 +43,14 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
return Theme( return Theme(
data: Theme.of(context), data: Theme.of(context),
child: FormDataField( child: FormDataField(
keyId: "$activeId-$idx-form-v-$seed", keyId: "$selectedId-$idx-form-v-$seed",
initialValue: rows[idx].name, initialValue: rows[idx].name,
hintText: " Add Key", hintText: " Add Key",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith( rows[idx] = rows[idx].copyWith(
name: value, name: value,
); );
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
formDataType: rows[idx].type, formDataType: rows[idx].type,
@ -60,7 +60,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
); );
rows[idx] = rows[idx].copyWith(value: ""); rows[idx] = rows[idx].copyWith(value: "");
setState(() {}); setState(() {});
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
), ),
); );
@ -113,7 +113,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
value: pickedResult.files.first.path!, value: pickedResult.files.first.path!,
); );
setState(() {}); setState(() {});
_onFieldChange(activeId!); _onFieldChange(selectedId!);
} }
}, },
label: Text( label: Text(
@ -132,12 +132,12 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
), ),
) )
: CellField( : CellField(
keyId: "$activeId-$idx-form-v-$seed", keyId: "$selectedId-$idx-form-v-$seed",
initialValue: rows[idx].value, initialValue: rows[idx].value,
hintText: " Add Value", hintText: " Add Value",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith(value: value); rows[idx] = rows[idx].copyWith(value: value);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -161,7 +161,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
} else { } else {
rows.removeAt(row.index); rows.removeAt(row.index);
} }
_onFieldChange(activeId!); _onFieldChange(selectedId!);
setState(() {}); setState(() {});
}, },
); );
@ -197,7 +197,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
setState(() { setState(() {
rows.add(kFormDataEmptyModel); rows.add(kFormDataEmptyModel);
}); });
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
icon: const Icon(Icons.add), icon: const Icon(Icons.add),
label: const Text( label: const Text(
@ -211,9 +211,9 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
); );
} }
void _onFieldChange(String activeId) { void _onFieldChange(String selectedId) {
ref.read(collectionStateNotifierProvider.notifier).update( ref.read(collectionStateNotifierProvider.notifier).update(
activeId, selectedId,
requestFormDataList: rows, requestFormDataList: rows,
); );
} }

22
lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
View File

@ -26,9 +26,9 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
seed = random.nextInt(kRandMax); seed = random.nextInt(kRandMax);
} }
void _onFieldChange(String activeId) { void _onFieldChange(String selectedId) {
ref.read(collectionStateNotifierProvider.notifier).update( ref.read(collectionStateNotifierProvider.notifier).update(
activeId, selectedId,
requestHeaders: rows, requestHeaders: rows,
isHeaderEnabledList: isRowEnabledList, isHeaderEnabledList: isRowEnabledList,
); );
@ -36,7 +36,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeId = ref.watch(activeIdStateProvider); final selectedId = ref.watch(activeIdStateProvider);
final length = ref.watch(selectedRequestModelProvider final length = ref.watch(selectedRequestModelProvider
.select((value) => value?.requestHeaders?.length)); .select((value) => value?.requestHeaders?.length));
var rH = ref.read(selectedRequestModelProvider)?.requestHeaders; var rH = ref.read(selectedRequestModelProvider)?.requestHeaders;
@ -58,13 +58,13 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
cellBuilder: (_, row) { cellBuilder: (_, row) {
int idx = row.index; int idx = row.index;
return CheckBox( return CheckBox(
keyId: "$activeId-$idx-headers-c-$seed", keyId: "$selectedId-$idx-headers-c-$seed",
value: isRowEnabledList[idx], value: isRowEnabledList[idx],
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
isRowEnabledList[idx] = value!; isRowEnabledList[idx] = value!;
}); });
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -77,12 +77,12 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
cellBuilder: (_, row) { cellBuilder: (_, row) {
int idx = row.index; int idx = row.index;
return HeaderField( return HeaderField(
keyId: "$activeId-$idx-headers-k-$seed", keyId: "$selectedId-$idx-headers-k-$seed",
initialValue: rows[idx].name, initialValue: rows[idx].name,
hintText: "Add Header Name", hintText: "Add Header Name",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith(name: value); rows[idx] = rows[idx].copyWith(name: value);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -104,12 +104,12 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
cellBuilder: (_, row) { cellBuilder: (_, row) {
int idx = row.index; int idx = row.index;
return CellField( return CellField(
keyId: "$activeId-$idx-headers-v-$seed", keyId: "$selectedId-$idx-headers-v-$seed",
initialValue: rows[idx].value, initialValue: rows[idx].value,
hintText: " Add Header Value", hintText: " Add Header Value",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith(value: value); rows[idx] = rows[idx].copyWith(value: value);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -137,7 +137,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
rows.removeAt(row.index); rows.removeAt(row.index);
isRowEnabledList.removeAt(row.index); isRowEnabledList.removeAt(row.index);
} }
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
); );
}, },
@ -171,7 +171,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
onPressed: () { onPressed: () {
rows.add(kNameValueEmptyModel); rows.add(kNameValueEmptyModel);
isRowEnabledList.add(true); isRowEnabledList.add(true);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
icon: const Icon(Icons.add), icon: const Icon(Icons.add),
label: const Text( label: const Text(

6
lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart
View File

@ -16,7 +16,7 @@ class EditRequestPane extends ConsumerStatefulWidget {
class _EditRequestPaneState extends ConsumerState<EditRequestPane> { class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeId = ref.watch(activeIdStateProvider); final selectedId = ref.watch(activeIdStateProvider);
final codePaneVisible = ref.watch(codePaneVisibleStateProvider); final codePaneVisible = ref.watch(codePaneVisibleStateProvider);
final tabIndex = ref.watch( final tabIndex = ref.watch(
selectedRequestModelProvider.select((value) => value?.requestTabIndex)); selectedRequestModelProvider.select((value) => value?.requestTabIndex));
@ -29,7 +29,7 @@ class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
.select((value) => value?.requestBody?.length)); .select((value) => value?.requestBody?.length));
return RequestPane( return RequestPane(
activeId: activeId, selectedId: selectedId,
codePaneVisible: codePaneVisible, codePaneVisible: codePaneVisible,
tabIndex: tabIndex, tabIndex: tabIndex,
onPressedCodeButton: () { onPressedCodeButton: () {
@ -39,7 +39,7 @@ class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
onTapTabBar: (index) { onTapTabBar: (index) {
ref ref
.read(collectionStateNotifierProvider.notifier) .read(collectionStateNotifierProvider.notifier)
.update(activeId!, requestTabIndex: index); .update(selectedId!, requestTabIndex: index);
}, },
showIndicators: [ showIndicators: [
paramLength != null && paramLength > 0, paramLength != null && paramLength > 0,

22
lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
View File

@ -27,9 +27,9 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
seed = random.nextInt(kRandMax); seed = random.nextInt(kRandMax);
} }
void _onFieldChange(String activeId) { void _onFieldChange(String selectedId) {
ref.read(collectionStateNotifierProvider.notifier).update( ref.read(collectionStateNotifierProvider.notifier).update(
activeId, selectedId,
requestParams: rows, requestParams: rows,
isParamEnabledList: isRowEnabledList, isParamEnabledList: isRowEnabledList,
); );
@ -37,7 +37,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeId = ref.watch(activeIdStateProvider); final selectedId = ref.watch(activeIdStateProvider);
final length = ref.watch(selectedRequestModelProvider final length = ref.watch(selectedRequestModelProvider
.select((value) => value?.requestParams?.length)); .select((value) => value?.requestParams?.length));
var rP = ref.read(selectedRequestModelProvider)?.requestParams; var rP = ref.read(selectedRequestModelProvider)?.requestParams;
@ -60,13 +60,13 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
int idx = row.index; int idx = row.index;
return CheckBox( return CheckBox(
keyId: "$activeId-$idx-params-c-$seed", keyId: "$selectedId-$idx-params-c-$seed",
value: isRowEnabledList[idx], value: isRowEnabledList[idx],
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
isRowEnabledList[idx] = value!; isRowEnabledList[idx] = value!;
}); });
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -79,12 +79,12 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
cellBuilder: (_, row) { cellBuilder: (_, row) {
int idx = row.index; int idx = row.index;
return CellField( return CellField(
keyId: "$activeId-$idx-params-k-$seed", keyId: "$selectedId-$idx-params-k-$seed",
initialValue: rows[idx].name, initialValue: rows[idx].name,
hintText: "Add URL Parameter", hintText: "Add URL Parameter",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith(name: value); rows[idx] = rows[idx].copyWith(name: value);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -106,12 +106,12 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
cellBuilder: (_, row) { cellBuilder: (_, row) {
int idx = row.index; int idx = row.index;
return CellField( return CellField(
keyId: "$activeId-$idx-params-v-$seed", keyId: "$selectedId-$idx-params-v-$seed",
initialValue: rows[idx].value, initialValue: rows[idx].value,
hintText: "Add Value", hintText: "Add Value",
onChanged: (value) { onChanged: (value) {
rows[idx] = rows[idx].copyWith(value: value); rows[idx] = rows[idx].copyWith(value: value);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
colorScheme: Theme.of(context).colorScheme, colorScheme: Theme.of(context).colorScheme,
); );
@ -139,7 +139,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
rows.removeAt(row.index); rows.removeAt(row.index);
isRowEnabledList.removeAt(row.index); isRowEnabledList.removeAt(row.index);
} }
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
); );
}, },
@ -173,7 +173,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
onPressed: () { onPressed: () {
rows.add(kNameValueEmptyModel); rows.add(kNameValueEmptyModel);
isRowEnabledList.add(true); isRowEnabledList.add(true);
_onFieldChange(activeId!); _onFieldChange(selectedId!);
}, },
icon: const Icon(Icons.add), icon: const Icon(Icons.add),
label: const Text( label: const Text(

4
lib/screens/home_page/editor_pane/editor_pane.dart
View File

@ -22,8 +22,8 @@ class _RequestEditorPaneState extends ConsumerState<RequestEditorPane> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final activeId = ref.watch(activeIdStateProvider); final selectedId = ref.watch(activeIdStateProvider);
if (activeId == null) { if (selectedId == null) {
return const RequestEditorDefault(); return const RequestEditorDefault();
} else { } else {
return Padding( return Padding(

6
lib/widgets/request_widgets.dart
View File

@ -5,7 +5,7 @@ import 'tabs.dart';
class RequestPane extends StatefulWidget { class RequestPane extends StatefulWidget {
const RequestPane({ const RequestPane({
super.key, super.key,
required this.activeId, required this.selectedId,
required this.codePaneVisible, required this.codePaneVisible,
this.tabIndex, this.tabIndex,
this.onPressedCodeButton, this.onPressedCodeButton,
@ -14,7 +14,7 @@ class RequestPane extends StatefulWidget {
this.showIndicators = const [false, false, false], this.showIndicators = const [false, false, false],
}); });
final String? activeId; final String? selectedId;
final bool codePaneVisible; final bool codePaneVisible;
final int? tabIndex; final int? tabIndex;
final void Function()? onPressedCodeButton; final void Function()? onPressedCodeButton;
@ -76,7 +76,7 @@ class _RequestPaneState extends State<RequestPane>
), ),
), ),
TabBar( TabBar(
key: Key(widget.activeId!), key: Key(widget.selectedId!),
controller: _controller, controller: _controller,
overlayColor: kColorTransparentState, overlayColor: kColorTransparentState,
onTap: widget.onTapTabBar, onTap: widget.onTapTabBar,

8
test/widgets/request_widgets_test.dart
View File

@ -11,7 +11,7 @@ void main() {
theme: kThemeDataLight, theme: kThemeDataLight,
home: Scaffold( home: Scaffold(
body: RequestPane( body: RequestPane(
activeId: '1', selectedId: '1',
codePaneVisible: true, codePaneVisible: true,
children: const [Text('abc'), Text('xyz'), Text('mno')], children: const [Text('abc'), Text('xyz'), Text('mno')],
onPressedCodeButton: () {}, onPressedCodeButton: () {},
@ -41,7 +41,7 @@ void main() {
theme: kThemeDataLight, theme: kThemeDataLight,
home: Scaffold( home: Scaffold(
body: RequestPane( body: RequestPane(
activeId: '1', selectedId: '1',
codePaneVisible: true, codePaneVisible: true,
onPressedCodeButton: () {}, onPressedCodeButton: () {},
tabIndex: 1, tabIndex: 1,
@ -72,7 +72,7 @@ void main() {
theme: kThemeDataLight, theme: kThemeDataLight,
home: Scaffold( home: Scaffold(
body: RequestPane( body: RequestPane(
activeId: '1', selectedId: '1',
codePaneVisible: false, codePaneVisible: false,
onPressedCodeButton: () {}, onPressedCodeButton: () {},
tabIndex: 2, tabIndex: 2,
@ -104,7 +104,7 @@ void main() {
theme: kThemeDataLight, theme: kThemeDataLight,
home: Scaffold( home: Scaffold(
body: RequestPane( body: RequestPane(
activeId: '1', selectedId: '1',
codePaneVisible: false, codePaneVisible: false,
onPressedCodeButton: () {}, onPressedCodeButton: () {},
onTapTabBar: (value) { onTapTabBar: (value) {