diff --git a/web/client/src/sections/install/containers/roles.jsx b/web/client/src/sections/install/containers/roles.jsx index e38e6ab..34a84d4 100644 --- a/web/client/src/sections/install/containers/roles.jsx +++ b/web/client/src/sections/install/containers/roles.jsx @@ -76,22 +76,22 @@ const Roles = (props) => { return (
{ - row.correlationProject.length >= 3 ? ( - -
7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.del ? '#F93920' : '' }}> - {item.pepProjectName} + row?.correlationProject?.length >= 3 ? ( + +
7 || item?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.del ? '#F93920' : '' }}> + {item.pepProjectName || item.name}
- ) : row.correlationProject.length == 2 ? ( - -
12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}> - {item.pepProjectName} + ) : row?.correlationProject?.length == 2 ? ( + +
12 || item?.name?.length > 12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}> + {item.pepProjectName || item.name}
) : ( - -
25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}> - {item.pepProjectName} + +
25 || item?.name?.length > 25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.del ? '#F93920' : '' }}> + {item.pepProjectName || item.name}
) @@ -102,14 +102,14 @@ const Roles = (props) => { }) } { - row.correlationProject.length > 3 ? ( + row?.correlationProject?.length > 3 ? ( { row.correlationProject.map((item, index) => { return (
- {item.pepProjectName}, + {item.pepProjectName || item.name},
) }) @@ -117,7 +117,7 @@ const Roles = (props) => {
} trigger="click" style={{ lineHeight: 2 }}>
- +{row.correlationProject.length - 3} + +{row?.correlationProject?.length - 3}
) : ('')