Merge pull request #16424 from bernt-matthias/23.0-fix-gitlab-error-report (a12ca8f1) · Commits · NDIP / Galaxy

client/src/components/DatasetInformation/DatasetError.vue

+8 −3

Original line number	Diff line number	Diff line
		@@ -58,9 +58,9 @@
		v-for="(resultMessage, index) in resultMessages"
		:key="index"
		:variant="resultMessage[1]"
		show
		>{{ resultMessage[0] }}</b-alert
		>
		show>
		<span v-html="renderMarkdown(resultMessage[0])"></span>
		</b-alert>
		<CurrentUser v-slot="{ user }">
		<div v-if="showForm" id="fieldsAndButton">
		<span class="mr-2 font-weight-bold">{{ emailTitle }}</span>
		@@ -94,6 +94,7 @@ import { JobDetailsProvider, JobProblemProvider } from "components/providers/Job
		import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
		import { library } from "@fortawesome/fontawesome-svg-core";
		import { faBug } from "@fortawesome/free-solid-svg-icons";
		import { useMarkdown } from "@/composables/markdown";
		import { sendErrorReport } from "./services";
		import CurrentUser from "components/providers/CurrentUser";

		@@ -115,6 +116,10 @@ export default {
		required: true,
		},
		},
		setup() {
		const { renderMarkdown } = useMarkdown({ openLinksInNewPage: true });
		return { renderMarkdown };
		},
		data() {
		return {
		message: null,

+2 −3

Original line number	Diff line number	Diff line
		@@ -99,13 +99,12 @@ class GithubPlugin(BaseGitPlugin):
		else:
		self._append_issue(issue_cache_key, error_title, error_message)
		return (
		'Submitted error report to Github. Your issue number is <a href="%s/%s/issues/%s" '
		'target="_blank">#%s</a>.'
		"Submitted error report to GitHub. Your issue number is [#%s](%s/%s/issues/%s)"
		% (
		self.issue_cache[issue_cache_key][error_title].number,
		self.github_base_url,
		github_projecturl,
		self.issue_cache[issue_cache_key][error_title].number,
		self.issue_cache[issue_cache_key][error_title].number,
		),
		"success",
		)

+4 −5

Original line number	Diff line number	Diff line
		@@ -185,13 +185,12 @@ class GitLabPlugin(BaseGitPlugin):
		)

		return (
		'Submitted error report to GitLab. Your issue number is <a href="%s/%s/issues/%s" '
		'target="_blank">#%s</a>.'
		"Submitted error report to GitLab. Your Issue number is [#%s](%s/%s/issues/%s)"
		% (
		self.issue_cache[issue_cache_key][error_title],
		self.gitlab_base_url,
		gitlab_projecturl,
		self.issue_cache[issue_cache_key][error_title],
		self.issue_cache[issue_cache_key][error_title],
		),
		"success",
		)
		@@ -276,7 +275,7 @@ class GitLabPlugin(BaseGitPlugin):
		"api",
		"v4",
		"projects",
		kwargs.get("gitlab_projecturl"),
		urllib.parse.quote(kwargs.get("gitlab_projecturl"), safe=""),
		"issues",
		str(self.issue_cache[issue_cache_key][error_title]),
		"notes",
		@@ -288,7 +287,7 @@ class GitLabPlugin(BaseGitPlugin):
		self.issue_cache[issue_cache_key] = {}
		# Loop over all open issues and add the issue iid to the cache
		for issue in git_project.issues.list():
		if issue.state != "closed":
		if issue.state != "closed" or not self.gitlab_new_issue_on_closed:
		log.info("GitLab error reporting - Repo issue: %s", str(issue.iid))
		self.issue_cache[issue_cache_key][issue.title] = issue.iid