Merge pull request #83 from PHOENIXCONTACT/port/fix/instruction-respo…

…nse-object

Port #82 to MORYX 8

.github/workflows/build-and-test.yml

@@ -17,10 +17,10 @@ on:
 env:
   dotnet_sdk_version: '8.0.100'
   REPOSITORY_NAME: ${{ github.event.repository.name }}
-  MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
-  MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
-  MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-future/api/v2/package'
-  MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-future/api/v3/index.json'
+  MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx-oss-ci/api/v2/package'
+  MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx-oss-ci/api/v3/index.json'
+  MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-oss-ci/api/v2/package'
+  MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-oss-ci/api/v3/index.json'
   MORYX_PACKAGE_TARGET_RELEASE: 'https://api.nuget.org/v3/index.json'
   MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
 

README.md

@@ -17,6 +17,12 @@
     </a>
 </p>
 
+<p align="center">
+    <a href="https://www.nuget.org/packages/Moryx/">
+        <img alt="NuGet Release" src="https://img.shields.io/nuget/v/Moryx.ControlSystem?color=0098A1">
+    </a>
+</p>
+
 # MORYX Factory
 
 **Public API definitions for MORYX Factory applications.**
@@ -25,13 +31,13 @@ This repository contains the APIs, domain objects and developer documentation fo
 
 ## Packages
 
-| Package | Stable | Preview | Future |
-|--|--|--|--|
-| `Moryx.ControlSystem` | [![NuGet](https://img.shields.io/nuget/v/Moryx.ControlSystem.svg)](https://www.nuget.org/packages/Moryx.ControlSystem/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.ControlSystem)](https://www.myget.org/feed/moryx/package/nuget/Moryx.ControlSystem) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.ControlSystem)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.ControlSystem) |
-| `Moryx.Orders` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Orders.svg)](https://www.nuget.org/packages/Moryx.Orders/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Orders)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Orders) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Orders)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.Orders) |
-| `Moryx.Users` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Users.svg)](https://www.nuget.org/packages/Moryx.Users/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Users)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Users) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Users)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.USers) | 
-| `Moryx.ProcessData` | [![NuGet](https://img.shields.io/nuget/v/Moryx.ProcessData.svg)](https://www.nuget.org/packages/Moryx.ProcessData/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.ProcessData)](https://www.myget.org/feed/moryx/package/nuget/Moryx.ProcessData) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.ProcessData)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.ProcessData) |
-| `Moryx.Simulation` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Simulation.svg)](https://www.nuget.org/packages/Moryx.Simulation/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Simulation)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Simulation) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Simulation)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.Simulation) |
+| Package |  |
+|--|--|
+| `Moryx.ControlSystem` |  |
+| `Moryx.Orders` |  |
+| `Moryx.Users` |  | 
+| `Moryx.ProcessData` |  |
+| `Moryx.Simulation` |  |
 ## Contribute
 
 You can contribute to the MORYX Factory Domain by reporting bugs and suggesting extensions to APIs.

VERSION

@@ -1 +1 @@
-8.0.1
+8.1.0

src/Moryx.ControlSystem/VisualInstructions/ActiveInstruction.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2022, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
+using System;
 using System.Collections.Generic;
 
 namespace Moryx.ControlSystem.VisualInstructions
@@ -33,6 +34,12 @@ public class ActiveInstruction
         /// <summary>
         /// Results of the instruction
         /// </summary>
+        [Obsolete("Use the result objects in 'Results' property instead!")]
         public IReadOnlyList<string> PossibleResults { get; set; } = new string[0];
+
+        /// <summary>
+        /// Possible results of the instruction
+        /// </summary>
+        public InstructionResult[] Results { get; set; } = Array.Empty<InstructionResult>();
     }
 }

src/Moryx.ControlSystem/VisualInstructions/ActiveInstructionResponse.cs

@@ -11,7 +11,6 @@ namespace Moryx.ControlSystem.VisualInstructions
     /// Response of the client for an <see cref="ActiveInstruction"/>
     /// </summary>
     public class ActiveInstructionResponse
-
     {
         /// <summary>
         /// Runtime unique identifier of this instruction per client-identifier
@@ -26,6 +25,12 @@ public class ActiveInstructionResponse
         /// <summary>
         /// Selected result option by the user
         /// </summary>
+        [Obsolete("Use result object from 'SelectedResult' instead")]
         public string Result { get; set; }
+
+        /// <summary>
+        /// Selected result option by the user
+        /// </summary>
+        public InstructionResult SelectedResult { get; set; }
     }
 }

src/Moryx.ControlSystem/VisualInstructions/EnumInstructionResult.cs

@@ -21,6 +21,18 @@ public static IReadOnlyList<string> PossibleResults(Type resultEnum, params stri
             return ParseEnum(resultEnum, exceptions).Keys.ToList();
         }
 
+        /// <summary>
+        /// Determine possible string buttons from enum result
+        /// </summary>
+        public static IReadOnlyList<InstructionResult> PossibleInstructionResults(Type resultEnum, params string[] exceptions)
+        {
+            return ParseEnum(resultEnum, exceptions).Select(pair => new InstructionResult
+            {
+                Key = pair.Value.ToString("D"),
+                DisplayValue = pair.Key
+            }).ToList();
+        }
+
         /// <summary>
         /// Parse the given result back to an enum value
         /// </summary>
@@ -29,6 +41,34 @@ public static int ResultToEnumValue(Type resultEnum, string result)
             return ParseEnum(resultEnum)[result];
         }
 
+        /// <summary>
+        /// Parse the given result back to an enum value
+        /// </summary>
+        public static int ResultToEnumValue(Type resultEnum, InstructionResult result)
+        {
+            return int.Parse(result.Key);
+        }
+
+        /// <summary>
+        /// Convert string result to typed enum
+        /// </summary>
+        public static TEnum ResultToGenericEnumValue<TEnum>(string result)
+            where TEnum : Enum
+        {
+            var numeric = ResultToEnumValue(typeof(TEnum), result);
+            return (TEnum)Enum.ToObject(typeof(TEnum), numeric);
+        }
+
+        /// <summary>
+        /// Convert string result to typed enum
+        /// </summary>
+        public static TEnum ResultToGenericEnumValue<TEnum>(InstructionResult result)
+            where TEnum : Enum
+        {
+            var numeric = int.Parse(result.Key);
+            return (TEnum)Enum.ToObject(typeof(TEnum), numeric);
+        }
+
         /// <summary>
         /// Parse the given enum to an dictionary of button text and value
         /// </summary>
@@ -70,7 +110,7 @@ private static IDictionary<string, int> ParseEnum(Type resultEnum, params string
             {
                 return allValues;
             }
-            
+
             // Case 3: All values are explicitly hidden => display nothing 
             if (allValues.Count == hiddenValues.Count)
             {

src/Moryx.ControlSystem/VisualInstructions/InstructionResult.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Moryx.ControlSystem.VisualInstructions
+{
+    /// <summary>
+    /// Object representing a possible result for an instructions
+    /// </summary>
+    public class InstructionResult
+    {
+        /// <summary>
+        /// Key of the result. This value needs to be unique for the instruction the result is used for.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Human readable value of the result
+        /// </summary>
+        public string DisplayValue { get; set; }
+    }
+}

src/Moryx.ControlSystem/VisualInstructions/VisualInstructorExtensions.cs

@@ -77,7 +77,13 @@ public static long Execute<T>(this IVisualInstructor instructor, string title, I
                 title,
                 parameter,
                 EnumInstructionResult.PossibleResults(typeof(T)),
-                result => { callback(EnumInstructionResult.ResultToEnumValue(typeof(T), result.Result)); });
+                result =>
+                {
+                    if (result.SelectedResult?.Key == null)
+                        callback(EnumInstructionResult.ResultToGenericEnumValue<T>(result.Result));
+                    else
+                        callback(EnumInstructionResult.ResultToGenericEnumValue<T>(result.SelectedResult));
+                });
         }
 
         /// <summary>

src/Moryx.Orders/Facade/IOrderManagement.cs

@@ -150,7 +150,7 @@ public interface IOrderManagement
 
         /// <summary>
         /// Tries to advise the <see cref="Operation"/>. 
-        /// The returned advice result contains information regarding the successful or unsuccesful attempt.
+        /// The returned advice result contains information regarding the successful or unsuccessful attempt.
         /// </summary>
         /// <param name="operation">The <see cref="Operation"/> to advice.</param>
         /// <param name="advice">The <see cref="OperationAdvice"/> to apply on the <see cref="Operation"/>.</param>

src/Moryx.Orders/Operation.cs

@@ -108,13 +108,23 @@ public class Operation
         /// <summary>
         /// Current state classification of this operation
         /// </summary>
-        public virtual OperationClassification State { get => (OperationClassification)((int)FullState & 0xFF); protected set => FullState = value; }
+        public virtual OperationClassification State
+        {
+            get => (OperationClassification)((int)FullState & 0xFF); 
+            protected set => FullState = value;
+        }
 
         /// <summary>
         /// Current state classification of this operation
         /// </summary>
         public virtual OperationClassification FullState { get; protected set; }
 
+        /// <summary>
+        /// Detailed display name of the state
+        /// TODO: Remove this property in next major and replace rework OperationClassification
+        /// </summary>
+        public virtual string StateDisplayName { get; protected set; }
+
         /// <summary>
         /// Source information of the operation
         /// </summary>

src/Moryx.Orders/OperationClassification.cs

@@ -8,7 +8,7 @@ namespace Moryx.Orders
     /// <summary>
     /// Enum providing the classification of the internal state machine of the operation for an external representation
     /// The lowest 8 bits define the state of the operation. The following 16 bits contain flags for the executable 
-    /// actions on the operation and the trailing 8 bits overal classification information.
+    /// actions on the operation and the trailing 8 bits overall classification information.
     /// Bit:    31 - 24  |  23 - 8  |  7 - 0  |
     /// Flag:     Type   |   Usage  |  State  |
     /// </summary>
@@ -60,7 +60,6 @@ public enum OperationClassification
         /// </summary>
         Failed = 11,
 
-
         /// <summary>
         /// Flag if the operation can be reloaded
         /// </summary>
@@ -84,6 +83,11 @@ public enum OperationClassification
         /// <summary>
         /// Flag if the operation can be adviced
         /// </summary>
-        CanAdvice = (1 << 20)
+        CanAdvice = (1 << 20),
+
+        /// <summary>
+        /// Flag if the operation is running but has no process
+        /// </summary>
+        IsAmountReached = (1 << 22),
     }
 }

src/Moryx.Orders/OperationLogMessage.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.Extensions.Logging;
-using Moryx.Logging;
 
 namespace Moryx.Orders
 {

src/Tests/Moryx.ControlSystem.Tests/EnumInstructionResultTests.cs

@@ -22,9 +22,11 @@ public void GetAllValuesIfNoResultIsDecorated()
         {
             // Act
             var instructionResult = EnumInstructionResult.PossibleResults(typeof(TestResults1));
+            var possibleResults = EnumInstructionResult.PossibleInstructionResults(typeof(TestResults1));
 
             // Assert
-            Assert.AreEqual(2, instructionResult.Count, "There should be 2 results because all of the results are not decorated");
+            Assert.AreEqual(2, instructionResult.Count(), "There should be 2 results because all of the results are not decorated");
+            Assert.AreEqual(2, possibleResults.Count(), "There should be 2 results because all of the results are not decorated");
         }
 
         private enum TestResults2
@@ -106,9 +108,11 @@ public void ParseResponse()
 
             // Act
             var enumValue = (TestResults1)EnumInstructionResult.ResultToEnumValue(typeof(TestResults1), instructionResult[1]);
+            var directValue = EnumInstructionResult.ResultToGenericEnumValue<TestResults1>(instructionResult[1]);
 
             // Assert
             Assert.AreEqual(TestResults1.Value2, enumValue);
+            Assert.AreEqual(TestResults1.Value2, directValue);
         }
 
         private class MyInput