refactoring

Author: AJIXuMuK

src/controls/dynamicForm/DynamicForm.tsx

@@ -207,9 +207,9 @@ export class DynamicForm extends React.Component<
             val.fieldDefaultValue = null;
             shouldBeReturnBack = true;
           }
-        } else if(val.fieldType === "Number"){
-          if(!val.showAsPercentage){
-            if((val.newValue < val.minimumValue) || (val.newValue > val.maximumValue)){
+        } else if (val.fieldType === "Number") {
+          if (!val.showAsPercentage) {
+            if ((val.newValue < val.minimumValue) || (val.newValue > val.maximumValue)) {
               shouldBeReturnBack = true;
             }
           }
@@ -364,9 +364,9 @@ export class DynamicForm extends React.Component<
           const folderTitle =
             objects[titleField] !== undefined && objects[titleField] !== ""
               ? (objects[titleField] as string).replace(
-                  /["|*|:|<|>|?|/|\\||]/g,
-                  "_"
-                ) // Replace not allowed chars in folder name
+                /["|*|:|<|>|?|/|\\||]/g,
+                "_"
+              ) // Replace not allowed chars in folder name
               : ""; // Empty string will be replaced by SPO with Folder Item ID
           const newFolder = await library.rootFolder.addSubFolderUsingPath(
             folderTitle
@@ -715,9 +715,9 @@ export class DynamicForm extends React.Component<
             listItemId: listItemId,
             principalType: principalType,
             description: field.Description,
-            maximumValue:field.MaximumValue,
-            minimumValue:field.MinimumValue,
-            showAsPercentage:field.ShowAsPercentage
+            maximumValue: field.MaximumValue,
+            minimumValue: field.MinimumValue,
+            showAsPercentage: field.ShowAsPercentage
           });
           tempFields.sort((a, b) => a.Order - b.Order);
         }

src/controls/dynamicForm/dynamicField/DynamicField.tsx

@@ -95,7 +95,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
 
     const labelEl = <label className={(required) ? styles.fieldRequired + ' ' + styles.fieldLabel : styles.fieldLabel}>{labelText}</label>;
     const errorText = this.getRequiredErrorText();
-    const errorTextforNumber = this.getnumberErrorText();
+    const errorTextforNumber = this.getNumberErrorText();
     const errorTextEl = <text className={styles.errormessage}>{errorText}</text>;
     const descriptionEl = <text className={styles.fieldDescription}>{description}</text>;
     const hasImage = !!changedValue;
@@ -139,7 +139,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
               value={value}
               className={styles.fieldDisplay}
               onChange={(newText) => { this.onChange(newText); return newText; }}
-              isEditMode={!disabled}/>
+              isEditMode={!disabled} />
             {descriptionEl}
             {errorTextEl}
           </div>;
@@ -588,28 +588,30 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
     const {
       changedValue
     } = this.state;
-    return (changedValue === undefined || changedValue === ''|| changedValue === null || this.isEmptyArray(changedValue)) && this.props.required ? strings.DynamicFormRequiredErrorMessage : null;
+    return (changedValue === undefined || changedValue === '' || changedValue === null || this.isEmptyArray(changedValue)) && this.props.required ? strings.DynamicFormRequiredErrorMessage : null;
   }
 
-  private getnumberErrorText = (): string => {
+  private getNumberErrorText = (): string => {
     const {
       changedValue
     } = this.state;
-    const{
+    const {
       maximumValue,
       minimumValue,
       showAsPercentage
     } = this.props;
 
-    if((changedValue === undefined || changedValue === ''|| changedValue === null || this.isEmptyArray(changedValue)) && this.props.required){
-      return strings.DynamicFormRequiredErrorMessage;
-    } else if((changedValue < minimumValue) || (changedValue > maximumValue)){
-      if(!showAsPercentage){
-        return strings.DynamicFormNumberErrorMessage
-                .replace('{0}', minimumValue.toString())
-                .replace('{1}', maximumValue.toString());
+    let errorText: string | null = null;
+
+    errorText = this.getRequiredErrorText();
+    if (!errorText && (changedValue < minimumValue) || (changedValue > maximumValue)) {
+      if (!showAsPercentage) {
+        errorText = strings.DynamicFormNumberErrorMessage
+          .replace('{0}', minimumValue.toString())
+          .replace('{1}', maximumValue.toString());
       }
     }
+    return errorText;
   }
 
   private isEmptyArray(value): boolean {