From 8fb15518809b128077a3736e2446e23eb2554c5a Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 10 Oct 2024 17:26:29 +0200
Subject: [PATCH] - fixed displaying data in table form field; - updated labels
 for fileupload fields;

---
 src/App.js                                         |  8 +++++---
 src/components/FileuploadDelega/index.js           |  6 ++++--
 .../FormField/components/Fileupload/index.js       |  9 ++++++---
 src/components/FormField/components/Table/index.js | 14 +++++++++-----
 src/components/ProtectedRoute/index.js             |  1 +
 src/pages/ProfileCompany/index.js                  |  1 +
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/App.js b/src/App.js
index 5afdbf0..9ff20f8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -4,11 +4,13 @@ import Routes from './routes';
 import { createI18n, setLocaleData } from '@wordpress/i18n';
 import { I18nProvider } from '@wordpress/react-i18n';
 import './assets/scss/theme.scss';
-import AuthenticationService from './service/authentication-service';
+import { isEmpty } from 'ramda'
 
 // store
 import { useStore, storeSet, storeGet } from './store';
-import CompanyService from './service/company-service';
+
+// api
+import AuthenticationService from './service/authentication-service';
 
 const i18n = createI18n({}, 'gepafin');
 
@@ -32,7 +34,7 @@ function App() {
     useEffect(() => {
         if (role === 'ROLE_BENEFICIARY') {
             const userData = storeGet.main.userData();
-            if (userData.companies) {
+            if (userData.companies && !isEmpty(userData.companies)) {
                 storeSet.main.companies(userData.companies);
             }
         }
diff --git a/src/components/FileuploadDelega/index.js b/src/components/FileuploadDelega/index.js
index 6042a03..83a6dab 100644
--- a/src/components/FileuploadDelega/index.js
+++ b/src/components/FileuploadDelega/index.js
@@ -17,6 +17,8 @@ const FileuploadDelega = ({
                                   maxSize = 100000000,
                                   emptyText = __('Trascina qui il tuo file', 'gepafin'),
                                   chooseLabel = __('Aggiungi delega', 'gepafin'),
+                              uploadLabel = __('Salva documento', 'gepafin'),
+                              cancelLabel = __('Cancella documento', 'gepafin'),
                                   multiple = false,
                                   companyId = 0,
                                   disabled = false
@@ -163,8 +165,8 @@ const FileuploadDelega = ({
                 maxFileSize={maxSize}
                 emptyTemplate={<p>{emptyText}</p>}
                 chooseLabel={chooseLabel}
-                cancelLabel={__('Cancella', 'gepafin')}
-                uploadLabel={__('Carica', 'gepafin')}
+                cancelLabel={cancelLabel}
+                uploadLabel={uploadLabel}
                 itemTemplate={itemTemplate}
                 customUpload
                 onBeforeDrop={onBeforeDrop}
diff --git a/src/components/FormField/components/Fileupload/index.js b/src/components/FormField/components/Fileupload/index.js
index 1509156..81792fa 100644
--- a/src/components/FormField/components/Fileupload/index.js
+++ b/src/components/FormField/components/Fileupload/index.js
@@ -26,11 +26,14 @@ const Fileupload = ({
                         maxSize = 100000000,
                         emptyText = __('Trascina qui il tuo file', 'gepafin'),
                         chooseLabel = __('Aggiungi file', 'gepafin'),
+                        uploadLabel = __('Salva documento', 'gepafin'),
+                        cancelLabel = __('Cancella documento', 'gepafin'),
                         multiple = false,
                         sourceId = 0,
                         source = 'application',
                         disabled = false,
-                        saveFormCallback = () => {}
+                        saveFormCallback = () => {
+                        }
                     }) => {
     const [stateFieldData, setStateFieldData] = useState([]);
     const [acceptFormats, setAcceptFormats] = useState('');
@@ -191,8 +194,8 @@ const Fileupload = ({
                     maxFileSize={maxSize}
                     emptyTemplate={<p>{emptyText}</p>}
                     chooseLabel={chooseLabel}
-                    cancelLabel={__('Cancella', 'gepafin')}
-                    uploadLabel={__('Carica', 'gepafin')}
+                    cancelLabel={cancelLabel}
+                    uploadLabel={uploadLabel}
                     className={classNames({ 'p-invalid': errors[fieldName] })}
                     itemTemplate={itemTemplate}
                     customUpload
diff --git a/src/components/FormField/components/Table/index.js b/src/components/FormField/components/Table/index.js
index 0fffbee..db95ab6 100644
--- a/src/components/FormField/components/Table/index.js
+++ b/src/components/FormField/components/Table/index.js
@@ -40,6 +40,11 @@ const Table = ({
         rowRowIndexToDelete(index);
     }
 
+    const updateRows = (data) => {
+        setRows(data);
+        setDataFn(fieldName, data, { shouldValidate: true });
+    }
+
     useEffect(() => {
         if (!isNil(rowIndexToDelete)) {
             const newRowsData = wrap(rows).del([rowIndexToDelete]).value();
@@ -49,11 +54,6 @@ const Table = ({
         rowRowIndexToDelete(null);
     }, [rowIndexToDelete]);
 
-    const updateRows = (data) => {
-        setRows(data);
-        setDataFn(fieldName, data, { shouldValidate: true });
-    }
-
     useEffect(() => {
         let shouldDisableNewRows = false;
 
@@ -110,6 +110,10 @@ const Table = ({
         setRowsCfg(rowsData);
     }, [tableColumns]);
 
+    useEffect(() => {
+        setRows(defaultValue)
+    }, [defaultValue]);
+
     useEffect(() => {
         register(fieldName, config);
     }, []);
diff --git a/src/components/ProtectedRoute/index.js b/src/components/ProtectedRoute/index.js
index c13ef1c..f50b3f8 100644
--- a/src/components/ProtectedRoute/index.js
+++ b/src/components/ProtectedRoute/index.js
@@ -5,6 +5,7 @@ import { Navigate, Outlet } from 'react-router-dom';
 import AuthenticationService from '../../service/authentication-service';
 
 const ProtectedRoute = () => {
+
     if (!AuthenticationService.wasLoggedIn()) {
         return (<Navigate to={'/login'} replace/>);
     }
diff --git a/src/pages/ProfileCompany/index.js b/src/pages/ProfileCompany/index.js
index d70611c..26c8f98 100644
--- a/src/pages/ProfileCompany/index.js
+++ b/src/pages/ProfileCompany/index.js
@@ -460,6 +460,7 @@ const ProfileCompany = () => {
                         <label htmlFor="delega">
                             {__('Carica documento Delega Firmato', 'gepafin')}
                             <span className="appForm__field--required">*</span>
+                            (.p7m)
                         </label>
                         <FileuploadDelega
                             setDataFn={setDelegaFile}