- removed unwanted call for companies for admin user;
This commit is contained in:
16
src/App.js
16
src/App.js
@@ -7,7 +7,7 @@ import './assets/scss/theme.scss';
|
|||||||
import AuthenticationService from './service/authentication-service';
|
import AuthenticationService from './service/authentication-service';
|
||||||
|
|
||||||
// store
|
// store
|
||||||
import { useStore, storeSet } from './store';
|
import { useStore, storeSet, storeGet } from './store';
|
||||||
import CompanyService from './service/company-service';
|
import CompanyService from './service/company-service';
|
||||||
|
|
||||||
const i18n = createI18n({}, 'gepafin');
|
const i18n = createI18n({}, 'gepafin');
|
||||||
@@ -16,17 +16,15 @@ function App() {
|
|||||||
const role = useStore().main.getRole();
|
const role = useStore().main.getRole();
|
||||||
|
|
||||||
const callback = (data) => {
|
const callback = (data) => {
|
||||||
|
storeSet.main.unsetAsyncRequest();
|
||||||
if (data.status === 'SUCCESS') {
|
if (data.status === 'SUCCESS') {
|
||||||
storeSet.main.userData(data.data);
|
storeSet.main.userData(data.data);
|
||||||
storeSet.main.setAsyncRequest();
|
|
||||||
CompanyService.getCompanyForUser(data.data.id, companyCallback, errCompanyCallback)
|
|
||||||
} else {
|
} else {
|
||||||
storeSet.main.doLogout();
|
storeSet.main.doLogout();
|
||||||
}
|
}
|
||||||
storeSet.main.unsetAsyncRequest();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const errCallback = (data) => {
|
const errCallback = () => {
|
||||||
storeSet.main.doLogout();
|
storeSet.main.doLogout();
|
||||||
storeSet.main.unsetAsyncRequest();
|
storeSet.main.unsetAsyncRequest();
|
||||||
}
|
}
|
||||||
@@ -43,6 +41,14 @@ function App() {
|
|||||||
storeSet.main.unsetAsyncRequest();
|
storeSet.main.unsetAsyncRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (role === 'ROLE_BENEFICIARY') {
|
||||||
|
storeSet.main.setAsyncRequest();
|
||||||
|
const userData = storeGet.main.userData();
|
||||||
|
CompanyService.getCompanyForUser(userData.id, companyCallback, errCompanyCallback)
|
||||||
|
}
|
||||||
|
}, [role])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
storeSet.main.setAsyncRequest();
|
storeSet.main.setAsyncRequest();
|
||||||
AuthenticationService.me(callback, errCallback);
|
AuthenticationService.me(callback, errCallback);
|
||||||
|
|||||||
@@ -734,7 +734,7 @@ export const elementItems = [
|
|||||||
],
|
],
|
||||||
validators: {}
|
validators: {}
|
||||||
},
|
},
|
||||||
/*{
|
{
|
||||||
id: 20,
|
id: 20,
|
||||||
sortOrder: 20,
|
sortOrder: 20,
|
||||||
name: 'table',
|
name: 'table',
|
||||||
@@ -747,5 +747,5 @@ export const elementItems = [
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
validators: {}
|
validators: {}
|
||||||
}*/
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user