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.

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] Fix Empty TAXII Ingester User Reverts to Previous User instead of System (#4813) #4834

Merged
merged 3 commits into from
Nov 8, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const ingestionRssValidation = (t) => Yup.object().shape({
object_marking_refs: Yup.array().nullable(),
report_types: Yup.array().nullable(),
created_by_ref: Yup.mixed().nullable(),
user_id: Yup.object().nullable(),
user_id: Yup.mixed().nullable(),
current_state_date: Yup.date()
.typeError(t('The value must be a datetime (yyyy-MM-dd hh:mm (a|p)m)'))
.nullable(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const ingestionTaxiiValidation = (t) => Yup.object().shape({
cert: Yup.string().nullable(),
key: Yup.string().nullable(),
ca: Yup.string().nullable(),
user_id: Yup.object().nullable(),
user_id: Yup.mixed().nullable(),
added_after_start: Yup.date()
.typeError(t('The value must be a datetime (yyyy-MM-dd hh:mm (a|p)m)'))
.nullable(),
Expand Down Expand Up @@ -149,6 +149,7 @@ const IngestionTaxiiEditionContainer = ({
'added_after_start',
]),
)(ingestionTaxii);

return (
<Drawer
title={t('Update a TAXII ingester')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const syncValidation = (t) => Yup.object().shape({
no_dependencies: Yup.bool(),
ssl_verify: Yup.bool(),
synchronized: Yup.bool(),
user_id: Yup.object().nullable(),
user_id: Yup.mixed().nullable(),
});

const SyncEditionContainer = ({ synchronizer }) => {
Expand Down