fix upload set (#491)

Author: oblomov-dev

src/z2ui5_cl_demo_app_000.clas.abap

@@ -1698,31 +1698,6 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
                          class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
      ).
 
-    panel = page->panel( expandable = abap_false
-                         expanded   = abap_true
-                         headertext = `Apps with add. Javascript`
-      ).
-
-    panel->generic_tile( header    = 'p13n Dialog'
-                         subheader = 'Popup for F4 Helps'
-                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_090' )
-                         mode      = 'LineMode'
-                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
- ).
-
-    panel->generic_tile( header    = 'Upload Set'
-                         subheader = ''
-                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_107' )
-                         mode      = 'LineMode'
-                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
- ).
-
-    panel->generic_tile( header    = 'Smart Variant Management'
-                         subheader = ''
-                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_111' )
-                         mode      = 'LineMode'
-                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
- ).
 
     page = page2->panel( expandable = abap_true
                          expanded   = client->_bind_edit( ms_check_expanded-demos )
@@ -2016,6 +1991,26 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
                          class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
  ).
 
+    panel->generic_tile( header    = 'p13n Dialog'
+                         subheader = 'Popup for F4 Helps'
+                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_090' )
+                         mode      = 'LineMode'
+                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+ ).
+
+    panel->generic_tile( header    = 'Upload Set'
+                         subheader = ''
+                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_107' )
+                         mode      = 'LineMode'
+                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+ ).
+
+    panel->generic_tile( header    = 'Smart Variant Management'
+                         subheader = ''
+                         press     = client->_event( 'Z2UI5_CL_DEMO_APP_111' )
+                         mode      = 'LineMode'
+                         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+ ).
 
     client->view_display( page->stringify( ) ).
 

src/z2ui5_cl_demo_app_107.clas.abap

@@ -44,12 +44,12 @@ CLASS Z2UI5_CL_DEMO_APP_107 IMPLEMENTATION.
   METHOD get_custom_js.
 
     result  = `` && |\n| &&
-                 `sap.z2ui5.fileGet = (oEvent,oController) => {` && |\n| &&
+                 `z2ui5.fileGet = (oEvent,oController) => {` && |\n| &&
                  ` var oFileUploadComponent = oEvent.getParameters("items").item.getFileObject();` && |\n| &&
                  ` if (oFileUploadComponent) {` && |\n| &&
                  `   _handleRawFile(oFileUploadComponent,oController);` && |\n| &&
                  ` }` && |\n| &&
-                 ` console.log(sap.z2ui5.oResponse.OVIEWMODEL.XX.MV_FILE_RAW.data);` && |\n| &&
+                 ` console.log(z2ui5.oResponse.OVIEWMODEL.XX.MV_FILE_RAW.data);` && |\n| &&
                  `};` && |\n| &&
                  `_handleRawFile = (oFile, oController) => {` && |\n| &&
                  ` var oFileRaw = {` && |\n| &&
@@ -58,7 +58,7 @@ CLASS Z2UI5_CL_DEMO_APP_107 IMPLEMENTATION.
                  ` var reader = new FileReader();` && |\n| &&
                  ` reader.onload = function (e) {` && |\n| &&
                  `   oFileRaw.data = e.target.result;` && |\n| &&
-                 `   sap.z2ui5.oResponse.OVIEWMODEL.XX.MV_FILE_RAW = oFileRaw;` && |\n| &&
+                 `   z2ui5.oResponse.OVIEWMODEL.XX.MV_FILE_RAW = oFileRaw;` && |\n| &&
                  ` }` && |\n| &&
                  `  reader.readAsDataURL(oFile);` && |\n| &&
                  `};`.
@@ -103,7 +103,7 @@ CLASS Z2UI5_CL_DEMO_APP_107 IMPLEMENTATION.
     DATA(view) = z2ui5_cl_xml_view=>factory( ).
 
     DATA(page) = view->shell( )->page(
-        title          = 'abap2UI5 - P13N Dialog'
+        title          = 'abap2UI5 - UploadSet Dialog'
         navbuttonpress = client->_event( 'BACK' )
         shownavbutton  = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL )
         class          = 'sapUiContentPadding' ).
@@ -119,8 +119,8 @@ CLASS Z2UI5_CL_DEMO_APP_107 IMPLEMENTATION.
                              mode               = `MultiSelect`
                              items              = client->_bind_edit( mt_items )
 *                             afteritemadded = client->_event( val = 'AFTER' t_arg = VALUE #( ( `${$parameters>/}` ) ) )
-                             afteritemadded     = `sap.z2ui5.fileGet($event,$controller)` "sap.z2ui5.updateData(${$parameters>/reason})
-                             uploadcompleted    = `sap.z2ui5.fileGet($event,$controller)` "sap.z2ui5.updateData(${$parameters>/reason})
+                             afteritemadded     = `z2ui5.fileGet($event,$controller)` "sap.z2ui5.updateData(${$parameters>/reason})
+                             uploadcompleted    = `z2ui5.fileGet($event,$controller)` "sap.z2ui5.updateData(${$parameters>/reason})
                               )->_generic( name = `toolbar`
                                            ns   = `upload`
                                 )->overflow_toolbar(