Merge branch 'main' into main

oblomov-dev · web-flow · commit 59180d12799b · 2025-03-18T10:39:24.000-03:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/workflows/auto_downport.yaml b/.github/workflows/auto_downport.yaml
@@ -24,7 +24,7 @@ jobs:
       run: |
         git config --global user.name 'github-actions[bot]'
         git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        git add src
+        git add .
         git commit -m "Downport changes"
 
     - name: Switch to Branch 702
@@ -35,4 +35,4 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         branch: 702
-        force: true
+        force: true
diff --git a/.github/workflows/mirror_ajson.yaml b/.github/workflows/mirror_ajson.yaml
@@ -3,7 +3,7 @@ name: mirror_ajson
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: '0 1 * * 1'
 
 permissions:
   contents: read
@@ -33,4 +33,4 @@ jobs:
       uses: peter-evans/create-pull-request@v4
       with:
         title: mirror-ajson-update
-        branch: mirror-ajson-update
+        branch: mirror-ajson-update
diff --git a/.github/workflows/mirror_srtti.yaml b/.github/workflows/mirror_srtti.yaml
@@ -3,7 +3,7 @@ name: mirror_srtti
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: '0 1 * * 1'
 
 permissions:
   contents: read
@@ -33,4 +33,4 @@ jobs:
       uses: peter-evans/create-pull-request@v4
       with:
         title: mirror-srtti-update
-        branch: mirror-srtti-update
+        branch: mirror-srtti-update
diff --git a/app/webapp/Component.js b/app/webapp/Component.js
@@ -8,6 +8,9 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models", "z2ui5/cc/Server
             ]
         },
         async init() {
+            
+            z2ui5.oConfig = {};
+            
             UIComponent.prototype.init.apply(this, arguments);
 
             if (typeof z2ui5 == 'undefined') {
@@ -24,7 +27,6 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models", "z2ui5/cc/Server
             z2ui5.oDeviceModel = Models.createDeviceModel();
             this.setModel(z2ui5.oDeviceModel, "device");
 
-            z2ui5.oConfig = {};
             z2ui5.oConfig.ComponentData = this.getComponentData();
 
             try {
@@ -79,4 +81,4 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models", "z2ui5/cc/Server
                 UIComponent.prototype.exit.apply(this, arguments);
         },
     });
-});
+});
diff --git a/app/webapp/cc/DebugTool.fragment.xml b/app/webapp/cc/DebugTool.fragment.xml
@@ -11,7 +11,7 @@
     >
         <IconTabHeader
             selectedKey="PLAIN"
-            select="onItemSelect"
+            select=".onItemSelect"
         >
             <items>
 		        <IconTabFilter
@@ -83,7 +83,7 @@
             </items>
         </IconTabHeader>
 			<VBox>
-				<ToggleButton text="Source XML after Templating" visible="{/isTemplating}" pressed="{/templatingSource}" press="onTemplatingPress" />
+				<ToggleButton text="Source XML after Templating" visible="{/isTemplating}" pressed="{/templatingSource}" press=".onTemplatingPress" />
         <ce:CodeEditor
             type="{/type}"
             value="{/value}"
@@ -97,7 +97,7 @@
         <endButton>
             <Button
                 text="Close"
-                press="onClose"
+                press=".onClose"
             />
         </endButton>
     </Dialog>
diff --git a/app/webapp/controller/App.controller.js b/app/webapp/controller/App.controller.js
@@ -851,8 +851,9 @@ sap.ui.define("z2ui5/SmartMultiInputExt", ["sap/ui/core/Control", "sap/m/Token",
 sap.ui.define("z2ui5/CameraPicture", [
   "sap/ui/core/Control",
   "sap/m/Dialog",
-  "sap/m/Button"
-], function (Control, Dialog, Button) {
+  "sap/m/Button", 
+  "sap/ui/core/HTML"
+], function (Control, Dialog, Button, HTML) {
   "use strict";
   return Control.extend("z2ui5.CameraPicture", {
     metadata: {
@@ -900,7 +901,7 @@ sap.ui.define("z2ui5/CameraPicture", [
           verticalScrolling: false,
           stretch: true,
           content: [
-            new sap.ui.core.HTML({
+            new HTML({
               id: this.getId() + 'PictureContainer',
               content: '<video width="600px" height="400px" autoplay="true" id="zvideo">'
             }),
@@ -911,7 +912,7 @@ sap.ui.define("z2ui5/CameraPicture", [
                 this._oScanDialog.close();
               }.bind(this)
             }),
-            new sap.ui.core.HTML({
+            new HTML({
               content: '<canvas hidden id="zcanvas" style="overflow:auto"></canvas>'
             }),
           ],
@@ -1035,7 +1036,7 @@ sap.ui.define("z2ui5/Favicon", ["sap/ui/core/Control"], (Control) => {
 }
 );
 
-sap.ui.define("z2ui5/Dirty", ["sap/ui/core/Control", "sap/ushell/Container"], (Control, Container) => {
+sap.ui.define("z2ui5/Dirty", ["sap/ui/core/Control"], (Control) => {
   "use strict";
   return Control.extend("z2ui5.Dirty", {
     metadata: {
@@ -1046,15 +1047,22 @@ sap.ui.define("z2ui5/Dirty", ["sap/ui/core/Control", "sap/ushell/Container"], (C
       }
     },
     setIsDirty(val) {
-      if (Container) {
-        Container.setDirtyFlag(val);
-      } else {
-        window.onbeforeunload = function (e) {
+
+      sap.ui.require([ "sap/ushell/Container"
+      ], async (Container) => {
+      
+        if (Container) {
+          Container.setDirtyFlag(val);
+        } else {
+          window.onbeforeunload = function (e) {
           if (val) {
             e.preventDefault();
           }
         }
       }
+        
+     });
+      
     },
     renderer(oRm, oControl) { }
   });
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "description": "Developing UI5 Apps Purely in ABAP.",
   "scripts": {
     "syfixes": "find . -type f -name '*.abap' -exec sed -i -e 's/ RAISE EXCEPTION TYPE cx_sy_itab_line_not_found/ ASSERT 1 = 0/g' {} + ",
-    "auto_downport": "abaplint --fix .github/abaplint/abap_702.jsonc && npm run syfixes && cp -r src node/downport",
+    "auto_downport": "abaplint --fix .github/abaplint/abap_702.jsonc && npm run syfixes && cp -r src node/downport &&  cp -f .github/abaplint/abap_702.jsonc abaplint.jsonc",
     "auto_app2abap": "node .github/app2abap/trans2abap.js",
     "auto_abaplint": "npx abaplint .github/abaplint/auto_abaplint_fix.jsonc --fix",
     "auto_transpile": "rm -rf node/output && cp node/srv/*.abap node/downport && abap_transpile ./node/setup/abap_transpile.json",
@@ -43,4 +43,4 @@
   "dependencies": {
     "npm-check-updates": "^17.1.14"
   }
-}
+}
diff --git a/src/00/01/z2ui5_cl_ajson.clas.abap b/src/00/01/z2ui5_cl_ajson.clas.abap
@@ -848,6 +848,8 @@ CLASS z2ui5_cl_ajson IMPLEMENTATION.
     DATA lv_path_pattern    TYPE string.
 
     CREATE OBJECT lo_section.
+    lo_section->mi_custom_mapping = mi_custom_mapping.
+
     lv_normalized_path = lcl_utils=>normalize_path( iv_path ).
     lv_path_len        = strlen( lv_normalized_path ).
     ls_path_parts      = lcl_utils=>split_path( lv_normalized_path ).
diff --git a/src/00/01/z2ui5_cl_ajson_mapping.clas.testclasses.abap b/src/00/01/z2ui5_cl_ajson_mapping.clas.testclasses.abap
@@ -358,6 +358,7 @@ CLASS ltcl_fields DEFINITION FINAL FOR TESTING
       to_json_without_path FOR TESTING RAISING z2ui5_cx_ajson_error,
       to_json_with_path FOR TESTING RAISING z2ui5_cx_ajson_error,
       to_abap FOR TESTING RAISING z2ui5_cx_ajson_error,
+      to_abap_with_slice FOR TESTING RAISING z2ui5_cx_ajson_error,
       to_json IMPORTING iv_path TYPE string RETURNING VALUE(rv_result) TYPE string RAISING z2ui5_cx_ajson_error.
 
 
@@ -403,6 +404,33 @@ CLASS ltcl_fields IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD to_abap_with_slice.
+
+    DATA: BEGIN OF ls_act,
+            y TYPE i,
+          END OF ls_act.
+
+    DATA lo_cut TYPE REF TO z2ui5_if_ajson.
+    DATA lt_mapping_fields TYPE z2ui5_if_ajson_mapping=>ty_mapping_fields.
+    DATA ls_mapping_field  LIKE LINE OF lt_mapping_fields.
+
+    CLEAR ls_mapping_field.
+    ls_mapping_field-abap = 'Y'.
+    ls_mapping_field-json = 'c'.
+    INSERT ls_mapping_field INTO TABLE lt_mapping_fields.
+
+    lo_cut = z2ui5_cl_ajson=>parse( iv_json           = '{"a":1,"b":{"c":2},"d":{"e":3}}'
+                               ii_custom_mapping = z2ui5_cl_ajson_mapping=>create_field_mapping( lt_mapping_fields )
+                               )->slice( `/b` ).
+
+    lo_cut->to_abap( IMPORTING ev_container = ls_act ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = ls_act-y
+      exp = 2 ).
+
+  ENDMETHOD.
+
 
   METHOD to_json_without_path.
 
diff --git a/src/00/01/z2ui5_if_ajson.intf.abap b/src/00/01/z2ui5_if_ajson.intf.abap
@@ -1,7 +1,7 @@
 INTERFACE z2ui5_if_ajson
   PUBLIC.
 
-  CONSTANTS version TYPE string VALUE 'v1.1.10'. "#EC NOTEXT
+  CONSTANTS version TYPE string VALUE 'v1.1.11'. "#EC NOTEXT
   CONSTANTS origin TYPE string VALUE 'https://github.com/sbcgua/ajson'. "#EC NOTEXT
   CONSTANTS license TYPE string VALUE 'MIT'. "#EC NOTEXT
 
diff --git a/src/00/03/z2ui5_cl_util.clas.abap b/src/00/03/z2ui5_cl_util.clas.abap
@@ -79,12 +79,18 @@ CLASS z2ui5_cl_util DEFINITION
       RETURNING
         VALUE(result) TYPE string.
 
-    CLASS-METHODS msg_get
+    CLASS-METHODS msg_get_t
       IMPORTING
-        val           TYPE any
+        VALUE(val)    TYPE any
       RETURNING
         VALUE(result) TYPE ty_t_msg.
 
+    CLASS-METHODS msg_get
+      IMPORTING
+        VALUE(val)    TYPE any
+      RETURNING
+        VALUE(result) TYPE ty_s_msg.
+
     CLASS-METHODS rtti_get_t_attri_by_include
       IMPORTING
         !type         TYPE REF TO cl_abap_datadescr
@@ -1411,7 +1417,7 @@ ENDLOOP.
 
   ENDMETHOD.
 
-  METHOD msg_get.
+  METHOD msg_get_t.
 
     result = z2ui5_cl_util_msg=>msg_get( val ).
 
@@ -1449,4 +1455,11 @@ ENDLOOP.
 
   ENDMETHOD.
 
+  METHOD msg_get.
+
+    DATA(lt_msg) = msg_get_t( val ).
+    result = lt_msg[ 0 ].
+
+  ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/01/02/z2ui5_cl_core_client.clas.abap b/src/01/02/z2ui5_cl_core_client.clas.abap
@@ -85,7 +85,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION.
   METHOD z2ui5_if_client~message_box_display.
 
     IF z2ui5_cl_util=>rtti_check_clike( text ) = abap_false.
-      DATA(lt_msg) = z2ui5_cl_util=>msg_get( text ).
+      DATA(lt_msg) = z2ui5_cl_util=>msg_get_t( text ).
       IF lines( lt_msg ) = 1.
         DATA(lv_text) = lt_msg[ 1 ]-text.
 
diff --git a/src/01/03/z2ui5_cl_app_app_js.clas.abap b/src/01/03/z2ui5_cl_app_app_js.clas.abap
@@ -875,8 +875,9 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `sap.ui.define("z2ui5/CameraPicture", [` && |\n| &&
              `  "sap/ui/core/Control",` && |\n| &&
              `  "sap/m/Dialog",` && |\n| &&
-             `  "sap/m/Button"` && |\n| &&
-             `], function (Control, Dialog, Button) {` && |\n| &&
+             `  "sap/m/Button",` && |\n| &&
+             `  "sap/ui/core/HTML"` && |\n| &&
+             `], function (Control, Dialog, Button, HTML) {` && |\n| &&
              `  "use strict";` && |\n| &&
              `  return Control.extend("z2ui5.CameraPicture", {` && |\n| &&
              `    metadata: {` && |\n| &&
@@ -924,7 +925,7 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `          verticalScrolling: false,` && |\n| &&
              `          stretch: true,` && |\n| &&
              `          content: [` && |\n| &&
-             `            new sap.ui.core.HTML({` && |\n| &&
+             `            new HTML({` && |\n| &&
              `              id: this.getId() + 'PictureContainer',` && |\n| &&
              `              content: '<video width="600px" height="400px" autoplay="true" id="zvideo">'` && |\n| &&
              `            }),` && |\n| &&
@@ -935,7 +936,7 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `                this._oScanDialog.close();` && |\n| &&
              `              }.bind(this)` && |\n| &&
              `            }),` && |\n| &&
-             `            new sap.ui.core.HTML({` && |\n| &&
+             `            new HTML({` && |\n| &&
              `              content: '<canvas hidden id="zcanvas" style="overflow:auto"></canvas>'` && |\n| &&
              `            }),` && |\n| &&
              `          ],` && |\n| &&
@@ -1059,7 +1060,7 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `}` && |\n| &&
              `);` && |\n| &&
              `` && |\n| &&
-             `sap.ui.define("z2ui5/Dirty", ["sap/ui/core/Control", "sap/ushell/Container"], (Control, Container) => {` && |\n| &&
+             `sap.ui.define("z2ui5/Dirty", ["sap/ui/core/Control"], (Control) => {` && |\n| &&
              `  "use strict";` && |\n| &&
              `  return Control.extend("z2ui5.Dirty", {` && |\n| &&
              `    metadata: {` && |\n| &&
@@ -1070,15 +1071,22 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `      }` && |\n| &&
              `    },` && |\n| &&
              `    setIsDirty(val) {` && |\n| &&
-             `      if (Container) {` && |\n| &&
-             `        Container.setDirtyFlag(val);` && |\n| &&
-             `      } else {` && |\n| &&
-             `        window.onbeforeunload = function (e) {` && |\n| &&
+             `` && |\n| &&
+             `      sap.ui.require([ "sap/ushell/Container"` && |\n| &&
+             `      ], async (Container) => {` && |\n| &&
+             `` && |\n| &&
+             `        if (Container) {` && |\n| &&
+             `          Container.setDirtyFlag(val);` && |\n| &&
+             `        } else {` && |\n| &&
+             `          window.onbeforeunload = function (e) {` && |\n| &&
              `          if (val) {` && |\n| &&
              `            e.preventDefault();` && |\n| &&
              `          }` && |\n| &&
              `        }` && |\n| &&
              `      }` && |\n| &&
+             `` && |\n| &&
+             `     });` && |\n| &&
+             `` && |\n| &&
              `    },` && |\n| &&
              `    renderer(oRm, oControl) { }` && |\n| &&
              `  });` && |\n| &&
diff --git a/src/01/03/z2ui5_cl_app_component_js.clas.abap b/src/01/03/z2ui5_cl_app_component_js.clas.abap
diff --git a/src/01/03/z2ui5_cl_app_debugtool_xml.clas.abap b/src/01/03/z2ui5_cl_app_debugtool_xml.clas.abap
diff --git a/src/02/01/z2ui5_cl_pop_bal.clas.abap b/src/02/01/z2ui5_cl_pop_bal.clas.abap
diff --git a/src/02/01/z2ui5_cl_pop_messages.clas.abap b/src/02/01/z2ui5_cl_pop_messages.clas.abap
