- updated zustand and react libraries;
- added 'put in draft' btn;
This commit is contained in:
@@ -5,7 +5,7 @@ import SockJS from 'sockjs-client';
|
||||
import { Stomp } from '@stomp/stompjs';
|
||||
|
||||
// store
|
||||
import { storeGet, useStore } from '../../store';
|
||||
import { storeGet, useStoreValue } from '../../store';
|
||||
|
||||
// api
|
||||
import NotificationService from '../../service/notification-service';
|
||||
@@ -24,8 +24,8 @@ import PaginatorBasic from '../PaginatorBasic';
|
||||
const socketUrl = process.env.REACT_APP_API_ADDRESS_WS;
|
||||
|
||||
const NotificationsSidebar = () => {
|
||||
const chosenCompanyId = useStore().main.chosenCompanyId();
|
||||
const userData = useStore().main.userData();
|
||||
const chosenCompanyId = useStoreValue('chosenCompanyId');
|
||||
const userData = useStoreValue('userData');
|
||||
const [activeIndex, setActiveIndex] = useState(0);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [notificationsVisible, setNotificationsVisible] = useState(false);
|
||||
@@ -82,8 +82,8 @@ const NotificationsSidebar = () => {
|
||||
}
|
||||
|
||||
const fetchMessages = useCallback((status = 'UNREAD') => {
|
||||
const chosenCompanyId = storeGet.main.chosenCompanyId();
|
||||
const userData = storeGet.main.userData();
|
||||
const chosenCompanyId = storeGet('chosenCompanyId');
|
||||
const userData = storeGet('userData');
|
||||
const role = pathOr('', ['role', 'roleType'], userData);
|
||||
const bodyParams = getPaginationQuery(status, currentPage);
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
|
||||
import { intersection } from 'ramda';
|
||||
|
||||
// store
|
||||
import { storeSet, useStore, useTrackedStore } from '../../store';
|
||||
import { storeSet, useStoreValue, useTrackedValue } from '../../store';
|
||||
|
||||
// components
|
||||
import { Menu } from 'primereact/menu';
|
||||
@@ -12,11 +12,11 @@ import { Toast } from 'primereact/toast';
|
||||
|
||||
const TopBarProfileMenu = ({ menuLeftRef }) => {
|
||||
const navigate = useNavigate();
|
||||
const userData = useTrackedStore().main.userData();
|
||||
const userData = useTrackedValue('userData');
|
||||
const fulleName = `${userData.firstName} ${userData.lastName}`;
|
||||
const permissions = useStore().main.getPermissions();
|
||||
const companies = useStore().main.companies();
|
||||
const chosenCompanyId = useStore().main.chosenCompanyId()
|
||||
const permissions = useStoreValue('getPermissions');
|
||||
const companies = useStoreValue('companies');
|
||||
const chosenCompanyId = useStoreValue('chosenCompanyId')
|
||||
const [companyItems, setCompanyItems] = useState([]);
|
||||
const toast = useRef(null);
|
||||
let items = [
|
||||
@@ -75,7 +75,7 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
|
||||
label: __('Logout', 'gepafin'),
|
||||
icon: 'pi pi-sign-out',
|
||||
command: () => {
|
||||
storeSet.main.doLogout();
|
||||
storeSet('doLogout');
|
||||
window.location.reload();
|
||||
},
|
||||
enable: true
|
||||
@@ -84,7 +84,7 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
|
||||
|
||||
const switchCompany = (id) => {
|
||||
if (chosenCompanyId !== id) {
|
||||
storeSet.main.chosenCompanyId(id);
|
||||
storeSet('chosenCompanyId', id);
|
||||
|
||||
if (toast.current) {
|
||||
toast.current.show({
|
||||
|
||||
@@ -52,7 +52,7 @@ const UnsavedChangesDetector = ({ getValuesFn }) => {
|
||||
formData.endTime = tzAwareDate.toISOString().substring(11, 16);
|
||||
}
|
||||
}
|
||||
const initial = storeGet.main.formInitialData();
|
||||
const initial = storeGet('formInitialData');
|
||||
|
||||
const isEqual = equal(initial, formData);
|
||||
// debug
|
||||
|
||||
Reference in New Issue
Block a user