This commit is contained in:
Vitalii Kiiko
2024-09-03 10:44:07 +02:00
parent 6f6234a1d8
commit 429ca3c1d1
12 changed files with 105 additions and 26 deletions

View File

@@ -1,7 +1,8 @@
import React, { useEffect, useState, useCallback } from 'react';
import { classNames } from 'primereact/utils';
import { __ } from '@wordpress/i18n';
import { head } from 'ramda';
import { head, isEmpty } from 'ramda';
import { diff } from 'deep-object-diff';
// components
import { Button } from 'primereact/button';
@@ -116,18 +117,27 @@ const FormFieldRepeaterFaq = ({
}, [stateFieldData]);
useEffect(() => {
const storeFieldData = data[fieldName] ?? [];
const storeFieldData = data ?? [];
setStateFieldData(storeFieldData);
setStateOptionsData([...options, ...storeFieldData]);
register(fieldName, config)
}, []);
useEffect(() => {
const diffData = diff(data, stateFieldData);
if (!isEmpty(diffData)) {
const storeFieldData = data ?? [];
setStateFieldData(storeFieldData);
}
}, [data]);
useEffect(() => {
setStateOptionsData([...options]);
}, [options]);
useEffect(() => {
setDataFn(fieldName, [...stateFieldData], { shouldValidate: true });
setDataFn(fieldName, stateFieldData, { shouldValidate: true });
}, [stateFieldData]);
return (

View File

@@ -10,6 +10,7 @@ import { Avatar } from 'primereact/avatar';
const TopBarProfileMenu = ({ menuLeftRef }) => {
const userData = useTrackedStore().main.userData();
const fulleName = `${userData.firstName} ${userData.lastName}`;
let items = [
{
@@ -18,19 +19,19 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
<div className="topBar__menuProfileItem">
<Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
<div className="userInfo">
<span className="userName">{`${userData.firstName} ${userData.lastName}`}</span>
<span className="userEmail">{userData.email}</span>
<span className="userName" title={fulleName}>{fulleName}</span>
<span className="userEmail" title={userData.email}>{userData.email}</span>
</div>
</div>
);
}
},
{
/*{
label: __('Il mio profilo', 'gepafin'),
command: () => {
console.log('go to profile page')
}
},
},*/
{
separator: true
},