From 555bf14216d89785d412c7495dae0fd35ccf36f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=BCnter?= <christianguenter@googlemail.com>
Date: Mon, 18 Dec 2017 19:49:50 +0000
Subject: [PATCH] Improve offline repository popup

---
 src/zabapgit_forms.prog.abap  | 19 ++++----
 src/zabapgit_popups.prog.abap | 89 +++++++++++++++++++++--------------
 2 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/src/zabapgit_forms.prog.abap b/src/zabapgit_forms.prog.abap
index be9c512c0..b842542b8 100644
--- a/src/zabapgit_forms.prog.abap
+++ b/src/zabapgit_forms.prog.abap
@@ -67,8 +67,8 @@ FORM branch_popup TABLES   tt_fields TYPE zif_abapgit_definitions=>ty_sval_tt
         ls_branch       TYPE lcl_git_branch_list=>ty_git_branch,
         lv_create       TYPE boolean.
 
-  FIELD-SYMBOLS: <ls_furl>    LIKE LINE OF tt_fields,
-                 <ls_fbranch> LIKE LINE OF tt_fields,
+  FIELD-SYMBOLS: <ls_furl>     LIKE LINE OF tt_fields,
+                 <ls_fbranch>  LIKE LINE OF tt_fields,
                  <ls_fpackage> LIKE LINE OF tt_fields.
 
   CLEAR cs_error.
@@ -113,9 +113,7 @@ FORM branch_popup TABLES   tt_fields TYPE zif_abapgit_definitions=>ty_sval_tt
     lcl_sap_package=>create( ls_package_data ).
     COMMIT WORK.
 
-    READ TABLE tt_fields ASSIGNING <ls_fbranch> WITH KEY tabname = 'TDEVC'.
-    ASSERT sy-subrc = 0.
-    <ls_fbranch>-value = ls_package_data-devclass.
+    <ls_fpackage>-value = ls_package_data-devclass.
   ENDIF.
 
 ENDFORM.                    "branch_popup
@@ -130,13 +128,17 @@ FORM package_popup TABLES   tt_fields TYPE zif_abapgit_definitions=>ty_sval_tt
   DATA: ls_package_data TYPE scompkdtln,
         lv_create       TYPE boolean.
 
-  FIELD-SYMBOLS: <ls_fbranch> LIKE LINE OF tt_fields.
+  FIELD-SYMBOLS: <ls_fpackage> LIKE LINE OF tt_fields.
 
   CLEAR cs_error.
 
   IF pv_code = 'COD1'.
     cv_show_popup = abap_true.
 
+    READ TABLE tt_fields ASSIGNING <ls_fpackage> WITH KEY fieldname = 'DEVCLASS'.
+    ASSERT sy-subrc = 0.
+    ls_package_data-devclass = <ls_fpackage>-value.
+
     lcl_popups=>popup_to_create_package( IMPORTING es_package_data = ls_package_data
                                                    ev_create       = lv_create ).
     IF lv_create = abap_false.
@@ -146,10 +148,9 @@ FORM package_popup TABLES   tt_fields TYPE zif_abapgit_definitions=>ty_sval_tt
     lcl_sap_package=>create( ls_package_data ).
     COMMIT WORK.
 
-    READ TABLE tt_fields ASSIGNING <ls_fbranch> WITH KEY tabname = 'TDEVC'.
-    ASSERT sy-subrc = 0.
-    <ls_fbranch>-value = ls_package_data-devclass.
+    <ls_fpackage>-value = ls_package_data-devclass.
   ENDIF.
+
 ENDFORM.                    "package_popup
 
 FORM output.
diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap
index 614359298..bad7d6eff 100644
--- a/src/zabapgit_popups.prog.abap
+++ b/src/zabapgit_popups.prog.abap
@@ -335,7 +335,9 @@ CLASS lcl_popups IMPLEMENTATION.
           lt_fields     TYPE TABLE OF sval,
           lv_icon_ok    TYPE icon-name,
           lv_button1    TYPE svalbutton-buttontext,
-          lv_icon1      TYPE icon-name.
+          lv_icon1      TYPE icon-name,
+          lv_finished   TYPE abap_bool,
+          lx_error      TYPE REF TO zcx_abapgit_exception.
 
     FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
 
@@ -350,45 +352,60 @@ CLASS lcl_popups IMPLEMENTATION.
                          iv_fieldtext = 'Package'
                CHANGING ct_fields     = lt_fields ).
 
-    lv_icon_ok  = icon_okay.
-    lv_button1 = 'Create package' ##NO_TEXT.
-    lv_icon1   = icon_folder.
+    WHILE lv_finished = abap_false.
 
-    CALL FUNCTION 'POPUP_GET_VALUES_USER_BUTTONS'
-      EXPORTING
-        popup_title       = 'New Offline Project'
-        programname       = sy-repid
-        formname          = 'PACKAGE_POPUP'
-        ok_pushbuttontext = ''
-        icon_ok_push      = lv_icon_ok
-        first_pushbutton  = lv_button1
-        icon_button_1     = lv_icon1
-        second_pushbutton = ''
-        icon_button_2     = ''
-      IMPORTING
-        returncode        = lv_returncode
-      TABLES
-        fields            = lt_fields
-      EXCEPTIONS
-        error_in_fields   = 1
-        OTHERS            = 2.
-    IF sy-subrc <> 0.
-      zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
-    ENDIF.
+      lv_icon_ok  = icon_okay.
+      lv_button1 = 'Create package' ##NO_TEXT.
+      lv_icon1   = icon_folder.
 
-    IF lv_returncode = 'A'.
-      rs_popup-cancel = abap_true.
-      RETURN.
-    ENDIF.
+      CALL FUNCTION 'POPUP_GET_VALUES_USER_BUTTONS'
+        EXPORTING
+          popup_title       = 'New Offline Project'
+          programname       = sy-repid
+          formname          = 'PACKAGE_POPUP'
+          ok_pushbuttontext = ''
+          icon_ok_push      = lv_icon_ok
+          first_pushbutton  = lv_button1
+          icon_button_1     = lv_icon1
+          second_pushbutton = ''
+          icon_button_2     = ''
+        IMPORTING
+          returncode        = lv_returncode
+        TABLES
+          fields            = lt_fields
+        EXCEPTIONS
+          error_in_fields   = 1
+          OTHERS            = 2.
+      IF sy-subrc <> 0.
+        zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
+      ENDIF.
 
-    READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
-    ASSERT sy-subrc = 0.
-    rs_popup-url = <ls_field>-value.
+      IF lv_returncode = 'A'.
+        rs_popup-cancel = abap_true.
+        RETURN.
+      ENDIF.
 
-    READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
-    ASSERT sy-subrc = 0.
-    rs_popup-package = <ls_field>-value.
-    TRANSLATE rs_popup-package TO UPPER CASE.
+      READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
+      ASSERT sy-subrc = 0.
+      rs_popup-url = <ls_field>-value.
+
+      READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
+      ASSERT sy-subrc = 0.
+      TRANSLATE <ls_field>-value TO UPPER CASE.
+      rs_popup-package = <ls_field>-value.
+
+      lv_finished = abap_true.
+
+      TRY.
+          lcl_app=>repo_srv( )->validate_package( rs_popup-package ).
+
+        CATCH zcx_abapgit_exception INTO lx_error.
+          " in case of validation errors we display the popup again
+          MESSAGE lx_error->text TYPE 'S' DISPLAY LIKE 'E'.
+          CLEAR lv_finished.
+      ENDTRY.
+
+    ENDWHILE.
 
   ENDMETHOD.                    "repo_new_offline