Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const CheckboxesField = ({
<FormControl component="fieldset" name={name}>
<FormLabel component="legend">{label}</FormLabel>

<ButtonGroup size="small" sx={{ marginY: 1 }}>
<ButtonGroup size="small" sx={{ marginY: 1.5 }}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we usually don't accept margin with a dot (only entire number)... but if REALLY needed let's keep that :/

<Button
disabled={items.length === 0}
variant={(items.length > 0 && value.length === items.length) ? 'primary' : 'secondary'}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,9 +665,9 @@ const GraphToolbarExpandTools = ({

<Dialog
fullWidth
maxWidth="sm"
maxWidth={false}
open={isExpandOpen}
slotProps={{ paper: { elevation: 1 } }}
sx={{ '& .MuiDialog-paper': { width: 640 } }}
onClose={() => setIsExpandOpen(false)}
>
<InvestigationExpandForm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -371,40 +371,42 @@ const InvestigationExpandFormContent = ({
>
{({ submitForm, handleReset, isSubmitting }) => (
<Form>
<Stack direction="row" justifyContent="space-between">
<Field
name="entity_types"
component={CheckboxesField}
label={t_i18n('All types of target')}
items={targets}
/>
<Stack spacing={3} sx={{ p: 3 }}>
<Stack direction="row" justifyContent="space-between">
<Field
name="entity_types"
component={CheckboxesField}
label={t_i18n('All types of target')}
items={targets}
/>
<Field
name="relationship_types"
component={CheckboxesField}
label={t_i18n('All types of relationship')}
items={relationships}
/>
</Stack>

<Field
name="relationship_types"
component={CheckboxesField}
label={t_i18n('All types of relationship')}
items={relationships}
component={SwitchField}
type="checkbox"
name="reset_filters"
label={t_i18n('Reset filters')}
containerstyle={{ marginTop: 12 }}
/>
</Stack>

<Field
component={SwitchField}
type="checkbox"
name="reset_filters"
label={t_i18n('Reset filters')}
containerstyle={{ marginTop: 20 }}
/>

<DialogActions>
<Button variant="secondary" onClick={handleReset} disabled={isSubmitting}>
{t_i18n('Cancel')}
</Button>
<Button
onClick={submitForm}
disabled={isSubmitting}
>
{t_i18n('Expand')}
</Button>
</DialogActions>
<DialogActions>
<Button variant="secondary" onClick={handleReset} disabled={isSubmitting}>
{t_i18n('Cancel')}
</Button>
<Button
onClick={submitForm}
disabled={isSubmitting}
>
{t_i18n('Expand')}
</Button>
</DialogActions>
</Stack>
</Form>
)}
</Formik>
Expand Down