@lingk/sync 1.0.24 → 1.0.26

package/build/main.js

@@ -3273,21 +3273,26 @@ module.exports =
 	          var primaryKeyResourceName = null;
 	          if (primaryDataSourceMetadata) {
 	            if (rsc.primaryKeyName) {
-	              //primaryKeyName coming from parameter (another resource)
-	              deNestedPrimaryKey = { property: rsc.primaryKeyName };
-	              primaryKeyResourceName = rsc.primaryKeyResource;
-	
-	              // primaryKeyName coming from field on this resource
-	              if (primaryResourceName === rsc.parentNameAndProvider.substr(0, rsc.parentNameAndProvider.lastIndexOf('_'))) {
-	                //if(primaryResourceName===rsc.primaryKeyResource){
-	                var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
-	                  return r.type === rsc.primaryKeyResource;
+	              (function () {
+	                //primaryKeyName coming from parameter (another resource)
+	                deNestedPrimaryKey = { property: rsc.primaryKeyName };
+	                primaryKeyResourceName = rsc.primaryKeyResource;
+	
+	                // primaryKeyName coming from resource IN THIS BUNDLE
+	                var primaryKeyResourceResource = bundle.resources.find(function (r) {
+	                  return primaryResourceName === r.resourceLabel;
 	                });
-	                if (rscPrimaryResource) {
-	                  deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
-	                  primaryKeyResourceName = rscPrimaryResource.name;
+	                if (primaryKeyResourceResource) {
+	                  //if(primaryResourceName===rsc.primaryKeyResource){
+	                  var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
+	                    return r.name === primaryKeyResourceResource.resourceLabel;
+	                  });
+	                  if (rscPrimaryResource) {
+	                    deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
+	                    primaryKeyResourceName = rscPrimaryResource.name;
+	                  }
 	                }
-	              }
+	              })();
 	            }
 	          }
 	          /*const primaryResourceProvider = bundle.resources[0].provider
@@ -17439,13 +17444,28 @@ module.exports =
 	  };
 	}
 	
-	function callGetScenarioList(tenantId, appId, typeGuid) {
+	function callGetScenarioList(tenantId, appId, typeGuid, isGlobal, isOrgAdmin) {
 	  return function (dispatch, getState, api) {
 	    var _getState9 = getState(),
 	        config = _getState9.config;
 	
 	    return api.get(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
 	      endpoint: config.TRANS_API_URL
+	    }).then(function (r) {
+	      var scenarios = r;
+	      if (isGlobal) {
+	        scenarios = r.filter(function (s) {
+	          return s.tenantId === 2147483647;
+	        });
+	      }
+	      if (isOrgAdmin) {
+	        scenarios = r.filter(function (s) {
+	          return s.tenantId === parseInt(tenantId, 10);
+	        });
+	      }
+	      return scenarios.sort(function (a, b) {
+	        return a.orderNum - b.orderNum;
+	      });
 	    });
 	  };
 	}
@@ -17462,14 +17482,20 @@ module.exports =
 	  };
 	}
 	
-	function callUpdateScenarioList(tenantId, appId, typeGuid, scenarioIds) {
+	function callUpdateScenarioList(tenantId, appId, typeGuid, scenarios, isGlobal) {
 	  return function (dispatch, getState, api) {
 	    var _getState11 = getState(),
 	        config = _getState11.config;
 	
-	    return api.post(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
+	    return api.post(tenantId + '/' + appId + '/scenarios/' + typeGuid + (isGlobal ? '/global' : ''), {
 	      endpoint: config.TRANS_API_URL,
-	      data: scenarioIds
+	      data: scenarios.map(function (s, i) {
+	        return {
+	          id: s.id,
+	          orderNum: i,
+	          deleted: s.deleted ? 1 : 0 // all uints in the backend, easy
+	        };
+	      })
 	    });
 	  };
 	}
@@ -23307,7 +23333,7 @@ module.exports =
 	            sourceSchema: sourceSchema, destinationSchema: destinationSchema })
 	        ) : null,
 	        _react2.default.createElement('br', null),
-	        step.isFramework && _react2.default.createElement(
+	        (step.isFramework || step.isOrgAdmin) && _react2.default.createElement(
 	          'div',
 	          null,
 	          ' ',
@@ -23871,12 +23897,17 @@ module.exports =
 	        return !o.isReverse;
 	      });
 	
-	      var options = [{
+	      var globalOptions = [{
 	        id: '0',
 	        title: 'Start From Scratch',
 	        label: 'Get started without any automatic mappings.'
-	      }].concat(opts);
-	      var scenarioOrder = step.scenarioOrder || [];
+	      }].concat(opts.filter(function (o) {
+	        return o.tenantId === 2147483647;
+	      }));
+	
+	      var localOptions = opts.filter(function (o) {
+	        return o.tenantId === parseInt(_this3.props.tenantId, 10);
+	      });
 	
 	      return _react2.default.createElement(
 	        'form',
@@ -23895,13 +23926,15 @@ module.exports =
 	          'Each scenario is designed to get you started with new data-driven reports, dashboards and notifications. Extend the scenarios to include your own custom objects in the following steps.'
 	        ),
 	        _react2.default.createElement('br', null),
+	        localOptions && localOptions.length > 0 && _react2.default.createElement(
+	          'div',
+	          { style: { fontSize: '16px', marginBottom: 12 } },
+	          ' Global Scenarios'
+	        ),
 	        _react2.default.createElement(
 	          'div',
 	          { style: { marginLeft: 16 } },
-	          scenarioOrder && ['0'].concat(scenarioOrder).map(function (s, i) {
-	            var o = options.find(function (opt) {
-	              return String(opt.id) === s;
-	            });
+	          globalOptions && globalOptions.map(function (o, i) {
 	            return o && _react2.default.createElement(
 	              'div',
 	              { key: i },
@@ -23923,6 +23956,40 @@ module.exports =
 	          })
 	        ),
 	        _react2.default.createElement('br', null),
+	        localOptions && localOptions.length > 0 && _react2.default.createElement(
+	          'div',
+	          null,
+	          _react2.default.createElement(
+	            'div',
+	            { style: { fontSize: '16px', marginBottom: 12 } },
+	            'Custom Scenarios'
+	          ),
+	          _react2.default.createElement(
+	            'div',
+	            { style: { marginLeft: 16 } },
+	            localOptions && localOptions.map(function (o, i) {
+	              return o && _react2.default.createElement(
+	                'div',
+	                { key: i },
+	                _react2.default.createElement(Radio, { onChange: function onChange() {
+	                    return _this3.select(o);
+	                  },
+	                  label: '' + o.title + (_this3.state.currentlyLoadingScenario === String(o.id) ? _this3.state.loadingDots : ''),
+	                  checked: String(o.id) === scenario, style: { cursor: 'pointer' }
+	                }),
+	                _react2.default.createElement('br', null),
+	                _react2.default.createElement(
+	                  'span',
+	                  { className: 'labelz' },
+	                  o.label
+	                ),
+	                _react2.default.createElement('br', null),
+	                _react2.default.createElement('br', null)
+	              );
+	            })
+	          )
+	        ),
+	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !scenario || this.state.currentlyLoadingScenario || !(wizard.savedConfiguration && wizard.savedConfiguration.scenario) && !wizard.gotScenario ? true : false, handleSubmit: handleSubmit,
 	          nav: nav, reset: reset, inputs: inputs, isAdmin: this.props.isAdmin }),
 	        _react2.default.createElement('br', null),
@@ -24719,8 +24786,7 @@ module.exports =
 	      title: '',
 	      description: '',
 	      loading: false,
-	      manageScenarios: false,
-	      scenarioOrder: []
+	      manageScenarios: false
 	    };
 	    _this.submitModal = _this.submitModal.bind(_this);
 	    _this.deleteScenario = _this.deleteScenario.bind(_this);
@@ -24741,10 +24807,7 @@ module.exports =
 	          step = _props.step;
 	
 	      this.setState({ loading: true });
-	      if (step.scenarioOrder && step.scenarioOrder.length > 0) {
-	        this.setState({ scenarioOrder: [].concat(_toConsumableArray(step.scenarioOrder)) });
-	      }
-	      actions.callGetScenarioList(tenantId, accountId, step.typeGuid).then(function (r) {
+	      actions.callGetScenarioList(tenantId, accountId, step.typeGuid, step.isFramework, step.isOrgAdmin).then(function (r) {
 	        _this2.setState({ scenarios: r, loading: false });
 	      });
 	    }
@@ -24757,7 +24820,7 @@ module.exports =
 	          title = _state.title,
 	          description = _state.description,
 	          manageScenarios = _state.manageScenarios,
-	          scenarioOrder = _state.scenarioOrder;
+	          scenarios = _state.scenarios;
 	      var _props2 = this.props,
 	          tenantId = _props2.tenantId,
 	          accountId = _props2.accountId,
@@ -24769,10 +24832,10 @@ module.exports =
 	
 	      if (manageScenarios) {
 	        this.setState({ loading: true });
-	        actions.callUpdateScenarioList(tenantId, accountId, step.typeGuid, scenarioOrder).then(function (it) {
+	        actions.callUpdateScenarioList(tenantId, accountId, step.typeGuid, scenarios, step.isFramework).then(function (wizTypeGuid) {
 	          actions.callGetScenarioList(tenantId, accountId, step.typeGuid).then(function (r) {
 	            _this3.setState({ loading: false });
-	            _this3.props.done({ wiz: it, scenarios: r });
+	            _this3.props.done({ typeGuid: wizTypeGuid, scenarios: r });
 	          });
 	        });
 	      } else {
@@ -24792,10 +24855,10 @@ module.exports =
 	        var data = { bundles: bundles, mappings: mappings, title: title, label: description, typeGuid: step.typeGuid, isReverse: isReverse, isGlobal: step.isFramework };
 	
 	        // 2147483647 is MaxInt32, for global scenarios
-	        actions.callCreateScenario(tenantId, accountId, data).then(function (it) {
+	        actions.callCreateScenario(tenantId, accountId, data).then(function (wizTypeGuid) {
 	          actions.callGetScenarioList(tenantId, accountId, step.typeGuid).then(function (r) {
 	            _this3.setState({ loading: false });
-	            _this3.props.done({ wiz: it, scenarios: r });
+	            _this3.props.done({ typeGuid: wizTypeGuid, scenarios: r });
 	          });
 	        });
 	        /**/
@@ -24804,33 +24867,34 @@ module.exports =
 	  }, {
 	    key: 'deleteScenario',
 	    value: function deleteScenario(id, i) {
-	      var scenarioOrder = this.state.scenarioOrder;
-	
-	      scenarioOrder.splice(i, 1);
-	      this.setState({ scenarioOrder: scenarioOrder });
+	      var scenarios = [].concat(_toConsumableArray(this.state.scenarios.filter(function (s) {
+	        return !s.deleted;
+	      })));
+	      scenarios[i].deleted = true;
+	      // put deleted ones on the end, to simplify updating order
+	      scenarios.splice(scenarios.length - 1, 0, scenarios.splice(i, 1)[0]);
+	      this.setState({ scenarios: scenarios });
 	    }
 	  }, {
 	    key: 'moveUp',
 	    value: function moveUp(id, i) {
-	      var scenarioOrder = this.state.scenarioOrder;
-	
+	      var scenarios = [].concat(_toConsumableArray(this.state.scenarios.filter(function (s) {
+	        return !s.deleted;
+	      })));
 	      if (i !== 0) {
-	        var temp = scenarioOrder[i];
-	        scenarioOrder[i] = scenarioOrder[i - 1];
-	        scenarioOrder[i - 1] = temp;
-	        this.setState({ scenarioOrder: scenarioOrder });
+	        scenarios.splice(i - 1, 0, scenarios.splice(i, 1)[0]);
+	        this.setState({ scenarios: scenarios });
 	      }
 	    }
 	  }, {
 	    key: 'moveDown',
 	    value: function moveDown(id, i) {
-	      var scenarioOrder = this.state.scenarioOrder;
-	
-	      if (i !== scenarioOrder.length - 1) {
-	        var temp = scenarioOrder[i];
-	        scenarioOrder[i] = scenarioOrder[i + 1];
-	        scenarioOrder[i + 1] = temp;
-	        this.setState({ scenarioOrder: scenarioOrder });
+	      var scenarios = [].concat(_toConsumableArray(this.state.scenarios.filter(function (s) {
+	        return !s.deleted;
+	      })));
+	      if (i !== scenarios.length - 1) {
+	        scenarios.splice(i + 1, 0, scenarios.splice(i, 1)[0]);
+	        this.setState({ scenarios: scenarios });
 	      }
 	    }
 	  }, {
@@ -24846,15 +24910,16 @@ module.exports =
 	      var _state2 = this.state,
 	          title = _state2.title,
 	          description = _state2.description,
-	          scenarios = _state2.scenarios,
 	          manageScenarios = _state2.manageScenarios,
-	          loading = _state2.loading,
-	          scenarioOrder = _state2.scenarioOrder;
+	          loading = _state2.loading;
 	
 	      var Modal = inputs.Modal;
 	      var Input = inputs.Input;
 	      var Spinner = inputs.Spinner;
 	      var Textarea = inputs.Textarea;
+	      var scenarios = this.state.scenarios && this.state.scenarios.filter(function (s) {
+	        return !s.deleted;
+	      });
 	
 	      return _react2.default.createElement(
 	        'div',
@@ -24864,7 +24929,7 @@ module.exports =
 	          { opened: opened, hideModal: hideModal, submitModal: this.submitModal, showCancel: true,
 	            title: manageScenarios ? 'Manage Scenarios' : 'Create New Scenario',
 	            submitLabel: manageScenarios ? 'Update Scenarios' : 'Save Scenario',
-	            submitDisabled: loading || (!manageScenarios ? !title || !description : JSON.stringify(step.scenarioOrder) === JSON.stringify(scenarioOrder)) },
+	            submitDisabled: loading || !manageScenarios && (!title || !description) },
 	          _react2.default.createElement(
 	            'div',
 	            null,
@@ -24922,44 +24987,50 @@ module.exports =
 	              { style: { padding: 26 } },
 	              loading ? _react2.default.createElement(Spinner, null) : _react2.default.createElement(
 	                'div',
-	                { style: { padding: '10px 0', border: '1px solid #EEE' } },
-	                scenarios && scenarioOrder && scenarioOrder.map(function (so, i) {
-	                  var s = scenarios.find(function (sce) {
-	                    return String(sce.id) === so;
-	                  });
-	                  return s ? _react2.default.createElement(
-	                    'div',
-	                    { key: i, style: { whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', position: 'relative', height: 19, width: '100%' } },
-	                    _react2.default.createElement(
-	                      'span',
-	                      { style: i !== 0 ? { cursor: 'pointer' } : { color: '#DDD' },
-	                        onClick: function onClick() {
-	                          return _this4.moveUp(s.id, i);
-	                        } },
-	                      '\u25B2'
-	                    ),
-	                    _react2.default.createElement(
-	                      'span',
-	                      { style: i !== scenarioOrder.length - 1 ? { cursor: 'pointer' } : { color: '#DDD' }, onClick: function onClick() {
-	                          return _this4.moveDown(s.id, i);
-	                        } },
-	                      '\u25BC'
-	                    ),
-	                    _react2.default.createElement(
-	                      'span',
-	                      null,
-	                      '\xA0\xA0',
-	                      s.title
-	                    ),
-	                    _react2.default.createElement(
+	                null,
+	                _react2.default.createElement(
+	                  'div',
+	                  { style: { marginBottom: 10, fontSize: '16px' } },
+	                  step.isFramework ? 'Global Scenarios' : 'Custom Scenarios'
+	                ),
+	                _react2.default.createElement(
+	                  'div',
+	                  { style: { padding: '10px 0', border: '1px solid #EEE' } },
+	                  scenarios && scenarios.map(function (s, i) {
+	                    return s ? _react2.default.createElement(
 	                      'div',
-	                      { onClick: function onClick() {
-	                          return _this4.deleteScenario(s.id, i);
-	                        }, style: { position: 'absolute', right: 9, top: 0, color: '#c23934', cursor: 'pointer' } },
-	                      'x'
-	                    )
-	                  ) : _react2.default.createElement('span', { key: i });
-	                })
+	                      { key: i, style: { whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', position: 'relative', height: 19, width: '100%' } },
+	                      _react2.default.createElement(
+	                        'span',
+	                        { style: i !== 0 ? { cursor: 'pointer' } : { color: '#DDD' },
+	                          onClick: function onClick() {
+	                            return _this4.moveUp(s.id, i);
+	                          } },
+	                        '\u25B2'
+	                      ),
+	                      _react2.default.createElement(
+	                        'span',
+	                        { style: i !== scenarios.length - 1 ? { cursor: 'pointer' } : { color: '#DDD' }, onClick: function onClick() {
+	                            return _this4.moveDown(s.id, i);
+	                          } },
+	                        '\u25BC'
+	                      ),
+	                      _react2.default.createElement(
+	                        'span',
+	                        null,
+	                        '\xA0\xA0',
+	                        s.title
+	                      ),
+	                      _react2.default.createElement(
+	                        'div',
+	                        { onClick: function onClick() {
+	                            return _this4.deleteScenario(s.id, i);
+	                          }, style: { position: 'absolute', right: 9, top: 0, color: '#c23934', cursor: 'pointer' } },
+	                        'x'
+	                      )
+	                    ) : _react2.default.createElement('span', { key: i });
+	                  })
+	                )
 	              )
 	            ),
 	            _react2.default.createElement('a', { ref: function ref(_ref) {
@@ -25526,74 +25597,28 @@ module.exports =
 	
 	    var _this = _possibleConstructorReturn(this, (LingkSync.__proto__ || Object.getPrototypeOf(LingkSync)).call(this));
 	
-	    _this.state = {
-	      steps: null
-	    };
-	    //-----------------------------
-	    //  3 Types:
-	    //  Point-to-point
-	    //  Api creation
-	    //  Event pub/sub
-	    //-----------------------------
-	    _this.allSteps = [
-	    // Point-to-point
-	    {
-	      type: 'name',
-	      title: 'Name'
-	    }, {
-	      type: 'env',
-	      title: 'Environments'
-	    }, {
-	      type: 'file',
-	      title: 'File Processing',
-	      mode: 'source'
-	    }, {
-	      type: 'scenario',
-	      title: 'Data Scenario'
-	    }, {
-	      type: 'schema',
-	      title: 'Object Mapping',
-	      mode: 'source'
-	    }, {
-	      type: 'map',
-	      title: 'Field Mapping'
-	    }, {
-	      type: 'deploy',
-	      title: 'Deploy'
-	    }];
-	    return _this;
-	  }
-	
-	  _createClass(LingkSync, [{
-	    key: 'componentWillUnmount',
-	    value: function componentWillUnmount() {
-	      this.props.actions.clearWizardFormData();
-	    }
-	  }, {
-	    key: 'componentWillMount',
-	    value: function componentWillMount() {
-	      var wizard = this.props.wizardConfig;
+	    _this.makeSteps = function (scenarios) {
+	      var wizard = _this.props.wizardConfig;
 	      var stepList = [];
-	      for (var i = 0; i < this.allSteps.length; i++) {
-	        var step = this.allSteps[i];
+	      for (var i = 0; i < _this.allSteps.length; i++) {
+	        var step = _this.allSteps[i];
 	        step.sourceConfig = wizard.source;
 	        step.destinationConfig = wizard.destination;
 	        step.sourceProvider = wizard.source.type;
 	        step.destinationProvider = wizard.destination.type;
-	        step.isFramework = this.props.isFramework;
-	        step.isOrgAdmin = this.props.isOrgAdmin;
+	        step.isFramework = _this.props.isFramework;
+	        step.isOrgAdmin = _this.props.isOrgAdmin;
 	        if (step.type === 'name') {
 	          step.name = wizard.title;
 	          stepList.push(step);
 	        } else if (step.type === 'env') {
-	          step.previewToken = this.props.previewToken;
+	          step.previewToken = _this.props.previewToken;
 	          step.typeGuid = wizard.typeGuid;
 	          stepList.push(step);
 	        } else if (step.type === 'file' && wizard.source.type === 'SFTP') {
 	          stepList.push(step);
-	        } else if (step.type === 'scenario' && wizard.scenarios.length > 0) {
-	          step.options = wizard.scenarios;
-	          step.scenarioOrder = wizard.scenarioIds;
+	        } else if (step.type === 'scenario' && scenarios.length > 0) {
+	          step.options = scenarios;
 	          step.magicNumber = '2147483647';
 	          stepList.push(step);
 	        } else if (step.type === 'environment') {
@@ -25604,7 +25629,7 @@ module.exports =
 	            step.credentials = wizard.source.credentials || null;
 	            step.metadataEndpoint = wizard.source.metadataEndpoint;
 	            step.metadataApi = wizard.source.metadataApi;
-	            step.previewToken = this.props.previewToken;
+	            step.previewToken = _this.props.previewToken;
 	            step.bidirectional = wizard.source.bidirectional;
 	            stepList.push(step);
 	          } else if (step.mode === 'destination' && !wizard.destination.skipEnvStep) {
@@ -25613,7 +25638,7 @@ module.exports =
 	            step.credentials = wizard.destination.credentials || null;
 	            step.metadataEndpoint = wizard.destination.metadataEndpoint;
 	            step.metadataApi = wizard.destination.metadataApi;
-	            step.previewToken = this.props.previewToken;
+	            step.previewToken = _this.props.previewToken;
 	            step.bidirectional = wizard.destination.bidirectional;
 	            stepList.push(step);
 	          }
@@ -25622,16 +25647,74 @@ module.exports =
 	        } else if (step.type === 'map') {
 	          step.customizable = wizard.destination.customizable;
 	          step.typeGuid = wizard.typeGuid;
-	          step.scenarioOrder = wizard.scenarioIds;
 	          stepList.push(step);
 	        } else if (step.type === 'deploy') {
 	          step.options = ['once', 'daily', 'repeating'];
 	          stepList.push(step);
 	        }
 	      }
-	      this.setState({
+	      _this.setState({
 	        steps: stepList
 	      });
+	    };
+	
+	    _this.state = {
+	      steps: null
+	    };
+	    //-----------------------------
+	    //  3 Types:
+	    //  Point-to-point
+	    //  Api creation
+	    //  Event pub/sub
+	    //-----------------------------
+	    _this.allSteps = [
+	    // Point-to-point
+	    {
+	      type: 'name',
+	      title: 'Name'
+	    }, {
+	      type: 'env',
+	      title: 'Environments'
+	    }, {
+	      type: 'file',
+	      title: 'File Processing',
+	      mode: 'source'
+	    }, {
+	      type: 'scenario',
+	      title: 'Data Scenario'
+	    }, {
+	      type: 'schema',
+	      title: 'Object Mapping',
+	      mode: 'source'
+	    }, {
+	      type: 'map',
+	      title: 'Field Mapping'
+	    }, {
+	      type: 'deploy',
+	      title: 'Deploy'
+	    }];
+	    return _this;
+	  }
+	
+	  _createClass(LingkSync, [{
+	    key: 'componentWillUnmount',
+	    value: function componentWillUnmount() {
+	      this.props.actions.clearWizardFormData();
+	    }
+	  }, {
+	    key: 'componentWillMount',
+	    value: function componentWillMount() {
+	      var _this2 = this;
+	
+	      var _props = this.props,
+	          tenantId = _props.tenantId,
+	          accountId = _props.accountId,
+	          actions = _props.actions,
+	          wizardConfig = _props.wizardConfig;
+	
+	      actions.callGetScenarioList(tenantId, accountId, wizardConfig.typeGuid).then(function (r) {
+	        return _this2.makeSteps(r);
+	      });
 	    }
 	  }, {
 	    key: 'render',