@lingk/sync 1.1.12 → 1.1.13

package/build/main.js

@@ -5720,6 +5720,7 @@ module.exports =
 	
 	      _this.setState({ uploading: true });
 	      setCsvFields(_this.state.meta, _this.state.fileContents, providerType).then(function () {
+	        console.log("SET META BACK");
 	        _this.setState({ meta: [], fileContents: [], uploading: false });
 	      });
 	    };
@@ -50689,7 +50690,7 @@ module.exports =
 	      data: { name: 'flatfile', resources: metadata, providerType: providerType, isSource: isSource }
 	    }).then(function (data) {
 	      d = data;
-	      return dispatch(uploadFilesToS3(tenantKey, appKey, metadata, data, contents));
+	      return dispatch(uploadFilesToS3(tenantKey, appKey, envId, metadata, data, contents));
 	    }).then(function () {
 	      return dispatch(postCredentials(tenantId, appId, providerType, d.guids, mode, envId, 'FlatFile')).then(function () {
 	        dispatch({
@@ -50731,10 +50732,10 @@ module.exports =
 	  };
 	}
 	
-	function uploadFilesToS3(tenantKey, appKey, metadata, d, contents) {
+	function uploadFilesToS3(tenantKey, appKey, envId, metadata, d, contents) {
 	  console.log("UPLOAD", metadata, contents);
 	  var args = contents.map(function (fileContent, i) {
-	    return { tenantKey: tenantKey, appKey: appKey, fileContent: fileContent, d: d, fileName: metadata[i].type };
+	    return { tenantKey: tenantKey, appKey: appKey, envId: envId, fileContent: fileContent, d: d, fileName: metadata[i].name };
 	  });
 	  return function (dispatch, getState, api) {
 	    return Promise.all(args.map(singleFileToS3));
@@ -50744,15 +50745,15 @@ module.exports =
 	function singleFileToS3(_ref) {
 	  var tenantKey = _ref.tenantKey,
 	      appKey = _ref.appKey,
+	      envId = _ref.envId,
 	      d = _ref.d,
 	      fileContent = _ref.fileContent,
 	      fileName = _ref.fileName;
 	
-	  if (!d.guids.files[fileName]) {
-	    return function () {
-	      return Promise.resolve(null);
-	    };
-	  }
+	  console.log(fileName, d);
+	  /*if(!d.guids.files[fileName]){
+	    return () => Promise.resolve(null)
+	  }*/
 	  var p = JSON.parse(atob(d.policy));
 	  console.log(p);
 	  var pFind = function pFind(s) {
@@ -50761,7 +50762,7 @@ module.exports =
 	    })[s];
 	  };
 	  var fd = new FormData();
-	  fd.append('key', tenantKey + '/' + appKey + '/' + d.guids.files[fileName]);
+	  fd.append('key', tenantKey + '/' + appKey + '/' + envId + '/' + fileName);
 	  fd.append('policy', d.policy);
 	  fd.append('acl', pFind('acl'));
 	  fd.append('success_action_status', pFind('success_action_status'));
@@ -50778,43 +50779,53 @@ module.exports =
 	  });
 	}
 	
-	function downloadFileFromAws(tenantId, appId, tenantKey, appKey, file) {
+	function downloadFileFromAws(tenantId, appId, tenantKey, appKey, envId, file) {
+	  console.log(file);
 	  return function (dispatch, getState, api) {
 	    var _getState5 = getState(),
 	        config = _getState5.config;
 	
-	    return api.get(tenantId + '/' + appId + '/downloadpolicy/' + file.fileHash, {
+	    return api.get(tenantId + '/' + appId + '/' + envId + '/downloadpolicy/' + file.name, {
 	      endpoint: config.TRANS_API_URL
 	    }).then(function (d) {
-	      return (0, _axios2.default)({
+	      var element = document.createElement('a');
+	      element.setAttribute('href', d);
+	      element.style.display = 'none';
+	      document.body.appendChild(element);
+	      element.click();
+	      document.body.removeChild(element);
+	    });
+	    /*.then(d => {
+	      return axios({
 	        method: 'get',
-	        url: d
-	      });
-	    }).then(function (f) {
-	      var extension = file.name.substr(file.name.lastIndexOf('.') + 1, file.name.length);
-	      var mime = 'data:text/plain;charset=utf-8,'; // csv
-	      var data = f.data;
-	      if (extension === 'json') {
-	        console.log('json!!!!');
-	        mime = 'data:text/json;charset=utf-8,';
-	        data = encodeURIComponent(JSON.stringify(f.data));
-	      } else if (extension === 'xls') {
-	        mime = 'data:application/vnd.ms-excel;charset=utf-8,';
-	        data = encodeURIComponent(f.data);
-	      } else if (extension === 'xlsx') {
-	        mime = 'data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8,';
-	        data = encodeURIComponent(f.data);
-	      }
-	      console.log(data);
+	        url: d,
+	      })
+	    })
+	    .then((f)=>{
+	      const extension = file.name.substr(file.name.lastIndexOf('.')+1, file.name.length)
+	      let mime = 'data:text/plain;charset=utf-8,' // csv
+	      let data = f.data
+	      if(extension==='json'){
+	        console.log('json!!!!')
+	        mime = 'data:text/json;charset=utf-8,'
+	        data = encodeURIComponent(JSON.stringify(f.data))
+	      } else if(extension==='xls'){
+	        mime = 'data:application/vnd.ms-excel;charset=utf-8,'
+	        data = encodeURIComponent(f.data)
+	      } else if(extension==='xlsx'){
+	        mime = 'data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8,'
+	        data = encodeURIComponent(f.data)
+	      }
+	      console.log(data)
 	      // NEED TO DOWNLOAD DEPENDING ON TYPE, JSON VS XLS
-	      var element = document.createElement('a');
+	      const element = document.createElement('a');
 	      element.setAttribute('href', mime + data);
 	      element.setAttribute('download', 'hi.xlsx');
 	      element.style.display = 'none';
 	      document.body.appendChild(element);
 	      element.click();
 	      document.body.removeChild(element);
-	    });
+	    })*/
 	  };
 	}
 	
@@ -50828,7 +50839,7 @@ module.exports =
 	  };
 	  return (0, _axios2.default)({
 	    method: 'get',
-	    url: 'https://' + pFind('bucket') + '.s3.amazonaws.com/' + tenantKey + '/' + appKey + '/' + file.fileHash,
+	    url: 'https://' + pFind('bucket') + '.s3.amazonaws.com/' + tenantKey + '/' + appKey + '/' + file.name,
 	    config: { headers: { 'Content-Type': 'multipart/form-data' } }
 	  });
 	}
@@ -55354,16 +55365,16 @@ module.exports =
 	          accountId = _this$props3.accountId,
 	          tenantKey = _this$props3.tenantKey,
 	          accountKey = _this$props3.accountKey,
-	          actions = _this$props3.actions;
+	          actions = _this$props3.actions,
+	          formValues = _this$props3.formValues;
 	
-	      return actions.downloadFileFromAws(tenantId, accountId, tenantKey, accountKey, file);
+	      return actions.downloadFileFromAws(tenantId, accountId, tenantKey, accountKey, formValues['environmentId'], file);
 	    };
 	
 	    _this.state = {
 	      selectedProvider: null,
 	      sourceEnvChecking: null,
-	      destinationEnvChecking: null,
-	      selectedEnvironment: null
+	      destinationEnvChecking: null
 	    };
 	    _this.check = _this.check.bind(_this);
 	    _this.tryGetCredentialAndCheck = _this.tryGetCredentialAndCheck.bind(_this);
@@ -55452,20 +55463,23 @@ module.exports =
 	            if (_this2.props.formValues[mode + 'FileSchema']) {
 	              savedFileSchema = [].concat(_toConsumableArray(formValues[mode + 'FileSchema']));
 	            }
-	            change(mode + 'FileSchema', {
-	              resources: metadata.map(function (r) {
-	                var existing = savedFileSchema.find(function (rsc) {
-	                  return r.name === rsc.name && r.type === rsc.type;
-	                });
-	                if (existing) return existing;
-	                return Object.assign({}, r, {
-	                  filePattern: r.name,
-	                  delimiter: ','
-	                });
-	              })
-	            });
+	            change(mode + 'FileSchema', metadata.map(function (r) {
+	              var existing = savedFileSchema.find(function (rsc) {
+	                return r.name === rsc.name && r.type === rsc.type;
+	              });
+	              if (existing) return existing;
+	              return Object.assign({}, r, {
+	                filePattern: r.name,
+	                delimiter: ','
+	              });
+	            }));
 	          })();
 	        }
+	
+	        var isFlat = metadata && metadata[0] && metadata[0].uploadedTime;
+	        if (isFlat) {
+	          change(mode + 'FileSchema', metadata);
+	        }
 	      });
 	    }
 	  }, {
@@ -55561,7 +55575,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'setCsvFields',
-	    value: function setCsvFields(metadata, contents, mode, providerType) {
+	    value: function setCsvFields(meta, contents, mode, providerType) {
 	      var _this4 = this;
 	
 	      var _props7 = this.props,
@@ -55569,12 +55583,11 @@ module.exports =
 	          accountId = _props7.accountId,
 	          tenantKey = _props7.tenantKey,
 	          accountKey = _props7.accountKey,
-	          wizard = _props7.wizard,
 	          actions = _props7.actions,
 	          formValues = _props7.formValues;
+	      //let meta = wizard[`${mode}Metadata`] || []
+	      //meta = meta.concat(metadata)
 	
-	      var meta = wizard[mode + 'Metadata'] || [];
-	      meta = meta.concat(metadata);
 	      return actions.setCsvFields(tenantId, accountId, tenantKey, accountKey, meta, contents, mode, providerType, mode === 'source', formValues['environmentId']).then(function (d) {
 	        // get the new list of files
 	        return _this4.check(mode, null, d, null, '');
@@ -55737,7 +55750,7 @@ module.exports =
 	                          return _this5.generateNewAdapterSecret(m);
 	                        },
 	                        seeFields: _this5.seeFields.bind(_this5),
-	                        fileSchema: wizard[m + 'Metadata'],
+	                        fileSchema: formValues[m + 'FileSchema'],
 	                        check: function check(actualCreds, extraQuery) {
 	                          _this5.check(m, null, actualCreds, null, extraQuery);
 	                        }, change: change,