- styled asteriks sign;

- fixed issue with validation on registration page;
- fixed issue with inputnumber;
- fixed issue with editor field;;
- added editors for new faq item form;
- fixed displaying html as simple text;
- fixed saving company data after saving;
- added toast for edit bando form;
- improved edit forms form;
- fixed styles for various elements;

src/pages/BandoFormsEdit/components/BuilderElementProperLabel/index.js

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { head } from 'ramda';
+import { head, pathOr } from 'ramda';
 
 // store
 import { useStore } from '../../../../store';
@@ -7,10 +7,11 @@ import renderHtmlContent from '../../../../helpers/renderHtmlContent';
 
 const BuilderElementProperLabel = ({ id, defaultLabel }) => {
     const elements = useStore().main.formElements();
+    const element = head(elements.filter(o => o.id === id));
     const [label, setLabel] = useState('');
+    const isRequired = pathOr(false, ['validators', 'isRequired'], element)
 
     useEffect(() => {
-        const element = head(elements.filter(o => o.id === id));
         const label = head(element.settings.filter(o => o.name === 'label'));
         const text = head(element.settings.filter(o => o.name === 'text'));
 
@@ -23,7 +24,10 @@ const BuilderElementProperLabel = ({ id, defaultLabel }) => {
         }
     }, [elements]);
 
-    return <div className="label">{renderHtmlContent(label)}</div>
+    return <div className="label">
+        {renderHtmlContent(label)}
+        {isRequired ? <span className="appForm__field--required">*</span> : null}
+    </div>
 }
 
 export default BuilderElementProperLabel;

src/pages/BandoFormsEdit/index.js

@@ -23,7 +23,7 @@ import FormsService from '../../service/forms-service';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
 // TODO temp data
-import { elementItems } from '../../tempData';
+//import { elementItems } from '../../tempData';
 
 const BandoFormsEdit = () => {
     const { id, formId } = useParams();
@@ -168,7 +168,14 @@ const BandoFormsEdit = () => {
     }
 
     const openPreview = () => {
-        doSave(true);
+        if ('PUBLISH' !== bandoStatus) {
+            doSave(true);
+        } else {
+            const bandoId = getBandoId();
+            const parsedFormId = parseInt(formId)
+            const bandoFormId = !isNaN(parsedFormId) ? parsedFormId : 0;
+            navigate(`/bandi/${bandoId}/forms/${bandoFormId}/preview`);
+        }
     }
 
     const confirmDelete = (event) => {
@@ -208,8 +215,8 @@ const BandoFormsEdit = () => {
 
     const getElementItemsCallback = (data) => {
         if (data.status === 'SUCCESS') {
-            storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
-            //storeSet.main.elementItems(data.data.sort((a, b) => a.sortOrder - b.sortOrder));
+            //storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
+            storeSet.main.elementItems(data.data.sort((a, b) => a.sortOrder - b.sortOrder));
         }
         storeSet.main.unsetAsyncRequest();
     }