diff --git a/src/components/fields/Status/ConditionModal.tsx b/src/components/fields/Status/ConditionModal.tsx
index 1e4b88de..a027e761 100644
--- a/src/components/fields/Status/ConditionModal.tsx
+++ b/src/components/fields/Status/ConditionModal.tsx
@@ -19,14 +19,11 @@ export default function ConditionModal({
setModal(EMPTY_STATE);
};
const handleAdd = () => {
- const labelIsEmpty = Boolean(modal.condition.label.length < 4);
+ const labelIsEmpty = Boolean(modal.condition.label.length === 0);
const stringValueIsEmpty = Boolean(
modal.condition.type === "string" && modal.condition.value.length === 0
);
- const hasDuplicate = Boolean(_find(conditions, modal.condition));
- const validation = Boolean(
- labelIsEmpty || stringValueIsEmpty || hasDuplicate
- );
+ const validation = Boolean(labelIsEmpty || stringValueIsEmpty);
if (validation) return;
function setConditionHack(type, condition) {
let rCondition = condition;
@@ -100,12 +97,7 @@ export default function ConditionModal({
secondary: secondaryAction(modal.index),
}}
children={
-
+
}
/>
);
diff --git a/src/components/fields/Status/ConditionModalContent.tsx b/src/components/fields/Status/ConditionModalContent.tsx
index 8c234f26..eb7340ae 100644
--- a/src/components/fields/Status/ConditionModalContent.tsx
+++ b/src/components/fields/Status/ConditionModalContent.tsx
@@ -4,29 +4,12 @@ import TextField from "@mui/material/TextField";
import Typography from "@mui/material/Typography";
import MultiSelect from "@rowy/multiselect";
-interface I_ConditionModalContent {
- handleUpdate: () => void;
- modal: any;
-}
-
export default function ConditionModalContent({
- isEditing,
condition,
- conditions,
handleUpdate,
}: any) {
const { label, operator, type, value } = condition;
const labelReqLen = Boolean(condition.label.length < 1);
- const onNewHasDuplicate = Boolean(_find(conditions, condition));
- const onEditConditions = conditions.filter(
- (c) => c.value !== condition.value
- ); //remove the current condition from list of conditions, to prevent false positive error on duplicate value
- const onEditHasDuplicate = Boolean(_find(onEditConditions, condition));
-
- const errorTextType = (isEditing: boolean, error: string) => {
- const hasError = isEditing ? onEditHasDuplicate : onNewHasDuplicate;
- return hasError ? error : "";
- };
return (
<>
@@ -76,23 +59,19 @@ export default function ConditionModalContent({
/>
handleUpdate("value")(Number(e.target.value))}
- helperText={errorTextType(isEditing, "Number value already exists")}
/>
)}
{type === "string" && (
handleUpdate("value")(e.target.value)}
- helperText={errorTextType(isEditing, "String value already exists")}
/>
)}