From 0211df03293b28ac5f6b848d2106de132772a172 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 14 Feb 2025 10:09:56 +0100
Subject: [PATCH] - added auto saving on validation application request;

---
 src/pages/BandoApplication/index.js           | 24 +++++++++++--------
 .../BuilderElementProperLabel/index.js        |  6 +++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index b168f58..0690ba2 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -100,11 +100,7 @@ const BandoApplication = () => {
     const formValues = watch();
 
     const onValidate = () => {
-        const applId = getApplicationId();
-        storeSet.main.setAsyncRequest();
-        formMsgs.current.clear();
-
-        ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback);
+        saveDraft('VALIDATE');
     };
 
     const onSubmit = () => {
@@ -263,11 +259,19 @@ const BandoApplication = () => {
                 });
             }
             if (!isEmpty(saveAndMove) && is(String, saveAndMove)) {
-                storeSet.main.setAsyncRequest();
-                ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [
-                    ['formId', formId],
-                    ['action', saveAndMove]
-                ]);
+                if (['NEXT','PREVIOUS'].includes(saveAndMove)) {
+                    storeSet.main.setAsyncRequest();
+                    ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [
+                        ['formId', formId],
+                        ['action', saveAndMove]
+                    ]);
+                } else if (['VALIDATE'].includes(saveAndMove)) {
+                    const applId = getApplicationId();
+                    storeSet.main.setAsyncRequest();
+                    formMsgs.current.clear();
+
+                    ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback);
+                }
             } else {
                 ApplicationService.getApplicationForm(data.data.id, getStatusCheckCallback, errGetStatusCheckCallbacks);
             }
diff --git a/src/pages/BandoFormsEdit/components/BuilderElementProperLabel/index.js b/src/pages/BandoFormsEdit/components/BuilderElementProperLabel/index.js
index bcc7ef3..99f65a8 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElementProperLabel/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElementProperLabel/index.js
@@ -9,7 +9,9 @@ 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)
+    const isRequired = pathOr(false, ['validators', 'isRequired'], element);
+    const customValidation = pathOr(false, ['validators', 'custom'], element);
+    let maybeNonEmptyTables = customValidation === 'nonEmptyTables';
 
     useEffect(() => {
         const label = head(element.settings.filter(o => o.name === 'label'));
@@ -26,7 +28,7 @@ const BuilderElementProperLabel = ({ id, defaultLabel }) => {
 
     return <div className="label">
         {renderHtmlContent(label)}
-        {isRequired ? <span className="appForm__field--required">*</span> : null}
+        {isRequired || maybeNonEmptyTables ? <span className="appForm__field--required">*</span> : null}
     </div>
 }