Skip to content

Commit

Permalink
fix: do not pass null value to checkbox component (#2105)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkholjuraev committed May 7, 2024
1 parent 86da24e commit 5de4817
Showing 1 changed file with 8 additions and 8 deletions.
Expand Up @@ -18,7 +18,7 @@ export const isCvssRangeValid = (min, max) => {
return min >= 0 && max <= 10 && min <= max && !isNaN(min) && !isNaN(max);
};

const CvssCustomFilter = ({ filterData, setFilterData, selectProps, filterName }) => {
const CvssCustomFilter = ({ filterData = { cvss_filter: {} }, setFilterData, selectProps, filterName }) => {
const [isOpen, setOpen] = useState(false);

const handleCvssInputChange = (value, inputName) => {
Expand All @@ -31,9 +31,9 @@ const CvssCustomFilter = ({ filterData, setFilterData, selectProps, filterName }
};

const validateCvssInput = (inputName) => {
const currentValue = filterData.cvss_filter[inputName];
const minValue = filterData.cvss_filter.from;
const maxValue = filterData.cvss_filter.to;
const currentValue = filterData?.cvss_filter && filterData?.cvss_filter[inputName];
const minValue = filterData?.cvss_filter?.from;
const maxValue = filterData?.cvss_filter?.to;

if (currentValue < 0 || currentValue > 10 || minValue > maxValue || isNaN(currentValue)) {
return 'error';
Expand All @@ -53,7 +53,7 @@ const CvssCustomFilter = ({ filterData, setFilterData, selectProps, filterName }
validated={validateCvssInput('from')}
id="cvss-min"
className="cvss-input"
value={filterData.cvss_filter.from}
value={filterData?.cvss_filter?.from}
/>
</SplitItem>
<SplitItem>
Expand All @@ -69,14 +69,14 @@ const CvssCustomFilter = ({ filterData, setFilterData, selectProps, filterName }
validated={validateCvssInput('to')}
id="cvss-max"
className="cvss-input"
value={filterData.cvss_filter.to}
value={filterData.cvss_filter?.to}
/>
</SplitItem>
</Split>);

const filterCvssGetLabel = () => {
const min = filterData.cvss_filter.from;
const max = filterData.cvss_filter.to;
const min = filterData.cvss_filter?.from;
const max = filterData.cvss_filter?.to;

if (min === 0 && max === 10) {
return `${filterName}: ${intl.formatMessage(messages.optionsAll)}`;
Expand Down

0 comments on commit 5de4817

Please sign in to comment.