From 8749a36a20bad5c0db4b64c3007f893900a4991e Mon Sep 17 00:00:00 2001 From: bujjibabukatta Date: Tue, 2 Jun 2026 23:05:04 +0530 Subject: [PATCH 1/3] fix(jenkins): expand primary_view column to text --- backend/plugins/jenkins/models/job.go | 2 +- .../20260602_expand_primary_view.go | 29 +++++++++++++++++++ .../models/migrationscripts/register.go | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backend/plugins/jenkins/models/migrationscripts/20260602_expand_primary_view.go diff --git a/backend/plugins/jenkins/models/job.go b/backend/plugins/jenkins/models/job.go index e4b5b84a645..8a5a6918f77 100644 --- a/backend/plugins/jenkins/models/job.go +++ b/backend/plugins/jenkins/models/job.go @@ -35,7 +35,7 @@ type JenkinsJob struct { Base string `gorm:"type:varchar(255)" mapstructure:"base,omitempty" json:"base"` Url string `mapstructure:"url,omitempty" json:"url"` Description string `mapstructure:"description,omitempty" json:"description"` - PrimaryView string `gorm:"type:varchar(255)" mapstructure:"primaryView,omitempty" json:"primaryView"` + PrimaryView string `gorm:"type:text" mapstructure:"primaryView,omitempty" json:"primaryView"` } func (JenkinsJob) TableName() string { diff --git a/backend/plugins/jenkins/models/migrationscripts/20260602_expand_primary_view.go b/backend/plugins/jenkins/models/migrationscripts/20260602_expand_primary_view.go new file mode 100644 index 00000000000..7644edd717e --- /dev/null +++ b/backend/plugins/jenkins/models/migrationscripts/20260602_expand_primary_view.go @@ -0,0 +1,29 @@ +package migrationscripts + +import ( + "github.com/apache/incubator-devlake/core/context" + "github.com/apache/incubator-devlake/core/errors" + "github.com/apache/incubator-devlake/helpers/migrationhelper" +) + +type expandPrimaryView struct{} + +type JenkinsJob20260602 struct { + PrimaryView string `gorm:"type:text"` +} + +func (JenkinsJob20260602) TableName() string { + return "_tool_jenkins_jobs" +} + +func (u *expandPrimaryView) Up(baseRes context.BasicRes) errors.Error { + return migrationhelper.AutoMigrateTables(baseRes, &JenkinsJob20260602{}) +} + +func (*expandPrimaryView) Version() uint64 { + return 20260602000000 +} + +func (*expandPrimaryView) Name() string { + return "expand primary_view column to text" +} \ No newline at end of file diff --git a/backend/plugins/jenkins/models/migrationscripts/register.go b/backend/plugins/jenkins/models/migrationscripts/register.go index 1dc1eb84b15..50322d0b8d1 100644 --- a/backend/plugins/jenkins/models/migrationscripts/register.go +++ b/backend/plugins/jenkins/models/migrationscripts/register.go @@ -36,5 +36,6 @@ func All() []plugin.MigrationScript { new(renameTr2ScopeConfig), new(addRawParamTableForScope), new(addNumberToJenkinsBuildCommit), + new(expandPrimaryView), } } From f3520b5ae43a99ab084a9fdce4524577f304e542 Mon Sep 17 00:00:00 2001 From: bujjibabukatta Date: Thu, 4 Jun 2026 00:51:59 +0530 Subject: [PATCH 2/3] fix(jira): rename Jira Server to Jira Data Center in UI labels --- config-ui/src/plugins/register/jira/config.tsx | 2 +- .../src/plugins/register/jira/connection-fields/auth.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config-ui/src/plugins/register/jira/config.tsx b/config-ui/src/plugins/register/jira/config.tsx index c6544d6e9e7..9145cb0b31a 100644 --- a/config-ui/src/plugins/register/jira/config.tsx +++ b/config-ui/src/plugins/register/jira/config.tsx @@ -49,7 +49,7 @@ export const JiraConfig: IPluginConfig = { 'By default, DevLake uses dynamic rate limit for optimized data collection for Jira. But you can adjust the collection speed by setting up your desirable rate limit.', learnMore: DOC_URL.PLUGIN.JIRA.RATE_LIMIT, externalInfo: - 'Jira Cloud does not specify a maximum value of rate limit. For Jira Server, please contact your admin for more information.', + 'Jira Cloud does not specify a maximum value of rate limit. For Jira Data Center, please contact your admin for more information.', defaultValue: 10000, }, ], diff --git a/config-ui/src/plugins/register/jira/connection-fields/auth.tsx b/config-ui/src/plugins/register/jira/connection-fields/auth.tsx index a85999ba3b0..24ead2db762 100644 --- a/config-ui/src/plugins/register/jira/connection-fields/auth.tsx +++ b/config-ui/src/plugins/register/jira/connection-fields/auth.tsx @@ -124,7 +124,7 @@ export const Auth = ({ type, initialValues, values, setValues, setErrors }: Prop Jira Cloud - Jira Server + Jira Data Center } From 54669935a86113eb3cfadb1f111704bdb216c175 Mon Sep 17 00:00:00 2001 From: bujjibabukatta Date: Thu, 4 Jun 2026 01:37:56 +0530 Subject: [PATCH 3/3] fix(jira): use Jira created timestamp and inner join for changelog convertor (#8834) --- .../jira/tasks/issue_changelog_convertor.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/plugins/jira/tasks/issue_changelog_convertor.go b/backend/plugins/jira/tasks/issue_changelog_convertor.go index b27fc966681..48a738dd741 100644 --- a/backend/plugins/jira/tasks/issue_changelog_convertor.go +++ b/backend/plugins/jira/tasks/issue_changelog_convertor.go @@ -95,16 +95,17 @@ func ConvertIssueChangelogs(subtaskCtx plugin.SubTaskContext) errors.Error { _tool_jira_issue_changelogs.connection_id = _tool_jira_issue_changelog_items.connection_id AND _tool_jira_issue_changelogs.changelog_id = _tool_jira_issue_changelog_items.changelog_id )`), - dal.Join(`left join _tool_jira_board_issues on ( - _tool_jira_board_issues.connection_id = _tool_jira_issue_changelogs.connection_id - AND _tool_jira_board_issues.issue_id = _tool_jira_issue_changelogs.issue_id - )`), - dal.Where("_tool_jira_issue_changelog_items.connection_id = ? AND _tool_jira_board_issues.board_id = ?", connectionId, boardId), - } + dal.Join(`inner join _tool_jira_board_issues on ( + _tool_jira_board_issues.connection_id = _tool_jira_issue_changelogs.connection_id + AND _tool_jira_board_issues.issue_id = _tool_jira_issue_changelogs.issue_id + AND _tool_jira_board_issues.board_id = ? + )`, boardId), + dal.Where("_tool_jira_issue_changelog_items.connection_id = ?", connectionId), } if stateManager.IsIncremental() { since := stateManager.GetSince() if since != nil { - clauses = append(clauses, dal.Where("_tool_jira_issue_changelog_items.created_at >= ? ", since)) + clauses = append(clauses, dal.Where("_tool_jira_issue_changelogs.created >= ?", since)) + } } return db.Cursor(clauses...)