From 3df7b9e58a3d3826eaba21c192129bba7258a235 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Mon, 10 Apr 2023 11:50:24 +0200 Subject: [PATCH] refactor ADT transport link building (#6207) --- package.json | 8 +++---- .../jump/zcl_abapgit_adt_link.clas.abap | 10 +++++++++ .../routing/zcl_abapgit_gui_router.clas.abap | 22 ++++--------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index ff80d4cbd..de72f31a1 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ ] }, "devDependencies": { - "@abaplint/cli": "^2.97.4", + "@abaplint/cli": "^2.97.7", "@abaplint/database-sqlite": "^2.5.39", - "@abaplint/runtime": "^2.5.76", - "@abaplint/transpiler-cli": "^2.5.76", + "@abaplint/runtime": "^2.5.79", + "@abaplint/transpiler-cli": "^2.5.79", "abapmerge": "^0.15.0", "c8": "^7.13.0", - "eslint": "^8.37.0" + "eslint": "^8.38.0" } } diff --git a/src/objects/jump/zcl_abapgit_adt_link.clas.abap b/src/objects/jump/zcl_abapgit_adt_link.clas.abap index 909437692..32f5bd3be 100644 --- a/src/objects/jump/zcl_abapgit_adt_link.clas.abap +++ b/src/objects/jump/zcl_abapgit_adt_link.clas.abap @@ -14,6 +14,12 @@ CLASS zcl_abapgit_adt_link DEFINITION RAISING zcx_abapgit_exception. + CLASS-METHODS link_transport + IMPORTING + iv_transport TYPE trkorr + RETURNING + VALUE(rv_link) TYPE string. + PROTECTED SECTION. CLASS-METHODS generate @@ -56,6 +62,10 @@ ENDCLASS. CLASS zcl_abapgit_adt_link IMPLEMENTATION. + METHOD link_transport. +* call to CL_CTS_ADT_TM_URI_BUILDER=>CREATE_ADT_URI replaced with logic that works on all systems, + rv_link = |adt://{ sy-sysid }/sap/bc/adt/cts/transportrequests/{ iv_transport }|. + ENDMETHOD. METHOD generate. diff --git a/src/ui/routing/zcl_abapgit_gui_router.clas.abap b/src/ui/routing/zcl_abapgit_gui_router.clas.abap index cf46a0e6e..a3dfaaaa3 100644 --- a/src/ui/routing/zcl_abapgit_gui_router.clas.abap +++ b/src/ui/routing/zcl_abapgit_gui_router.clas.abap @@ -459,27 +459,13 @@ CLASS ZCL_ABAPGIT_GUI_ROUTER IMPLEMENTATION. METHOD jump_display_transport. DATA: - lv_transport_adt_uri TYPE string, - lv_adt_link TYPE string, - lv_adt_jump_enabled TYPE abap_bool. + lv_adt_link TYPE string, + lv_adt_jump_enabled TYPE abap_bool. lv_adt_jump_enabled = zcl_abapgit_persist_factory=>get_settings( )->read( )->get_adt_jump_enabled( ). IF lv_adt_jump_enabled = abap_true. - TRY. - CALL METHOD ('CL_CTS_ADT_TM_URI_BUILDER')=>('CREATE_ADT_URI') - EXPORTING - trnumber = iv_transport - RECEIVING - result = lv_transport_adt_uri. - - lv_adt_link = |adt://{ sy-sysid }{ lv_transport_adt_uri }|. - zcl_abapgit_ui_factory=>get_frontend_services( )->execute( iv_document = lv_adt_link ). - - CATCH cx_root. - CALL FUNCTION 'TR_DISPLAY_REQUEST' - EXPORTING - i_trkorr = iv_transport. - ENDTRY. + lv_adt_link = zcl_abapgit_adt_link=>link_transport( iv_transport ). + zcl_abapgit_ui_factory=>get_frontend_services( )->execute( iv_document = lv_adt_link ). ELSE. CALL FUNCTION 'TR_DISPLAY_REQUEST' EXPORTING