Skip to content

ui5 2.x fixes #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions src/z2ui5_cl_demo_app_000.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.

CONSTANTS c_title TYPE string VALUE ` abap2UI5 - Samples`.

" TODO: variable is assigned but never used (ABAP cleaner)
DATA(ls_get) = client->get( ).

IF client->get( )-check_on_navigated = abap_true.
IF mt_scroll IS INITIAL.
mt_scroll = VALUE #( ( n = `page` ) ).
Expand Down Expand Up @@ -284,12 +281,6 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).

panel->generic_tile( header = 'Messages'
subheader = 'More...'
press = client->_event( 'z2ui5_cl_demo_app_084' )
mode = 'LineMode'
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).

panel = page->panel( expandable = abap_false
expanded = abap_true
Expand Down Expand Up @@ -1602,6 +1593,42 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
headertext = `Custom Extensions`
).

panel = page->panel( expandable = abap_false
expanded = abap_true
headertext = `JS`
).

panel->generic_tile( header = 'Follow Up Action with JS Function'
press = client->_event( 'Z2UI5_CL_DEMO_APP_309' )
mode = 'LineMode'
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).

panel = page->panel( expandable = abap_false
expanded = abap_true
headertext = `CSS`
).

panel->generic_tile( header = 'Messages with Styles I'
press = client->_event( 'Z2UI5_CL_DEMO_APP_310' )
mode = 'LineMode'
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).

panel->generic_tile( header = 'Messages with Styles II'
press = client->_event( 'Z2UI5_CL_DEMO_APP_311' )
mode = 'LineMode'
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).


panel->generic_tile( header = 'Messages with Styles III'
subheader = 'More...'
press = client->_event( 'z2ui5_cl_demo_app_084' )
mode = 'LineMode'
class = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
).

panel = page->panel( expandable = abap_false
expanded = abap_true
headertext = `General`
Expand Down
2 changes: 0 additions & 2 deletions src/z2ui5_cl_demo_app_008.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ CLASS z2ui5_cl_demo_app_008 IMPLEMENTATION.
ENDCASE.

DATA(view) = z2ui5_cl_xml_view=>factory( ).
view->_generic( ns = `html`
name = `style` )->_cc_plain_xml( `.my-style{ background: black !important; opacity: 0.6; color: white; }` ).

DATA(page) = view->shell(
)->page(
Expand Down
10 changes: 0 additions & 10 deletions src/z2ui5_cl_demo_app_038.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,11 @@ CLASS Z2UI5_CL_DEMO_APP_038 IMPLEMENTATION.
METHOD z2ui5_display_view.

DATA(view) = z2ui5_cl_xml_view=>factory( ).
view->_generic( ns = `html`
name = `style` )->_cc_plain_xml( `.sapMDialogScroll { height:100%; }` ).
DATA(page) = view->shell(
)->page(
title = 'abap2UI5 - List'
navbuttonpress = client->_event( val = 'BACK' )
shownavbutton = abap_true ).
* )->header_content(
* )->link(
* text = 'Demo' target = '_blank'
* href = `https://twitter.com/abap2UI5/status/1647246029828268032`
* )->link(
*
*
* )->get_parent( ).
page->button( text = 'Messages in Popup'
press = client->_event( 'POPUP' ) ).
page->message_view(
Expand Down
46 changes: 10 additions & 36 deletions src/z2ui5_cl_demo_app_059.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CLASS z2ui5_cl_demo_app_059 DEFINITION PUBLIC.

TYPES ty_t_table TYPE STANDARD TABLE OF ty_s_tab WITH EMPTY KEY.

DATA mv_search_value TYPE string.
* DATA mv_search_value TYPE string.
DATA mt_table TYPE ty_t_table.

PROTECTED SECTION.
Expand All @@ -25,7 +25,6 @@ CLASS z2ui5_cl_demo_app_059 DEFINITION PUBLIC.
DATA check_initialized TYPE abap_bool.

METHODS z2ui5_on_event.
METHODS z2ui5_set_search.
METHODS z2ui5_set_data.
METHODS z2ui5_view_display.

Expand Down Expand Up @@ -61,7 +60,12 @@ CLASS z2ui5_cl_demo_app_059 IMPLEMENTATION.

WHEN 'BUTTON_SEARCH'.
z2ui5_set_data( ).
z2ui5_set_search( ).
z2ui5_cl_util=>itab_filter_by_val(
EXPORTING
val = client->get_event_arg( 1 )
CHANGING
tab = mt_table ).

client->view_model_update( ).

WHEN 'BACK'.
Expand All @@ -85,32 +89,6 @@ CLASS z2ui5_cl_demo_app_059 IMPLEMENTATION.
ENDMETHOD.


METHOD z2ui5_set_search.

IF client->get_event_arg( 1 ) IS INITIAL.
RETURN.
ENDIF.

LOOP AT mt_table REFERENCE INTO DATA(lr_row).
DATA(lv_row) = ``.
DATA(lv_index) = 1.
DO.
ASSIGN COMPONENT lv_index OF STRUCTURE lr_row->* TO FIELD-SYMBOL(<field>).
IF sy-subrc <> 0.
EXIT.
ENDIF.
lv_row = lv_row && <field>.
lv_index = lv_index + 1.
ENDDO.

IF lv_row NS mv_search_value.
DELETE mt_table.
ENDIF.
ENDLOOP.

ENDMETHOD.


METHOD z2ui5_view_display.

DATA(view) = z2ui5_cl_xml_view=>factory( ).
Expand All @@ -120,17 +98,13 @@ CLASS z2ui5_cl_demo_app_059 IMPLEMENTATION.
navbuttonpress = client->_event( 'BACK' )
shownavbutton = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL ) ).

DATA(ls_cnt) = VALUE z2ui5_if_types=>ty_s_event_control( check_allow_multi_req = abap_true ).
DATA(lo_box) = page1->vbox( )->text( `Search` )->search_field(
livechange = client->_event(
DATA(lo_box) = page1->vbox( )->text( `Search`
)->search_field( width = `17.5rem` livechange = client->_event(
val = 'BUTTON_SEARCH'
t_arg = VALUE #( ( `${$source>/value}` ) )
s_ctrl = ls_cnt
)
width = `17.5rem` ).
s_ctrl = VALUE #( check_allow_multi_req = abap_true ) ) ).

DATA(tab) = lo_box->table( client->_bind( mt_table ) ).

DATA(lo_columns) = tab->columns( ).
lo_columns->column( )->text( text = `Product` ).
lo_columns->column( )->text( text = `Date` ).
Expand Down
15 changes: 0 additions & 15 deletions src/z2ui5_cl_demo_app_180.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,8 @@ CLASS Z2UI5_CL_DEMO_APP_180 IMPLEMENTATION.

CASE client->get( )-event.

WHEN 'CUSTOM_JS_FROM_EB'.

client->follow_up_action( val = `sap.z2ui5.afterBE()` ).

WHEN 'CALL_EF'.

mv_url = `https://www.google.com`.

client->view_model_update( ).
client->follow_up_action( val = client->_event_client( val = client->cs_event-open_new_tab t_arg = VALUE #( ( mv_url ) ) ) ).

Expand All @@ -52,9 +46,6 @@ CLASS Z2UI5_CL_DEMO_APP_180 IMPLEMENTATION.
METHOD view_display.

DATA(view) = z2ui5_cl_xml_view=>factory( ).
view->_generic( name = `script`
ns = `html` )->_cc_plain_xml( `sap.z2ui5.afterBE = () => { alert("afterBE triggered !!"); }` ).

DATA(page) = view->shell( )->page(
title = `Client->FOLLOW_UP_ACTION use cases`
class = `sapUiContentPadding`
Expand All @@ -66,10 +57,6 @@ CLASS Z2UI5_CL_DEMO_APP_180 IMPLEMENTATION.
page->label( text = `MV_URL was set AFTER backend event and model update to:` ).
page->label( text = client->_bind_edit( mv_url ) ).

page->get_parent( )->hbox( class = `sapUiSmallMargin` ).
page->button( text = `call custom JS from EB`
press = client->_event( 'CUSTOM_JS_FROM_EB' ) ).

client->view_display( view->stringify( ) ).

ENDMETHOD.
Expand All @@ -81,9 +68,7 @@ CLASS Z2UI5_CL_DEMO_APP_180 IMPLEMENTATION.

IF mv_initialized = abap_false.
mv_initialized = abap_true.

view_display( ).

ENDIF.

on_event( ).
Expand Down
81 changes: 81 additions & 0 deletions src/z2ui5_cl_demo_app_309.clas.abap
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
CLASS z2ui5_cl_demo_app_309 DEFINITION
PUBLIC
CREATE PUBLIC .

PUBLIC SECTION.


INTERFACES z2ui5_if_app .

DATA mv_initialized TYPE abap_bool.
DATA mv_url TYPE string.

METHODS on_event.
METHODS view_display.

PROTECTED SECTION.

DATA client TYPE REF TO z2ui5_if_client.

PRIVATE SECTION.
ENDCLASS.



CLASS Z2UI5_CL_DEMO_APP_309 IMPLEMENTATION.


METHOD on_event.

CASE client->get( )-event.

WHEN 'CUSTOM_JS_FROM_EB'.

* client->follow_up_action( val = `sap.z2ui5.afterBE()` ).
client->follow_up_action( `alert("afterBE triggered !!");` ).

WHEN 'BACK'.
client->nav_app_leave( ).
RETURN.

ENDCASE.

ENDMETHOD.


METHOD view_display.

DATA(view) = z2ui5_cl_xml_view=>factory( ).
view->_generic( name = `script`
ns = `html` )->_cc_plain_xml( `sap.z2ui5.afterBE = () => { alert("afterBE triggered !!"); }` ).

DATA(page) = view->shell( )->page(
title = `Client->FOLLOW_UP_ACTION use cases`
class = `sapUiContentPadding`
navbuttonpress = client->_event( 'BACK' )
shownavbutton = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL ) ).
page = page->vbox( ).
page->get_parent( )->hbox( class = `sapUiSmallMargin` ).
page->button( text = `call custom JS from EB`
press = client->_event( 'CUSTOM_JS_FROM_EB' ) ).

client->view_display( view->stringify( ) ).

ENDMETHOD.


METHOD z2ui5_if_app~main.

me->client = client.

IF mv_initialized = abap_false.
mv_initialized = abap_true.

view_display( ).

ENDIF.

on_event( ).

ENDMETHOD.
ENDCLASS.
16 changes: 16 additions & 0 deletions src/z2ui5_cl_demo_app_309.clas.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
<asx:values>
<VSEOCLASS>
<CLSNAME>Z2UI5_CL_DEMO_APP_309</CLSNAME>
<LANGU>E</LANGU>
<DESCRIPT>follow_up_action with JS</DESCRIPT>
<STATE>1</STATE>
<CLSCCINCL>X</CLSCCINCL>
<FIXPT>X</FIXPT>
<UNICODE>X</UNICODE>
</VSEOCLASS>
</asx:values>
</asx:abap>
</abapGit>
Loading