Skip to content

Commit

Permalink
Fix overflow issue in visibility status
Browse files Browse the repository at this point in the history
  • Loading branch information
@Piumal1999
Piumal1999 committed Oct 11, 2024
1 parent c5b71df commit a735dcb
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 33 deletions.
33 changes: 16 additions & 17 deletions ...sher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Configuration.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function Configuration(props) {

{(api.gatewayVendor === 'wso2') && (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Transports */}
<Typography
id='transports'
Expand Down Expand Up @@ -98,7 +98,7 @@ function Configuration(props) {
</Tooltip>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{api.transport && api.transport.length !== 0 && (
api.transport.map((item, index) => (
Expand Down Expand Up @@ -128,15 +128,15 @@ function Configuration(props) {
)}
{ (api.gatewayVendor === 'solace') && (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.MetaData.solace.transports'
defaultMessage='Available Protocols'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
{api.solaceTransportProtocols
&& api.solaceTransportProtocols.map((protocol) => (
<Chip
Expand All @@ -153,7 +153,7 @@ function Configuration(props) {
</Grid>
</>
)}
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* API Security */}
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
Expand Down Expand Up @@ -182,7 +182,7 @@ function Configuration(props) {
</Tooltip>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{api.securityScheme && api.securityScheme.length !== 0 && (
<>
Expand All @@ -204,7 +204,7 @@ function Configuration(props) {
)}
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Access Control */}
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
Expand Down Expand Up @@ -245,7 +245,7 @@ function Configuration(props) {
</Tooltip>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{api.accessControl && (
<>
Expand All @@ -257,7 +257,7 @@ function Configuration(props) {
{api.accessControl === 'RESTRICTED' && ' ) '}
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* workflowStatus */}
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
Expand All @@ -266,7 +266,7 @@ function Configuration(props) {
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{api.workflowStatus && <>{api.workflowStatus}</>}
{!api.workflowStatus && (
Expand All @@ -281,13 +281,12 @@ function Configuration(props) {
)}
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Visibility */}
<Typography
component='p'
variant='subtitle2'
className={parentClasses.subtitle}
style={{ overflow: 'hidden', whiteSpace: 'nowrap' }}
>
<FormattedMessage
id='Apis.Details.NewOverview.MetaData.visibility.store'
Expand Down Expand Up @@ -327,7 +326,7 @@ function Configuration(props) {
</Tooltip>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{(api.visibility && api.visibility === 'PRIVATE')
? (
Expand All @@ -348,15 +347,15 @@ function Configuration(props) {
{(api.gatewayVendor === 'wso2') && (<Policies parentClasses={parentClasses} />)}
{api.apiType === API.CONSTS.APIProduct ? null : (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.MetaData.tags'
defaultMessage='Tags'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
{api.tags
&& api.tags.map((tag) => (
<Chip
Expand Down Expand Up @@ -386,7 +385,7 @@ function Configuration(props) {
</Grid>
</>
)}
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.MetaData.subvalidation'
Expand Down Expand Up @@ -417,7 +416,7 @@ function Configuration(props) {
</Tooltip>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{isSubValidationDisabled ?
<Typography
Expand Down
28 changes: 14 additions & 14 deletions ...ublisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Endpoints.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function Endpoints(props) {
<Box p={1}>
{(!api.advertiseInfo || !api.advertiseInfo.advertised) && (
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Production Endpoint (TODO) fix the endpoint
info when it's available with the api object */}
{ !isPrototypedAvailable ? (
Expand All @@ -100,7 +100,7 @@ function Endpoints(props) {
</Typography>
)}
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Tooltip
placement='top'
classes={{
Expand Down Expand Up @@ -129,7 +129,7 @@ function Endpoints(props) {
</Typography>
</Grid>
{!isPrototypedAvailable && (
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Sandbox Endpoint (TODO) fix the endpoint info when
it's available with the api object */}
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
Expand All @@ -143,7 +143,7 @@ function Endpoints(props) {
)}

{!isPrototypedAvailable && (
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Tooltip
placement='top'
classes={{
Expand Down Expand Up @@ -174,7 +174,7 @@ function Endpoints(props) {
)}
{isPrototypedAvailable ? (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
{/* Sandbox Endpoint (TODO) fix the endpoint info when
it's available with the api object */}
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
Expand All @@ -184,7 +184,7 @@ function Endpoints(props) {
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{productionEndpointSecurity && <>{authTypes[productionEndpointSecurity]}</>}
</Typography>
Expand All @@ -203,15 +203,15 @@ function Endpoints(props) {
</>
) : (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.Endpoints.production.endpoint.security'
defaultMessage='Production Endpoint Security'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{productionEndpointSecurity && <>{authTypes[productionEndpointSecurity]}</>}
</Typography>
Expand All @@ -227,15 +227,15 @@ function Endpoints(props) {
)}
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.Endpoints.sandbox.endpoint.security'
defaultMessage='Sandbox Endpoint Security'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='body1'>
{sandboxEndpointSecurity && <>{authTypes[sandboxEndpointSecurity]}</>}
</Typography>
Expand All @@ -257,15 +257,15 @@ function Endpoints(props) {
)}
{api.advertiseInfo && api.advertiseInfo.advertised && (
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.Endpoints.external.production.endpoint'
defaultMessage='External Production Endpoint'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Tooltip
placement='top'
classes={{
Expand Down Expand Up @@ -293,15 +293,15 @@ function Endpoints(props) {
)}
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.Endpoints.external.sandbox.endpoint'
defaultMessage='External Sandbox Endpoint'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
<Tooltip
placement='top'
classes={{
Expand Down
4 changes: 2 additions & 2 deletions ...publisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Policies.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ function Policies(props) {
&& api.policies.length === 1 && api.policies[0].includes(CONSTS.DEFAULT_SUBSCRIPTIONLESS_PLAN);
return (
<>
<Grid item xs={12} md={6} lg={4}>
<Grid item xs={12} md={6} lg={6}>
<Typography component='p' variant='subtitle2' className={parentClasses.subtitle}>
<FormattedMessage
id='Apis.Details.NewOverview.Policies.business.plans'
defaultMessage='Business Plans:'
/>
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={8}>
<Grid item xs={12} md={6} lg={6}>
{/* Throttling Policies */}
<Typography component='p' variant='body1'>
{api.policies && api.policies.length > 0 ? (
Expand Down

0 comments on commit a735dcb

Please sign in to comment.