@zohodesk/library-platform 1.1.13 → 1.2.0-exp.1

package/es/platform/data-source/utils/validation-rules/FieldConditions.js

@@ -57,7 +57,7 @@ export function MaxLengthCondition(field) {
     conditions: [{
       condition: TextValidationConditions.IsNot,
       fieldName: apiName,
-      value: [`maxLength:/(${btoa(`.{0,${maxLength}}`)})/`]
+      value: [`maxLength:/(${btoa(`[\\w\\W]{0,${maxLength}}`)})/`]
     }],
     actions: {
       alert: i18NProviderUtils.getI18NValue('support.form.more.than.max.length', [i18NLabel, maxLength])

package/es/platform/sdk-behaviour/adapters/controllers/InitializeController.js

@@ -2,7 +2,9 @@ import { AbstractController } from "./AbstractController";
 export class InitializeController extends AbstractController {
   handle(_ref) {
     let {
-      state
+      state,
+      dispatch,
+      updateState
     } = _ref;
     const {
       service
@@ -12,7 +14,10 @@ export class InitializeController extends AbstractController {
       createResourceInstanceUseCase
     } = service;
     createResourceInstanceUseCase.execute({
-      instanceName
+      instanceName,
+      state,
+      dispatch,
+      updateState
     });
   }
 

package/es/platform/sdk-behaviour/applications/usecases/CreateResourceInstanceUseCase.js

@@ -2,13 +2,22 @@ import AbstractUseCase from "../AbstractUseCase";
 export class CreateResourceInstanceUseCase extends AbstractUseCase {
   execute(_ref) {
     let {
-      instanceName
+      instanceName,
+      state,
+      dispatch,
+      updateState
     } = _ref;
     const {
       repository
     } = this.dependencies;
     const behaviourResourceConnector = repository.getBehaviourResourceConnector();
     behaviourResourceConnector.createResourceInstances(instanceName);
+    behaviourResourceConnector.syncStateWithResources({
+      instanceName,
+      state,
+      dispatch,
+      updateState
+    });
   }
 
 }

package/es/platform/zform/adapters/controllers/GetInitialRecordSuccessController.js

@@ -0,0 +1,31 @@
+import AbstractController from "./AbstractController";
+
+class GetInitialRecordSuccessController extends AbstractController {
+  handle(event) {
+    const {
+      getInitialRecordSuccessUseCase
+    } = this.service;
+    let {
+      state,
+      updateState,
+      action,
+      dispatch
+    } = event;
+    const {
+      disableValidationRule,
+      disableLayoutRule,
+      disableDependencyMapping
+    } = state.properties;
+    getInitialRecordSuccessUseCase.updateDependency(state, updateState);
+    getInitialRecordSuccessUseCase.execute({
+      dispatch,
+      record: action.payload.response,
+      disableValidationRule,
+      disableLayoutRule,
+      disableDependencyMapping
+    });
+  }
+
+}
+
+export default GetInitialRecordSuccessController;

package/es/platform/zform/adapters/gateway/FormRepository.js

@@ -13,7 +13,8 @@ class FormRepository {
   getFormEntity() {
     const {
       moduleName,
-      departmentId
+      departmentId,
+      recordId
     } = this.state.properties;
     const {
       context
@@ -25,7 +26,10 @@ class FormRepository {
       validationRules = [],
       sections = [],
       layoutRules = [],
-      dependencyMappings = []
+      dependencyMappings = [],
+      layoutId,
+      mode,
+      initialRecordData
     } = zform;
     let validationRuleEntities = validationRules.map(rule => {
       return new ZValidationRule(rule);
@@ -59,6 +63,10 @@ class FormRepository {
       dependencyMappings: dependencyMappingsEntities,
       layoutRules: layoutRulesEntities,
       context,
+      layoutId: layoutId,
+      recordId,
+      mode,
+      initialRecordData,
       isMyFormFetching: zform.isMyFormFetching,
       isDependencyFetching: zform.isDependencyFetching,
       isLayoutRulesFetching: zform.isLayoutRulesFetching,

package/es/platform/zform/adapters/gateway/Service.js

@@ -3,6 +3,7 @@ import CreateRecordSuccessUseCase from "../../applications/usecases/CreateRecord
 import CreateRecordFailedUseCase from "../../applications/usecases/CreateRecordFailedUseCase";
 import InitializeUseCase from "../../applications/usecases/InitializeUseCase";
 import MyLayoutSuccessUseCase from "../../applications/usecases/MyLayoutSuccessUseCase";
+import GetInitialRecordSuccessUseCase from "../../applications/usecases/GetInitialRecordSuccessUseCase";
 import MyFormSuccessUseCase from "../../applications/usecases/MyFormSuccessUseCase";
 import DependenciesSuccessUseCase from "../../applications/usecases/DependenciesSuccessUseCase";
 import MyFormRequestUseCase from "../../applications/usecases/MyFormRequestUseCase";
@@ -26,6 +27,7 @@ class Service {
     this.formSubmitUseCase = new FormSubmitUseCase(dependencies);
     this.initializeUseCase = new InitializeUseCase(dependencies);
     this.myLayoutSuccessUseCase = new MyLayoutSuccessUseCase(dependencies);
+    this.getInitialRecordSuccessUseCase = new GetInitialRecordSuccessUseCase(dependencies);
     this.myFormSuccessUseCase = new MyFormSuccessUseCase(dependencies);
     this.dependenciesSuccessUseCase = new DependenciesSuccessUseCase(dependencies);
     this.myFormRequestUseCase = new MyFormRequestUseCase(dependencies);

package/es/platform/zform/adapters/presenter/FormTranslator.js

@@ -1,6 +1,7 @@
 import ClientActionsTranslator from "../../../client-actions/translators/client-actions-translator";
 import SectionTranslator from "./translators/SectionTranslator";
 import DefaultFormClientActions from "./utils/DefaultClientActions";
+import { filterClientActionsByLocation } from "../../../client-actions/behaviour/zclient-actions/adapters/presenters/FilterUtils";
 export default class FormTranslator {
   static transformState(state) {
     const {
@@ -40,14 +41,23 @@ export default class FormTranslator {
     });
     const mappedClientActions = mapper(combinedClientActions || []);
     const transformedClientActions = {};
+    const formValues = zform.formValues ? zform.formValues : {
+      cf: {}
+    };
+    const initialRecordData = zform.initialRecordData ? zform.initialRecordData : {
+      cf: {}
+    };
     const actionContext = { ...context,
+      mode: zform.mode,
+      formValues,
+      record: initialRecordData,
       isSubmitFetching,
       submitStatus: isSubmitFetching ? 'loading' : 'none'
     };
     Object.entries(mappedClientActions).forEach(_ref => {
       let [key, value] = _ref;
 
-      if (isFooterEnabled && (key === 'footerRightActions' || key === 'footerLeftActions')) {
+      if (isFooterEnabled && (key === 'footerLeftActions' || key === 'footerRightActions')) {
         let footerActions = ClientActionsTranslator.transform(value, instanceName, moduleName, actionContext);
         transformedClientActions[key] = footerActions;
       }
@@ -143,17 +153,19 @@ export default class FormTranslator {
 
 }
 
-const mapper = clientAction => ({
-  headerLeftActions: clientAction.filter(action => action.location === 'header_left_actions'),
-  headerRightActions: clientAction.filter(action => action.location === 'header_right_actions'),
-  footerLeftActions: clientAction.filter(action => action.location === 'footer_left_actions'),
-  footerRightActions: clientAction.filter(action => action.location === 'footer_right_actions'),
-  fieldLabelActions: clientAction.filter(action => action.location === 'field_label_actions'),
-  fieldActions: clientAction.filter(action => action.location === 'field_actions'),
-  sectionHeaderLeftActions: clientAction.filter(action => action.location === 'section_header_left_actions'),
-  sectionHeaderRightActions: clientAction.filter(action => action.location === 'section_header_right_actions'),
-  sectionTitleLeftActions: clientAction.filter(action => action.location === 'section_title_left_actions'),
-  sectionTitleRightActions: clientAction.filter(action => action.location === 'section_title_right_actions'),
-  fieldOptionLeftActions: clientAction.filter(action => action.location === 'field_options_left_actions'),
-  fieldOptionRightActions: clientAction.filter(action => action.location === 'field_options_right_actions')
-});
+const mapper = clientActions => {
+  return {
+    headerLeftActions: filterClientActionsByLocation(clientActions, 'header_left_actions'),
+    headerRightActions: filterClientActionsByLocation(clientActions, 'header_right_actions'),
+    footerLeftActions: filterClientActionsByLocation(clientActions, 'footer_left_actions'),
+    footerRightActions: filterClientActionsByLocation(clientActions, 'footer_right_actions'),
+    fieldLabelActions: filterClientActionsByLocation(clientActions, 'field_label_actions'),
+    fieldActions: filterClientActionsByLocation(clientActions, 'field_actions'),
+    sectionHeaderLeftActions: filterClientActionsByLocation(clientActions, 'section_header_left_actions'),
+    sectionHeaderRightActions: filterClientActionsByLocation(clientActions, 'section_header_right_actions'),
+    sectionTitleLeftActions: filterClientActionsByLocation(clientActions, 'section_title_left_actions'),
+    sectionTitleRightActions: filterClientActionsByLocation(clientActions, 'section_title_right_actions'),
+    fieldOptionLeftActions: filterClientActionsByLocation(clientActions, 'field_options_left_actions'),
+    fieldOptionRightActions: filterClientActionsByLocation(clientActions, 'field_options_right_actions')
+  };
+};

package/es/platform/zform/adapters/presenter/translators/SectionTranslator.js

@@ -109,7 +109,7 @@ function SectionTranslator(_ref) {
       fieldPreModified['actions'] = transformedDefaultActions.fieldActions.concat(transformedActions.fieldActions);
       const noPlaceHolderSupport = ['Boolean', 'Date', 'DateTime']; // Placeholder check
 
-      if (field.toolTip && field.toolTipType === "placeholder" && !noPlaceHolderSupport.includes(field.type)) {
+      if (field.toolTip && field.toolTipType === "placeHolder" && !noPlaceHolderSupport.includes(field.type)) {
         fieldPreModified["placeholder"] = field.toolTip;
       } // const optionActionAvailArray = ['Picklist', 'Multiselect'];
       // // Option Actions check

package/es/platform/zform/adapters/presenter/translators/fields/CurrencyFieldTranslator.js

@@ -21,6 +21,7 @@ const CurrencyFieldTranslator = _ref => {
     id: field.id,
     label: field.i18NLabel,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     isVisible: field.isVisible,
     currencyLocale: prefCurrencyLocale || contextCurrencyLocale,

package/es/platform/zform/adapters/presenter/translators/fields/DecimalFieldTranslator.js

@@ -16,6 +16,7 @@ const DecimalFieldTranslator = _ref => {
     label: field.i18NLabel,
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     isVisible: field.isVisible,
     errorMessage: field.errorMessage || ''

package/es/platform/zform/adapters/presenter/translators/fields/EmailFieldTranslator.js

@@ -16,6 +16,7 @@ const EmailFieldTranslator = _ref => {
     label: field.i18NLabel,
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     // visibility: field.isVisible,
     isVisible: field.isVisible,

package/es/platform/zform/adapters/presenter/translators/fields/LookUpFieldTranslator.js

@@ -6,19 +6,23 @@ const LookUpFieldTranslator = _ref => {
     uiConfig
   } = _ref;
   const fieldModified = {
-    type,
-    uiConfig,
-    value: field.value || '',
+    // Need to check if value is an object or string (ID)
+    value: field.value ? field.value instanceof Object ? field.value.id : field.value : '',
     //state.behaviours.zform.values[field.apiName],
     name: field.apiName,
     ...fieldPreModified,
+    uiConfig: uiConfig,
+    type: type,
+    fieldType: field.type,
     id: field.id,
     label: field.i18NLabel,
-    required: field.isMandatory,
-    readonly: field.isReadOnly,
-    // visibility: field.isVisible,
+    apiName: field.apiName,
+    errorMessage: field.errorMessage,
     isVisible: field.isVisible,
-    errorMessage: field.errorMessage || '',
+    readonly: field.isReadOnly,
+    required: field.isMandatory,
+    isCustomField: field.isCustomField,
+    maxLength: field.maxLength,
     lookup: field.lookup
   };
   return fieldModified;

package/es/platform/zform/adapters/presenter/translators/fields/NumberFieldTranslator.js

@@ -16,6 +16,7 @@ const NumberFieldTranslator = _ref => {
     label: field.i18NLabel,
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     // visibility: field.isVisible,
     isVisible: field.isVisible,

package/es/platform/zform/adapters/presenter/translators/fields/PhoneFieldTranslator.js

@@ -16,6 +16,7 @@ const PhoneFieldTranslator = _ref => {
     label: field.i18NLabel,
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     isVisible: field.isVisible,
     errorMessage: field.errorMessage || ''

package/es/platform/zform/adapters/presenter/translators/fields/TextAreaFieldTranslator.js

@@ -16,6 +16,7 @@ const TextAreaFieldTranslator = _ref => {
     label: field.i18NLabel,
     required: field.isMandatory,
     readonly: field.isReadOnly,
+    maxLength: field.maxLength,
     // visibility: field.isVisible,
     isVisible: field.isVisible,
     errorMessage: field.errorMessage || ''

package/es/platform/zform/adapters/presenter/translators/fields/TextFieldTranslator.js

@@ -17,6 +17,7 @@ const TextFieldTranslator = _ref => {
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
     readonly: field.isReadOnly,
+    maxLength: field.maxLength,
     // visibility: field.isVisible,
     isVisible: field.isVisible,
     errorMessage: field.errorMessage || ''

package/es/platform/zform/adapters/presenter/translators/fields/URLFieldTranslator.js

@@ -16,6 +16,7 @@ const URLFieldTranslator = _ref => {
     label: field.i18NLabel,
     // ePHI: field.isPHI, //field.ePHI,
     required: field.isMandatory,
+    maxLength: field.maxLength,
     readonly: field.isReadOnly,
     // visibility: field.isVisible,
     isVisible: field.isVisible,

package/es/platform/zform/adapters/presenter/utils/sanitizeHtmlString.js

@@ -1,5 +1,5 @@
-import ZSEC from '@zoho/SecurityJS';
-const currentZSEC = ZSEC['7.2.4'];
+import ZWAF from '@zoho/SecurityJS';
+const currentZSEC = ZWAF['7.4.2'];
 const {
   HTMLPurifier
 } = currentZSEC;

package/es/platform/zform/applications/interfaces/input/GetInitialRecordSuccessUseCaseInputModel.js

@@ -0,0 +1 @@
+export {};

package/es/platform/zform/applications/usecases/GetInitialRecordSuccessUseCase.js

@@ -0,0 +1,132 @@
+import AbstractUseCase from "./AbstractUseCase";
+import { ZFORM_API_FAILURE, ZFORM_DEPENDENCY_MAPPINGS_SUCCESS, ZFORM_LAYOUT_RULES_SUCCESS, ZFORM_MY_FORM_SUCCESS } from "../../../../bc/zform/Symbol";
+import { DATA_SOURCE_EXECUTE as DATA_BROKER_EXECUTE } from "../../../../bc/zdata-source/Constants";
+import { DATA_SOURCE_SUCCESS, DATA_SOURCE_NO_CONTENT, DATA_SOURCE_FAILURE } from "../../../../bc/zdata-source/Symbols";
+
+class GetInitialRecordSuccessUseCase extends AbstractUseCase {
+  execute(input) {
+    const {
+      disableValidationRule,
+      disableLayoutRule,
+      disableDependencyMapping
+    } = input;
+    const {
+      dispatch,
+      record
+    } = input;
+    const zformEntity = this.dependencies.repository.getFormEntity();
+    zformEntity.setInitialRecord(record);
+    const context = { ...zformEntity.getContext(),
+      layoutId: zformEntity.getLayoutId()
+    };
+    dispatch({
+      type: DATA_BROKER_EXECUTE,
+      payload: {
+        actionName: "getMyForm",
+        props: context
+      },
+      metaData: {
+        actionName: "getMyForm",
+        //hack
+        initialRecordData: record,
+        // Store record data here for later use
+        [DATA_SOURCE_NO_CONTENT]: {
+          type: ZFORM_MY_FORM_SUCCESS,
+          metaData: {
+            actionName: "getMyForm",
+            initialRecordData: record
+          }
+        },
+        //hack
+        [DATA_SOURCE_FAILURE]: {
+          type: ZFORM_API_FAILURE,
+          metaData: {
+            actionName: 'getMyForm'
+          }
+        },
+        [DATA_SOURCE_SUCCESS]: {
+          type: ZFORM_MY_FORM_SUCCESS,
+          metaData: {
+            actionName: "getMyForm",
+            initialRecordData: record
+          }
+        }
+      }
+    });
+
+    if (!disableDependencyMapping) {
+      dispatch({
+        type: DATA_BROKER_EXECUTE,
+        payload: {
+          actionName: "getDependencyMappings",
+          props: context
+        },
+        metaData: {
+          actionName: "getDependencyMappings",
+          //hack
+          [DATA_SOURCE_SUCCESS]: {
+            type: ZFORM_DEPENDENCY_MAPPINGS_SUCCESS,
+            metaData: {
+              actionName: "getDependencyMappings"
+            }
+          },
+          [DATA_SOURCE_FAILURE]: {
+            type: ZFORM_API_FAILURE,
+            metaData: {
+              actionName: 'getDependencyMappings'
+            }
+          },
+          [DATA_SOURCE_NO_CONTENT]: {
+            type: ZFORM_DEPENDENCY_MAPPINGS_SUCCESS,
+            metaData: {
+              actionName: "getDependencyMappings"
+            }
+          }
+        }
+      });
+    } else {
+      zformEntity.setDependencyFetching(false);
+    }
+
+    if (!disableLayoutRule) {
+      dispatch({
+        type: DATA_BROKER_EXECUTE,
+        payload: {
+          actionName: "getLayoutRules",
+          props: { ...context,
+            activeRulesOnly: true
+          }
+        },
+        metaData: {
+          actionName: "getLayoutRules",
+          //hack
+          [DATA_SOURCE_NO_CONTENT]: {
+            type: ZFORM_LAYOUT_RULES_SUCCESS,
+            metaData: {
+              actionName: "getLayoutRules"
+            }
+          },
+          [DATA_SOURCE_FAILURE]: {
+            type: ZFORM_API_FAILURE,
+            metaData: {
+              actionName: 'getLayoutRules'
+            }
+          },
+          [DATA_SOURCE_SUCCESS]: {
+            type: ZFORM_LAYOUT_RULES_SUCCESS,
+            metaData: {
+              actionName: "getLayoutRules"
+            }
+          }
+        }
+      });
+    } else {
+      zformEntity.setLayoutRulesFetching(false);
+    }
+
+    this.dependencies.presenter.updateFormResponse(zformEntity.toObject());
+  }
+
+}
+
+export default GetInitialRecordSuccessUseCase;

package/es/platform/zform/applications/usecases/InitializeUseCase.js

@@ -1,10 +1,11 @@
 import AbstractUseCase from "./AbstractUseCase";
-import { ZFORM_API_FAILURE, ZFORM_MY_LAYOUTS_SUCCESS } from "../../../../bc/zform/Symbol";
+import { ZFORM_API_FAILURE, ZFORM_INITIAL_RECORD_SUCCESS, ZFORM_MY_LAYOUTS_SUCCESS } from "../../../../bc/zform/Symbol";
 import { DATA_SOURCE_EXECUTE } from "../../../../bc/zdata-source/Constants";
-import { DATA_SOURCE_SUCCESS, DATA_SOURCE_NO_CONTENT, DATA_SOURCE_FAILURE } from "../../../../bc/zdata-source/Symbols";
 import { CLIENTACTION_BEHAVIOUR_EXECUTE } from "../../../client-actions/bc/zclient-actions/Constants";
 import { ZFormApiActionName } from "../../../../bc/zform/Constants";
 import { CLIENTSCRIPT_FETCH } from "../../../client-scripts/bc/zclient-scripts-fetch/Constants";
+import { RecordApiActionName } from "../../../../bc/zrecord/Constants";
+import { ACA_ERROR_OCCURRED, ErrorCodes } from "../../../../cc/component/ErrorStructure";
 
 class InitializeUseCase extends AbstractUseCase {
   execute(input) {
@@ -48,38 +49,61 @@ class InitializeUseCase extends AbstractUseCase {
       });
     }
 
-    dispatch({
-      type: DATA_SOURCE_EXECUTE,
-      payload: {
-        actionName: ZFormApiActionName.getMyLayouts,
-        props: { ...context,
-          from: 1,
-          limit: 50
-        }
-      },
-      metaData: {
-        actionName: ZFormApiActionName.getMyLayouts,
-        //hack
-        [DATA_SOURCE_NO_CONTENT]: {
-          type: ZFORM_MY_LAYOUTS_SUCCESS,
-          metaData: {
-            actionName: ZFormApiActionName.getMyLayouts
+    if (zformEntity.isEditMode()) {
+      const recordId = zformEntity.getRecordId();
+
+      if (!recordId) {
+        const errorStructure = {
+          code: ErrorCodes.PROPERTY_VALIDATION_FAILED,
+          message: 'Record ID is required for Edit Mode',
+          errorDetails: {
+            validationResults: [{
+              key: 'recordId',
+              errors: [{
+                message: 'Record ID is required for Edit Mode'
+              }],
+              value: recordId
+            }],
+            isBreaking: true
           }
+        };
+        dispatch({
+          type: ACA_ERROR_OCCURRED,
+          payload: errorStructure
+        });
+        return;
+      }
+
+      dispatch({
+        type: DATA_SOURCE_EXECUTE,
+        payload: {
+          actionName: RecordApiActionName.GET_SINGLE_RECORD,
+          props: context
         },
-        [DATA_SOURCE_FAILURE]: {
-          type: ZFORM_API_FAILURE,
-          metaData: {
-            actionName: ZFormApiActionName.getMyLayouts
+        metaData: zformEntity.getDataSourceMetaData({
+          actionName: RecordApiActionName.GET_SINGLE_RECORD,
+          successEvent: ZFORM_INITIAL_RECORD_SUCCESS,
+          failureEvent: ZFORM_API_FAILURE
+        })
+      });
+    } else {
+      dispatch({
+        type: DATA_SOURCE_EXECUTE,
+        payload: {
+          actionName: ZFormApiActionName.getMyLayouts,
+          props: { ...context,
+            from: 1,
+            limit: 50
           }
         },
-        [DATA_SOURCE_SUCCESS]: {
-          type: ZFORM_MY_LAYOUTS_SUCCESS,
-          metaData: {
-            actionName: ZFormApiActionName.getMyLayouts
-          }
-        }
-      }
-    });
+        metaData: zformEntity.getDataSourceMetaData({
+          actionName: ZFormApiActionName.getMyLayouts,
+          //hack
+          successEvent: ZFORM_MY_LAYOUTS_SUCCESS,
+          failureEvent: ZFORM_API_FAILURE
+        })
+      });
+    }
   }
 
 }

package/es/platform/zform/applications/usecases/LookupFieldSuccessUseCase.js

@@ -11,6 +11,11 @@ class LookUpFieldSuccessUseCase extends AbstractUseCase {
       dispatch,
       fieldMetadataResponse
     } = input;
+
+    if (!fieldMetadataResponse || !fieldMetadataResponse.data || fieldMetadataResponse.data.length === 0) {
+      return;
+    }
+
     const {
       data
     } = fieldMetadataResponse;

package/es/platform/zform/applications/usecases/MyFormSuccessUseCase.js

@@ -21,14 +21,17 @@ class MyFormSuccessUseCase extends AbstractUseCase {
       sections
     } = myForm;
     const zFormEntity = repository.getFormEntity();
+    const layoutId = zFormEntity.getLayoutId();
+    const initialRecord = zFormEntity.getInitialRecord();
     const context = { ...zFormEntity.getContext(),
-      layoutId: zFormEntity.getLayoutId()
+      layoutId: layoutId
     };
     const lookupFields = sections.flatMap(section => section.fields.filter(field => field.type === 'LookUp'));
     const sectionEntities = sections.map(section => {
       const fields = section.fields.map(field => {
+        const recordValue = initialRecord ? field.isCustomField ? initialRecord.cf[field.apiName] : initialRecord[field.apiName] : undefined;
         const entity = new ZField(field);
-        entity.decideDefaultValue();
+        entity.decideDefaultValue(recordValue);
         return entity;
       });
       const sectionWithFields = { ...section,
@@ -63,24 +66,22 @@ class MyFormSuccessUseCase extends AbstractUseCase {
         type: DATA_SOURCE_EXECUTE,
         payload: {
           actionName: 'fetchLookupFields',
-          props: { ...context
-          }
+          props: context
         },
         metaData: {
           actionName: 'fetchLookupFields',
-          //hack
           [DATA_SOURCE_NO_CONTENT]: {
             type: ZFORM_LOOKUP_FIELD_SUCCESS,
             metaData: {
               actionName: 'fetchLookupFields'
             }
           },
-          // [DATA_SOURCE_FAILURE]: {
-          //   type: ZFORM_LOOKUP_FIELD_SUCCESS,
-          //   metaData: {
-          //     actionName: 'fetchValidationRules'
-          //   }
-          // },
+          [DATA_SOURCE_FAILURE]: {
+            type: ZFORM_API_FAILURE,
+            metaData: {
+              actionName: 'fetchLookupFields'
+            }
+          },
           [DATA_SOURCE_SUCCESS]: {
             type: ZFORM_LOOKUP_FIELD_SUCCESS,
             metaData: {