post works with tags check

salesforce · Nov 28, 2016 · 3d5f345 · 3d5f345
1 parent dca69c4
commit 3d5f345
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/view/admin/components/common/Forms.js b/view/admin/components/common/Forms.js
@@ -112,6 +112,7 @@ const Form = React.createClass({
       // what if needs more than name and value?
       // unit test this
       const propsFromForm = propertyMetaData[i].propsFromForm;
+      console.log(propsFromForm)
       if (propsFromForm && propsFromForm.length) {
         for (let j = propsFromForm.length - 1; j >= 0; j--) {
           obj[propsFromForm[j]] = (
@@ -124,6 +125,7 @@ const Form = React.createClass({
       let fieldValue = '';
       // give value to custom renderer
       if (propertyMetaData[i].hasOwnProperty('customOutput')) {
+        console.log('********', propertyMetaData[i].propertyName, obj)
         // does every field have a fieldvalue?
         fieldValue = propertyMetaData[i].customOutput(
           Object.assign({}, obj, { disabled: !edit })

diff --git a/view/admin/components/pages/Detail.js b/view/admin/components/pages/Detail.js
@@ -98,7 +98,7 @@ class Detail extends React.Component {
     const keys = Object.keys(failedFields);
     if (keys.length) {
       this.setIinvalidFieldObj(failedFields);
-      this.showError('error from create. ' + keys.join(', ') + ' failed validation');
+      this.showError('error from update: ' + keys.join(', ') + ' failed validation');
     } else {
       // all fields are valid
       this.setIinvalidFieldObj({});

diff --git a/view/admin/components/pages/List.js b/view/admin/components/pages/List.js
@@ -30,6 +30,7 @@ import ErrorRender from '../common/ErrorRender';
 class List extends React.Component {
   constructor(props) {
     super(props);
+    this.setIinvalidFieldObj = this.setIinvalidFieldObj.bind(this);
     this.postForm = this.postForm.bind(this);
     this.showError = this.showError.bind(this);
     this.closeError = this.closeError.bind(this);
@@ -42,6 +43,7 @@ class List extends React.Component {
     this.state = {
       delResource: false,
       error: '',
+      invalidFieldObj: {},
     };
   }
 
@@ -84,16 +86,27 @@ class List extends React.Component {
     const { history, postResource, checkValidation, url } = this.props;
     // if array contains fields, show error
     const failedFields = checkValidation(propertyMetaData, formObj);
-    if (failedFields.length) {
-      this.showError('error from create. ' + failedFields.join(', ') + ' failed validation');
+    const keys = Object.keys(failedFields);
+    if (keys.length) {
+      this.setIinvalidFieldObj(failedFields);
+      this.showError('error from create: ' + keys.join(', ') + ' failed validation');
     } else {
+      // all fields valid
+      this.setIinvalidFieldObj({});
       // go to details page
       postResource(formObj, goToUrl, (redirectUrl) => {
         history.push(redirectUrl);
       });
     }
   }
 
+  // obj contains invalid fields and their data
+  setIinvalidFieldObj(invalidFieldObj) {
+    this.setState({
+      invalidFieldObj,
+    });
+  }
+
   postForm() {
     const { url, getFormData } = this.props;
     const form = this.refs.addResourceForm;
@@ -152,6 +165,12 @@ class List extends React.Component {
       tableOpts.parentAbsolutePath = urlQuery.split('=').pop() || 'dummy';
       formOpts.parentAbsolutePath = urlQuery.split('=').pop();
     }
+    const { invalidFieldObj } = this.state;
+    // if invalid input, show them
+    if ( Object.keys(invalidFieldObj).length) {
+      formOpts.data = invalidFieldObj;
+    }
+
     const errorMessage = this.state.error ? <ErrorRender
         hide={this.closeError.bind(this)}
         error={ this.state.error }

diff --git a/view/admin/config/create.js b/view/admin/config/create.js
@@ -43,6 +43,7 @@ obj.samples = [
 obj.subjects = [{
   propertyName: 'name',
   displayName: 'Name',
+  validate: /^[0-9A-Za-z_\\-]{1,60}$/,
 }, {
   propertyName: 'parentAbsolutePath',
   displayName: 'Parent Absolute Path',

diff --git a/view/admin/config/detail.js b/view/admin/config/detail.js
@@ -172,6 +172,7 @@ const subjectMetaData = [
   {
     propertyName: 'name',
     displayName: 'Name',
+    validate: /^[0-9A-Za-z_\\-]{1,60}$/,
   }, {
     propertyName: 'parentAbsolutePath',
     displayName: 'Parent Absolute Path',