diff --git a/frontend/src/component/project/Project/ProjectSettings/ProjectActions/ProjectActionsTable/ProjectActionsModal/ProjectActionsForm/ProjectActionsFormStep/ProjectActionsFormStepSource/ProjectActionsFilterItem.tsx b/frontend/src/component/project/Project/ProjectSettings/ProjectActions/ProjectActionsTable/ProjectActionsModal/ProjectActionsForm/ProjectActionsFormStep/ProjectActionsFormStepSource/ProjectActionsFilterItem.tsx index 16551562c8..5f5e4dd8c9 100644 --- a/frontend/src/component/project/Project/ProjectSettings/ProjectActions/ProjectActionsTable/ProjectActionsModal/ProjectActionsForm/ProjectActionsFormStep/ProjectActionsFormStepSource/ProjectActionsFilterItem.tsx +++ b/frontend/src/component/project/Project/ProjectSettings/ProjectActions/ProjectActionsTable/ProjectActionsModal/ProjectActionsForm/ProjectActionsFormStep/ProjectActionsFormStepSource/ProjectActionsFilterItem.tsx @@ -11,13 +11,13 @@ import Input from 'component/common/Input/Input'; import { ProjectActionsFormItem } from '../ProjectActionsFormItem.tsx'; import { inOperators, + isStringOperator, numOperators, type Operator, semVerOperators, stringOperators, } from 'constants/operators'; import { useEffect, useState } from 'react'; -import { oneOf } from 'utils/oneOf'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { CaseSensitiveButton } from './StyledToggleButton/CaseSensitiveButton/CaseSensitiveButton.tsx'; import { InvertedOperatorButton } from './StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton.tsx'; @@ -169,7 +169,7 @@ export const ProjectActionsFilterItem = ({ }, [value, error]); useEffect(() => { - if (oneOf(stringOperators, operator)) { + if (isStringOperator(operator)) { setShowCaseSensitiveButton(true); } else { setShowCaseSensitiveButton(false); @@ -177,7 +177,7 @@ export const ProjectActionsFilterItem = ({ }, [operator]); const onOperatorChange = (operator: Operator) => { - if (oneOf(stringOperators, operator)) { + if (isStringOperator(operator)) { setShowCaseSensitiveButton(true); } else { setShowCaseSensitiveButton(false); diff --git a/frontend/src/hooks/useChangeRequestInReviewWarning.tsx b/frontend/src/hooks/useChangeRequestInReviewWarning.tsx index 5d11237441..c5c0277b86 100644 --- a/frontend/src/hooks/useChangeRequestInReviewWarning.tsx +++ b/frontend/src/hooks/useChangeRequestInReviewWarning.tsx @@ -1,5 +1,4 @@ import { Alert } from '@mui/material'; -import { oneOf } from 'utils/oneOf'; import type { ChangeRequestType } from '../component/changeRequest/changeRequest.types'; export const useChangeRequestInReviewWarning = ( @@ -11,7 +10,7 @@ export const useChangeRequestInReviewWarning = ( return draft.some( (changeRequest) => changeRequest.environment === environment && - oneOf(['In review', 'Approved'], changeRequest.state), + ['In review', 'Approved'].includes(changeRequest.state), ); }; diff --git a/frontend/src/utils/cleanConstraint.ts b/frontend/src/utils/cleanConstraint.ts index e5caacf312..bf0f08bcc4 100644 --- a/frontend/src/utils/cleanConstraint.ts +++ b/frontend/src/utils/cleanConstraint.ts @@ -1,13 +1,12 @@ -import { singleValueOperators } from 'constants/operators'; import type { IConstraint } from 'interfaces/strategy'; -import { oneOf } from 'utils/oneOf'; import produce from 'immer'; +import { isSingleValueOperator } from 'constants/operators'; export const cleanConstraint = ( constraint: Readonly, ): IConstraint => { return produce(constraint, (draft) => { - if (oneOf(singleValueOperators, constraint.operator)) { + if (isSingleValueOperator(constraint.operator)) { delete draft.values; } else { delete draft.value; diff --git a/frontend/src/utils/oneOf.ts b/frontend/src/utils/oneOf.ts deleted file mode 100644 index d7b3a47c3d..0000000000 --- a/frontend/src/utils/oneOf.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const oneOf = (values: string[], match: string) => { - return values.some((value) => value === match); -}; diff --git a/frontend/src/utils/operatorsForContext.ts b/frontend/src/utils/operatorsForContext.ts index df54c0e882..09fdf291bc 100644 --- a/frontend/src/utils/operatorsForContext.ts +++ b/frontend/src/utils/operatorsForContext.ts @@ -1,23 +1,22 @@ import { allOperators, - dateOperators, + isDateOperator, type Operator, } from 'constants/operators'; -import { oneOf } from 'utils/oneOf'; export const CURRENT_TIME_CONTEXT_FIELD = 'currentTime'; export const operatorsForContext = (contextName: string): Operator[] => { return allOperators.filter((operator) => { if ( - oneOf(dateOperators, operator) && + isDateOperator(operator) && contextName !== CURRENT_TIME_CONTEXT_FIELD ) { return false; } if ( - !oneOf(dateOperators, operator) && + !isDateOperator(operator) && contextName === CURRENT_TIME_CONTEXT_FIELD ) { return false;