From e14cba7d717f03cafde90059913a23c664d64b82 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Tue, 28 Nov 2023 19:24:08 +0100 Subject: [PATCH] flow page, cleanup and remove feature flag (#6668) --- src/ui/lib/zcl_abapgit_html_form.clas.abap | 19 +++++++++++++------ .../pages/zcl_abapgit_gui_page_flow.clas.abap | 12 +++++++++++- .../zcl_abapgit_gui_page_repo_over.clas.abap | 8 +++----- .../zcl_abapgit_gui_page_sett_locl.clas.abap | 10 ++++------ 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/ui/lib/zcl_abapgit_html_form.clas.abap b/src/ui/lib/zcl_abapgit_html_form.clas.abap index 82a7ef7f5..06d6726d8 100644 --- a/src/ui/lib/zcl_abapgit_html_form.clas.abap +++ b/src/ui/lib/zcl_abapgit_html_form.clas.abap @@ -76,6 +76,7 @@ CLASS zcl_abapgit_html_form DEFINITION !iv_label TYPE csequence !iv_name TYPE csequence !iv_hint TYPE csequence OPTIONAL + !iv_readonly TYPE abap_bool DEFAULT abap_false RETURNING VALUE(ro_self) TYPE REF TO zcl_abapgit_html_form . METHODS radio @@ -201,10 +202,11 @@ CLASS zcl_abapgit_html_form IMPLEMENTATION. DATA ls_field LIKE LINE OF mt_fields. - ls_field-type = zif_abapgit_html_form=>c_field_type-checkbox. - ls_field-name = iv_name. - ls_field-label = iv_label. - ls_field-hint = iv_hint. + ls_field-type = zif_abapgit_html_form=>c_field_type-checkbox. + ls_field-name = iv_name. + ls_field-label = iv_label. + ls_field-hint = iv_hint. + ls_field-readonly = iv_readonly. APPEND ls_field TO mt_fields. @@ -632,7 +634,8 @@ CLASS zcl_abapgit_html_form IMPLEMENTATION. METHOD render_field_checkbox. - DATA lv_checked TYPE string. + DATA lv_checked TYPE string. + DATA lv_disabled TYPE string. IF is_attr-error IS NOT INITIAL. ii_html->add( is_attr-error ). @@ -643,8 +646,12 @@ CLASS zcl_abapgit_html_form IMPLEMENTATION. lv_checked = ' checked'. ENDIF. + IF is_attr-readonly IS NOT INITIAL. + lv_disabled = ' disabled'. + ENDIF. + ii_html->add( || ). + |{ lv_checked }{ lv_disabled }{ is_attr-autofocus }>| ). ii_html->add( || ). ENDMETHOD. diff --git a/src/ui/pages/zcl_abapgit_gui_page_flow.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_flow.clas.abap index 306f3361e..64722335c 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_flow.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_flow.clas.abap @@ -50,7 +50,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_PAGE_FLOW IMPLEMENTATION. +CLASS zcl_abapgit_gui_page_flow IMPLEMENTATION. METHOD constructor. @@ -336,6 +336,16 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_FLOW IMPLEMENTATION. ri_html->add( '
' ). ENDLOOP. + IF lines( mt_features ) = 0. + ri_html->add( 'Empty, repositories must be favorite + flow enabled

' ). + + ri_html->add_a( + iv_txt = 'abapGit flow documentation' + iv_act = |{ zif_abapgit_definitions=>c_action-url + }?url=https://docs.abapgit.org/user-guide/reference/flow.html| + iv_class = |url| ). + ENDIF. + ri_html->add( '' ). ENDMETHOD. diff --git a/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap index 79764ae42..d02292895 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap @@ -1002,11 +1002,9 @@ CLASS zcl_abapgit_gui_page_repo_over IMPLEMENTATION. CREATE OBJECT ro_toolbar EXPORTING iv_id = 'toolbar-main'. - IF zcl_abapgit_feature=>is_enabled( 'FLOW' ) = abap_true. - ro_toolbar->add( - iv_txt = zcl_abapgit_gui_buttons=>flow( ) - iv_act = zif_abapgit_definitions=>c_action-flow ). - ENDIF. + ro_toolbar->add( + iv_txt = zcl_abapgit_gui_buttons=>flow( ) + iv_act = zif_abapgit_definitions=>c_action-flow ). ro_toolbar->add( iv_txt = zcl_abapgit_gui_buttons=>new_online( ) diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap index 7ac661a09..8c5c00593 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap @@ -274,12 +274,10 @@ CLASS zcl_abapgit_gui_page_sett_locl IMPLEMENTATION. iv_label = 'Only Serialize Main Language' iv_hint = 'Ignore translations; serialize only main language of repository' ). - IF zcl_abapgit_feature=>is_enabled( 'FLOW' ) = abap_true - AND li_package->are_changes_recorded_in_tr_req( ) = abap_true. - ro_form->checkbox( - iv_name = c_id-flow - iv_label = 'Enable Flow Page' ). - ENDIF. + ro_form->checkbox( + iv_name = c_id-flow + iv_readonly = boolc( li_package->are_changes_recorded_in_tr_req( ) = abap_false ) + iv_label = 'BETA: Enable abapGit flow for this repository (requires transported packages)' ). ro_form->start_group( iv_name = c_id-checks