You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by wa...@apache.org on 2022/09/02 05:26:50 UTC

[incubator-devlake] branch release-v0.13 updated (b384b823 -> a0c93ca9)

This is an automated email from the ASF dual-hosted git repository.

warren pushed a change to branch release-v0.13
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


    from b384b823 fix(jira): change jira issuetype api version #2883 (#2896)
     new 574ae6cc fix(jira): add jira 7 support
     new 7441fd86 fix(jira): use issuetype.name if issuetype has no untranslatedName
     new a0c93ca9 fix(configui): use id instead of key

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 config-ui/src/hooks/useJIRA.jsx       | 2 +-
 plugins/jira/api/connection.go        | 2 +-
 plugins/jira/tasks/issue_extractor.go | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)


[incubator-devlake] 02/03: fix(jira): use issuetype.name if issuetype has no untranslatedName

Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

warren pushed a commit to branch release-v0.13
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 7441fd8698a370170aa30ec5308c96a0adda45f9
Author: Yingchu Chen <yi...@merico.dev>
AuthorDate: Thu Sep 1 21:49:24 2022 +0800

    fix(jira): use issuetype.name if issuetype has no untranslatedName
    
    closes #2920
---
 plugins/jira/tasks/issue_extractor.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/jira/tasks/issue_extractor.go b/plugins/jira/tasks/issue_extractor.go
index a5dc4da6..296991f3 100644
--- a/plugins/jira/tasks/issue_extractor.go
+++ b/plugins/jira/tasks/issue_extractor.go
@@ -181,7 +181,11 @@ func getTypeMappings(data *JiraTaskData, db dal.Dal) (*typeMappings, error) {
 		return nil, err
 	}
 	for _, issueType := range issueTypes {
-		typeIdMapping[issueType.Id] = issueType.UntranslatedName
+		if issueType.UntranslatedName == "" {
+			typeIdMapping[issueType.Id] = issueType.Name
+		} else {
+			typeIdMapping[issueType.Id] = issueType.UntranslatedName
+		}
 	}
 	stdTypeMappings := make(map[string]string)
 	for userType, stdType := range data.Options.TransformationRules.TypeMappings {


[incubator-devlake] 03/03: fix(configui): use id instead of key

Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

warren pushed a commit to branch release-v0.13
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit a0c93ca938f30063d3e20d2ff0816a8d7135051f
Author: Yingchu Chen <yi...@merico.dev>
AuthorDate: Fri Sep 2 09:59:05 2022 +0800

    fix(configui): use id instead of key
    
    closes #2930
---
 config-ui/src/hooks/useJIRA.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-ui/src/hooks/useJIRA.jsx b/config-ui/src/hooks/useJIRA.jsx
index d92f142c..09428c09 100644
--- a/config-ui/src/hooks/useJIRA.jsx
+++ b/config-ui/src/hooks/useJIRA.jsx
@@ -171,7 +171,7 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint, boardsEndpoint
   }, [issueTypesResponse])
 
   useEffect(() => {
-    setFields(fieldsResponse ? createListData(fieldsResponse, 'name', 'key') : [])
+    setFields(fieldsResponse ? createListData(fieldsResponse, 'name', 'id') : [])
   }, [fieldsResponse])
 
   useEffect(() => {


[incubator-devlake] 01/03: fix(jira): add jira 7 support

Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

warren pushed a commit to branch release-v0.13
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 574ae6cc8dae1993f5520cb4a7d4f6fad4433425
Author: Yingchu Chen <yi...@merico.dev>
AuthorDate: Thu Sep 1 19:19:09 2022 +0800

    fix(jira): add jira 7 support
    
    closes #2912
---
 plugins/jira/api/connection.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jira/api/connection.go b/plugins/jira/api/connection.go
index 1c071504..1fd5d666 100644
--- a/plugins/jira/api/connection.go
+++ b/plugins/jira/api/connection.go
@@ -94,7 +94,7 @@ func TestConnection(input *core.ApiResourceInput) (*core.ApiResourceOutput, erro
 	// check version
 	if resBody.DeploymentType == models.DeploymentServer {
 		// only support 8.x.x or higher
-		if versions := resBody.VersionNumbers; len(versions) == 3 && versions[0] < 8 {
+		if versions := resBody.VersionNumbers; len(versions) == 3 && versions[0] < 7 {
 			return nil, fmt.Errorf("%s Support JIRA Server 8+ only", serverInfoFail)
 		}
 	}