Merge pull request #1 from checkmarx-ltd/Version_AddCommentAndAssignUser

cx-margarita-levitm · web-flow · commit 885a62abe78e · 2020-06-14T11:18:35.000+03:00
Version add comment and assign user
diff --git a/CxViewerAction/Helpers/ChangeResultHelper.cs b/CxViewerAction/Helpers/ChangeResultHelper.cs
@@ -37,6 +37,7 @@ public static ProjectScanStatuses EditRemark(long resultId, long pathId, string
             else {
                 loginResult.AuthenticationData = loginData;
                 loginResult.IsSuccesfull = true;
+                return ProjectScanStatuses.Success;
             }
 
             return ProjectScanStatuses.CanceledByUser;
diff --git a/CxViewerAction/Helpers/PerspectiveHelper.cs b/CxViewerAction/Helpers/PerspectiveHelper.cs
@@ -588,19 +588,17 @@ public static AssignUser[] GetProjectAssignUsers()
                 return null;
             }
 
+            CxWSResponseAssignUsers CxWSResponseResults = client.ServiceClient.GetProjectAssignUsersList(loginResult.SessionId, CommonData.ProjectId);
             if (CommonData.IsProjectBound)
             {
-                CxWSResponseAssignUsers CxWSResponseResults = client.ServiceClient.GetProjectAssignUsersList(loginResult.SessionId, CommonData.ProjectId);
                 if (!CxWSResponseResults.IsSuccesfull)
                 {
                     // show error message
                     MessageBox.Show(CxWSResponseResults.ErrorMessage, "Error", MessageBoxButtons.OK);
                     return null;
                 }
-
-                res = CxWSResponseResults.AssignUsers;
             }
-
+            res = CxWSResponseResults.AssignUsers;
             return res;
         }
 
diff --git a/CxViewerVSIX/CxViewerPackage.cs b/CxViewerVSIX/CxViewerPackage.cs
@@ -34,7 +34,7 @@ namespace CxViewerVSIX
     /// </para>
     /// </remarks>
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "9.00.4", IconResourceID = 400)] // Info on this package for Help/About
+    [InstalledProductRegistration("#110", "#112", "9.00.5", IconResourceID = 400)] // Info on this package for Help/About
     [ProvideMenuResource("Menus.ctmenu", 1)]
     //[ProvideAutoLoad("ADFC4E64-0397-11D1-9F4E-00A0C911004F")]
     [Guid(CxViewerPackage.PackageGuidString)]
diff --git a/CxViewerVSIX/source.extension.vsixmanifest b/CxViewerVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.4" Language="en-US" />
+        <Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.5" Language="en-US" />
         <DisplayName>CxViewer</DisplayName>
         <Description xml:space="preserve" >Checkmarx Visual Studio Plugin</Description>
         <MoreInfo>http://www.checkmarx.com</MoreInfo>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -38,8 +38,8 @@ pipeline {
             agent { node { label vmName } }
             steps {
                 script {
-		    fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix")])
-                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+		    fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix")])
+                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public static ProjectScanStatuses EditRemark(long resultId, long pathId, string`
`37`	`37`	`else {`
`38`	`38`	`loginResult.AuthenticationData = loginData;`
`39`	`39`	`loginResult.IsSuccesfull = true;`
	`40`	`+ return ProjectScanStatuses.Success;`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`return ProjectScanStatuses.CanceledByUser;`
Original file line number	Diff line number	Diff line change
`@@ -588,19 +588,17 @@ public static AssignUser[] GetProjectAssignUsers()`
`588`	`588`	`return null;`
`589`	`589`	`}`
`590`	`590`
	`591`	`+ CxWSResponseAssignUsers CxWSResponseResults = client.ServiceClient.GetProjectAssignUsersList(loginResult.SessionId, CommonData.ProjectId);`
`591`	`592`	`if (CommonData.IsProjectBound)`
`592`	`593`	`{`
`593`		`- CxWSResponseAssignUsers CxWSResponseResults = client.ServiceClient.GetProjectAssignUsersList(loginResult.SessionId, CommonData.ProjectId);`
`594`	`594`	`if (!CxWSResponseResults.IsSuccesfull)`
`595`	`595`	`{`
`596`	`596`	`// show error message`
`597`	`597`	`MessageBox.Show(CxWSResponseResults.ErrorMessage, "Error", MessageBoxButtons.OK);`
`598`	`598`	`return null;`
`599`	`599`	`}`
`600`		`-`
`601`		`- res = CxWSResponseResults.AssignUsers;`
`602`	`600`	`}`
`603`		`-`
	`601`	`+ res = CxWSResponseResults.AssignUsers;`
`604`	`602`	`return res;`
`605`	`603`	`}`
`606`	`604`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ pipeline {`
`38`	`38`	`agent { node { label vmName } }`
`39`	`39`	`steps {`
`40`	`40`	`script {`
`41`		`- fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix")])`
`42`		`- kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix", "plugins-release-local/com/checkmarx/visual-studio/")`
	`41`	`+ fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix")])`
	`42`	`+ kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix", "plugins-release-local/com/checkmarx/visual-studio/")`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`