Refactor "Go Back" (#6605)

Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
Marc Bernard 2023-11-01 08:42:27 -04:00 committed by GitHub
parent f442bb77d1
commit ec3ecb4a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 23 additions and 56 deletions

View File

@ -35,7 +35,6 @@ CLASS zcl_abapgit_gui_page_addofflin DEFINITION
CONSTANTS:
BEGIN OF c_event,
go_back TYPE string VALUE 'go-back',
choose_package TYPE string VALUE 'choose-package',
choose_labels TYPE string VALUE 'choose-labels',
create_package TYPE string VALUE 'create-package',
@ -185,7 +184,7 @@ CLASS zcl_abapgit_gui_page_addofflin IMPLEMENTATION.
iv_action = c_event-create_package
)->command(
iv_label = 'Back'
iv_action = c_event-go_back ).
iv_action = zif_abapgit_definitions=>c_action-go_back ).
ENDMETHOD.
@ -235,9 +234,6 @@ CLASS zcl_abapgit_gui_page_addofflin IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN c_event-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-create_package.
mo_form_data->set(

View File

@ -37,7 +37,6 @@ CLASS zcl_abapgit_gui_page_addonline DEFINITION
CONSTANTS:
BEGIN OF c_event,
go_back TYPE string VALUE 'go-back',
choose_package TYPE string VALUE 'choose-package',
create_package TYPE string VALUE 'create-package',
choose_branch TYPE string VALUE 'choose-branch',
@ -200,7 +199,7 @@ CLASS zcl_abapgit_gui_page_addonline IMPLEMENTATION.
iv_action = c_event-create_package
)->command(
iv_label = 'Back'
iv_action = c_event-go_back ).
iv_action = zif_abapgit_definitions=>c_action-go_back ).
ENDMETHOD.
@ -268,9 +267,6 @@ CLASS zcl_abapgit_gui_page_addonline IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN c_event-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-create_package.
mo_form_data->set(

View File

@ -222,8 +222,6 @@ CLASS zcl_abapgit_gui_page_codi_base IMPLEMENTATION.
WHEN c_actions-sort_3.
SORT mt_result BY test code objtype objname sobjtype sobjname line col.
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
ENDCASE.

View File

@ -114,7 +114,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
METHOD branch_name_to_internal.
@ -468,9 +468,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-commit.
" Validate form entries before committing
mo_validation_log = validate_form( mo_form_data ).
@ -507,6 +504,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
ELSE.
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
ENDIF.
WHEN OTHERS.
ASSERT 1 = 1.
ENDCASE.
ENDMETHOD.

View File

@ -370,8 +370,6 @@ CLASS zcl_abapgit_gui_page_data IMPLEMENTATION.
add_via_transport( ).
mo_repo->refresh( ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
ENDCASE.
ENDMETHOD.

View File

@ -21,6 +21,7 @@ CLASS zcl_abapgit_gui_page_db DEFINITION
RAISING
zcx_abapgit_exception.
PROTECTED SECTION.
PRIVATE SECTION.
CONSTANTS:
@ -511,8 +512,6 @@ CLASS zcl_abapgit_gui_page_db IMPLEMENTATION.
WHEN c_action-restore.
do_restore_db( ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
WHEN c_action-back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
ENDCASE.
ENDMETHOD.

View File

@ -91,7 +91,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_DB_ENTRY IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_db_entry IMPLEMENTATION.
METHOD build_toolbar.
@ -249,8 +249,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DB_ENTRY IMPLEMENTATION.
WHEN c_action-update.
do_update( dbcontent_decode( ii_event->form_data( ) ) ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_action-back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
ENDCASE.
ENDMETHOD.

View File

@ -14,9 +14,7 @@ CLASS zcl_abapgit_gui_page_debuginfo DEFINITION
VALUE(ri_page) TYPE REF TO zif_abapgit_gui_renderable
RAISING
zcx_abapgit_exception .
METHODS constructor
RAISING
zcx_abapgit_exception .
PROTECTED SECTION.
PRIVATE SECTION.
@ -26,7 +24,6 @@ CLASS zcl_abapgit_gui_page_debuginfo DEFINITION
CONSTANTS:
BEGIN OF c_action,
save TYPE string VALUE 'save',
back TYPE string VALUE 'back',
END OF c_action.
DATA mv_html TYPE string .
@ -80,16 +77,11 @@ CLASS zcl_abapgit_gui_page_debuginfo IMPLEMENTATION.
iv_act = c_action-save ).
ro_menu->add(
iv_txt = 'Back'
iv_act = c_action-back ).
iv_act = zif_abapgit_definitions=>c_action-go_back ).
ENDMETHOD.
METHOD constructor.
super->constructor( ).
ENDMETHOD.
METHOD create.
DATA lo_component TYPE REF TO zcl_abapgit_gui_page_debuginfo.
@ -419,8 +411,9 @@ CLASS zcl_abapgit_gui_page_debuginfo IMPLEMENTATION.
MESSAGE 'abapGit Debug Info successfully saved' TYPE 'S'.
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
WHEN c_action-back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN OTHERS.
ASSERT 1 = 1.
ENDCASE.
ENDMETHOD.

View File

@ -28,7 +28,6 @@ CLASS zcl_abapgit_gui_page_ex_object DEFINITION
CONSTANTS:
BEGIN OF c_event,
go_back TYPE string VALUE 'go-back',
export TYPE string VALUE 'export',
choose_object_type TYPE string VALUE 'choose-object-type',
END OF c_event.
@ -50,7 +49,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_EX_OBJECT IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
METHOD constructor.
@ -130,7 +129,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_EX_OBJECT IMPLEMENTATION.
iv_action = c_event-export
)->command(
iv_label = 'Back'
iv_action = c_event-go_back ).
iv_action = zif_abapgit_definitions=>c_action-go_back ).
ENDMETHOD.
@ -138,10 +137,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_EX_OBJECT IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN c_event-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-export.
export_object( ).

View File

@ -28,7 +28,6 @@ CLASS zcl_abapgit_gui_page_ex_pckage DEFINITION
CONSTANTS:
BEGIN OF c_event,
go_back TYPE string VALUE 'go-back',
export_package TYPE string VALUE 'export-package',
choose_package TYPE string VALUE 'choose-object-type',
END OF c_event.
@ -50,7 +49,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_EX_PCKAGE IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_ex_pckage IMPLEMENTATION.
METHOD constructor.
@ -121,7 +120,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_EX_PCKAGE IMPLEMENTATION.
iv_cmd_type = zif_abapgit_html_form=>c_cmd_type-input_main
)->command(
iv_label = 'Back'
iv_action = c_event-go_back ).
iv_action = zif_abapgit_definitions=>c_action-go_back ).
ENDMETHOD.
@ -129,10 +128,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_EX_PCKAGE IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN c_event-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-export_package.
mo_validation_log = mo_form_util->validate( mo_form_data ).

View File

@ -154,8 +154,6 @@ CLASS zcl_abapgit_gui_page_merge_sel IMPLEMENTATION.
mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
CASE ii_event->mv_action.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-merge.
IF mo_form_data->get( c_id-source ) = mo_form_data->get( c_id-target ).
@ -169,6 +167,8 @@ CLASS zcl_abapgit_gui_page_merge_sel IMPLEMENTATION.
rs_handled-state = zcl_abapgit_gui=>c_event_state-new_page.
WHEN OTHERS.
ASSERT 1 = 1.
ENDCASE.
ENDMETHOD.

View File

@ -239,10 +239,10 @@ CLASS zcl_abapgit_gui_page_runit IMPLEMENTATION.
METHOD zif_abapgit_gui_event_handler~on_event.
CASE ii_event->mv_action.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_actions-rerun.
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
WHEN OTHERS.
ASSERT 1 = 1.
ENDCASE.
ENDMETHOD.

View File

@ -324,8 +324,6 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
mo_form_data->merge( zcl_abapgit_html_form_utils=>create( mo_form )->normalize( ii_event->form_data( ) ) ).
CASE ii_event->mv_action.
WHEN zif_abapgit_definitions=>c_action-go_back.
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN c_event-choose_commit.
lv_commit = choose_commit( ).

View File

@ -216,7 +216,7 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION.
lv_key = ii_event->query( )->get( 'KEY' ).
CASE ii_event->mv_action.
WHEN zif_abapgit_definitions=>c_action-go_home.
WHEN zif_abapgit_definitions=>c_action-go_home. " Go Home
lv_last_repo_key = zcl_abapgit_persistence_user=>get_instance( )->get_repo_show( ).
IF lv_last_repo_key IS NOT INITIAL.
@ -226,6 +226,8 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION.
rs_handled-page = main_page( ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-new_page.
ENDIF.
WHEN zif_abapgit_definitions=>c_action-go_back. " Go Back
rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back.
WHEN zif_abapgit_definitions=>c_action-go_db. " Go DB util page
rs_handled-page = zcl_abapgit_gui_page_db=>create( ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-new_page.