@wavemaker/app-ng-runtime 11.6.0-next.40753 → 11.6.0-next.41002

app-ng-runtime/variables/fesm2020/index.mjs

@@ -604,12 +604,12 @@ const setParamsFromURL = (queryParams, params) => {
  * @param variable: the variable that is called from user action
  * @param requestParams object consisting the info to construct the XHR request for the service
  */
-const downloadThroughIframe = (requestParams, success) => {
+const downloadThroughIframe = (requestParams, success, dataBinding) => {
     // Todo: SHubham: URL contains '//' in between which should be handled at the URL formation only
     if (requestParams.url[1] === '/' && requestParams.url[2] === '/') {
         requestParams.url = requestParams.url.slice(0, 1) + requestParams.url.slice(2);
     }
-    let iFrameElement, formEl, paramElement, queryParams = '';
+    let iFrameElement, formEl, paramElement, queryParams = '', data;
     const IFRAME_NAME = 'fileDownloadIFrame', FORM_NAME = 'fileDownloadForm', CONTENT_TYPE = 'Content-Type', url = requestParams.url, encType = _.get(requestParams.headers, CONTENT_TYPE), params = _.pickBy(requestParams.headers, function (val, key) { return key !== CONTENT_TYPE; });
     /* Todo: shubham : define getService method
      WS_CONSTANTS    = getService('WS_CONSTANTS');*/
@@ -624,7 +624,7 @@ const downloadThroughIframe = (requestParams, success) => {
         'target': iFrameElement.attr('name'),
         'action': url,
         'method': requestParams.method,
-        'enctype': encType
+        'enctype': !(_.isEmpty(requestParams.data) && _.isEmpty(queryParams)) ? encType : WS_CONSTANTS.CONTENT_TYPES.MULTIPART_FORMDATA
     });
     /* process query params, append a hidden input element in the form against each param */
     queryParams += url.indexOf('?') !== -1 ? url.substring(url.indexOf('?') + 1) : '';
@@ -633,8 +633,14 @@ const downloadThroughIframe = (requestParams, success) => {
     if (_.includes(WS_CONSTANTS.NON_BODY_HTTP_METHODS, _.toUpper(requestParams.method))) {
         setParamsFromURL(queryParams, params); // Set params for URL query params
     }
-    setParamsFromURL(requestParams.data, params); // Set params for request data
-    _.forEach(params, function (val, key) {
+    if (!_.isEmpty(requestParams.data)) {
+        setParamsFromURL(requestParams.data, params); // Set params for request data
+        data = params;
+    }
+    else {
+        data = dataBinding;
+    }
+    _.forEach(data, function (val, key) {
         paramElement = $('<input type="hidden">');
         paramElement.attr({
             'name': key,
@@ -930,7 +936,7 @@ const processBinding = (variable, context, bindSource, bindTarget) => {
  * @param success success callback
  * @param error error callback
  */
-const simulateFileDownload = (requestParams, fileName, exportFormat, success, error) => {
+const simulateFileDownload = (requestParams, fileName, exportFormat, success, error, dataBinding) => {
     /*success and error callbacks are executed incase of downloadThroughAnchor
      Due to technical limitation cannot be executed incase of iframe*/
     if (CONSTANTS.hasCordova) {
@@ -944,7 +950,7 @@ const simulateFileDownload = (requestParams, fileName, exportFormat, success, er
         downloadThroughAnchor(requestParams, success, error);
     }
     else {
-        downloadThroughIframe(requestParams, success);
+        downloadThroughIframe(requestParams, success, dataBinding);
     }
 };
 /**