Merge pull request #122 from Onix-Systems/fix/swagger-parser

fix(Swagger): Fix bug with swagger parser url logic

Author: cozvtieg9

Makefile

@@ -7,4 +7,7 @@ build_macos:
 	@appdmg installers/dmg_creator/config.json release/Onix_Flutter_Project_Generator.dmg
 
 build_runner:
-	fvm dart run build_runner build --delete-conflicting-outputs
+	fvm dart run build_runner build --delete-conflicting-outputs
+
+codegen:
+	dart run build_runner build --delete-conflicting-outputs

lib/core/di/bloc.dart

@@ -52,6 +52,7 @@ void registerBloc(GetIt getIt) {
     ..registerFactory<SwaggerParserScreenBloc>(
       () => SwaggerParserScreenBloc(
         GetIt.I.get<FetchSwaggerDataUseCase>(),
+        GetIt.I.get<ClearSwaggerComponentsUseCase>(),
       ),
     )
     ..registerFactory<ScreensScreenBloc>(ScreensScreenBloc.new)

lib/presentation/screen/swagger_parser_screen/bloc/swagger_parser_screen_bloc.dart

@@ -2,18 +2,19 @@ import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:onix_flutter_bloc/onix_flutter_bloc.dart';
-import 'package:onix_flutter_bricks/domain/entity/config/config.dart';
+import 'package:onix_flutter_bricks/domain/usecase/swagger/empty_swagger_components_usecase.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/fetch_swagger_data_usecase.dart';
 import 'package:onix_flutter_bricks/presentation/screen/swagger_parser_screen/bloc/swagger_parser_screen_bloc_imports.dart';
 
 class SwaggerParserScreenBloc extends BaseBloc<SwaggerParserScreenEvent,
     SwaggerParserScreenState, SwaggerParserScreenSR> {
   final FetchSwaggerDataUseCase _fetchSwaggerDataUseCase;
+  final ClearSwaggerComponentsUseCase _clearSwaggerComponentsUseCase;
 
-  SwaggerParserScreenBloc(this._fetchSwaggerDataUseCase)
-      : super(
-          const SwaggerParserScreenStateData(config: Config()),
-        ) {
+  SwaggerParserScreenBloc(
+    this._fetchSwaggerDataUseCase,
+    this._clearSwaggerComponentsUseCase,
+  ) : super(const SwaggerParserScreenStateData()) {
     on<SwaggerParserScreenEventInit>(_onInit);
     on<SwaggerParserScreenEventParse>(_onParse);
   }
@@ -30,23 +31,25 @@ class SwaggerParserScreenBloc extends BaseBloc<SwaggerParserScreenEvent,
     Emitter<SwaggerParserScreenState> emit,
   ) async {
     if (event.url.isEmpty) {
+      emit(state.copyWith(config: state.config.copyWith(swaggerUrl: '')));
+      _clearSwaggerComponentsUseCase();
       addSr(const SwaggerParserScreenSR.onContinue());
+      return;
     }
-    emit(
-      state.copyWith(
-        config: state.config.copyWith(
-          swaggerUrl: event.url,
-        ),
-      ),
-    );
-
     showProgress();
 
     final swaggerComponentsResult =
         await _fetchSwaggerDataUseCase(url: event.url);
 
     await hideProgress();
     if (swaggerComponentsResult.success) {
+      emit(
+        state.copyWith(
+          config: state.config.copyWith(
+            swaggerUrl: event.url,
+          ),
+        ),
+      );
       addSr(const SwaggerParserScreenSR.onContinue());
     } else {
       addSr(const SwaggerParserScreenSR.onParseError());

lib/presentation/screen/swagger_parser_screen/bloc/swagger_parser_screen_models.dart

@@ -24,6 +24,6 @@ class SwaggerParserScreenSR with _$SwaggerParserScreenSR {
 @freezed
 class SwaggerParserScreenState with _$SwaggerParserScreenState {
   const factory SwaggerParserScreenState.data({
-    required Config config,
+    @Default(Config()) Config config,
   }) = SwaggerParserScreenStateData;
 }

lib/presentation/screen/swagger_parser_screen/bloc/swagger_parser_screen_models.freezed.dart

@@ -35,34 +35,29 @@ class _SwaggerParserScreenState extends BaseState<SwaggerParserScreenState,
 
   @override
   void onBlocCreated(BuildContext context, SwaggerParserScreenBloc bloc) {
-    bloc.add(SwaggerParserScreenEventInit(config: widget.config));
+    bloc.add(SwaggerParserScreenEvent.init(config: widget.config));
     _urlController.text = widget.config.swaggerUrl;
     super.onBlocCreated(context, bloc);
   }
 
   @override
   Widget buildWidget(BuildContext context) {
-    return srObserver(
-      context: context,
-      child: CupertinoPageScaffold(
-        navigationBar: TitleBar(
-          title: S.of(context).importApi,
-        ),
-        child: SizedBox.expand(
-          child: blocBuilder(
-            builder: _buildMainContainer,
-          ),
+    return CupertinoPageScaffold(
+      navigationBar: TitleBar(
+        title: S.of(context).importApi,
+      ),
+      child: SizedBox.expand(
+        child: blocBuilder(
+          builder: _buildMainContainer,
         ),
       ),
-      onSR: _onSingleResult,
     );
   }
 
-  void _onSingleResult(
-    BuildContext context,
-    SwaggerParserScreenSR singleResult,
-  ) {
-    singleResult.when(
+  @override
+  void onSR(BuildContext context, SwaggerParserScreenSR sr) {
+    super.onSR(context, sr);
+    sr.when(
       onParseError: () => Dialogs.showOkDialog(
         context: context,
         isError: true,
@@ -105,45 +100,39 @@ class _SwaggerParserScreenState extends BaseState<SwaggerParserScreenState,
                 textController: _urlController,
                 onChanged: () {},
                 autofocus: true,
-                onEditingComplete: () => _onContinue(context, state),
+                onEditingComplete: () => _processSwaggerParser(context),
                 expanded: true,
               ),
             ),
             const Spacer(),
             NavigationButtonBar(
               nextText: S.of(context).continueLabel,
               prevText: S.of(context).goBack,
-              onNextPressed: () {
-                _onContinue(context, state);
-              },
-              onPrevPressed: () {
-                _onBack(context, state);
-              },
+              onNextPressed: () => _processSwaggerParser(context),
+              onPrevPressed: () => _onBack(context, state),
             ),
           ],
         ),
       ),
     );
   }
 
+  void _processSwaggerParser(BuildContext context) {
+    blocOf(context)
+        .add(SwaggerParserScreenEvent.parse(url: _urlController.text));
+  }
+
   void _onContinue(BuildContext context, SwaggerParserScreenState state) {
-    if (_urlController.text.isNotEmpty) {
-      blocOf(context)
-          .add(SwaggerParserScreenEventParse(url: _urlController.text));
-    } else {
-      state.config.projectExists
-          ? context.pop(
-              widget.config.copyWith(
-                swaggerUrl: state.config.swaggerUrl,
-              ),
-            )
-          : context.go(
-              AppRouter.dataComponentsScreen,
-              extra: widget.config.copyWith(
-                swaggerUrl: state.config.swaggerUrl,
-              ),
-            );
-    }
+    state.config.projectExists
+        ? context.pop(
+            widget.config.copyWith(
+              swaggerUrl: state.config.swaggerUrl,
+            ),
+          )
+        : context.go(
+            AppRouter.dataComponentsScreen,
+            extra: state.config,
+          );
   }
 
   void _onBack(BuildContext context, SwaggerParserScreenState state) =>
@@ -155,8 +144,6 @@ class _SwaggerParserScreenState extends BaseState<SwaggerParserScreenState,
             )
           : context.go(
               AppRouter.stylesScreen,
-              extra: widget.config.copyWith(
-                swaggerUrl: state.config.swaggerUrl,
-              ),
+              extra: state.config,
             );
 }