Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[frontend] In Observable / Indicators composed with this observable view, fix the css(#9279) #9391

Merged
merged 5 commits into from
Jan 28, 2025
Merged

[frontend] In Observable / Indicators composed with this observable view, fix the css(#9279) #9391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95c93dd
[frontend] Correct the position of the + button and the size of the d…
Gwendoline-FAVRE-FELIX Dec 17, 2024
14ffdc5
[frontend] Reset the drawer width and correct the length of the trunc…
Gwendoline-FAVRE-FELIX Dec 18, 2024
a6d42e8
[frontend] Fix truncate by CSS (#9279)
Gwendoline-FAVRE-FELIX Jan 28, 2025
935fcda
[frontend] Fix import (#9279)
Gwendoline-FAVRE-FELIX Jan 28, 2025
88728ba
[frontend] Remove change (#9279)
Gwendoline-FAVRE-FELIX Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions ...e/components/common/stix_core_relationships/StixCoreRelationshipCreationFromEntityList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import ListItemText from '@mui/material/ListItemText';
import { graphql } from 'react-relay';
import Skeleton from '@mui/material/Skeleton';
import * as R from 'ramda';
import { truncate } from '../../../../utils/String';
import ItemIcon from '../../../../components/ItemIcon';
import { deleteNodeFromEdge } from '../../../../utils/store';
import { useFormatter } from '../../../../components/i18n';
Expand Down Expand Up @@ -333,13 +332,9 @@ const StixCoreRelationshipCreationFromEntityList = ({
.filter((edge) => edge.node.id !== entity.id)
.map((edge) => edge.node);

const defaultDescription = (data) => truncate(
// eslint-disable-next-line no-nested-ternary
data.parent_types.includes('Stix-Cyber-Observable')
? data.x_opencti_description
: data.description,
120,
);
const defaultDescription = (data) => (data.parent_types.includes('Stix-Cyber-Observable')
? data.x_opencti_description
: data.description);

return (
<>
Expand Down Expand Up @@ -393,6 +388,14 @@ const StixCoreRelationshipCreationFromEntityList = ({
<ListItemText
primary={node.name}
secondary={defaultDescription(node)}
sx={{
'.MuiListItemText-primary, .MuiListItemText-secondary': {
overflowX: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
marginRight: '20px',
},
}}
/>
</ListItem>
);
Expand Down
2 changes: 1 addition & 1 deletion ...atform/opencti-front/src/private/components/observations/indicators/IndicatorCreation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const useStyles = makeStyles<Theme>((theme) => ({
createButtonContextual: {
position: 'fixed',
bottom: 30,
right: 100,
right: 30,
transition: theme.transitions.create('right', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
Expand Down
10 changes: 8 additions & 2 deletions ...ivate/components/observations/stix_cyber_observables/StixCyberObservableAddIndicators.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class StixCyberObservableAddIndicators extends Component {
size="large"
color="primary"
>
<Close fontSize="small" color="primary" />
<Close fontSize="small" color="primary"/>
</IconButton>
<Typography variant="h6" classes={{ root: classes.title }}>
{t('Add indicators')}
Expand Down Expand Up @@ -134,8 +134,14 @@ class StixCyberObservableAddIndicators extends Component {
}}
/>
</div>
<div className={classes.createButton}>
<IndicatorCreation
display={open}
contextual
paginationOptions={paginationOptions}
/>
</div>
</Drawer>
<IndicatorCreation display={open} contextual paginationOptions={paginationOptions} />
</>
);
}
Expand Down
Loading