From df60f2301f4c57e59d1b23b026a3bb5b34a37000 Mon Sep 17 00:00:00 2001 From: olav Date: Fri, 8 Apr 2022 14:02:51 +0200 Subject: [PATCH] fix: remove separator from first option in list (#872) --- .../ConstraintOperatorSelect.tsx | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintOperatorSelect/ConstraintOperatorSelect.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintOperatorSelect/ConstraintOperatorSelect.tsx index d922148cdf..9c38f2d8f5 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintOperatorSelect/ConstraintOperatorSelect.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintOperatorSelect/ConstraintOperatorSelect.tsx @@ -5,6 +5,7 @@ import { semVerOperators, dateOperators, numOperators, + inOperators, } from 'constants/operators'; import React, { useState, ChangeEvent } from 'react'; import { formatOperatorDescription } from 'component/common/ConstraintAccordion/ConstraintOperator/formatOperatorDescription'; @@ -61,7 +62,8 @@ export const ConstraintOperatorSelect = ({ key={operator} value={operator} className={classNames( - needSeparatorAbove(operator) && styles.separator + needSeparatorAbove(options, operator) && + styles.separator )} >
@@ -77,15 +79,20 @@ export const ConstraintOperatorSelect = ({ ); }; -const needSeparatorAbove = (operator: Operator): boolean => { - const groups = [ - stringOperators, - numOperators, - dateOperators, - semVerOperators, - ]; +const needSeparatorAbove = (options: Operator[], option: Operator): boolean => { + if (option === options[0]) { + return false; + } - return groups.some(group => { - return group[0] === operator; + return operatorGroups.some(group => { + return group[0] === option; }); }; + +const operatorGroups = [ + inOperators, + stringOperators, + numOperators, + dateOperators, + semVerOperators, +];