diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ProtectedRouteComponent.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ProtectedRouteComponent.js index ee27dbbf00874fdad77260ef2ca894c57e4e303b..2ca0e9103f800840c842df224339a797f68bfdf2 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ProtectedRouteComponent.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ProtectedRouteComponent.js @@ -23,45 +23,16 @@ class ProtectedRoute extends Component{ hasPermission() { const permission = this.props.permissions - if(permission.length <= 2){ - if(typeof(permission[0]) !== undefined && permission[1] !== undefined) { - if(this.state.permission_set['userRolePermission'][permission[0]][permission[1]]) { - return true; - } else { - return false; + if(permission.length <= 2) { + if(typeof(permission[0]) !== undefined && permission[1] !== undefined) { + if(this.state.permission_set['userRolePermission'][permission[0]][permission[1]]) { + return true; + } else { + return false; + } } } - // else if (permission.length == 3){ - // let path = _.split( window.location.pathname, '/' ) - // console.log(path) - // let moduleProperties = this.getModuleProperties(path) - // console.log(moduleProperties) - // if(moduleProperties && this.state.permission_set[moduleProperties.moduleType] && this.state.permission_set[moduleProperties.moduleType][moduleProperties.id]) { - // console.log('nside') - // return this.state.permission_set[moduleProperties.moduleType][moduleProperties.id][permission[2]]? true : false; - // } - // else { - // const permission = await AuthUtil.getUserRoleById(moduleProperties.moduleType, moduleProperties.id); - // console.log(permission) - // return false - // } - // } - // else { - // return true; - // } - } } -// getModuleProperties(path){ -// let moduleProperties = {}; -// if (path[1]=== 'task'){ -// moduleProperties.moduleType = path[3] === 'draft' ? 'task_draft': 'task_bleuprint'; -// moduleProperties.id = path[4] -// } else if (path[1] === 'project'){ -// moduleProperties.moduleType = path[1]; -// moduleProperties.id = path[3] -// } -// return moduleProperties; -// } render() { const { name, component, path, exact, permissions } = this.props;