BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated notifications functionality;

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-01-03 08:50:23 +01:00
parent b9a60ecc27
commit 63b71ce20e
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/FlowBuilder/index.js
View File

@@ -8,7 +8,7 @@ import { isEmpty } from 'ramda';
import '@xyflow/react/dist/style.css'; import '@xyflow/react/dist/style.css';
// store // store
import { useStore, storeSet, storeGet } from '../../store'; import { useStore, storeSet } from '../../store';
// nodes // nodes
import NodeInitialForm from './components/NodeInitialForm'; import NodeInitialForm from './components/NodeInitialForm';

2
src/components/FormField/components/DatepickerRange/index.js
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { classNames } from 'primereact/utils'; import { classNames } from 'primereact/utils';
import { isEmpty, isNil } from 'ramda'; import { isNil } from 'ramda';
// components // components
import { Controller } from 'react-hook-form'; import { Controller } from 'react-hook-form';

10
src/components/NotificationsSidebar/index.js
View File

@@ -70,12 +70,12 @@ const NotificationsSidebar = () => {
const role = pathOr('', ['role', 'roleType'], userData); const role = pathOr('', ['role', 'roleType'], userData);
if (currentSubscription) { if (currentSubscription) {
console.log('UNsubscribed') //console.log('UNsubscribed')
currentSubscription.unsubscribe(); currentSubscription.unsubscribe();
setCurrentSubscription(null); setCurrentSubscription(null);
} }
if (isConnected && userData.id && chosenCompanyId !== 0 && role === 'ROLE_BENEFICIARY') { if (userData.id && chosenCompanyId !== 0 && role === 'ROLE_BENEFICIARY') {
setLoading(true); setLoading(true);
NotificationService.getNotifications( NotificationService.getNotifications(
userData.id, userData.id,
@@ -86,10 +86,10 @@ const NotificationsSidebar = () => {
['companyId', chosenCompanyId] ['companyId', chosenCompanyId]
] ]
); );
if (socket.current) { if (isConnected && socket.current) {
subscribeTo(`/topic/notifications_user_${userData.id}_company_${chosenCompanyId}`) subscribeTo(`/topic/notifications_user_${userData.id}_company_${chosenCompanyId}`)
} }
} else if (isConnected && userData.id && role !== 'ROLE_BENEFICIARY') { } else if (userData.id && role !== 'ROLE_BENEFICIARY') {
setLoading(true); setLoading(true);
NotificationService.getNotifications( NotificationService.getNotifications(
userData.id, userData.id,
@@ -99,7 +99,7 @@ const NotificationsSidebar = () => {
['status', status] ['status', status]
] ]
); );
if (socket.current) { if (isConnected && socket.current) {
subscribeTo(`/topic/notifications_user_${userData.id}`) subscribeTo(`/topic/notifications_user_${userData.id}`)
} }
} }

2
src/helpers/set404FromErrorResponse.js
View File

@@ -1,4 +1,4 @@
import { storeSet } from '../store'; //import { storeSet } from '../store';
const set404FromErrorResponse = (data) => { const set404FromErrorResponse = (data) => {
if (data && data.status === 'NOT_FOUND') { if (data && data.status === 'NOT_FOUND') {

6
src/pages/BandoApplicationPreview/index.js
View File

@@ -39,7 +39,7 @@ const BandoApplicationPreview = () => {
const [formData, setFormData] = useState([]); const [formData, setFormData] = useState([]);
const [formInitialData, setFormInitialData] = useState(null); const [formInitialData, setFormInitialData] = useState(null);
const [bandoTitle, setBandoTitle] = useState(''); const [bandoTitle, setBandoTitle] = useState('');
const [bandoId, setBandoId] = useState(0); const [, setBandoId] = useState(0);
const [formId, setFormId] = useState(''); const [formId, setFormId] = useState('');
const [totalSteps, setTotalSteps] = useState(0); const [totalSteps, setTotalSteps] = useState(0);
const [applicationStatus, setApplicationStatus] = useState(''); const [applicationStatus, setApplicationStatus] = useState('');
@@ -86,8 +86,8 @@ const BandoApplicationPreview = () => {
ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback); ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback);
}; };
const onSubmit = () => { /*const onSubmit = () => {
}; };*/
const validateApplicationCallback = (data) => { const validateApplicationCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {