From 163716c0063ae21613acbe3304d77e4f6d460b71 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Sun, 7 May 2023 10:50:11 +0200 Subject: [PATCH] INTF, WEBI: Hide objects generated by proxy (SPRX) (#6259) Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_object_intf.clas.abap | 7 +++ src/objects/zcl_abapgit_object_webi.clas.abap | 53 +++++++++++-------- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/objects/zcl_abapgit_object_intf.clas.abap b/src/objects/zcl_abapgit_object_intf.clas.abap index 4e78fc5b4..30b963f9e 100644 --- a/src/objects/zcl_abapgit_object_intf.clas.abap +++ b/src/objects/zcl_abapgit_object_intf.clas.abap @@ -570,6 +570,13 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. OR version = '0' ) ##WARN_OK. "#EC CI_GENBUFF IF sy-subrc = 0 AND lv_category = seoc_category_webdynpro_class. rv_bool = abap_false. + ELSE. + SELECT SINGLE obj_name FROM sproxhdr INTO ls_class_key-clsname + WHERE object = 'INTF' AND obj_name = ls_class_key-clsname. + IF sy-subrc = 0. + " generated by proxy + rv_bool = abap_false. + ENDIF. ENDIF. ENDIF. diff --git a/src/objects/zcl_abapgit_object_webi.clas.abap b/src/objects/zcl_abapgit_object_webi.clas.abap index 1fb91415e..ec19867a5 100644 --- a/src/objects/zcl_abapgit_object_webi.clas.abap +++ b/src/objects/zcl_abapgit_object_webi.clas.abap @@ -319,6 +319,28 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION. ENDMETHOD. + METHOD sort. + SORT cs_webi-pvepheader BY vepname version. + SORT cs_webi-pvepfunction BY vepname version function. + SORT cs_webi-pvepfault BY vepname version function fault. + SORT cs_webi-pvepparameter BY vepname version function vepparam vepparamtype. + SORT cs_webi-pveptype BY vepname version typename. + SORT cs_webi-pvepelemtype BY vepname version typename. + SORT cs_webi-pveptabletype BY vepname version typename. + SORT cs_webi-pvepstrutype BY vepname version typename fieldpos. + SORT cs_webi-pveptypesoapext BY vepname version typename. + SORT cs_webi-pvepeletypsoap BY vepname version typename assign_type assign_data1 assign_data2. + SORT cs_webi-pveptabtypsoap BY vepname version typename. + SORT cs_webi-pvepfuncsoapext BY vepname version function. + SORT cs_webi-pvepfieldref BY vepname version function vepparam vepparamtype strucid fieldname. + SORT cs_webi-pvependpoint BY relid vepname version sortfield. + SORT cs_webi-pvepvisoapext BY vepname version. + SORT cs_webi-pvepparasoapext BY vepname version function vepparam vepparamtype. + SORT cs_webi-pwsheader BY wsname version. + SORT cs_webi-pwssoapprop BY wsname version feature soapapp funcref propnum. + ENDMETHOD. + + METHOD zif_abapgit_object~changed_by. SELECT SINGLE changedby FROM vepheader INTO rv_user @@ -419,10 +441,17 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION. METHOD zif_abapgit_object~exists. DATA: lv_name TYPE vepname. - + DATA lv_generated TYPE abap_bool. lv_name = ms_item-obj_name. + " Check if service is generated by proxy + SELECT SINGLE auto_generated FROM vependpoint INTO lv_generated + WHERE vepname = lv_name AND version = sews_c_vif_version-active. + IF sy-subrc = 0 AND lv_generated = abap_true. + RETURN. + ENDIF. + rv_bool = cl_ws_md_vif_root=>check_existence_by_vif_name( name = lv_name i_version = sews_c_vif_version-all ). @@ -568,26 +597,4 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION. io_xml = io_xml ). ENDMETHOD. - - METHOD sort. - SORT cs_webi-pvepheader BY vepname version. - SORT cs_webi-pvepfunction BY vepname version function. - SORT cs_webi-pvepfault BY vepname version function fault. - SORT cs_webi-pvepparameter BY vepname version function vepparam vepparamtype. - SORT cs_webi-pveptype BY vepname version typename. - SORT cs_webi-pvepelemtype BY vepname version typename. - SORT cs_webi-pveptabletype BY vepname version typename. - SORT cs_webi-pvepstrutype BY vepname version typename fieldpos. - SORT cs_webi-pveptypesoapext BY vepname version typename. - SORT cs_webi-pvepeletypsoap BY vepname version typename assign_type assign_data1 assign_data2. - SORT cs_webi-pveptabtypsoap BY vepname version typename. - SORT cs_webi-pvepfuncsoapext BY vepname version function. - SORT cs_webi-pvepfieldref BY vepname version function vepparam vepparamtype strucid fieldname. - SORT cs_webi-pvependpoint BY relid vepname version sortfield. - SORT cs_webi-pvepvisoapext BY vepname version. - SORT cs_webi-pvepparasoapext BY vepname version function vepparam vepparamtype. - SORT cs_webi-pwsheader BY wsname version. - SORT cs_webi-pwssoapprop BY wsname version feature soapapp funcref propnum. - ENDMETHOD. - ENDCLASS.