@lingk/sync 1.1.8 → 1.1.10

package/build/main.js

@@ -5538,7 +5538,7 @@ module.exports =
 	      f = Math.floor(Math.log(a) / Math.log(c));return parseFloat((a / Math.pow(c, f)).toFixed(d)) + " " + e[f];
 	}
 	
-	var extensionBlacklist = ['xls', 'xml', 'zip', 'tar', 'gz'];
+	var extensionBlacklist = ['xls', 'xlsx', 'xml', 'zip', 'tar', 'gz'];
 	
 	var FlatFile = function (_Component) {
 	  _inherits(FlatFile, _Component);
@@ -5744,7 +5744,7 @@ module.exports =
 	          fileSchema = _props.fileSchema,
 	          inputs = _props.inputs;
 	
-	      var files = fileSchema && fileSchema.resources;
+	      var fileSchemas = fileSchema;
 	      var Button = inputs.Button;
 	      var Spinner = inputs.Spinner;
 	      var hasFile = meta && meta.length > 0;
@@ -5769,100 +5769,113 @@ module.exports =
 	            )
 	          )
 	        ),
-	        hasFile && _react2.default.createElement(
-	          'aside',
-	          { style: { marginLeft: 30, display: 'inline-block' } },
-	          _react2.default.createElement(
-	            'div',
+	        _react2.default.createElement(
+	          'div',
+	          { style: { marginLeft: 30, display: 'inline-block', verticalAlign: 'top',
+	              maxWidth: '60%' } },
+	          hasFile && _react2.default.createElement(
+	            'aside',
 	            null,
 	            _react2.default.createElement(
-	              'h3',
-	              { style: { marginTop: 10, display: 'inline-block', verticalAlign: 'top' } },
-	              'Dropped files'
-	            ),
-	            _react2.default.createElement(
-	              Button,
-	              {
-	                type: 'brand',
-	                onClick: this.upload,
-	                style: { marginTop: 4, marginLeft: 20, verticalAlign: 'top', height: 36 },
-	                disabled: uploading },
-	              _react2.default.createElement(
-	                'span',
-	                { style: { display: 'inline-block', verticalAlign: 'top', marginTop: 3 } },
-	                'Upload'
-	              ),
-	              '\xA0\xA0',
-	              _react2.default.createElement(UploadIcon, null)
-	            ),
-	            uploading && _react2.default.createElement(
 	              'div',
-	              { style: { paddingLeft: 12, paddingTop: 12, display: 'inline-block' } },
-	              _react2.default.createElement(Spinner, null)
-	            )
-	          ),
-	          _react2.default.createElement(
-	            'ul',
-	            { style: { padding: 0 } },
-	            meta.map(function (f, i) {
-	              return _react2.default.createElement(
-	                'li',
-	                { key: i, style: { listStyle: 'none' } },
-	                f.name,
-	                ' - ',
-	                formatBytes(f.byteSize)
-	              );
-	            })
-	          )
-	        ),
-	        !uploading && !hasFile && files && files.length > 0 && _react2.default.createElement(
-	          'div',
-	          { style: {
-	              marginLeft: 20, display: 'inline-block', marginTop: 13, verticalAlign: 'top'
-	            } },
-	          _react2.default.createElement(
-	            'div',
-	            { style: { marginBottom: 4 } },
-	            _react2.default.createElement(
-	              'strong',
-	              { style: { marginRight: 5 } },
-	              files && files.length
-	            ),
-	            _react2.default.createElement(
-	              'strong',
 	              null,
-	              'file' + (files.length === 1 ? '' : 's') + ' uploaded on '
+	              _react2.default.createElement(
+	                'h3',
+	                { style: { marginTop: 10, display: 'inline-block', verticalAlign: 'top' } },
+	                'Dropped files'
+	              ),
+	              _react2.default.createElement(
+	                Button,
+	                {
+	                  type: 'brand',
+	                  onClick: this.upload,
+	                  style: { marginTop: 4, marginLeft: 20, verticalAlign: 'top', height: 36 },
+	                  disabled: uploading },
+	                _react2.default.createElement(
+	                  'span',
+	                  { style: { display: 'inline-block', verticalAlign: 'top', marginTop: 3 } },
+	                  'Upload'
+	                ),
+	                '\xA0\xA0',
+	                _react2.default.createElement(UploadIcon, null)
+	              ),
+	              uploading && _react2.default.createElement(
+	                'div',
+	                { style: { paddingLeft: 12, paddingTop: 12, display: 'inline-block' } },
+	                _react2.default.createElement(Spinner, null)
+	              )
 	            ),
 	            _react2.default.createElement(
-	              'strong',
-	              null,
-	              (0, _moment2.default)(fileSchema.uploadedTime).format('MMM Do Y, h:mm a')
+	              'ul',
+	              { style: { padding: 0 } },
+	              meta.map(function (f, i) {
+	                return _react2.default.createElement(
+	                  'li',
+	                  { key: i, style: { listStyle: 'none' } },
+	                  f.name,
+	                  ' - ',
+	                  formatBytes(f.byteSize)
+	                );
+	              })
 	            )
 	          ),
-	          _react2.default.createElement(
-	            'ul',
-	            { style: { padding: 0 } },
-	            files.map(function (f, i) {
+	          fileSchemas && fileSchemas.length > 0 && _react2.default.createElement(
+	            'div',
+	            { style: {
+	                display: 'inline-block', marginTop: 13, verticalAlign: 'top'
+	              } },
+	            fileSchemas.map(function (fs) {
+	              var files = fs.resources;
 	              return _react2.default.createElement(
-	                'li',
-	                { key: i, style: { listStyle: 'none' } },
+	                'div',
+	                { key: fs.schemaGuid },
 	                _react2.default.createElement(
-	                  'a',
-	                  { onClick: function onClick(e) {
-	                      return _this2.downloadFile(e, f);
-	                    } },
-	                  f.name
+	                  'div',
+	                  { style: { marginBottom: 4 } },
+	                  _react2.default.createElement(
+	                    'strong',
+	                    null,
+	                    (files && files.length) + ' file' + (files.length === 1 ? '' : 's')
+	                  ),
+	                  _react2.default.createElement(
+	                    'span',
+	                    null,
+	                    ' uploaded on '
+	                  ),
+	                  _react2.default.createElement(
+	                    'strong',
+	                    null,
+	                    (0, _moment2.default)(fs.uploadedTime).format('MMM Do Y, h:mm a')
+	                  )
 	                ),
 	                _react2.default.createElement(
-	                  'span',
-	                  null,
-	                  ' - ',
-	                  formatBytes(f.byteSize)
+	                  'ul',
+	                  { style: { padding: 0 } },
+	                  files.map(function (f, i) {
+	                    return _react2.default.createElement(
+	                      'li',
+	                      { key: i, style: { listStyle: 'none' } },
+	                      _react2.default.createElement(
+	                        'a',
+	                        { onClick: function onClick(e) {
+	                            return _this2.downloadFile(e, f);
+	                          } },
+	                        f.name
+	                      ),
+	                      _react2.default.createElement(
+	                        'span',
+	                        null,
+	                        ' - ',
+	                        formatBytes(f.byteSize)
+	                      )
+	                    );
+	                  })
 	                )
 	              );
 	            })
 	          )
-	        )
+	        ),
+	        ' '
 	      );
 	    }
 	  }]);
@@ -50584,6 +50597,7 @@ module.exports =
 	      metadataApi = providerConfig.metadataApi,
 	      credentialType = providerConfig.credentialType;
 	
+	  var isFlatFile = credentialType === 'FlatFile';
 	  if (!metadataEndpoint) {
 	    return function () {
 	      return Promise.resolve();
@@ -50598,9 +50612,9 @@ module.exports =
 	      metadataEndpoint = 'adaptermetadata?url=' + endpoint;
 	      isAdapter = true;
 	    }
-	    if (metadataEndpoint === 'fileschema') {
-	      metadataEndpoint = 'fileschema?schemaGuid=' + schemaGuid;
-	    }
+	    /*if(metadataEndpoint==='fileschema'){ // CHANGE FLAT FILE TO ALL IN ENV
+	      metadataEndpoint = `fileschema?schemaGuid=${schemaGuid}`
+	    }*/
 	    if (metadataEndpoint === 'schema/swagger/moodle' && creds.swaggerUrl) {
 	      metadataEndpoint = 'schema/swagger/moodle?swaggerUrl=' + creds.swaggerUrl;
 	    }
@@ -50617,8 +50631,7 @@ module.exports =
 	        }
 	      });
 	    } else {
-	      if (isOauth || isAdapter || providerType === 'Ethos') {
-	        // USE ONLY ENVS!!!
+	      if (isOauth || isAdapter || isFlatFile || providerType === 'Ethos') {
 	        return api.get(tenantId + '/' + appId + '/environments/' + envName + '/' + metadataEndpoint + (extraQuery || ''), {
 	          endpoint: config[metadataApi]
 	        });
@@ -50649,7 +50662,7 @@ module.exports =
 	          type: types.FINISH_WIZARD_ENV_CHECK,
 	          data: { metadata: { resources: metadata }, mode: mode, code: '200 OK', providerType: providerType }
 	        });
-	        return metadata;
+	        return d.guids;
 	      });
 	    }).catch(function (err) {
 	      console.log(err);
@@ -55398,7 +55411,7 @@ module.exports =
 	        _this2.setState(_defineProperty({}, mode + 'EnvChecking', false));
 	        // set meta for File Schema step if needed
 	        // set defaults of filename and delimiter
-	        var isSFTP = metadata && metadata.providerType.toLowerCase() === 'sftp';
+	        var isSFTP = metadata && metadata.providerType && metadata.providerType.toLowerCase() === 'sftp';
 	        if (isSFTP) {
 	          (function () {
 	            var savedFileSchema = [];
@@ -55420,7 +55433,7 @@ module.exports =
 	          })();
 	        }
 	
-	        var isFlat = metadata && metadata.providerType.toLowerCase() === 'flatfile';
+	        var isFlat = metadata && metadata[0] && metadata[0].providerType && metadata[0].providerType.toLowerCase() === 'flatfile';
 	        if (isFlat) {
 	          change(mode + 'FileSchema', metadata);
 	        }
@@ -55521,6 +55534,8 @@ module.exports =
 	  }, {
 	    key: 'setCsvFields',
 	    value: function setCsvFields(metadata, contents, mode, providerType) {
+	      var _this4 = this;
+	
 	      var _props7 = this.props,
 	          tenantId = _props7.tenantId,
 	          accountId = _props7.accountId,
@@ -55528,16 +55543,13 @@ module.exports =
 	          accountKey = _props7.accountKey,
 	          wizard = _props7.wizard,
 	          actions = _props7.actions,
-	          formValues = _props7.formValues,
-	          change = _props7.change;
+	          formValues = _props7.formValues;
 	
 	      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 () {
-	        change(mode + 'FileSchema', {
-	          uploadedTime: new Date().getTime(),
-	          resources: 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, '');
 	      });
 	    }
 	  }, {
@@ -55572,7 +55584,7 @@ module.exports =
 	  }, {
 	    key: 'render',
 	    value: function render() {
-	      var _this4 = this;
+	      var _this5 = this;
 	
 	      var _props9 = this.props,
 	          inputs = _props9.inputs,
@@ -55639,16 +55651,16 @@ module.exports =
 	            _react2.default.createElement('br', null),
 	            modes.map(function (m) {
 	              var isSelected = step[m + 'Provider'] === selectedProvider;
-	              var checking = _this4.state[m + 'EnvChecking'];
+	              var checking = _this5.state[m + 'EnvChecking'];
 	              var adapterSecret = wizard.savedCredentials && wizard.savedCredentials[m + 'AdapterSecret'] && wizard.savedCredentials[m + 'AdapterSecret'].credentials;
-	              var customSettings = _this4.createCustomSettings(m);
+	              var customSettings = _this5.createCustomSettings(m);
 	              return _react2.default.createElement(
 	                'div',
 	                { key: m, className: 'env-section' },
 	                _react2.default.createElement(
 	                  'div',
 	                  { onClick: function onClick() {
-	                      return _this4.selectProvider(step[m + 'Provider']);
+	                      return _this5.selectProvider(step[m + 'Provider']);
 	                    },
 	                    className: 'env-section-header' },
 	                  _react2.default.createElement(EnvCheckIcons, { wizard: wizard, inputs: inputs, mode: m, checking: checking,
@@ -55663,7 +55675,7 @@ module.exports =
 	                  'div',
 	                  { className: 'env-inspect-button',
 	                    onClick: function onClick() {
-	                      return _this4.setState({ showResources: m });
+	                      return _this5.setState({ showResources: m });
 	                    } },
 	                  _react2.default.createElement(
 	                    'span',
@@ -55692,29 +55704,29 @@ module.exports =
 	                    _react2.default.createElement(
 	                      _credSections2.default,
 	                      { config: step[m + 'Config'], checking: checking,
-	                        wizard: wizard, getOauthUrl: _this4.getOauthUrl.bind(_this4),
+	                        wizard: wizard, getOauthUrl: _this5.getOauthUrl.bind(_this5),
 	                        formValues: formValues, inputs: inputs,
 	                        generateNewAdapterSecret: function generateNewAdapterSecret() {
-	                          return _this4.generateNewAdapterSecret(m);
+	                          return _this5.generateNewAdapterSecret(m);
 	                        },
-	                        seeFields: _this4.seeFields.bind(_this4),
+	                        seeFields: _this5.seeFields.bind(_this5),
 	                        fileSchema: formValues[m + 'FileSchema'],
 	                        check: function check(actualCreds, extraQuery) {
-	                          _this4.check(m, null, actualCreds, null, extraQuery);
+	                          _this5.check(m, null, actualCreds, null, extraQuery);
 	                        }, change: change,
 	                        tenantKey: tenantKey, accountKey: accountKey,
 	                        setCsvFields: function setCsvFields(meta, contents, providerType) {
-	                          return _this4.setCsvFields(meta, contents, m, providerType);
+	                          return _this5.setCsvFields(meta, contents, m, providerType);
 	                        },
-	                        downloadFileFromAws: _this4.downloadFileFromAws,
+	                        downloadFileFromAws: _this5.downloadFileFromAws,
 	                        clearCsvFields: function clearCsvFields() {
-	                          return _this4.clearCsvFields(m);
+	                          return _this5.clearCsvFields(m);
 	                        },
 	                        creds: formValues[m + 'Credentials'],
 	                        envCheckResult: wizard[m + 'CheckResult'],
 	                        adapterSecret: adapterSecret,
 	                        checkOauthCreds: function checkOauthCreds(phase) {
-	                          return _this4.checkOauthCreds(phase, m);
+	                          return _this5.checkOauthCreds(phase, m);
 	                        } },
 	                      _react2.default.isValidElement(customSettings) ? _react2.default.cloneElement(customSettings) : null
 	                    )
@@ -55726,7 +55738,7 @@ module.exports =
 	        ),
 	        this.state.showResources && _react2.default.createElement(PreviewModal, {
 	          onHide: function onHide() {
-	            return _this4.setState({ showResources: null });
+	            return _this5.setState({ showResources: null });
 	          },
 	          mode: this.state.showResources, wizard: wizard,
 	          step: step, inputs: inputs,
@@ -55758,7 +55770,7 @@ module.exports =
 	
 	  var Modal = inputs.Modal;
 	  var config = step[mode + 'Config'];
-	
+	  console.log(wizard[mode + 'Metadata']);
 	  var POSTS = wizard[mode + 'Metadata'] && wizard[mode + 'Metadata'].filter(function (m) {
 	    return m.method === 'POST' || m.method === 'PUT';
 	  });
@@ -55897,12 +55909,12 @@ module.exports =
 	  function CustomSalesforceSettings() {
 	    _classCallCheck(this, CustomSalesforceSettings);
 	
-	    var _this5 = _possibleConstructorReturn(this, (CustomSalesforceSettings.__proto__ || Object.getPrototypeOf(CustomSalesforceSettings)).call(this));
+	    var _this6 = _possibleConstructorReturn(this, (CustomSalesforceSettings.__proto__ || Object.getPrototypeOf(CustomSalesforceSettings)).call(this));
 	
-	    _this5.state = {
+	    _this6.state = {
 	      custom: false
 	    };
-	    return _this5;
+	    return _this6;
 	  }
 	
 	  _createClass(CustomSalesforceSettings, [{
@@ -55917,7 +55929,7 @@ module.exports =
 	  }, {
 	    key: 'render',
 	    value: function render() {
-	      var _this6 = this;
+	      var _this7 = this;
 	
 	      var inputs = this.props.inputs;
 	      var Radio = inputs.Radio;
@@ -55933,7 +55945,7 @@ module.exports =
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(Radio, { onChange: function onChange() {
-	            return _this6.setState({ custom: false });
+	            return _this7.setState({ custom: false });
 	          },
 	          label: 'Default Batch Size (10,000)',
 	          checked: this.state.custom === false,
@@ -55941,7 +55953,7 @@ module.exports =
 	        }),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(Radio, { onChange: function onChange() {
-	            return _this6.setState({ custom: true });
+	            return _this7.setState({ custom: true });
 	          },
 	          label: 'Custom Batch Size',
 	          checked: this.state.custom === true,
@@ -56591,9 +56603,9 @@ module.exports =
 	        _react2.default.createElement(
 	          'div',
 	          { className: 'labelz', style: { fontSize: '14px', marginBottom: 5 } },
-	          fileSchema && fileSchema.resources && fileSchema.fileSchema.length > 0 ? 'Available Files:' : 'No available files. Please upload files to your SFTP server and click Check Connection in the Environments step.'
+	          fileSchema && fileSchema.resources && fileSchema.resources.length > 0 ? 'Available Files:' : 'No available files. Please upload files to your SFTP server and click Check Connection in the Environments step.'
 	        ),
-	        fileSchema && fileSchema.resources && fileSchema.fileSchema.length > 0 && _react2.default.createElement(FileTable, {
+	        fileSchema && fileSchema.resources && fileSchema.resources.length > 0 && _react2.default.createElement(FileTable, {
 	          files: fileSchema.resources, inputs: inputs, mode: step.mode,
 	          removeFile: this.removeFile
 	        }),
@@ -59284,18 +59296,24 @@ module.exports =
 	          environmentId: String(formValues['environmentId'])
 	        }, formValues['batchSize'] && { batchSize: formValues['batchSize'] }, formValues['includeSystemResources'] && { includeSystemResources: formValues['includeSystemResources'] ? 'true' : 'false' });
 	        // saving schemas for SFTP, so there does not have to be a file on server to reload wizard
-	        var sourceFileSchema = {
-	          resources: formValues['sourceFileSchema'],
-	          name: title + ' Schema',
-	          providerType: wizardConfig.source.type,
-	          isSource: true
-	        };
-	        var destinationFileSchema = {
-	          resources: formValues['destinationFileSchema'],
-	          name: title + ' Schema',
-	          providerType: wizardConfig.destination.type,
-	          isSource: false
-	        };
+	        var sourceFileSchema = {};
+	        var destinationFileSchema = {};
+	        if (formValues['sourceFileSchema'] && wizardConfig.source.type.toLowerCase() === 'sftp') {
+	          sourceFileSchema = {
+	            resources: formValues['sourceFileSchema'].resources,
+	            name: title + ' Schema',
+	            providerType: wizardConfig.source.type,
+	            isSource: true
+	          };
+	        }
+	        if (formValues['destinationFileSchema'] && wizardConfig.destination.type.toLowerCase() === 'sftp') {
+	          destinationFileSchema = {
+	            resources: formValues['destinationFileSchema'].resources,
+	            name: title + ' Schema',
+	            providerType: wizardConfig.destination.type,
+	            isSource: false
+	          };
+	        }
 	        return { title: title, envName: envName, envId: envId, bundles: bundles, mappings: mappings, typeId: typeId, typeGuid: typeGuid, configuration: configuration, deployment: deployment, sourceFileSchema: sourceFileSchema, destinationFileSchema: destinationFileSchema };
 	      }
 	      var form = crunch(formValues, this.props.wizardConfig, this.props.wizard);