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

fixes: form data & curl

Browse Source
This commit is contained in:
Ankit Mahato
2024-03-17 00:44:10 +05:30
parent 09c572c290
commit 9f8a745fb4
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/codegen/others/curl.dart
View File

@ -58,7 +58,7 @@ class cURLCodeGen {
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
for (var formData in requestModel.formDataList) { for (var formData in requestModel.formDataList) {
var templateFormData = jj.Template(kTemplateFormData); var templateFormData = jj.Template(kTemplateFormData);
if (formData.name.isNotEmpty && formData.value.isNotEmpty) { if (formData.name.isNotEmpty) {
result += templateFormData.render({ result += templateFormData.render({
"name": formData.name, "name": formData.name,
"value": "value":

7
lib/models/request_model.dart
View File

@ -80,10 +80,10 @@ class RequestModel {
bool get hasFormData => bool get hasFormData =>
kMethodsWithBody.contains(method) && kMethodsWithBody.contains(method) &&
hasFormDataContentType && hasFormDataContentType &&
(requestFormDataList ?? <FormDataModel>[]).isNotEmpty; formDataMapList.isNotEmpty;
List<FormDataModel> get formDataList => List<FormDataModel> get formDataList =>
requestFormDataList ?? <FormDataModel>[]; requestFormDataList ?? <FormDataModel>[];
List<Map<String, dynamic>> get formDataMapList => List<Map<String, String>> get formDataMapList =>
rowsToFormDataMapList(requestFormDataList) ?? []; rowsToFormDataMapList(requestFormDataList) ?? [];
bool get hasFileInFormData => formDataList bool get hasFileInFormData => formDataList
.map((e) => e.type == FormDataType.file) .map((e) => e.type == FormDataType.file)
@ -137,6 +137,7 @@ class RequestModel {
var params = requestParams ?? this.requestParams; var params = requestParams ?? this.requestParams;
var enabledHeaders = isHeaderEnabledList ?? this.isHeaderEnabledList; var enabledHeaders = isHeaderEnabledList ?? this.isHeaderEnabledList;
var enabledParams = isParamEnabledList ?? this.isParamEnabledList; var enabledParams = isParamEnabledList ?? this.isParamEnabledList;
var formDataList = requestFormDataList ?? this.requestFormDataList;
return RequestModel( return RequestModel(
id: id ?? this.id, id: id ?? this.id,
method: method ?? this.method, method: method ?? this.method,
@ -151,7 +152,7 @@ class RequestModel {
requestBodyContentType: requestBodyContentType:
requestBodyContentType ?? this.requestBodyContentType, requestBodyContentType ?? this.requestBodyContentType,
requestBody: requestBody ?? this.requestBody, requestBody: requestBody ?? this.requestBody,
requestFormDataList: requestFormDataList ?? this.requestFormDataList, requestFormDataList: formDataList != null ? [...formDataList] : null,
responseStatus: responseStatus ?? this.responseStatus, responseStatus: responseStatus ?? this.responseStatus,
message: message ?? this.message, message: message ?? this.message,
responseModel: responseModel ?? this.responseModel, responseModel: responseModel ?? this.responseModel,

11
lib/utils/convert_utils.dart
View File

@ -1,5 +1,6 @@
import 'dart:typed_data'; import 'dart:typed_data';
import 'dart:convert'; import 'dart:convert';
import 'package:collection/collection.dart';
import '../models/models.dart'; import '../models/models.dart';
import '../consts.dart'; import '../consts.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
@ -90,18 +91,22 @@ List<NameValueModel>? mapToRows(Map<String, String>? kvMap) {
return finalRows; return finalRows;
} }
List<Map<String, dynamic>>? rowsToFormDataMapList( List<Map<String, String>>? rowsToFormDataMapList(
List<FormDataModel>? kvRows, List<FormDataModel>? kvRows,
) { ) {
if (kvRows == null) { if (kvRows == null) {
return null; return null;
} }
List<Map<String, dynamic>> finalMap = kvRows List<Map<String, String>> finalMap = kvRows
.map((FormDataModel formData) => { .map((FormDataModel formData) =>
(formData.name.trim().isEmpty && formData.value.trim().isEmpty)
? null
: {
"name": formData.name, "name": formData.name,
"value": formData.value, "value": formData.value,
"type": formData.type.name, "type": formData.type.name,
}) })
.whereNotNull()
.toList(); .toList();
return finalMap; return finalMap;
} }

2
lib/utils/file_utils.dart
View File

@ -50,7 +50,7 @@ String getShortPath(String path) {
String getFilenameFromPath(String path) { String getFilenameFromPath(String path) {
var f = p.split(path); var f = p.split(path);
return f.last; return f.lastOrNull ?? "";
} }
String getTempFileName() { String getTempFileName() {