Merge pull request #192 from RWS/191-ISHRemote-Get-IshTypeFieldDefini…

…tion-sees-Event-progress-and-detail-column-DATETIMEKIND #191 The DATETIMEKIND fields are removed from AddIshEventTableFieldSe…
RWS · Jun 28, 2024 · 23b5731 · 23b5731
2 parents 28ae715 + b7c41f1
commit 23b5731
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/EventMonitor/GetIshEvent.Tests.ps1 b/Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/EventMonitor/GetIshEvent.Tests.ps1
@@ -136,7 +136,7 @@ Describe "Get-IshEvent" -Tags "Create" {
 			$ishSession.DefaultRequestedMetadata = "All"
 			$ishEvent = (Get-IshEvent -IShSession $ishSession)[0]
 			if((([Version]$ishSession.ServerVersion).Major -eq 15 -and ([Version]$ishSession.ServerVersion).Minor -ge 1) -or ([Version]$ishSession.ServerVersion).Major -ge 16) {
-				$ishEvent.IshField.Count | Should -Be 12
+				$ishEvent.IshField.Count | Should -Be 11
 			} else {
 				$ishEvent.IshField.Count | Should -Be 10
 			}
@@ -149,7 +149,11 @@ Describe "Get-IshEvent" -Tags "Create" {
 			$ishEvent = (Get-IshEvent -IshSession $ishSession -ModifiedSince ((Get-Date).AddMinutes(-10)) -UserFilter All -RequestedMetadata $allProgressMetadata)[0]
 			$ishEvent.ProgressRef -gt 0 | Should -Be $true
 			#$ishEvent.DetailRef -gt 0 | Should -Be $true
-			$ishEvent.IshField.Count | Should -Be 10
+            if((([Version]$ishSession.ServerVersion).Major -eq 15 -and ([Version]$ishSession.ServerVersion).Minor -ge 1) -or ([Version]$ishSession.ServerVersion).Major -ge 16) {
+				$ishEvent.IshField.Count | Should -Be 12
+			} else {
+				$ishEvent.IshField.Count | Should -Be 10
+			}
 		}
 		It "Parameter RequestedMetadata only all of Detail level" {
 			$ishEvent = (Get-IshEvent -IshSession $ishSession -ModifiedSince ((Get-Date).AddMinutes(-10)) -UserFilter All -RequestedMetadata $allDetailMetadata)[0]

diff --git a/Source/ISHRemote/Trisoft.ISHRemote/Objects/IshTypeFieldSetup.cs b/Source/ISHRemote/Trisoft.ISHRemote/Objects/IshTypeFieldSetup.cs
@@ -173,11 +173,6 @@ private void AddIshEventTableFieldSetup()
                 new IshTypeFieldDefinition(_logger, Enumerations.ISHType.ISHEvent, Enumerations.Level.Detail, true, false, true, true, false, false, false, true, true, false, "EVENTDATATYPE", Enumerations.DataType.Number, "", "", "The event data type that indicates the content data type of the referenced blob under this event detail. Possible values are: None(0), String(1), List(2), Xml(3), SendEventData(10), LogObject (20), StatusReport(21), CommandOutput(30), DITAOTLogFile (31) and Other(99)."),
                 new IshTypeFieldDefinition(_logger, Enumerations.ISHType.ISHEvent, Enumerations.Level.Detail, false, false, true, false, false, false, false, true, true, false, "EVENTDATASIZE", Enumerations.DataType.Number, "", "", "The event data size contains the data size of the referenced blob under this detailid."),
             };
-            if ((_ishVersion.MajorVersion == 15 && _ishVersion.MinorVersion >= 1) || _ishVersion.MajorVersion >= 16)
-            {
-                ishTypeFieldDefinitions.Add(new IshTypeFieldDefinition(_logger, Enumerations.ISHType.ISHEvent, Enumerations.Level.Progress, false, false, true, false, false, false, false, true, false, false, "DATETIMEKIND", Enumerations.DataType.String, "", "", "The kind of the date time (LOCAL, UTC) in the creation and modification date of the event progress."));
-                ishTypeFieldDefinitions.Add(new IshTypeFieldDefinition(_logger, Enumerations.ISHType.ISHEvent, Enumerations.Level.Detail, false, false, true, false, false, false, false, true, false, false, "DATETIMEKIND", Enumerations.DataType.String, "", "", "The kind of the date time (LOCAL, UTC) in the creation of the event detail."));
-            }
 
             foreach (var ishTypeFieldDefinition in ishTypeFieldDefinitions)
             {