Skip to content

Commit 0b66939

Browse files
committed
Fix tab indicator for formdata
1 parent 21dfa85 commit 0b66939

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

lib/codegen/go/http.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func main() {
9999

100100
var templateStart = jj.Template(kTemplateStart);
101101
result += templateStart.render({
102-
"hasBody": requestModel.hasData,
102+
"hasBody": requestModel.hasBody,
103103
"hasFormData": requestModel.hasFormData,
104104
"hasFileInFormData": requestModel.hasFileInFormData,
105105
});
@@ -144,7 +144,7 @@ func main() {
144144
});
145145

146146
var headersList = requestModel.enabledRequestHeaders;
147-
if (headersList != null || requestModel.hasData) {
147+
if (headersList != null || requestModel.hasBody) {
148148
var headers = requestModel.enabledHeadersMap;
149149
if (requestModel.hasJsonData || requestModel.hasTextData) {
150150
headers.putIfAbsent(kHeaderContentType,

lib/codegen/python/http_client.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ body = b'\r\n'.join(dataList)
116116
}
117117
}
118118

119-
if (requestModel.hasData) {
119+
if (requestModel.hasBody) {
120120
hasBody = true;
121121
if (requestModel.hasJsonData || requestModel.hasTextData) {
122122
var templateBody = jj.Template(kTemplateBody);

lib/models/request_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RequestModel {
6868
bool get hasJsonContentType => requestBodyContentType == ContentType.json;
6969
bool get hasTextContentType => requestBodyContentType == ContentType.text;
7070
int get contentLength => utf8.encode(requestBody ?? "").length;
71-
bool get hasData => hasJsonData || hasTextData || hasFormData;
71+
bool get hasBody => hasJsonData || hasTextData || hasFormData;
7272
bool get hasJsonData =>
7373
kMethodsWithBody.contains(method) &&
7474
hasJsonContentType &&

lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
3737
@override
3838
Widget build(BuildContext context) {
3939
final selectedId = ref.watch(selectedIdStateProvider);
40-
final length = ref.watch(selectedRequestModelProvider
40+
ref.watch(selectedRequestModelProvider
4141
.select((value) => value?.requestHeaders?.length));
4242
var rH = ref.read(selectedRequestModelProvider)?.requestHeaders;
4343
rows = (rH == null || rH.isEmpty)

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ class EditRequestPane extends ConsumerWidget {
1717
selectedRequestModelProvider.select((value) => value?.requestTabIndex));
1818

1919
final headerLength = ref.watch(selectedRequestModelProvider
20-
.select((value) => value?.headersMap.length));
20+
.select((value) => value?.headersMap.length)) ??
21+
0;
2122
final paramLength = ref.watch(selectedRequestModelProvider
22-
.select((value) => value?.paramsMap.length));
23-
final bodyLength = ref.watch(selectedRequestModelProvider
24-
.select((value) => value?.requestBody?.length));
23+
.select((value) => value?.paramsMap.length)) ??
24+
0;
25+
final hasBody = ref.watch(
26+
selectedRequestModelProvider.select((value) => value?.hasBody)) ??
27+
false;
2528

2629
return RequestPane(
2730
selectedId: selectedId,
@@ -37,9 +40,9 @@ class EditRequestPane extends ConsumerWidget {
3740
.update(selectedId!, requestTabIndex: index);
3841
},
3942
showIndicators: [
40-
paramLength != null && paramLength > 0,
41-
headerLength != null && headerLength > 0,
42-
bodyLength != null && bodyLength > 0,
43+
paramLength > 0,
44+
headerLength > 0,
45+
hasBody,
4346
],
4447
children: const [
4548
EditRequestURLParams(),

lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
3838
@override
3939
Widget build(BuildContext context) {
4040
final selectedId = ref.watch(selectedIdStateProvider);
41-
final length = ref.watch(selectedRequestModelProvider
41+
ref.watch(selectedRequestModelProvider
4242
.select((value) => value?.requestParams?.length));
4343
var rP = ref.read(selectedRequestModelProvider)?.requestParams;
4444
rows = (rP == null || rP.isEmpty)

0 commit comments

Comments
 (0)