From 1b970b5750b2cf3818ec1442fc6ebaf825599d02 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 14 Nov 2025 12:09:02 +0100
Subject: [PATCH 1/4] - enabled button for closing amendmend aslo for status
 AWAITING;

---
 src/pages/SoccorsoEditInstructorManager/index.js | 2 +-
 src/pages/SoccorsoEditPreInstructor/index.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index b8faa2b..3ada3bb 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -554,7 +554,7 @@ const SoccorsoEditInstructorManager = () => {
                         <Button
                             type="button"
                             onClick={openCloseAmendmentDialog}
-                            disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
+                            disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
                             label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
                             icon="pi pi-times" iconPos="right"/>
                     </div>
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 15d16d0..068cf2d 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -554,7 +554,7 @@ const SoccorsoEditPreInstructor = () => {
                         <Button
                             type="button"
                             onClick={openCloseAmendmentDialog}
-                            disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
+                            disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
                             label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
                             icon="pi pi-times" iconPos="right"/>
                     </div>

From baebc7496bc3d57449479ff834da8ba909f0705b Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 14 Nov 2025 12:34:15 +0100
Subject: [PATCH 2/4] - fixed enabling buttons approve/reject;

---
 src/pages/DomandaEditInstructorManager/index.js  | 7 ++-----
 src/pages/DomandaEditPreInstructor/index.js      | 7 ++-----
 src/pages/SoccorsoEditInstructorManager/index.js | 2 +-
 src/pages/SoccorsoEditPreInstructor/index.js     | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index d291661..6f27ef3 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -1119,7 +1119,7 @@ const DomandaEditInstructorManager = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditInstructorManager = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 807b314..23cf7e2 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -1119,7 +1119,7 @@ const DomandaEditPreInstructor = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditPreInstructor = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 3ada3bb..256e0e8 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType])
+                && amendmentRequestedDocs[data.amendmentDocumentType]  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 068cf2d..e58976a 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType])
+                && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">

From afa4e33c5fc61af1c1bc759ecd0a0f9e73b38eb9 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 14 Nov 2025 12:49:01 +0100
Subject: [PATCH 3/4] - fixed JS bug in amendmend page;

---
 src/pages/SoccorsoEditInstructorManager/index.js | 7 ++++---
 src/pages/SoccorsoEditPreInstructor/index.js     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 256e0e8..15c3534 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType]  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType])  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditInstructorManager = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}
 
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index e58976a..15949f1 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType]))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditPreInstructor = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}
 

From a445ddc135e3dfeec8f1430277ec2b8a34202b5b Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 14 Nov 2025 13:03:46 +0100
Subject: [PATCH 4/4] - fixed JS error;

---
 src/pages/SoccorsoEditInstructorManager/index.js | 2 +-
 src/pages/SoccorsoEditPreInstructor/index.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 15c3534..56647cb 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -444,7 +444,7 @@ const SoccorsoEditInstructorManager = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
                                 ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 15949f1..345752c 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -444,7 +444,7 @@ const SoccorsoEditPreInstructor = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
                                 ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>