From 4db563d03344d7ef2240f80cc2bd6a4c71aa741a Mon Sep 17 00:00:00 2001 From: oblomov <102328295+oblomov-dev@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:47:47 +0100 Subject: [PATCH] Downport fixes (#737) * downport-fixes * version * Delete src/01/01/z2ui5_if_abapgit_version.intf.abap * Delete src/01/01/z2ui5_if_abapgit_version.intf.xml * version * Update z2ui5_cl_fw_http_handler.clas.abap * Update changelog.txt * Update changelog.txt * Update changelog.txt * Update z2ui5_cl_fw_http_handler.clas.abap --- .abapgit.xml | 2 +- changelog.txt | 10 ++++++++++ src/01/01/z2ui5_cl_fw_client.clas.abap | 10 ++++++---- src/01/01/z2ui5_cl_fw_controller.clas.abap | 3 ++- src/01/01/z2ui5_cl_fw_http_handler.clas.abap | 16 +++++++++------- src/01/01/z2ui5_if_abapgit_version.intf.abap | 6 ------ src/01/01/z2ui5_if_abapgit_version.intf.xml | 15 --------------- src/01/02/z2ui5_cl_fw_ui_startup.clas.abap | 1 + 8 files changed, 29 insertions(+), 34 deletions(-) delete mode 100644 src/01/01/z2ui5_if_abapgit_version.intf.abap delete mode 100644 src/01/01/z2ui5_if_abapgit_version.intf.xml diff --git a/.abapgit.xml b/.abapgit.xml index 33be0cab..b9e57d8d 100644 --- a/.abapgit.xml +++ b/.abapgit.xml @@ -17,7 +17,7 @@ /src/01/z2ui5_cl_fw_font_awsome_icons.clas.abap /src/01/z2ui5_cl_fw_font_awsome_icons.clas.xml - z2ui5_if_abapgit_version=>c_abap_version + z2ui5_cl_fw_http_handler=>c_abap_version diff --git a/changelog.txt b/changelog.txt index 0ee3d0a5..d76bfb65 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,16 @@ Legend + : added - : removed + +2023-12-15 v1.111.0 +------------------- + ++ binding on cell level ++ custom control - MultiInput with backend token handling ++ custom control - ui.table filtering after model update +* downport ready syntax + + 2023-12-15 v1.110.0 ------------------- diff --git a/src/01/01/z2ui5_cl_fw_client.clas.abap b/src/01/01/z2ui5_cl_fw_client.clas.abap index 272a73a3..ca455e5a 100644 --- a/src/01/01/z2ui5_cl_fw_client.clas.abap +++ b/src/01/01/z2ui5_cl_fw_client.clas.abap @@ -338,8 +338,10 @@ CLASS z2ui5_cl_fw_client IMPLEMENTATION. METHOD bind_tab_cell. - FIELD-SYMBOLS TYPE any. - FIELD-SYMBOLS TYPE any. + FIELD-SYMBOLS TYPE any. + FIELD-SYMBOLS TYPE any. + data lr_ref_in type ref to data. + data lr_ref type ref to data. ASSIGN i_tab[ i_tab_index ] TO . DATA(lt_attri) = z2ui5_cl_util_func=>rtti_get_t_comp_by_struc( ). @@ -347,9 +349,9 @@ CLASS z2ui5_cl_fw_client IMPLEMENTATION. LOOP AT lt_attri ASSIGNING FIELD-SYMBOL(). ASSIGN COMPONENT -name OF STRUCTURE TO . - DATA(lr_ref_in) = REF #( ). + lr_ref_in = REF #( ). - DATA(lr_ref) = REF #( i_val ). + lr_ref = REF #( i_val ). IF lr_ref = lr_ref_in. r_result = `{` && iv_name && '/' && shift_right( CONV string( i_tab_index - 1 ) ) && '/' && -name && `}`. RETURN. diff --git a/src/01/01/z2ui5_cl_fw_controller.clas.abap b/src/01/01/z2ui5_cl_fw_controller.clas.abap index 2003681b..81391749 100644 --- a/src/01/01/z2ui5_cl_fw_controller.clas.abap +++ b/src/01/01/z2ui5_cl_fw_controller.clas.abap @@ -234,7 +234,8 @@ CLASS z2ui5_cl_fw_controller IMPLEMENTATION. TRY. FIELD-SYMBOLS TYPE any. - DATA(ls_params) = location->get_attribute( `STARTUP_PARAMETERS` )->get_val_ref( ). + data ls_params type ref to data. + ls_params = location->get_attribute( `STARTUP_PARAMETERS` )->get_val_ref( ). ASSIGN ls_params->* TO . DATA(lt_comp) = z2ui5_cl_util_func=>rtti_get_t_comp_by_struc( ). diff --git a/src/01/01/z2ui5_cl_fw_http_handler.clas.abap b/src/01/01/z2ui5_cl_fw_http_handler.clas.abap index 581892dd..5c90aa1c 100644 --- a/src/01/01/z2ui5_cl_fw_http_handler.clas.abap +++ b/src/01/01/z2ui5_cl_fw_http_handler.clas.abap @@ -4,6 +4,8 @@ CLASS z2ui5_cl_fw_http_handler DEFINITION PUBLIC SECTION. + CONSTANTS c_abap_version TYPE string VALUE '1.111.0' ##NO_TEXT. + CLASS-METHODS http_post IMPORTING body TYPE string @@ -12,18 +14,18 @@ CLASS z2ui5_cl_fw_http_handler DEFINITION CLASS-METHODS http_get IMPORTING - t_config TYPE z2ui5_if_client=>ty_t_name_value OPTIONAL - content_security_policy TYPE clike OPTIONAL - check_logging TYPE abap_bool OPTIONAL - custom_js TYPE string OPTIONAL - json_model_limit TYPE string DEFAULT '100' + t_config TYPE z2ui5_if_client=>ty_t_name_value OPTIONAL + content_security_policy TYPE clike OPTIONAL + check_logging TYPE abap_bool OPTIONAL + custom_js TYPE string OPTIONAL + json_model_limit TYPE string DEFAULT '100' PREFERRED PARAMETER t_config RETURNING - VALUE(r_result) TYPE string. + VALUE(r_result) TYPE string. PROTECTED SECTION. CLASS-METHODS get_js - returning value(result) type string. + RETURNING VALUE(result) TYPE string. PRIVATE SECTION. diff --git a/src/01/01/z2ui5_if_abapgit_version.intf.abap b/src/01/01/z2ui5_if_abapgit_version.intf.abap deleted file mode 100644 index 18e16016..00000000 --- a/src/01/01/z2ui5_if_abapgit_version.intf.abap +++ /dev/null @@ -1,6 +0,0 @@ -INTERFACE z2ui5_if_abapgit_version - PUBLIC . - - CONSTANTS c_abap_version TYPE string VALUE '1.110.0' ##NO_TEXT. - -ENDINTERFACE. diff --git a/src/01/01/z2ui5_if_abapgit_version.intf.xml b/src/01/01/z2ui5_if_abapgit_version.intf.xml deleted file mode 100644 index 406dca09..00000000 --- a/src/01/01/z2ui5_if_abapgit_version.intf.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Z2UI5_IF_ABAPGIT_VERSION - E - abap2UI5 - abapgit version - 2 - 1 - X - - - - diff --git a/src/01/02/z2ui5_cl_fw_ui_startup.clas.abap b/src/01/02/z2ui5_cl_fw_ui_startup.clas.abap index d4b5af24..abc2db5e 100644 --- a/src/01/02/z2ui5_cl_fw_ui_startup.clas.abap +++ b/src/01/02/z2ui5_cl_fw_ui_startup.clas.abap @@ -55,6 +55,7 @@ CLASS z2ui5_cl_fw_ui_startup IMPLEMENTATION. page->headercontent( )->title( `abap2UI5 - Developing UI5 Apps in Pure ABAP` )->toolbarspacer( + )->text( `v.` && z2ui5_cl_fw_http_handler=>c_abap_version )->link( text = `SCN` target = `_blank` href = `https://blogs.sap.com/tag/abap2ui5/`