[create-pull-request] automated change

Author: oblomov-dev

src/01/00/03/z2ui6_cl_util.clas.abap

@@ -1154,7 +1154,7 @@ CLASS z2ui6_cl_util IMPLEMENTATION.
 
     lv_search = shift_left( val = lv_search
                             sub = `?` ).
-    lv_search = c_trim_lower( lv_search ).
+*    lv_search = c_trim_lower( lv_search ).
 
     DATA(lv_search2) = substring_after( val = lv_search
                                         sub = `&sap-startup-params=` ).
@@ -1170,8 +1170,10 @@ CLASS z2ui6_cl_util IMPLEMENTATION.
 
     LOOP AT lt_param REFERENCE INTO DATA(lr_param).
       SPLIT lr_param->* AT `=` INTO DATA(lv_name) DATA(lv_value).
-      INSERT VALUE #( n = c_trim_lower( lv_name )
-                      v = c_trim_lower( lv_value ) ) INTO TABLE rt_params.
+*      INSERT VALUE #( n = c_trim_lower( lv_name )
+*                      v = c_trim_lower( lv_value ) ) INTO TABLE rt_params.
+      INSERT VALUE #( n = lv_name
+                      v = lv_value ) INTO TABLE rt_params.
     ENDLOOP.
 
   ENDMETHOD.

src/01/02/z2ui6_cl_core_action.clas.abap

@@ -80,6 +80,36 @@ CLASS z2ui6_cl_core_action IMPLEMENTATION.
 
     TRY.
         result = NEW #( mo_http_post ).
+
+        IF mo_http_post->ms_request-s_control-app_start_draft IS NOT INITIAL.
+          TRY.
+
+              DATA(lo_app) = z2ui6_cl_core_app=>db_load( mo_http_post->ms_request-s_control-app_start_draft ).
+              result->mo_app = lo_app.
+              result->ms_actual-check_on_navigated = abap_true.
+              result->ms_next-s_set-set_app_state_active = abap_true.
+              result->mo_app->ms_draft-id_prev_app_stack = ''.
+              " check for new app?
+*              TRY.
+*                  DATA(lo_draft) = NEW z2ui5_cl_core_srv_draft( ).
+*                  DATA(ls_draft) = lo_draft->read_info( ms_next-o_app_leave->id_draft ).
+*                  result->mo_app->ms_draft-id = z2ui5_cl_util=>uuid_get_c32( ).
+*                CATCH cx_root.
+*                  result->mo_app->ms_draft-id_prev_app_stack = mo_app->ms_draft-id_prev_app_stack.
+*                  RETURN.
+*              ENDTRY.
+
+*              " check for already existing app?
+*              IF mo_app->ms_draft-id_prev_app_stack IS NOT INITIAL.
+*                ls_draft = lo_draft->read_info( mo_app->ms_draft-id_prev_app_stack ).
+*                result->mo_app->ms_draft-id_prev_app_stack = ls_draft-id_prev_app_stack.
+*              ENDIF.
+
+              RETURN.
+            CATCH cx_root.
+          ENDTRY.
+        ENDIF.
+
         result->mo_app->ms_draft-id = z2ui6_cl_util=>uuid_get_c32( ).
 
         CREATE OBJECT result->mo_app->mo_app TYPE (mo_http_post->ms_request-s_control-app_start).

src/01/02/z2ui6_cl_core_client.clas.abap

@@ -367,15 +367,34 @@ CLASS z2ui6_cl_core_client IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD z2ui6_if_client~set_nav_back.
+
+    mo_action->ms_next-s_set-set_nav_back = val.
+
+  ENDMETHOD.
+
+  METHOD z2ui6_if_client~set_push_state.
+
+    mo_action->ms_next-s_set-set_push_state = val.
+
+  ENDMETHOD.
+
+
+  METHOD z2ui6_if_client~set_app_state_active.
+
+    mo_action->ms_next-s_set-set_app_state_active = val.
+
+  ENDMETHOD.
+
   METHOD z2ui6_if_client~set_session_stateful.
 
     DATA(lv_check_sticky) = CAST z2ui6_if_app( mo_action->mo_app->mo_app )->check_sticky.
-    IF lv_check_sticky = abap_true AND stateful = abap_true.
+    IF lv_check_sticky = abap_true AND val = abap_true.
       RAISE EXCEPTION TYPE z2ui6_cx_util_error
         EXPORTING
           val = `STATEFUL_ALREADY_ACTIVATED_ERROR`.
     ENDIF.
-    IF stateful = abap_true.
+    IF val = abap_true.
       mo_action->ms_next-s_set-s_stateful-active = 1.
       CAST z2ui6_if_app( mo_action->mo_app->mo_app )->check_sticky = abap_true.
     ELSE.

src/01/02/z2ui6_cl_core_srv_json.clas.abap

@@ -163,6 +163,10 @@ CLASS z2ui6_cl_core_srv_json IMPLEMENTATION.
           CATCH cx_root.
         ENDTRY.
 
+        result-s_control-app_start_draft = z2ui6_cl_util=>c_trim_upper(
+                                              z2ui6_cl_util=>url_param_get( val = `z2ui5-xapp-state`
+                                                                            url = result-s_front-search ) ).
+
         IF result-s_control-app_start IS NOT INITIAL.
           IF result-s_control-app_start(1) = `-`.
             REPLACE FIRST OCCURRENCE OF `-` IN result-s_control-app_start WITH `/`.
@@ -175,9 +179,11 @@ CLASS z2ui6_cl_core_srv_json IMPLEMENTATION.
                                          z2ui6_cl_util=>url_param_get( val = `app_start`
                                                                        url = result-s_front-search ) ).
 
+
       CATCH cx_root INTO DATA(x).
         RAISE EXCEPTION TYPE z2ui6_cx_util_error
-          EXPORTING val = x.
+          EXPORTING
+            val = x.
     ENDTRY.
   ENDMETHOD.
 

src/01/02/z2ui6_if_core_types.intf.abap

@@ -136,7 +136,10 @@ INTERFACE z2ui6_if_core_types
         custom_js TYPE string_table,
       END OF s_follow_up_action,
 *      handler_attrs TYPE ty_s_http_handler_attributes,
-      s_stateful TYPE ty_s_http_res-s_stateful,
+      set_app_state_active TYPE abap_bool,
+      set_push_state       TYPE abap_bool,
+      set_nav_back         TYPE abap_bool,
+      s_stateful           TYPE ty_s_http_res-s_stateful,
     END OF ty_s_next_frontend.
 
   TYPES:
@@ -175,6 +178,7 @@ INTERFACE z2ui6_if_core_types
       BEGIN OF s_control,
         check_launchpad TYPE abap_bool,
         app_start       TYPE string,
+        app_start_draft TYPE string,
       END OF s_control,
     END OF ty_s_request.
 

src/01/03/z2ui6_cl_app_component_js.clas.abap

@@ -18,17 +18,17 @@ CLASS z2ui6_cl_app_component_js IMPLEMENTATION.
 
   METHOD get.
 
-    result =              `sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server", "sap/ui/VersionInfo", "z2ui5/cc/DebugTool"` && |\n|  &&
-             `    ], function (UIComponent, Models, Server, VersionInfo, DebugTool) {` && |\n|  &&
+    result =              `sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models", "z2ui5/cc/Server", "sap/ui/VersionInfo", "z2ui5/cc/DebugTool"` && |\n|  &&
+             `], function (UIComponent, Models, Server, VersionInfo, DebugTool) {` && |\n|  &&
              `    return UIComponent.extend("z2ui5.Component", {` && |\n|  &&
              `        metadata: {` && |\n|  &&
              `            manifest: "json"` && |\n|  &&
              `        },` && |\n|  &&
              `        async init() {` && |\n|  &&
              `            UIComponent.prototype.init.apply(this, arguments);` && |\n|  &&
              `` && |\n|  &&
-             `            if (typeof z2ui5 == 'undefined'){` && |\n|  &&
-             `              z2ui5 = {};` && |\n|  &&
+             `            if (typeof z2ui5 == 'undefined') {` && |\n|  &&
+             `                z2ui5 = {};` && |\n|  &&
              `            }` && |\n|  &&
              `            this.getRouter().initialize();` && |\n|  &&
              `            z2ui5.oRouter = this.getRouter();` && |\n|  &&
@@ -40,13 +40,13 @@ CLASS z2ui6_cl_app_component_js IMPLEMENTATION.
              `` && |\n|  &&
              `            try {` && |\n|  &&
              `                z2ui5.oLaunchpadService = await this.getService("ShellUIService");` && |\n|  &&
-             `            } catch (e) {}` && |\n|  &&
+             `            } catch (e) { }` && |\n|  &&
              `` && |\n|  &&
              `            let oVersionInfo = await VersionInfo.load();` && |\n|  &&
              `            z2ui5.oConfig.UI5VersionInfo = {` && |\n|  &&
-             `                version : oVersionInfo.version,` && |\n|  &&
-             `                buildTimestamp : oVersionInfo.buildTimestamp,` && |\n|  &&
-             `                gav : oVersionInfo.gav,` && |\n|  &&
+             `                version: oVersionInfo.version,` && |\n|  &&
+             `                buildTimestamp: oVersionInfo.buildTimestamp,` && |\n|  &&
+             `                gav: oVersionInfo.gav,` && |\n|  &&
              `            }` && |\n|  &&
              `` && |\n|  &&
              `            if (/iPad|iPhone/.test(navigator.platform)) {` && |\n|  &&
@@ -57,13 +57,25 @@ CLASS z2ui6_cl_app_component_js IMPLEMENTATION.
              `` && |\n|  &&
              `            document.addEventListener("keydown", function (zEvent) {` && |\n|  &&
              `                if (zEvent?.ctrlKey && zEvent?.key === "F12") {` && |\n|  &&
-             `                   if (!z2ui5.debugTool){` && |\n|  &&
-             `                     z2ui5.debugTool = new DebugTool();` && |\n|  &&
-             `                     z2ui5.debugTool.show();` && |\n|  &&
-             `                   } else {` && |\n|  &&
-             `                     z2ui5.debugTool.close();` && |\n|  &&
-             `                     z2ui5.debugTool = null;` && |\n|  &&
-             `                   }` && |\n|  &&
+             `                    if (!z2ui5.debugTool) {` && |\n|  &&
+             `                        z2ui5.debugTool = new DebugTool();` && |\n|  &&
+             `                    }` && |\n|  &&
+             `                    z2ui5.debugTool.toggle();` && |\n|  &&
+             `                }` && |\n|  &&
+             `            });` && |\n|  &&
+             `` && |\n|  &&
+             `            // Handle forward/back buttons` && |\n|  &&
+             `            window.addEventListener("popstate", (event) => {` && |\n|  &&
+             `                delete event?.state?.response?.PARAMS?.SET_PUSH_STATE;` && |\n|  &&
+             `                delete event?.state?.response?.PARAMS?.SET_APP_STATE_ACTIVE;` && |\n|  &&
+             `                if (event?.state?.view) {` && |\n|  &&
+             `                    z2ui5.oController.ViewDestroy();` && |\n|  &&
+             `                    z2ui5.oResponse = event.state.response;` && |\n|  &&
+             `                    z2ui5.oController.displayView(event.state.view, event.state.model);` && |\n|  &&
+             `                }else{` && |\n|  &&
+             `                    let urlObj = new URL(window.location.href);` && |\n|  &&
+             `                    urlObj.searchParams.delete("z2ui5-xapp-state");` && |\n|  &&
+             `                    history.replaceState(null, null, urlObj.pathname + urlObj.search + urlObj.hash);` && |\n|  &&
              `                }` && |\n|  &&
              `            });` && |\n|  &&
              `        },` && |\n|  &&

src/01/03/z2ui6_cl_app_debugtool_js.clas.abap

@@ -76,7 +76,7 @@ CLASS z2ui6_cl_app_debugtool_js IMPLEMENTATION.
              `                    displayEditor(oEvent, JSON.stringify(z2ui5.oViewPopup.getModel().getData(), null, 3), 'json');` && |\n|  &&
              `                    break;` && |\n|  &&
              `                case 'POPOVER':` && |\n|  &&
-             `                    displayEditor(oEvent, oResponse?.PARAMS?.S_POPOVER?.XML, 'xml');` && |\n|  &&
+             `                    displayEditor(oEvent, this.prettifyXml(oResponse?.PARAMS?.S_POPOVER?.XML), 'xml');` && |\n|  &&
              `                    break;` && |\n|  &&
              `                case 'POPOVER_MODEL':` && |\n|  &&
              `                    displayEditor(oEvent, JSON.stringify(z2ui5?.oViewPopover?.getModel()?.getData(), null, 3), 'json');` && |\n|  &&
@@ -126,7 +126,7 @@ CLASS z2ui6_cl_app_debugtool_js IMPLEMENTATION.
              `        },` && |\n|  &&
              `` && |\n|  &&
              `        onClose: function () {` && |\n|  &&
-             `            this.oDialog.close();` && |\n|  &&
+             `            this.close();` && |\n|  &&
              `        },` && |\n|  &&
              `` && |\n|  &&
              `        async show() {` && |\n|  &&
@@ -163,8 +163,18 @@ CLASS z2ui6_cl_app_debugtool_js IMPLEMENTATION.
              `            if (this.oDialog){` && |\n|  &&
              `                this.oDialog.close();` && |\n|  &&
              `                this.oDialog.destroy();` && |\n|  &&
+             `                this.oDialog = null;` && |\n|  &&
              `            }` && |\n|  &&
              `        },` && |\n|  &&
+             `` && |\n|  &&
+             `        async toggle(){` && |\n|  &&
+             `            if (this.oDialog){` && |\n|  &&
+             `                this.close()` && |\n|  &&
+             `            } else {` && |\n|  &&
+             `                this.show()` && |\n|  &&
+             `            }` && |\n|  &&
+             `        },` && |\n|  &&
+             `` && |\n|  &&
              `        renderer(){` && |\n|  &&
              `        }` && |\n|  &&
              `    });` && |\n|  &&

src/01/03/z2ui6_cl_app_server_js.clas.abap

@@ -51,6 +51,11 @@ CLASS z2ui6_cl_app_server_js IMPLEMENTATION.
              `                    }` && |\n|  &&
              `                };` && |\n|  &&
              `` && |\n|  &&
+             `                try{` && |\n|  &&
+             `                let oState = JSON.parse(JSON.stringify({ view: z2ui5.oView.mProperties.viewContent, model: z2ui5.oView.getModel().getData(), response: z2ui5.oResponse }));` && |\n|  &&
+             `                history.replaceState(oState, "", window.location.href );` && |\n|  &&
+             `                }catch(e){}` && |\n|  &&
+             `` && |\n|  &&
              `                z2ui5.oBody ??= {};` && |\n|  &&
              `                z2ui5.oBody.S_FRONT = {` && |\n|  &&
              `                    ID: z2ui5?.oBody?.ID,` && |\n|  &&