From e68bef7b37bb210b6aebd6a9b6b88515d44bc55f Mon Sep 17 00:00:00 2001
From: oblomov <102328295+oblomov-dev@users.noreply.github.com>
Date: Fri, 11 Aug 2023 18:39:54 +0200
Subject: [PATCH] Dev (#478)

* Update README.md

* Update README.md

* update controller nest

* message manager

* update

* Update src/z2ui5_cl_http_handler.clas.abap

Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>

---------

Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>
---
 src/00/z2ui5_cl_fw_client.clas.abap  |  1 +
 src/00/z2ui5_cl_fw_handler.clas.abap | 10 ++++++++++
 src/z2ui5_cl_http_handler.clas.abap  |  5 +++++
 src/z2ui5_if_client.intf.abap        | 20 +++++++++++++++-----
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/00/z2ui5_cl_fw_client.clas.abap b/src/00/z2ui5_cl_fw_client.clas.abap
index 54b99d9a..d4e9dc9a 100644
--- a/src/00/z2ui5_cl_fw_client.clas.abap
+++ b/src/00/z2ui5_cl_fw_client.clas.abap
@@ -45,6 +45,7 @@ CLASS z2ui5_cl_fw_client IMPLEMENTATION.
       check_launchpad_active = mo_handler->ms_actual-check_launchpad_active
       t_event_arg            = mo_handler->ms_actual-t_event_arg
       t_scroll_pos           = mo_handler->ms_actual-t_scroll_pos
+      t_message_manager      = mo_handler->ms_actual-t_message_manager
       s_draft                = CORRESPONDING #( mo_handler->ms_db )
       check_on_navigated     = mo_handler->ms_actual-check_on_navigated
       s_config               = z2ui5_cl_fw_handler=>ss_config ).
diff --git a/src/00/z2ui5_cl_fw_handler.clas.abap b/src/00/z2ui5_cl_fw_handler.clas.abap
index 3cfe045e..586891c5 100644
--- a/src/00/z2ui5_cl_fw_handler.clas.abap
+++ b/src/00/z2ui5_cl_fw_handler.clas.abap
@@ -345,6 +345,16 @@ CLASS Z2UI5_CL_FW_HANDLER IMPLEMENTATION.
       CATCH cx_root.
     ENDTRY.
 
+    TRY.
+        DATA(lo_message) = so_body->get_attribute( `OMESSAGEMANAGER` ).
+        z2ui5_cl_fw_utility=>trans_ref_tab_2_tab(
+            EXPORTING
+                ir_tab_from = lo_message->mr_actual
+            IMPORTING
+                t_result    = result->ms_actual-t_message_manager ).
+      CATCH cx_root.
+    ENDTRY.
+
     TRY.
         DATA(lo_scroll) = so_body->get_attribute( `OSCROLL` ).
         z2ui5_cl_fw_utility=>trans_ref_tab_2_tab(
diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index fa4da311..a886a252 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -276,6 +276,11 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `                        }` && |\n| &&
                            `                    });` && |\n| &&
                            `                }` && |\n| &&
+`  try {              ` && |\n| &&
+                              `   sap.z2ui5.oBody.OMESSAGEMANAGER = [];   ` && |\n| &&
+                              `   sap.ui.getCore().getMessageManager().getMessageModel().oMessageManager.oMessageModel.oData.forEach( row => {             ` && |\n| &&
+                              `    sap.z2ui5.oBody.OMESSAGEMANAGER.push( { type : row.type , message : row.message , additionaltext : row.additionalText , atargets : row.aTargets[ 0 ] } );            ` && |\n| &&
+                              `}  ) } catch (e) { } ` && |\n| &&
                            `                sap.z2ui5.oBody.ID = sap.z2ui5.oResponse.ID;` && |\n| &&
                            `              sap.z2ui5.oBody.ARGUMENTS = args;` && |\n| &&
                            `                try { sap.z2ui5.oBody.OCURSOR = sap.ui.getCore().byId(sap.ui.getCore().getCurrentFocusedControlId()).getFocusInfo(); } catch (e) { }` && |\n| &&
diff --git a/src/z2ui5_if_client.intf.abap b/src/z2ui5_if_client.intf.abap
index 49ff0913..ab5393b5 100644
--- a/src/z2ui5_if_client.intf.abap
+++ b/src/z2ui5_if_client.intf.abap
@@ -14,13 +14,13 @@ INTERFACE z2ui5_if_client
       n TYPE string,
       v TYPE string,
     END OF ty_s_name_value.
-      TYPES:
+  TYPES:
     BEGIN OF ty_s_name_value_int,
       n TYPE string,
       v TYPE i,
     END OF ty_s_name_value_int.
-  TYPES ty_t_name_value TYPE STANDARD TABLE OF ty_s_name_value WITH EMPTY KEY.
-  TYPES ty_t_name_value_int TYPE STANDARD TABLE OF ty_s_name_value_int WITH EMPTY KEY.
+  TYPES ty_t_name_value TYPE TABLE OF ty_s_name_value WITH EMPTY KEY.
+  TYPES ty_t_name_value_int TYPE TABLE OF ty_s_name_value_int WITH EMPTY KEY.
 
   TYPES:
     BEGIN OF ty_s_config,
@@ -49,11 +49,21 @@ INTERFACE z2ui5_if_client
       selectionend   TYPE i,
     END OF ty_s_cursor.
 
+  TYPES:
+    BEGIN OF ty_s_message_manager,
+      type           TYPE string,
+      message        TYPE string,
+      additionaltext TYPE string,
+      aTargets       TYPE string,
+    END OF ty_s_message_manager,
+    ty_t_message_manager TYPE TABLE OF ty_s_message_manager WITH EMPTY KEY.
+
   TYPES:
     BEGIN OF ty_s_get,
       event                  TYPE string,
       t_event_arg            TYPE string_table,
       t_scroll_pos           TYPE ty_t_name_value_int,
+      t_message_manager      TYPE ty_t_message_manager,
       check_launchpad_active TYPE abap_bool,
       check_on_navigated     TYPE abap_bool,
       s_draft                TYPE ty_s_draft,
@@ -137,8 +147,8 @@ INTERFACE z2ui5_if_client
 
   METHODS timer_set
     IMPORTING
-      interval_ms     TYPE clike
-      event_finished  TYPE clike.
+      interval_ms    TYPE clike
+      event_finished TYPE clike.
 
   METHODS message_toast_display
     IMPORTING