From d21c8a3cfe80f06bc2c6c07732c7de91c010101e Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 6 Dec 2024 04:47:39 -0500 Subject: [PATCH 1/7] Fix dark theme CSS whitespace (#7104) Co-authored-by: Lars Hvam --- src/ui/zabapgit_css_theme_dark.w3mi.data.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/zabapgit_css_theme_dark.w3mi.data.css b/src/ui/zabapgit_css_theme_dark.w3mi.data.css index e6e867b36..2d59d8e4c 100644 --- a/src/ui/zabapgit_css_theme_dark.w3mi.data.css +++ b/src/ui/zabapgit_css_theme_dark.w3mi.data.css @@ -263,4 +263,4 @@ div.log { color: var(--theme-greyscale-dark); } .dialog input[readonly] { background-color: var(--theme-greyscale-dark); color: var(--theme-greyscale-medium); -} +} From 53bad5bd20847cb51b82b356b882fc8593a202dc Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 6 Dec 2024 04:51:12 -0500 Subject: [PATCH 2/7] Adjust object descriptions (#7101) Co-authored-by: Lars Hvam --- src/cts/zif_abapgit_default_transport.intf.xml | 2 +- src/inspect/zcl_abapgit_where_used_tools.clas.xml | 2 +- src/objects/zcl_abapgit_object_fugs.clas.xml | 2 +- src/ui/lib/zcl_abapgit_gui_picklist.clas.xml | 2 +- src/ui/pages/codi/zcl_abapgit_gui_page_whereused.clas.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cts/zif_abapgit_default_transport.intf.xml b/src/cts/zif_abapgit_default_transport.intf.xml index 1d7795e67..e7ad06161 100644 --- a/src/cts/zif_abapgit_default_transport.intf.xml +++ b/src/cts/zif_abapgit_default_transport.intf.xml @@ -5,7 +5,7 @@ ZIF_ABAPGIT_DEFAULT_TRANSPORT E - ZIF_ABAPGIT_DEFAULT_TRANSPORT + abapGit - Default Transport 2 1 X diff --git a/src/inspect/zcl_abapgit_where_used_tools.clas.xml b/src/inspect/zcl_abapgit_where_used_tools.clas.xml index bcbde1723..2a5281546 100644 --- a/src/inspect/zcl_abapgit_where_used_tools.clas.xml +++ b/src/inspect/zcl_abapgit_where_used_tools.clas.xml @@ -5,7 +5,7 @@ ZCL_ABAPGIT_WHERE_USED_TOOLS E - abapGit where used utilities + abapGit - Where-used Utilities 1 X X diff --git a/src/objects/zcl_abapgit_object_fugs.clas.xml b/src/objects/zcl_abapgit_object_fugs.clas.xml index 54cdabde2..a52df4001 100644 --- a/src/objects/zcl_abapgit_object_fugs.clas.xml +++ b/src/objects/zcl_abapgit_object_fugs.clas.xml @@ -5,7 +5,7 @@ ZCL_ABAPGIT_OBJECT_FUGS E - abapGit - FUGS + abapGit - FUGS - Function Group (SAP) 1 X X diff --git a/src/ui/lib/zcl_abapgit_gui_picklist.clas.xml b/src/ui/lib/zcl_abapgit_gui_picklist.clas.xml index 3830c0365..d11fbd3be 100644 --- a/src/ui/lib/zcl_abapgit_gui_picklist.clas.xml +++ b/src/ui/lib/zcl_abapgit_gui_picklist.clas.xml @@ -5,7 +5,7 @@ ZCL_ABAPGIT_GUI_PICKLIST E - abapGit - Pick from list + abapGit - GUI Pick List 1 X X diff --git a/src/ui/pages/codi/zcl_abapgit_gui_page_whereused.clas.xml b/src/ui/pages/codi/zcl_abapgit_gui_page_whereused.clas.xml index 1f1873811..ad32d13b8 100644 --- a/src/ui/pages/codi/zcl_abapgit_gui_page_whereused.clas.xml +++ b/src/ui/pages/codi/zcl_abapgit_gui_page_whereused.clas.xml @@ -5,7 +5,7 @@ ZCL_ABAPGIT_GUI_PAGE_WHEREUSED E - abapGit where-used page + abapGit - GUI Where-used 1 X X From fef6bf49cab313ef7661d79fb4a65b69f63a1809 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:25:58 -0500 Subject: [PATCH 3/7] Fix generic table types (#7105) Co-authored-by: Lars Hvam --- src/exits/zif_abapgit_exit.intf.abap | 2 +- src/objects/aff/zcl_abapgit_json_handler.clas.abap | 2 +- src/objects/zcl_abapgit_object_sush.clas.abap | 8 ++++---- src/ui/zif_abapgit_popups.intf.abap | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/exits/zif_abapgit_exit.intf.abap b/src/exits/zif_abapgit_exit.intf.abap index 5a95ec67b..e07b0b21f 100644 --- a/src/exits/zif_abapgit_exit.intf.abap +++ b/src/exits/zif_abapgit_exit.intf.abap @@ -7,7 +7,7 @@ INTERFACE zif_abapgit_exit PUBLIC. clone_url TYPE string, END OF ty_ci_repo. TYPES: - ty_ci_repos TYPE TABLE OF ty_ci_repo. + ty_ci_repos TYPE STANDARD TABLE OF ty_ci_repo WITH DEFAULT KEY. TYPES: ty_object_types TYPE STANDARD TABLE OF tadir-object WITH DEFAULT KEY. TYPES: diff --git a/src/objects/aff/zcl_abapgit_json_handler.clas.abap b/src/objects/aff/zcl_abapgit_json_handler.clas.abap index 738d017f9..877dde787 100644 --- a/src/objects/aff/zcl_abapgit_json_handler.clas.abap +++ b/src/objects/aff/zcl_abapgit_json_handler.clas.abap @@ -18,7 +18,7 @@ CLASS zcl_abapgit_json_handler DEFINITION mappings TYPE ty_json_abap_mappings, END OF ty_enum_mapping . TYPES: - ty_enum_mappings TYPE TABLE OF ty_enum_mapping WITH DEFAULT KEY . + ty_enum_mappings TYPE STANDARD TABLE OF ty_enum_mapping WITH DEFAULT KEY . TYPES: BEGIN OF ty_path_value_pair, path TYPE string, diff --git a/src/objects/zcl_abapgit_object_sush.clas.abap b/src/objects/zcl_abapgit_object_sush.clas.abap index d9e0cc92d..974a94250 100644 --- a/src/objects/zcl_abapgit_object_sush.clas.abap +++ b/src/objects/zcl_abapgit_object_sush.clas.abap @@ -23,10 +23,10 @@ CLASS zcl_abapgit_object_sush DEFINITION METHODS clear_metadata CHANGING cs_data_head TYPE any - ct_usobx TYPE table - ct_usobt TYPE table - ct_usobx_ext TYPE table - ct_usobt_ext TYPE table. + ct_usobx TYPE STANDARD TABLE + ct_usobt TYPE STANDARD TABLE + ct_usobx_ext TYPE STANDARD TABLE + ct_usobt_ext TYPE STANDARD TABLE. ENDCLASS. diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap index d6217dbcb..d921b749e 100644 --- a/src/ui/zif_abapgit_popups.intf.abap +++ b/src/ui/zif_abapgit_popups.intf.abap @@ -12,7 +12,7 @@ INTERFACE zif_abapgit_popups show_icon TYPE abap_bool, center TYPE abap_bool, END OF ty_alv_column, - ty_alv_column_tt TYPE TABLE OF ty_alv_column WITH DEFAULT KEY. + ty_alv_column_tt TYPE STANDARD TABLE OF ty_alv_column WITH DEFAULT KEY. TYPES: BEGIN OF ty_popup_position, From f24f0c958998450e47d84be0c1a01a31897f5717 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:09:18 -0500 Subject: [PATCH 4/7] MSAG: Fix deletion of message longtexts (#7109) Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_object_msag.clas.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objects/zcl_abapgit_object_msag.clas.abap b/src/objects/zcl_abapgit_object_msag.clas.abap index a3f58f990..6a66fa415 100644 --- a/src/objects/zcl_abapgit_object_msag.clas.abap +++ b/src/objects/zcl_abapgit_object_msag.clas.abap @@ -84,7 +84,7 @@ CLASS zcl_abapgit_object_msag IMPLEMENTATION. object_is_enqueued_by_corr = 6 user_break = 7 OTHERS = 8. - IF sy-subrc <> 0. + IF sy-subrc <> 0 AND sy-subrc <> 4. zcx_abapgit_exception=>raise( 'Error deleting longtext for message' ). ENDIF. From 621f0192efa43c81c9e641a82eead491145ae7e1 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Sun, 8 Dec 2024 05:47:37 -0500 Subject: [PATCH 5/7] Fix missing longtexts (#7108) Co-authored-by: Lars Hvam --- .../texts/zcl_abapgit_longtexts.clas.abap | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/objects/texts/zcl_abapgit_longtexts.clas.abap b/src/objects/texts/zcl_abapgit_longtexts.clas.abap index 11c2a94b7..8db89aae7 100644 --- a/src/objects/texts/zcl_abapgit_longtexts.clas.abap +++ b/src/objects/texts/zcl_abapgit_longtexts.clas.abap @@ -64,6 +64,10 @@ CLASS zcl_abapgit_longtexts IMPLEMENTATION. FIELD-SYMBOLS: LIKE LINE OF lt_dokil. + IF iv_object_name CA '#'. + zcx_abapgit_exception=>raise( |Invalid name for longtext: { iv_longtext_id } { iv_object_name }| ). + ENDIF. + lv_object = escape_name( iv_longtext_id = iv_longtext_id iv_object_name = iv_object_name ). @@ -77,21 +81,19 @@ CLASS zcl_abapgit_longtexts IMPLEMENTATION. ENDIF. ELSEIF iv_longtext_id IS NOT INITIAL. - IF lv_object NA '#'. - IF iv_main_lang_only = abap_true. - SELECT * FROM dokil - INTO TABLE lt_dokil - WHERE id = iv_longtext_id - AND object LIKE lv_object ESCAPE '#' - AND masterlang = abap_true - ORDER BY PRIMARY KEY. - ELSE. - SELECT * FROM dokil - INTO TABLE lt_dokil - WHERE id = iv_longtext_id - AND object LIKE lv_object ESCAPE '#' - ORDER BY PRIMARY KEY. - ENDIF. + IF iv_main_lang_only = abap_true. + SELECT * FROM dokil + INTO TABLE lt_dokil + WHERE id = iv_longtext_id + AND object LIKE lv_object ESCAPE '#' + AND masterlang = abap_true + ORDER BY PRIMARY KEY. + ELSE. + SELECT * FROM dokil + INTO TABLE lt_dokil + WHERE id = iv_longtext_id + AND object LIKE lv_object ESCAPE '#' + ORDER BY PRIMARY KEY. ENDIF. ELSE. From bc36dcc44bff243258c49b9b29077e38ad679b3e Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Mon, 9 Dec 2024 08:56:39 -0500 Subject: [PATCH 6/7] Fix RFC error handling (#7102) Co-authored-by: Lars Hvam --- .../jump/zcl_abapgit_gui_jumper.clas.abap | 3 +- .../routing/zcl_abapgit_gui_router.clas.abap | 77 ++++++++++--------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/objects/jump/zcl_abapgit_gui_jumper.clas.abap b/src/objects/jump/zcl_abapgit_gui_jumper.clas.abap index 247961df6..35a048049 100644 --- a/src/objects/jump/zcl_abapgit_gui_jumper.clas.abap +++ b/src/objects/jump/zcl_abapgit_gui_jumper.clas.abap @@ -253,7 +253,8 @@ CLASS zcl_abapgit_gui_jumper IMPLEMENTATION. EXCEPTIONS communication_failure = 1 MESSAGE lv_msg system_failure = 2 MESSAGE lv_msg - OTHERS = 3. + resource_failure = 3 + OTHERS = 4. lv_subrc = sy-subrc. diff --git a/src/ui/routing/zcl_abapgit_gui_router.clas.abap b/src/ui/routing/zcl_abapgit_gui_router.clas.abap index 685b6af98..db7cf5da2 100644 --- a/src/ui/routing/zcl_abapgit_gui_router.clas.abap +++ b/src/ui/routing/zcl_abapgit_gui_router.clas.abap @@ -186,7 +186,8 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. EXCEPTIONS communication_failure = 1 MESSAGE lv_msg system_failure = 2 MESSAGE lv_msg - OTHERS = 3. + resource_failure = 3 + OTHERS = 4. IF sy-subrc <> 0. lv_msg = |Error starting transaction { iv_tcode }: { lv_msg }|. MESSAGE lv_msg TYPE 'I'. @@ -478,6 +479,22 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. ENDMETHOD. + METHOD go_stage_transport. + + DATA lt_r_trkorr TYPE zif_abapgit_definitions=>ty_trrngtrkor_tt. + DATA lo_repo TYPE REF TO zcl_abapgit_repo. + + lt_r_trkorr = zcl_abapgit_ui_factory=>get_popups( )->popup_select_wb_tc_tr_and_tsk( ). + + lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). + + CREATE OBJECT ro_filter. + ro_filter->set_filter_values( iv_package = lo_repo->get_package( ) + it_r_trkorr = lt_r_trkorr ). + + ENDMETHOD. + + METHOD jump_display_transport. DATA: @@ -762,6 +779,28 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. ENDMETHOD. + METHOD zip_export_transport. + + DATA lo_obj_filter_trans TYPE REF TO zcl_abapgit_object_filter_tran. + DATA lt_r_trkorr TYPE zif_abapgit_definitions=>ty_trrngtrkor_tt. + DATA lo_repo TYPE REF TO zcl_abapgit_repo. + DATA lv_xstr TYPE xstring. + + lt_r_trkorr = zcl_abapgit_ui_factory=>get_popups( )->popup_select_wb_tc_tr_and_tsk( ). + lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). + lo_repo->refresh( ). + CREATE OBJECT lo_obj_filter_trans. + lo_obj_filter_trans->set_filter_values( iv_package = lo_repo->get_package( ) + it_r_trkorr = lt_r_trkorr ). + + lv_xstr = zcl_abapgit_zip=>encode_files( lo_repo->get_files_local_filtered( lo_obj_filter_trans ) ). + lo_repo->refresh( ). + file_download( iv_package = lo_repo->get_package( ) + iv_xstr = lv_xstr ). + + ENDMETHOD. + + METHOD zip_services. DATA: lv_key TYPE zif_abapgit_persistence=>ty_repo-key, @@ -860,40 +899,4 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. ENDCASE. ENDMETHOD. - - METHOD zip_export_transport. - - DATA lo_obj_filter_trans TYPE REF TO zcl_abapgit_object_filter_tran. - DATA lt_r_trkorr TYPE zif_abapgit_definitions=>ty_trrngtrkor_tt. - DATA lo_repo TYPE REF TO zcl_abapgit_repo. - DATA lv_xstr TYPE xstring. - - lt_r_trkorr = zcl_abapgit_ui_factory=>get_popups( )->popup_select_wb_tc_tr_and_tsk( ). - lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). - lo_repo->refresh( ). - CREATE OBJECT lo_obj_filter_trans. - lo_obj_filter_trans->set_filter_values( iv_package = lo_repo->get_package( ) - it_r_trkorr = lt_r_trkorr ). - - lv_xstr = zcl_abapgit_zip=>encode_files( lo_repo->get_files_local_filtered( lo_obj_filter_trans ) ). - lo_repo->refresh( ). - file_download( iv_package = lo_repo->get_package( ) - iv_xstr = lv_xstr ). - - ENDMETHOD. - - METHOD go_stage_transport. - - DATA lt_r_trkorr TYPE zif_abapgit_definitions=>ty_trrngtrkor_tt. - DATA lo_repo TYPE REF TO zcl_abapgit_repo. - - lt_r_trkorr = zcl_abapgit_ui_factory=>get_popups( )->popup_select_wb_tc_tr_and_tsk( ). - - lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). - - CREATE OBJECT ro_filter. - ro_filter->set_filter_values( iv_package = lo_repo->get_package( ) - it_r_trkorr = lt_r_trkorr ). - - ENDMETHOD. ENDCLASS. From 3d3cae39909fbf8f1f0dcbc988ccfb5c413acdce Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:50:34 -0500 Subject: [PATCH 7/7] IDOC/IEXT: Fix deserialize in background (#7113) --- src/objects/core/zcl_abapgit_file_deserialize.clas.abap | 3 +++ src/objects/zcl_abapgit_object_idoc.clas.abap | 3 +++ src/objects/zcl_abapgit_object_iext.clas.abap | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap index 242d9686f..65d7c43d9 100644 --- a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap +++ b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap @@ -214,6 +214,9 @@ CLASS zcl_abapgit_file_deserialize IMPLEMENTATION. DELETE lt_requires WHERE obj_type <> 'IASP' AND obj_type <> 'PROG' AND obj_type <> 'IARP'. + WHEN 'IDOC' OR 'IEXT'. + lt_requires = lt_items. + DELETE lt_requires WHERE obj_type <> 'TABL'. WHEN 'DCLS'. lt_requires = lt_items. DELETE lt_requires WHERE obj_type <> 'DDLS'. diff --git a/src/objects/zcl_abapgit_object_idoc.clas.abap b/src/objects/zcl_abapgit_object_idoc.clas.abap index e01d7db1a..5b958f5b0 100644 --- a/src/objects/zcl_abapgit_object_idoc.clas.abap +++ b/src/objects/zcl_abapgit_object_idoc.clas.abap @@ -163,6 +163,9 @@ CLASS zcl_abapgit_object_idoc IMPLEMENTATION. MOVE-CORRESPONDING ls_idoc-attributes TO ls_attributes. IF zif_abapgit_object~exists( ) = abap_false. + " Avoid popup asking for package + tadir_insert( iv_package ). + CALL FUNCTION 'IDOCTYPE_CREATE' EXPORTING pi_idoctyp = mv_idoctyp diff --git a/src/objects/zcl_abapgit_object_iext.clas.abap b/src/objects/zcl_abapgit_object_iext.clas.abap index 712bbf900..c3240dc82 100644 --- a/src/objects/zcl_abapgit_object_iext.clas.abap +++ b/src/objects/zcl_abapgit_object_iext.clas.abap @@ -97,6 +97,9 @@ CLASS zcl_abapgit_object_iext IMPLEMENTATION. EXCEPTIONS OTHERS = 1. ELSE. + " Avoid popup asking for package + tadir_insert( iv_package ). + CALL FUNCTION 'EXTTYPE_CREATE' EXPORTING pi_cimtyp = mv_extension