validate and remove conflict data when copy event to new draft

src/actions/editor.js

@@ -4,10 +4,12 @@ import {includes, keys} from 'lodash';
 
 import constants from '../constants'
 import {
+    mapAPIDataToUIFormat,
     mapUIDataToAPIFormat,
     calculateSuperEventTime,
     combineSubEventsFromEditor,
 } from '../utils/formDataMapping'
+import {emptyField} from '../utils/helpers'
 
 import {push} from 'react-router-redux'
 import {setFlashMsg, confirmAction} from './app'
@@ -89,15 +91,27 @@ export function setLanguages(languages) {
  * Replace all editor values
  * @param  {obj} formValues     new form values to replace all existing values
  */
-export function replaceData(formValues) {
-    return (dispatch) => {
-    // Run validations
-        dispatch(validateFor(null))
-        dispatch(setValidationErrors({}))
+export function replaceData(formData) {
+    return (dispatch, getState) => {
+        const {contentLanguages} = getState().editor
+        let formObject = mapAPIDataToUIFormat(formData)
+        const publicationStatus = formObject.publication_status || constants.PUBLICATION_STATUS.PUBLIC
 
+        // run the validation before copy to a draft
+        const validationErrors = doValidations(formObject, contentLanguages, publicationStatus)
+
+        // empty id, event_status, and any field that has validation errors
+        keys(validationErrors).map(field => {
+            formObject = emptyField(formObject, field)
+        })
+        delete formObject.id
+        delete formObject.event_status
+
+        dispatch(validateFor(publicationStatus))
+        dispatch(setValidationErrors({}))
         dispatch({
             type: constants.EDITOR_REPLACEDATA,
-            values: formValues,
+            values: formObject,
         })
     }
 }

src/utils/helpers.js

@@ -1,3 +1,5 @@
+import {isArray} from 'lodash';
+
 import CONSTANTS from '../constants'
 
 const {VALIDATION_RULES, CHARACTER_LIMIT} = CONSTANTS
@@ -44,3 +46,25 @@ export function textLimitValidator(value, limit) {
     }
     return true
 }
+
+// set a property of an object to empty value based on its type
+export const emptyField = (object, field) => {
+    let value = object[field];
+    const fieldValueType = isArray(value) ? 'array' : typeof value;
+
+    switch (fieldValueType) {
+        case 'array':
+            value = []
+            break
+        case 'object':
+            value = {}
+            break
+        case 'string':
+        case 'number':
+            value = ''
+            break
+        default:
+    }
+
+    return Object.assign({}, object, {[field]: value})
+}

src/views/Event/index.js

@@ -40,21 +40,15 @@ class EventPage extends React.Component {
     copyAsTemplate() {
         const {events:{event}, replaceData, routerPush} = this.props
         if(event) {
-            let formData = mapAPIDataToUIFormat(event)
-            formData.id = undefined
-            delete formData.id
-
-            replaceData(formData)
+            replaceData(event)
             routerPush(`/event/create/new`)
         }
     }
 
     editEvent() {
         const {events:{event}, replaceData, routerPush} = this.props
         if(event) {
-            let formData = mapAPIDataToUIFormat(event)
-
-            replaceData(formData)            
+            replaceData(event)            
             routerPush(`/event/update/${event.id}`)
         }
     }
@@ -235,7 +229,7 @@ const mapStateToProps = (state) => ({
 const mapDispatchToProps = (dispatch) => ({
     fetchEventDetails: (eventId, user) => dispatch(fetchEventDetailsAction(eventId, user)),
     routerPush: (url) => dispatch(push(url)),
-    replaceData: (formData) => dispatch(replaceDataAction(formData)),
+    replaceData: (event) => dispatch(replaceDataAction(event)),
     confirm: (msg, style, actionButtonLabel, data) => dispatch(confirmAction(msg, style, actionButtonLabel, data)),
     deleteEvent: (eventId, user) => dispatch(deleteEventAction(eventId, user)),
     cancelEvent: (eventId, user, values) => dispatch(cancelEventAction(eventId, user, values)),

src/views/Search/__snapshots__/Search.test.js.snap

@@ -33,34 +33,32 @@ exports[`Search Snapshot should render view correctly 1`] = `
       <div
         className="hel-text-field"
       >
-        <div>
+        <div
+          className="react-datepicker-wrapper"
+        >
           <div
-            className="react-datepicker-wrapper"
+            className="react-datepicker__input-container"
           >
-            <div
-              className="react-datepicker__input-container"
-            >
-              <input
-                autoComplete={undefined}
-                autoFocus={undefined}
-                className=""
-                disabled={false}
-                id={undefined}
-                name="startDate"
-                onBlur={[Function]}
-                onChange={[Function]}
-                onClick={[Function]}
-                onFocus={[Function]}
-                onKeyDown={[Function]}
-                placeholder="pp.kk.vvvv"
-                readOnly={false}
-                required={undefined}
-                tabIndex={undefined}
-                title={undefined}
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              autoComplete={undefined}
+              autoFocus={undefined}
+              className=""
+              disabled={false}
+              id={undefined}
+              name="startDate"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onClick={[Function]}
+              onFocus={[Function]}
+              onKeyDown={[Function]}
+              placeholder="pp.kk.vvvv"
+              readOnly={false}
+              required={undefined}
+              tabIndex={undefined}
+              title={undefined}
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>
@@ -71,34 +69,32 @@ exports[`Search Snapshot should render view correctly 1`] = `
       <div
         className="hel-text-field"
       >
-        <div>
+        <div
+          className="react-datepicker-wrapper"
+        >
           <div
-            className="react-datepicker-wrapper"
+            className="react-datepicker__input-container"
           >
-            <div
-              className="react-datepicker__input-container"
-            >
-              <input
-                autoComplete={undefined}
-                autoFocus={undefined}
-                className=""
-                disabled={false}
-                id={undefined}
-                name="endDate"
-                onBlur={[Function]}
-                onChange={[Function]}
-                onClick={[Function]}
-                onFocus={[Function]}
-                onKeyDown={[Function]}
-                placeholder="pp.kk.vvvv"
-                readOnly={false}
-                required={undefined}
-                tabIndex={undefined}
-                title={undefined}
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              autoComplete={undefined}
+              autoFocus={undefined}
+              className=""
+              disabled={false}
+              id={undefined}
+              name="endDate"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onClick={[Function]}
+              onFocus={[Function]}
+              onKeyDown={[Function]}
+              placeholder="pp.kk.vvvv"
+              readOnly={false}
+              required={undefined}
+              tabIndex={undefined}
+              title={undefined}
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>