Merge remote-tracking branch 'origin/dev'

PHOENIXCONTACT · Feb 17, 2023 · 53c140a · 53c140a
2 parents fbe7afe + a496b52
commit 53c140a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.3.1
+4.4.1
diff --git a/src/Moryx.ControlSystem/Jobs/JobPositionType.cs b/src/Moryx.ControlSystem/Jobs/JobPositionType.cs
@@ -32,5 +32,10 @@ public enum JobPositionType
         /// The new jobs surround existing ones
         /// </summary>
         AroundExisting = 4,
+
+        /// <summary>
+        /// Append job(s) to group of jobs with the same recipe
+        /// </summary>
+        AppendToRecipe = 5,
     }
 }
diff --git a/src/Moryx.ControlSystem/VisualInstructions/VisualInstructionBinder.cs b/src/Moryx.ControlSystem/VisualInstructions/VisualInstructionBinder.cs
@@ -19,7 +19,7 @@ public class VisualInstructionBinder
         /// </summary>
         public VisualInstructionBinder(IEnumerable<VisualInstruction> instructions, IBindingResolverFactory resolverFactory)
         {
-            _instructionResolvers = instructions.Select(inst => new InstructionResolver(inst, resolverFactory)).ToArray();
+            _instructionResolvers = instructions.Where(inst => inst.Type != InstructionContentType.Unknown).Select(inst => new InstructionResolver(inst, resolverFactory)).ToArray();
         }
 
         /// <summary>
@@ -40,7 +40,7 @@ public InstructionResolver(VisualInstruction instruction, IBindingResolverFactor
             {
                 _instruction = instruction;
 
-                _contentResolver = TextBindingResolverFactory.Create(instruction.Content, resolverFactory);
+                _contentResolver = TextBindingResolverFactory.Create(instruction.Content ?? string.Empty, resolverFactory);
                 if (!string.IsNullOrEmpty(instruction.Preview))
                     _previewResolver = TextBindingResolverFactory.Create(instruction.Preview, resolverFactory);
             }