From f241fc5ffc0ac605826456a8d7deb90898039146 Mon Sep 17 00:00:00 2001 From: StormGear Date: Sun, 12 Jan 2025 13:30:46 +0000 Subject: [PATCH] Included a field which can help determine the values of isHeaderEnabledList and isParamEnabledList to the Header and Parameter Model --- .../lib/import_export/insomnia_io.dart | 6 +-- .../lib/models/insomnia_collection.dart | 1 + .../models/insomnia_collection.freezed.dart | 41 +++++++++++++------ .../lib/models/insomnia_collection.g.dart | 2 + 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/packages/apidash_core/lib/import_export/insomnia_io.dart b/packages/apidash_core/lib/import_export/insomnia_io.dart index b87eeec9..bbbce1a1 100644 --- a/packages/apidash_core/lib/import_export/insomnia_io.dart +++ b/packages/apidash_core/lib/import_export/insomnia_io.dart @@ -38,8 +38,8 @@ class InsomniaIO { for (var header in request.headers ?? []) { var name = header.name ?? ""; - var value = header.value; - var activeHeader = header.name?.isNotEmpty ?? false; + var value = header.value ?? ""; + var activeHeader = header.disabled ?? false; headers.add(NameValueModel(name: name, value: value)); isHeaderEnabledList.add(!activeHeader); } @@ -47,7 +47,7 @@ class InsomniaIO { for (var query in request.parameters ?? []) { var name = query.name ?? ""; var value = query.value; - var activeQuery = query.name?.isNotEmpty ?? false; + var activeQuery = query.disabled ?? false; params.add(NameValueModel(name: name, value: value)); isParamEnabledList.add(!activeQuery); } diff --git a/packages/insomnia_collection/lib/models/insomnia_collection.dart b/packages/insomnia_collection/lib/models/insomnia_collection.dart index f5236a00..d35797b2 100644 --- a/packages/insomnia_collection/lib/models/insomnia_collection.dart +++ b/packages/insomnia_collection/lib/models/insomnia_collection.dart @@ -125,6 +125,7 @@ class Header with _$Header { const factory Header({ String? name, String? value, + bool? disabled, }) = _Header; factory Header.fromJson(Map json) => _$HeaderFromJson(json); diff --git a/packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart b/packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart index d2085f88..ffde31d4 100644 --- a/packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart +++ b/packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart @@ -292,8 +292,7 @@ mixin _$Resource { String? get method => throw _privateConstructorUsedError; Body? get body => throw _privateConstructorUsedError; List? get parameters => throw _privateConstructorUsedError; - List
? get headers => - throw _privateConstructorUsedError; // List? authentication, + List
? get headers => throw _privateConstructorUsedError; String? get preRequestScript => throw _privateConstructorUsedError; num? get metaSortKey => throw _privateConstructorUsedError; bool? get isPrivate => throw _privateConstructorUsedError; @@ -735,7 +734,6 @@ class _$ResourceImpl implements _Resource { return EqualUnmodifiableListView(value); } -// List? authentication, @override final String? preRequestScript; @override @@ -905,7 +903,7 @@ abstract class _Resource implements Resource { @override List? get parameters; @override - List
? get headers; // List? authentication, + List
? get headers; @override String? get preRequestScript; @override @@ -1341,6 +1339,7 @@ Header _$HeaderFromJson(Map json) { mixin _$Header { String? get name => throw _privateConstructorUsedError; String? get value => throw _privateConstructorUsedError; + bool? get disabled => throw _privateConstructorUsedError; /// Serializes this Header to a JSON map. Map toJson() => throw _privateConstructorUsedError; @@ -1356,7 +1355,7 @@ abstract class $HeaderCopyWith<$Res> { factory $HeaderCopyWith(Header value, $Res Function(Header) then) = _$HeaderCopyWithImpl<$Res, Header>; @useResult - $Res call({String? name, String? value}); + $Res call({String? name, String? value, bool? disabled}); } /// @nodoc @@ -1376,6 +1375,7 @@ class _$HeaderCopyWithImpl<$Res, $Val extends Header> $Res call({ Object? name = freezed, Object? value = freezed, + Object? disabled = freezed, }) { return _then(_value.copyWith( name: freezed == name @@ -1386,6 +1386,10 @@ class _$HeaderCopyWithImpl<$Res, $Val extends Header> ? _value.value : value // ignore: cast_nullable_to_non_nullable as String?, + disabled: freezed == disabled + ? _value.disabled + : disabled // ignore: cast_nullable_to_non_nullable + as bool?, ) as $Val); } } @@ -1397,7 +1401,7 @@ abstract class _$$HeaderImplCopyWith<$Res> implements $HeaderCopyWith<$Res> { __$$HeaderImplCopyWithImpl<$Res>; @override @useResult - $Res call({String? name, String? value}); + $Res call({String? name, String? value, bool? disabled}); } /// @nodoc @@ -1415,6 +1419,7 @@ class __$$HeaderImplCopyWithImpl<$Res> $Res call({ Object? name = freezed, Object? value = freezed, + Object? disabled = freezed, }) { return _then(_$HeaderImpl( name: freezed == name @@ -1425,6 +1430,10 @@ class __$$HeaderImplCopyWithImpl<$Res> ? _value.value : value // ignore: cast_nullable_to_non_nullable as String?, + disabled: freezed == disabled + ? _value.disabled + : disabled // ignore: cast_nullable_to_non_nullable + as bool?, )); } } @@ -1433,7 +1442,7 @@ class __$$HeaderImplCopyWithImpl<$Res> @JsonSerializable(explicitToJson: true, anyMap: true, includeIfNull: false) class _$HeaderImpl implements _Header { - const _$HeaderImpl({this.name, this.value}); + const _$HeaderImpl({this.name, this.value, this.disabled}); factory _$HeaderImpl.fromJson(Map json) => _$$HeaderImplFromJson(json); @@ -1442,10 +1451,12 @@ class _$HeaderImpl implements _Header { final String? name; @override final String? value; + @override + final bool? disabled; @override String toString() { - return 'Header(name: $name, value: $value)'; + return 'Header(name: $name, value: $value, disabled: $disabled)'; } @override @@ -1454,12 +1465,14 @@ class _$HeaderImpl implements _Header { (other.runtimeType == runtimeType && other is _$HeaderImpl && (identical(other.name, name) || other.name == name) && - (identical(other.value, value) || other.value == value)); + (identical(other.value, value) || other.value == value) && + (identical(other.disabled, disabled) || + other.disabled == disabled)); } @JsonKey(includeFromJson: false, includeToJson: false) @override - int get hashCode => Object.hash(runtimeType, name, value); + int get hashCode => Object.hash(runtimeType, name, value, disabled); /// Create a copy of Header /// with the given fields replaced by the non-null parameter values. @@ -1478,8 +1491,10 @@ class _$HeaderImpl implements _Header { } abstract class _Header implements Header { - const factory _Header({final String? name, final String? value}) = - _$HeaderImpl; + const factory _Header( + {final String? name, + final String? value, + final bool? disabled}) = _$HeaderImpl; factory _Header.fromJson(Map json) = _$HeaderImpl.fromJson; @@ -1487,6 +1502,8 @@ abstract class _Header implements Header { String? get name; @override String? get value; + @override + bool? get disabled; /// Create a copy of Header /// with the given fields replaced by the non-null parameter values. diff --git a/packages/insomnia_collection/lib/models/insomnia_collection.g.dart b/packages/insomnia_collection/lib/models/insomnia_collection.g.dart index 531f0c16..947de2bc 100644 --- a/packages/insomnia_collection/lib/models/insomnia_collection.g.dart +++ b/packages/insomnia_collection/lib/models/insomnia_collection.g.dart @@ -128,10 +128,12 @@ Map _$$ParameterImplToJson(_$ParameterImpl instance) => _$HeaderImpl _$$HeaderImplFromJson(Map json) => _$HeaderImpl( name: json['name'] as String?, value: json['value'] as String?, + disabled: json['disabled'] as bool?, ); Map _$$HeaderImplToJson(_$HeaderImpl instance) => { if (instance.name case final value?) 'name': value, if (instance.value case final value?) 'value': value, + if (instance.disabled case final value?) 'disabled': value, };