Merge branch 'develop' into 7257-AdvancedRecordsetFuncitonsNotWorking

Author: PREMIER\Njabulo.Nxele

Dev/Dev2.Activities.Designers.Tests/Decision/DecisionTests.cs

@@ -388,6 +388,7 @@ public void DecisionDesignerViewModel_Validate_All()
                 TrueArmText = "",
                 FalseArmText = ""
             };
+            viewModel.Collection.RemoveAt(0);
             //------------Execute Test---------------------------
             viewModel.Validate();
             //------------Assert Results-------------------------
@@ -410,6 +411,7 @@ public void DecisionDesignerViewModel_Validate_DisplayText()
                 TrueArmText = "some text",
                 FalseArmText = "some text"
             };
+            viewModel.Collection.RemoveAt(0);
             //------------Execute Test---------------------------
             viewModel.Validate();
             //------------Assert Results-------------------------
@@ -433,6 +435,7 @@ public void DecisionDesignerViewModel_Validate_TrueArm()
                 TrueArmText = "",
                 FalseArmText = "some text"
             };
+            viewModel.Collection.RemoveAt(0);
             //------------Execute Test---------------------------
             viewModel.Validate();
             //------------Assert Results-------------------------
@@ -456,6 +459,7 @@ public void DecisionDesignerViewModel_Validate_FalseText()
                 TrueArmText = "some text",
                 FalseArmText = ""
             };
+            viewModel.Collection.RemoveAt(0);
             //------------Execute Test---------------------------
             viewModel.Validate();
             //------------Assert Results-------------------------
@@ -466,6 +470,25 @@ public void DecisionDesignerViewModel_Validate_FalseText()
             Assert.IsTrue(viewModel.IsFalseArmFocused);
         }
 
+        [TestMethod]
+        [Owner("Ashley Lewis")]
+        [TestCategory(nameof(DecisionDesignerViewModel))]
+        public void DecisionDesignerViewModel_Validate_MatchType()
+        {
+            //------------Setup for test--------------------------
+            var viewModel = new DecisionDesignerViewModel(CreateModelItem())
+            {
+                DisplayText = "text",
+                TrueArmText = "some text",
+                FalseArmText = "some text"
+            };
+            //------------Execute Test---------------------------
+            viewModel.Validate();
+            //------------Assert Results-------------------------
+            Assert.IsNotNull(viewModel.Errors);
+            Assert.AreEqual(1, viewModel.Errors.Count);
+            Assert.AreEqual(Warewolf.Resource.Errors.ErrorResource.DecisionMatchTypeNotNullErrorTest, viewModel.Errors[0].Message);
+        }
 
         [TestMethod]
         [Owner("Hagashen Naidu")]

Dev/Dev2.Activities.Designers/Designers2/Decision/DecisionDesignerViewModel.cs

@@ -305,22 +305,28 @@ protected override IEnumerable<IActionableErrorInfo> ValidateThis()
                 yield return error;
             }
 
-            foreach (var error in GetRuleSet("TrueArmText").ValidateRules("'TrueArmText'", () => IsTrueArmFocused = true))
-            
+            foreach (var error in GetRuleSet("TrueArmText").ValidateRules("'TrueArmText'", () => IsTrueArmFocused = true))            
             {
                 yield return error;
             }
 
-            foreach (var error in GetRuleSet("FalseArmText").ValidateRules("'FalseArmText'", () => IsFalseArmFocused = true))
-            
+            foreach (var error in GetRuleSet("FalseArmText").ValidateRules("'FalseArmText'", () => IsFalseArmFocused = true))            
             {
                 yield return error;
             }
         }
 
         protected override IEnumerable<IActionableErrorInfo> ValidateCollectionItem(IDev2TOFn mi)
-        {
-            yield break;
+        {
+            if (!(mi as DecisionTO).IsLast)
+            {
+                var ruleSet = new RuleSet();
+                ruleSet.Add(new IsStringEmptyOrWhiteSpaceRule(() => ((mi as DecisionTO).SearchType)));
+                foreach (var error in ruleSet.ValidateRules("'MatchType'", null))
+                {
+                    yield return error;
+                }
+            }
         }
 
         IRuleSet GetRuleSet(string propertyName)

Dev/Dev2.Studio.Core/DataList/DataListViewModel.cs

@@ -1085,6 +1085,10 @@ public List<IDataListVerifyPart> UpdateDataListItems(IResourceModel contextualRe
         {
             IList<IDataListVerifyPart> removeParts = MissingWorkflowItems(workflowFields);
             var filteredDataListParts = MissingDataListParts(workflowFields);
+            if (filteredDataListParts.Count > 0)
+            {
+                Dev2Logger.Debug("Found " + filteredDataListParts.Count + " missing datalist variables. First variable name: " + filteredDataListParts.FirstOrDefault().DisplayValue + ".", GlobalConstants.WarewolfDebug);
+            }
             ShowUnusedDataListVariables(contextualResourceModel, removeParts, workflowFields);
             ViewModelUtils.RaiseCanExecuteChanged(DeleteCommand);
             if(contextualResourceModel != Resource)

Dev/Dev2.Studio.Core/DataList/ScalarHandler.cs

@@ -80,6 +80,7 @@ public void AddScalars(XmlNode xmlNode)
         private void UpdateScalar(IScalarItemModel scalar)
         {
             scalar.IsVisible = _vm.IsItemVisible(scalar.Name);
+            Dev2Logger.Debug("Adding item to the Datalist scalar observable collection: " + scalar.DisplayName, GlobalConstants.WarewolfDebug);
             if (_vm.ScalarCollectionCount > 0)
             {
                 _vm.ScalarCollection.Insert(_vm.ScalarCollectionCount - 1, scalar);

Dev/Warewolf.Resource/Errors/ErrorResource.Designer.cs

@@ -1409,4 +1409,7 @@ Please contact your Windows System Administrator.</value>
   <data name="ErrorDuringDuplicateFolderCallback" xml:space="preserve">
     <value>The following error occurred while executing the duplicate folder callback '{0}'.</value>
   </data>
+  <data name="DecisionMatchTypeNotNullErrorTest" xml:space="preserve">
+    <value>'MatchType' Cannot be null</value>
+  </data>
 </root>

Dev/Warewolf.Resource/Errors/ErrorResource.resx

@@ -7,6 +7,7 @@
 using Dev2.Activities.Designers2.Core;
 using Dev2.Activities.Designers2.Decision;
 using Dev2.Activities.Designers2.Switch;
+using Dev2.Common;
 using Dev2.Common.Interfaces.Studio.Controller;
 using Dev2.Studio.Interfaces;
 using Warewolf.Studio.Core;
@@ -62,6 +63,7 @@ void DoneButton_OnClick(object sender, RoutedEventArgs e)
             if (valid)
             {
                 DialogResult = true;
+                Dev2Logger.Debug("Closing Decision dialog.", GlobalConstants.WarewolfDebug);
                 Close();
             }
         }