page_diff UX filter part1

src/zabapgit_css_common.w3mi.data.css

@@ -457,6 +457,16 @@ span.diff_name {
   padding-left: 0.5em;
   color: grey;
 }
+span.diff_changed_by {
+  color: grey;
+  float: right;
+}
+span.diff_changed_by span.user {
+  border-radius: 3px;
+  border: solid 1px #c2d4ea;
+  background-color: #d9e4f2;
+  padding: 1px 0.4em;
+}
 span.diff_name strong {
   color: #333;
 }

src/zabapgit_html.prog.abap

@@ -388,7 +388,6 @@ CLASS lcl_html_toolbar DEFINITION FINAL.
           iv_vertical               TYPE abap_bool OPTIONAL
           iv_sort                   TYPE abap_bool OPTIONAL
           iv_as_angle               TYPE abap_bool OPTIONAL
-          iv_with_icons             TYPE abap_bool OPTIONAL
           iv_add_minizone           TYPE abap_bool OPTIONAL
         RETURNING
           VALUE(ro_html)            TYPE REF TO lcl_html.
@@ -435,8 +434,9 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
 
   METHOD render. "TODO refactor
 
-    DATA: lv_class   TYPE string,
+    DATA: lv_class     TYPE string,
-          lv_is_drop TYPE abap_bool.
+          lv_has_icons TYPE abap_bool,
+          lv_is_drop   TYPE abap_bool.
 
     FIELD-SYMBOLS <ls_item> LIKE LINE OF mt_items.
 
@@ -479,15 +479,22 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
       SORT mt_items BY txt ASCENDING AS TEXT.
     ENDIF.
 
-    IF iv_with_icons = abap_true.
+    " Check has icons
+    LOOP AT mt_items ASSIGNING <ls_item> WHERE ico IS NOT INITIAL.
+      lv_has_icons = abap_true.
+      EXIT.
+    ENDLOOP.
+
+    IF lv_has_icons = abap_true.
       ro_html->add( '<table>' ).
     ENDIF.
 
+    " Render items
     LOOP AT mt_items ASSIGNING <ls_item>.
 
       IF <ls_item>-sub IS INITIAL.
 
-        IF iv_with_icons = abap_true.
+        IF lv_has_icons = abap_true.
           ro_html->add( '<tr>' ).
           ro_html->add( |<td class="icon">{ lcl_html=>icon( <ls_item>-ico ) }</td>| ).
           ro_html->add( '<td class="text">' ).
@@ -498,7 +505,7 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
                         iv_opt   = <ls_item>-opt
                         iv_typ   = <ls_item>-typ ).
 
-        IF iv_with_icons = abap_true.
+        IF lv_has_icons = abap_true.
           ro_html->add( '</td>' ).
           ro_html->add( '</tr>' ).
         ENDIF.
@@ -509,7 +516,7 @@ CLASS lcl_html_toolbar IMPLEMENTATION.
 
     ENDLOOP.
 
-    IF iv_with_icons = abap_true.
+    IF lv_has_icons = abap_true.
       ro_html->add( '</table>' ).
     ENDIF.
 

src/zabapgit_js_common.w3mi.data.js

@@ -363,3 +363,60 @@ StageHelper.prototype.iterateStageTab = function (changeMode, cb /*, ...*/) {
     window.scrollTo(0, scrollOffset);
   }
 }
+
+/**********************************************************
+ * Diff page logic
+ **********************************************************/
+
+function diffProcessFilterClick(e) {
+  var target = event.target || event.srcElement;
+
+  if (!target) return;
+  if (target.tagName !== "A") return;
+  if (target.parentNode.tagName !== "TD") return;
+
+  var iconTd = target.parentNode.parentNode.children[0];
+
+  if (!iconTd) return;
+  if (iconTd.tagName !== "TD") return;
+
+  var icon = iconTd.firstChild;
+  if (icon.tagName !== "I") return;
+  if (!icon.classList.contains("octicon")) return;
+
+  var state;
+  if (icon.classList.contains("blue")) {
+    icon.classList.remove("blue");
+    icon.classList.add("grey");
+    state = false;
+  } else {
+    icon.classList.add("blue");
+    icon.classList.remove("grey");
+    state = true;
+  }
+
+  return { filter: target.innerText, state: state };
+}
+
+function diffApplyFilter(param, action) {
+  var diffList = document.getElementById("diff-list");
+  // console.log("Action:", param, action.filter, action.state);
+  for (var i = diffList.children.length - 1; i >= 0; i--) {
+    var div = diffList.children[i];
+    if (div.className !== "diff") return; // Unexpected error !
+    var attr = div.getAttribute("data-"+param);
+    if (attr === action.filter) {
+      div.style.display = action.state ? "" : "none";
+    }
+  }
+}
+
+function diffFilterType(e) {
+  var action = diffProcessFilterClick(e);
+  diffApplyFilter("type", action);
+}
+
+function diffFilterUser(e) {
+  var action = diffProcessFilterClick(e);
+  diffApplyFilter("changed-by", action);
+}

src/zabapgit_page_diff.prog.abap

@@ -14,11 +14,13 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page.
       END OF c_fstate.
 
     TYPES: BEGIN OF ty_file_diff,
-             filename TYPE string,
+             filename   TYPE string,
-             lstate   TYPE char1,
+             lstate     TYPE char1,
-             rstate   TYPE char1,
+             rstate     TYPE char1,
-             fstate   TYPE char1, " FILE state - Abstraction for shorter ifs
+             fstate     TYPE char1, " FILE state - Abstraction for shorter ifs
-             o_diff   TYPE REF TO lcl_diff,
+             o_diff     TYPE REF TO lcl_diff,
+             changed_by TYPE xubname,
+             type       TYPE string,
            END OF ty_file_diff,
            tt_file_diff TYPE STANDARD TABLE OF ty_file_diff.
 
@@ -87,7 +89,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
     super->constructor( ).
     ms_control-page_title = 'DIFF'.
-    ms_control-page_menu  = build_menu( ).
     mv_unified            = lcl_app=>user( )->get_diff_unified( ).
 
     ASSERT is_file IS INITIAL OR is_object IS INITIAL. " just one passed
@@ -131,11 +132,14 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
       lcx_exception=>raise( 'PAGE_DIFF ERROR: No diff files found' ).
     ENDIF.
 
+    ms_control-page_menu  = build_menu( ).
+
   ENDMETHOD.
 
   METHOD append_diff.
 
     DATA:
+      lv_offs    TYPE i,
       ls_r_dummy LIKE LINE OF it_remote ##NEEDED,
       ls_l_dummy LIKE LINE OF it_local  ##NEEDED.
 
@@ -175,6 +179,24 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
       <ls_diff>-fstate = c_fstate-remote.
     ENDIF.
 
+    " Changed by
+    IF <ls_local>-item-obj_type IS NOT INITIAL.
+      <ls_diff>-changed_by = to_lower( lcl_objects=>changed_by( <ls_local>-item ) ).
+    ENDIF.
+
+    " Extension
+    IF <ls_local>-file-filename IS NOT INITIAL.
+      <ls_diff>-type = reverse( <ls_local>-file-filename ).
+    ELSE.
+      <ls_diff>-type = reverse( <ls_remote>-filename ).
+    ENDIF.
+
+    FIND FIRST OCCURRENCE OF '.' IN <ls_diff>-type MATCH OFFSET lv_offs.
+    <ls_diff>-type = reverse( substring( val = <ls_diff>-type len = lv_offs ) ).
+    IF <ls_diff>-type <> 'xml' AND <ls_diff>-type <> 'abap'.
+      <ls_diff>-type = 'other'.
+    ENDIF.
+
     IF <ls_diff>-fstate = c_fstate-remote. " Remote file leading changes
       CREATE OBJECT <ls_diff>-o_diff
         EXPORTING
@@ -190,9 +212,51 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
   ENDMETHOD.  "append_diff
 
   METHOD build_menu.
+
+    DATA: lo_sub   TYPE REF TO lcl_html_toolbar,
+          lt_types TYPE string_table,
+          lt_users TYPE string_table.
+
+    FIELD-SYMBOLS: <diff> LIKE LINE OF mt_diff_files,
+                   <i>    TYPE string.
+
+    LOOP AT mt_diff_files ASSIGNING <diff>.
+      APPEND <diff>-type TO lt_types.
+      APPEND <diff>-changed_by TO lt_users.
+    ENDLOOP.
+
+    SORT: lt_types, lt_users.
+    DELETE ADJACENT DUPLICATES FROM: lt_types, lt_users.
+
     CREATE OBJECT ro_menu.
+
+    IF lines( lt_types ) > 1.
+      CREATE OBJECT lo_sub.
+      LOOP AT lt_types ASSIGNING <i>.
+        lo_sub->add( iv_txt = <i>
+                     iv_typ = gc_action_type-onclick
+                     iv_ico = 'check/blue'
+                     iv_act = 'diffFilterType(event);' ).
+      ENDLOOP.
+      ro_menu->add( iv_txt = 'Filter type'
+                    io_sub = lo_sub ) ##NO_TEXT.
+    ENDIF.
+
+    IF lines( lt_users ) > 1.
+      CREATE OBJECT lo_sub.
+      LOOP AT lt_users ASSIGNING <i>.
+        lo_sub->add( iv_txt = <i>
+                     iv_typ = gc_action_type-onclick
+                     iv_ico = 'check/blue'
+                     iv_act = 'diffFilterUser(event);' ).
+      ENDLOOP.
+      ro_menu->add( iv_txt = 'Filter user'
+                    io_sub = lo_sub ) ##NO_TEXT.
+    ENDIF.
+
     ro_menu->add( iv_txt = 'Split/Unified view'
                   iv_act = c_actions-toggle_unified ) ##NO_TEXT.
+
   ENDMETHOD.  " build_menu.
 
 **********************************************************************
@@ -219,6 +283,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
+    ro_html->add( '<div id="diff-list">' ).
     LOOP AT mt_diff_files INTO ls_diff_file.
       lcl_progress=>show( iv_key     = 'Diff'
                           iv_current = sy-tabix
@@ -227,6 +292,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
       ro_html->add( render_diff( ls_diff_file ) ).
     ENDLOOP.
+    ro_html->add( '</div>' ).
 
   ENDMETHOD.  "render_content
 
@@ -234,7 +300,8 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
-    ro_html->add( '<div class="diff">' ).                   "#EC NOTEXT
+    ro_html->add( |<div class="diff" data-type="{ is_diff-type
+      }" data-changed-by="{ is_diff-changed_by }">| ).       "#EC NOTEXT
     ro_html->add( render_diff_head( is_diff ) ).
 
     " Content
@@ -279,6 +346,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
                  && ' highlighting for MM assumes local file is newer ! </span>' ). "#EC NOTEXT
     ENDIF.
 
+    ro_html->add( |<span class="diff_changed_by">last change by: <span class="user">{
+      is_diff-changed_by }</span></span>| ).
+
     ro_html->add( '</div>' ).                               "#EC NOTEXT
 
   ENDMETHOD.

src/zabapgit_page_main.prog.abap

@@ -292,7 +292,6 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
     ro_html->add( lo_allbar->render(
       iv_as_droplist_with_label = lcl_html=>icon( iv_name = 'three-bars/blue' iv_class = 'pad4px' )
       iv_sort                   = abap_true
-      iv_with_icons             = abap_true
       iv_add_minizone           = abap_true ) ).
     ro_html->add( '</td>' ).
     ro_html->add( '</tr></table>' ).