Disable saving new scripts and executors that use deprecated languages

nolanpro · nolanpro · commit 1882fcb5d9dc · 2025-01-14T14:30:53.000-08:00
diff --git a/ProcessMaker/Models/Script.php b/ProcessMaker/Models/Script.php
@@ -130,14 +130,27 @@ public static function rules($existing = null)
     {
         $unique = Rule::unique('scripts')->ignore($existing);
 
+        if ($existing) {
+            $allowedLanguages = static::scriptFormatValues();
+            $allowedExecutorIds = ScriptExecutor::all()->pluck('id')->toArray();
+        } else {
+            $allowedLanguages = array_filter(static::scriptFormatValues(), function ($language) {
+                return !in_array($language, Script::deprecatedLanguages);
+            });
+            $allowedExecutorIds = ScriptExecutor::active()->pluck('id')->toArray();
+        }
+
         return [
             'key' => 'unique:scripts,key',
             'title' => ['required', 'string', $unique, 'alpha_spaces'],
             'language' => [
                 'required_without:script_executor_id',
-                Rule::in(static::scriptFormatValues()),
+                Rule::in($allowedLanguages),
+            ],
+            'script_executor_id' => [
+                'required_without:language',
+                Rule::in($allowedExecutorIds),
             ],
-            'script_executor_id' => 'required_without:language|exists:script_executors,id',
             'description' => 'required',
             'run_as_user_id' => 'required',
             'timeout' => 'integer|min:0|max:65535',
diff --git a/ProcessMaker/Models/ScriptExecutor.php b/ProcessMaker/Models/ScriptExecutor.php
@@ -147,11 +147,19 @@ public static function config($language)
 
     public static function rules($existing = null)
     {
+        if ($existing) {
+            $allowedLanguages = Script::scriptFormatValues();
+        } else {
+            $allowedLanguages = array_filter(Script::scriptFormatValues(), function ($language) {
+                return !in_array($language, Script::deprecatedLanguages);
+            });
+        }
+
         return [
             'title' => 'required',
             'language' => [
                 'required',
-                Rule::in(Script::scriptFormatValues()),
+                Rule::in($allowedLanguages),
             ],
         ];
     }
