fix(rbac): do not disable already selected rule for allOf/anyOf (#1739)

janus-idp · May 30, 2024 · dc73650 · dc73650
1 parent c0f4de9
commit dc73650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx b/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx
@@ -163,9 +163,6 @@ export const ConditionsFormRow = ({
                   criteria={criteria}
                   conditionRulesData={conditionRulesData}
                   setErrors={setErrors}
-                  optionDisabled={ruleOption =>
-                    ruleOptionDisabled(ruleOption, conditionRow.allOf)
-                  }
                   setRemoveAllClicked={setRemoveAllClicked}
                 />
                 <IconButton
@@ -194,9 +191,6 @@ export const ConditionsFormRow = ({
                   criteria={criteria}
                   conditionRulesData={conditionRulesData}
                   setErrors={setErrors}
-                  optionDisabled={ruleOption =>
-                    ruleOptionDisabled(ruleOption, conditionRow.anyOf)
-                  }
                   setRemoveAllClicked={setRemoveAllClicked}
                 />
                 <IconButton

diff --git a/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRowFields.tsx b/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRowFields.tsx
@@ -30,7 +30,7 @@ type ConditionFormRowFieldsProps = {
   conditionRow: ConditionsData;
   conditionRulesData?: RulesData;
   setErrors: React.Dispatch<React.SetStateAction<RuleParamsErrors | undefined>>;
-  optionDisabled: (ruleOption: string) => boolean;
+  optionDisabled?: (ruleOption: string) => boolean;
   setRemoveAllClicked: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
@@ -96,7 +96,9 @@ export const ConditionsFormRowFields = ({
         style={{ marginTop: '27px', width: '50%' }}
         options={rules ?? []}
         value={oldCondition?.rule || null}
-        getOptionDisabled={option => optionDisabled(option)}
+        getOptionDisabled={option =>
+          optionDisabled ? optionDisabled(option) : false
+        }
         onChange={(_event, ruleVal?: string | null) =>
           handleConditionChange({
             ...oldCondition,