@zengenti/contensis-react-base 3.0.0-beta.74 → 3.0.0-beta.77

package/cjs/forms.js

@@ -44,7 +44,7 @@ const initialSettings = {
   }
 };
 const initialStatus = {
-  isLoading: false,
+  isLoading: true,
   isSubmitting: false,
   hasSuccess: false,
   successMessage: null,
@@ -95,6 +95,7 @@ var reducer = immer.produce((state, action) => {
         state[formId].groups = groups;
         state[formId].defaultLanguage = defaultLanguage;
         state[formId].status.isSubmitting = false;
+        state[formId].status.isLoading = false;
         state[formId].status.hasSuccess = false;
         state[formId].status.hasError = false;
         state[formId].settings = settings;
@@ -436,7 +437,7 @@ const validateInput = (field, value) => {
           message: 'You must enter a business email address.'
         };
       }
-    } else {
+    } else if (!isValidRegex(field, value)) {
       return {
         fieldId: field.id,
         groupId: field.groupId,
@@ -484,13 +485,15 @@ const isBusinessEmailValid = (field, value) => {
 };
 
 const MakeFieldType = field => {
+  var _field$editor, _field$editor$propert;
+
   if (!field) return null;
 
   if (field.dataType === 'string' && field.editor && field.editor.id === 'multiline') {
     return 'textarea';
   } else if (field.dataType === 'string' && field.editor && field.editor.id === 'list-dropdown') {
     return 'dropdown';
-  } else if (field.editor && field.editor.properties && field.editor.properties.readOnly || field.groupId && field.groupId === 'private') {
+  } else if (field !== null && field !== void 0 && (_field$editor = field.editor) !== null && _field$editor !== void 0 && (_field$editor$propert = _field$editor.properties) !== null && _field$editor$propert !== void 0 && _field$editor$propert.readOnly || (field === null || field === void 0 ? void 0 : field.groupId) === 'private' || (field === null || field === void 0 ? void 0 : field.groupId) === 'settings') {
     return 'hidden';
   } else if (field.dataType === 'stringArray' || field.dataType === 'boolean') {
     return 'checkbox';
@@ -631,7 +634,7 @@ function* fetchForm(action) {
 
   const formId = action.formId;
   const schema = yield getFormSchema(formId);
-  const groups = schema === null || schema === void 0 ? void 0 : (_schema$groups = schema.groups) === null || _schema$groups === void 0 ? void 0 : _schema$groups.filter(group => group.id !== 'private');
+  const groups = schema === null || schema === void 0 ? void 0 : (_schema$groups = schema.groups) === null || _schema$groups === void 0 ? void 0 : _schema$groups.filter(group => group.id !== 'private' && group.id !== 'settings');
 
   if (formId && schema) {
     var _schema$groups2, _submitButtonText$def;
@@ -1912,17 +1915,23 @@ FormComposer.propTypes = {
   setCheckboxValue: PropTypes__default["default"].func
 };
 
-const LoadingSpinner = () => {
+const LoadingSpinner = ({
+  className,
+  color = '#fff',
+  width = 20,
+  height = 20
+}) => {
   return /*#__PURE__*/React__default["default"].createElement("svg", {
-    width: "20px",
-    height: "20px",
+    className: className,
+    width: `${width}px`,
+    height: `${height}px`,
     viewBox: "0 0 100 100",
     preserveAspectRatio: "xMidYMid"
   }, /*#__PURE__*/React__default["default"].createElement("circle", {
     cx: "50",
     cy: "50",
     fill: "none",
-    stroke: "#ffffff",
+    stroke: color,
     strokeWidth: "10",
     r: "35",
     strokeDasharray: "164.93361431346415 56.97787143782138",
@@ -1969,7 +1978,10 @@ const Button = ({
     onClick: () => action(),
     disabled: loading,
     useDefaultTheme: useDefaultTheme
-  }, text, loading && /*#__PURE__*/React__default["default"].createElement(LoadingSpinner, null));
+  }, text, loading && /*#__PURE__*/React__default["default"].createElement(LoadingSpinner, {
+    height: 18,
+    width: 18
+  }));
 };
 Button.propTypes = {
   className: PropTypes__default["default"].string,
@@ -2137,7 +2149,7 @@ const Form = ({
       className: className,
       id: formId,
       useDefaultTheme: useDefaultTheme
-    }, !status || status && !status.isLoading && !status.isSubmitting && !status.hasSuccess && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, pagingInfo.pageIndex > 0 && /*#__PURE__*/React__default["default"].createElement(Button, {
+    }, !status || !(status !== null && status !== void 0 && status.hasSuccess) && !(status !== null && status !== void 0 && status.isLoading) ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, pagingInfo.pageIndex > 0 && /*#__PURE__*/React__default["default"].createElement(Button, {
       type: "button",
       text: "Go Back",
       action: () => _togglePageBack(formId, pagingInfo.pageIndex - 1),
@@ -2163,13 +2175,19 @@ const Form = ({
     }), isLastPage && /*#__PURE__*/React__default["default"].createElement(Button, {
       text: (settings === null || settings === void 0 ? void 0 : settings.submitButtonText) || "Submit",
       type: "button",
+      loading: status === null || status === void 0 ? void 0 : status.isLoading,
       action: () => {
         _submitForm(formId);
 
         if (customSubmit) customSubmit();
       },
       useDefaultTheme: useDefaultTheme
-    })), status && status.hasSuccess && status.successMessage && /*#__PURE__*/React__default["default"].createElement("p", {
+    })) : /*#__PURE__*/React__default["default"].createElement(LoadingSpinner, {
+      className: "loading",
+      height: 24,
+      width: 24,
+      color: "#333"
+    }), (status === null || status === void 0 ? void 0 : status.hasSuccess) && (status === null || status === void 0 ? void 0 : status.successMessage) && /*#__PURE__*/React__default["default"].createElement("p", {
       className: "success-message"
     }, status.successMessage)));
   } else {
@@ -2179,7 +2197,7 @@ const Form = ({
       className: className,
       id: formId,
       useDefaultTheme: useDefaultTheme
-    }, !status || status && !status.isLoading && !status.isSubmitting && !status.hasSuccess && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(FormComposer, {
+    }, !status || !(status !== null && status !== void 0 && status.hasSuccess) && !(status !== null && status !== void 0 && status.isLoading) ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(FormComposer, {
       fields: fields,
       formId: formId,
       setValue: _setValue,
@@ -2191,6 +2209,7 @@ const Form = ({
       entries: entries,
       setCheckboxValue: _setCheckboxValue
     }), /*#__PURE__*/React__default["default"].createElement(Button, {
+      loading: status === null || status === void 0 ? void 0 : status.isSubmitting,
       text: (settings === null || settings === void 0 ? void 0 : settings.submitButtonText) || "Submit",
       type: "button",
       action: () => {
@@ -2199,7 +2218,12 @@ const Form = ({
         if (customSubmit) customSubmit();
       },
       useDefaultTheme: useDefaultTheme
-    })), status && status.hasSuccess && status.successMessage && /*#__PURE__*/React__default["default"].createElement("p", {
+    })) : /*#__PURE__*/React__default["default"].createElement(LoadingSpinner, {
+      className: "loading",
+      height: 24,
+      width: 24,
+      color: "#333"
+    }), (status === null || status === void 0 ? void 0 : status.hasSuccess) && (status === null || status === void 0 ? void 0 : status.successMessage) && /*#__PURE__*/React__default["default"].createElement("p", {
       className: "success-message"
     }, status.successMessage)));
   }