diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/Subscriptions.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/Subscriptions.jsx index 0c8e7624185..9f6cee97bc9 100755 --- a/portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/Subscriptions.jsx +++ b/portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/Subscriptions.jsx @@ -52,6 +52,7 @@ const PREFIX = 'Subscriptions'; const classes = { searchRoot: `${PREFIX}-searchRoot`, + searchBar: `${PREFIX}-searchBar`, input: `${PREFIX}-input`, iconButton: `${PREFIX}-iconButton`, divider: `${PREFIX}-divider`, @@ -61,6 +62,7 @@ const classes = { cardTitle: `${PREFIX}-cardTitle`, cardContent: `${PREFIX}-cardContent`, titleWrapper: `${PREFIX}-titleWrapper`, + dialogHeader: `${PREFIX}-dialogHeader`, dialogTitle: `${PREFIX}-dialogTitle`, genericMessageWrapper: `${PREFIX}-genericMessageWrapper`, searchResults: `${PREFIX}-searchResults`, @@ -141,17 +143,29 @@ const StyledDialog = styled(Dialog)(( }, }, + [`& .${classes.dialogHeader}`]: { + display: 'flex', + justifyContent: 'space-between', + }, + [`& .${classes.dialogTitle}`]: { + marginTop: theme.spacing(1), padding: theme.spacing(2), }, [`& .${classes.searchRoot}`]: { + marginLeft: 'auto', + width: '50%', + marginTop: theme.spacing(2), + }, + + [`& .${classes.searchBar}`]: { padding: '2px 4px', display: 'flex', alignItems: 'center', flex: 1, marginLeft: theme.spacing(2), - marginRight: theme.spacing(2), + marginRight: theme.spacing(1), }, [`& .${classes.clearSearchIcon}`]: { @@ -177,9 +191,9 @@ const StyledDialog = styled(Dialog)(( }, [`& .${classes.closeButton}`]: { - position: 'absolute', - right: theme.spacing(0.5), - top: theme.spacing(0.5), + height: '100%', + marginTop: theme.spacing(2), + marginRight: theme.spacing(1), }, })); @@ -631,79 +645,80 @@ class Subscriptions extends React.Component { maxWidth='sm' className={classes.subscribePop} > - - - - - - - cancel - - - - {searchText && ( - + + + - )} - + + + + {searchText && ( + + )} + { this.searchInputElem = el; }} - onChange={this.handleSearchTextTmpChange} - onKeyDown={this.handleEnterPress} - /> - - - - - - {(searchText && searchText !== '') ? ( - <> + })} + inputProps={{ + 'aria-label': intl.formatMessage({ + defaultMessage: 'Search APIs', + id: 'Applications.Details.Subscriptions.search', + }), + }} + inputRef={(el) => { this.searchInputElem = el; }} + onChange={this.handleSearchTextTmpChange} + onKeyDown={this.handleEnterPress} + /> + + + + + + {(searchText && searchText !== '') ? ( + <> + + + {` ${searchText}`} + + + ) : ( - {` ${searchText}`} - - ) : ( - - - - )} + )} + - + + cancel +