Clear useless form conditions (#21979)

Author: AdrienClairembault

src/Glpi/Form/Comment.php

@@ -169,6 +169,8 @@ private function prepareInput(array $input): array
             unset($input['_conditions']);
         }
 
+        $input = $this->removeSavedConditionsIfAlwaysVisible($input);
+
         return $input;
     }
 

src/Glpi/Form/Condition/ConditionableCreationInterface.php

@@ -37,4 +37,7 @@
 interface ConditionableCreationInterface extends ConditionableInterface
 {
     public function getConfiguredCreationStrategy(): CreationStrategy;
+
+    // TODO: uncomment on main to prevent BC breaks
+    // protected function removeSavedConditionsIfAlwaysCreated(array $input): array;
 }

src/Glpi/Form/Condition/ConditionableCreationTrait.php

@@ -34,6 +34,8 @@
 
 namespace Glpi\Form\Condition;
 
+use function Safe\json_encode;
+
 trait ConditionableCreationTrait
 {
     use ConditionableTrait;
@@ -44,4 +46,19 @@ public function getConfiguredCreationStrategy(): CreationStrategy
         $strategy = CreationStrategy::tryFrom($strategy_value);
         return $strategy ?? CreationStrategy::ALWAYS_CREATED;
     }
+
+    protected function removeSavedConditionsIfAlwaysCreated(array $input): array
+    {
+        $strategy_field = 'creation_strategy';
+        $condition_field = $this->getConditionsFieldName();
+
+        if (
+            isset($input[$strategy_field])
+            && $input[$strategy_field] == CreationStrategy::ALWAYS_CREATED->value
+        ) {
+            $input[$condition_field] = json_encode([]);
+        }
+
+        return $input;
+    }
 }

src/Glpi/Form/Condition/ConditionableValidationTrait.php

@@ -34,6 +34,8 @@
 
 namespace Glpi\Form\Condition;
 
+use function Safe\json_encode;
+
 trait ConditionableValidationTrait
 {
     use ConditionableTrait {
@@ -76,4 +78,19 @@ public function getConfiguredValidationStrategy(): ValidationStrategy
         $strategy = ValidationStrategy::tryFrom($strategy_value);
         return $strategy ?? ValidationStrategy::NO_VALIDATION;
     }
+
+    protected function removeSavedConditionsIfNoValidation(array $input): array
+    {
+        $strategy_field = $this->getValidationStrategyFieldName();
+        $condition_field = $this->getValidationConditionsFieldName();
+
+        if (
+            isset($input[$strategy_field])
+            && $input[$strategy_field] == ValidationStrategy::NO_VALIDATION->value
+        ) {
+            $input[$condition_field] = json_encode([]);
+        }
+
+        return $input;
+    }
 }

src/Glpi/Form/Condition/ConditionableVisibilityInterface.php

@@ -49,4 +49,7 @@ public function getConfiguredVisibilityStrategy(): VisibilityStrategy;
      * @return string
      */
     public function getUUID(): string;
+
+    // TODO: uncomment on main to prevent BC breaks
+    // protected function removeSavedConditionsIfAlwaysVisible(array $input): array;
 }

src/Glpi/Form/Condition/ConditionableVisibilityTrait.php

@@ -34,6 +34,8 @@
 
 namespace Glpi\Form\Condition;
 
+use function Safe\json_encode;
+
 trait ConditionableVisibilityTrait
 {
     use ConditionableTrait;
@@ -56,4 +58,19 @@ public function getConfiguredVisibilityStrategy(): VisibilityStrategy
         $strategy = VisibilityStrategy::tryFrom($strategy_value);
         return $strategy ?? VisibilityStrategy::ALWAYS_VISIBLE;
     }
+
+    protected function removeSavedConditionsIfAlwaysVisible(array $input): array
+    {
+        $visibility_field = $this->getVisibilityStrategyFieldName();
+        $condition_field = $this->getConditionsFieldName();
+
+        if (
+            isset($input[$visibility_field])
+            && $input[$visibility_field] == VisibilityStrategy::ALWAYS_VISIBLE->value
+        ) {
+            $input[$condition_field] = json_encode([]);
+        }
+
+        return $input;
+    }
 }

src/Glpi/Form/Destination/FormDestination.php

@@ -284,6 +284,8 @@ public function prepareInput($input): array
             unset($input['_conditions']);
         }
 
+        $input = $this->removeSavedConditionsIfAlwaysCreated($input);
+
         return $input;
     }
 

src/Glpi/Form/Form.php

@@ -375,6 +375,8 @@ private function prepareInput(array $input): array
             unset($input['_submit_button_conditions']);
         }
 
+        $input = $this->removeSavedConditionsIfAlwaysVisible($input);
+
         return $input;
     }
 

src/Glpi/Form/Question.php

@@ -401,6 +401,9 @@ private function prepareInput(array $input): array
             }
         }
 
+        $input = $this->removeSavedConditionsIfAlwaysVisible($input);
+        $input = $this->removeSavedConditionsIfNoValidation($input);
+
         return $input;
     }
 

src/Glpi/Form/Section.php

@@ -144,6 +144,8 @@ private function prepareInput(array $input): array
             unset($input['_conditions']);
         }
 
+        $input = $this->removeSavedConditionsIfAlwaysVisible($input);
+
         return $input;
     }