Improve pull dialog button logic (#6169)

src/ui/zcl_abapgit_popups.clas.locals_imp.abap

@@ -88,7 +88,20 @@ CLASS lcl_object_descision_list DEFINITION FINAL.
     METHODS mark_all
       IMPORTING
         iv_selected TYPE abap_bool.
-    METHODS mark_visible.
+    METHODS mark_visible
+      IMPORTING
+        iv_selected TYPE abap_bool.
+    METHODS mark_selected.
+    METHODS mark_indexed
+      IMPORTING
+        iv_selected TYPE abap_bool DEFAULT abap_true
+        iv_invert   TYPE abap_bool DEFAULT abap_false
+        it_scope    TYPE lvc_t_fidx.
+    METHODS are_all_marked
+      IMPORTING
+        it_scope      TYPE lvc_t_fidx
+      RETURNING
+        VALUE(rv_yes) TYPE abap_bool.
 
 ENDCLASS.
 
@@ -374,15 +387,15 @@ CLASS lcl_object_descision_list IMPLEMENTATION.
         mo_alv->close_screen( ).
 
       WHEN 'SALL' OR 'SEL_ALL'.
-        mark_all( abap_true ).
+        mark_visible( abap_true ).
         mo_alv->refresh( ).
 
       WHEN 'DSEL' OR 'SEL_DEL'.
-        mark_all( abap_false ).
+        mark_visible( abap_false ).
         mo_alv->refresh( ).
 
       WHEN 'SEL_KEY'.
-        mark_visible( ).
+        mark_selected( ).
         mo_alv->refresh( ).
 
       WHEN 'SEL_CAT'.
@@ -417,13 +430,9 @@ CLASS lcl_object_descision_list IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD mark_visible.
+  METHOD are_all_marked.
 
-    DATA:
+    DATA lv_index LIKE LINE OF it_scope.
-      lo_selection  TYPE REF TO cl_salv_selections,
-      lt_filters    TYPE lvc_t_filt,
-      lt_scope      TYPE lvc_t_fidx,
-      lv_index      LIKE LINE OF lt_scope.
 
     FIELD-SYMBOLS:
       <lt_table>    TYPE STANDARD TABLE,
@@ -433,15 +442,57 @@ CLASS lcl_object_descision_list IMPLEMENTATION.
     ASSIGN mr_table->* TO <lt_table>.
     ASSERT sy-subrc = 0.
 
-    " First get selection
+    LOOP AT it_scope INTO lv_index.
-    lo_selection = mo_alv->get_selections( ).
+
-    lt_scope = lo_selection->get_selected_rows( ).
+      READ TABLE <lt_table> ASSIGNING <ls_line> INDEX lv_index.
+      CHECK sy-subrc = 0.
+
+      ASSIGN COMPONENT c_fieldname_selected OF STRUCTURE <ls_line> TO <lv_selected>.
+      ASSERT sy-subrc = 0.
+
+      IF <lv_selected> = abap_true.
+        rv_yes = abap_true.
+      ELSE.
+        rv_yes = abap_false.
+        RETURN.
+      ENDIF.
+
+    ENDLOOP.
+
+  ENDMETHOD.
+
+  METHOD mark_selected.
+
+    DATA lt_clear TYPE salv_t_row.
+    DATA lt_scope TYPE lvc_t_fidx.
+
+    lt_scope = mo_alv->get_selections( )->get_selected_rows( ).
+
+    IF lines( lt_scope ) > 0.
+      mark_indexed(
+        it_scope    = lt_scope
+        iv_selected = boolc( are_all_marked( lt_scope ) = abap_false ) ).
+      mo_alv->get_selections( )->set_selected_rows( lt_clear ).
+    ELSE.
+      MESSAGE 'Select rows first to mark them' TYPE 'S'.
+    ENDIF.
+
+  ENDMETHOD.
+
+  METHOD mark_visible.
+
+    DATA lt_filters TYPE lvc_t_filt.
+    DATA lt_scope   TYPE lvc_t_fidx.
+
+    FIELD-SYMBOLS <lt_table> TYPE STANDARD TABLE.
+
+    ASSIGN mr_table->* TO <lt_table>.
+    ASSERT sy-subrc = 0.
 
-    IF lines( lt_scope ) = 0.
     " If nothing selected, select all VISIBLE
     lt_filters = cl_salv_controller_metadata=>get_lvc_filter( mo_alv->get_filters( ) ).
     IF lines( lt_filters ) = 0.
-        mark_all( abap_true ). " No filters - just select all
+      mark_all( iv_selected ). " No filters - just select all
       RETURN.
     ENDIF.
 
@@ -452,16 +503,38 @@ CLASS lcl_object_descision_list IMPLEMENTATION.
         et_filter_index_inside = lt_scope
       TABLES
         it_data                = <lt_table>.
-    ENDIF.
 
-    LOOP AT lt_scope INTO lv_index.
+    mark_indexed(
+      it_scope    = lt_scope
+      iv_selected = iv_selected ).
+
+  ENDMETHOD.
+
+  METHOD mark_indexed.
+
+    DATA lv_index LIKE LINE OF it_scope.
+
+    FIELD-SYMBOLS:
+      <lt_table>    TYPE STANDARD TABLE,
+      <ls_line>     TYPE any,
+      <lv_selected> TYPE abap_bool.
+
+    ASSIGN mr_table->* TO <lt_table>.
+    ASSERT sy-subrc = 0.
+
+    LOOP AT it_scope INTO lv_index.
 
       READ TABLE <lt_table> ASSIGNING <ls_line> INDEX lv_index.
       CHECK sy-subrc = 0.
 
       ASSIGN COMPONENT c_fieldname_selected OF STRUCTURE <ls_line> TO <lv_selected>.
       ASSERT sy-subrc = 0.
-      <lv_selected> = abap_true.
+
+      IF iv_invert = abap_true.
+        <lv_selected> = boolc( <lv_selected> = abap_false ).
+      ELSE.
+        <lv_selected> = iv_selected.
+      ENDIF.
 
     ENDLOOP.
 

src/zabapgit.prog.xml

@@ -85,7 +85,7 @@
       <TEXT_TYPE>S</TEXT_TYPE>
       <TEXT_NAME>ICON_SELECT_ALL</TEXT_NAME>
       <ICON_ID>@4B@</ICON_ID>
-      <FUN_TEXT>Select All</FUN_TEXT>
+      <FUN_TEXT>Select All Visible</FUN_TEXT>
      </RSMPE_FUNT>
      <RSMPE_FUNT>
       <CODE>SEL_CAT</CODE>
@@ -101,7 +101,7 @@
       <TEXT_TYPE>S</TEXT_TYPE>
       <TEXT_NAME>ICON_DESELECT_ALL</TEXT_NAME>
       <ICON_ID>@4D@</ICON_ID>
-      <FUN_TEXT>Deselect All</FUN_TEXT>
+      <FUN_TEXT>Deselect All Visible</FUN_TEXT>
      </RSMPE_FUNT>
      <RSMPE_FUNT>
       <CODE>SEL_KEY</CODE>
@@ -109,7 +109,7 @@
       <TEXT_TYPE>S</TEXT_TYPE>
       <TEXT_NAME>ICON_SELECT_BLOCK</TEXT_NAME>
       <ICON_ID>@4C@</ICON_ID>
-      <FUN_TEXT>Mark selected or all visible</FUN_TEXT>
+      <FUN_TEXT>Mark/Toggle Selected</FUN_TEXT>
      </RSMPE_FUNT>
     </FUN>
     <BUT>