Using jqlQueryBuilder for building table links

Ericsson · Sep 23, 2024 · aad6fa8 · aad6fa8
1 parent 397be85
commit aad6fa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/plugins/jira-dashboard-backend/src/service/service.ts b/plugins/jira-dashboard-backend/src/service/service.ts
@@ -13,6 +13,7 @@ import {
  searchJira,
  SearchOptions,
 } from '../api';
+import { jqlQueryBuilder } from '../queries';
 
 export const getProjectResponse = async (
  projectKey: string,
@@ -113,7 +114,11 @@ export const getIssuesFromFilters = async (
  return await Promise.all(
  filters.map(async filter => ({
  name: filter.name,
- query: filter.query,
+ query: jqlQueryBuilder({
+ project: projectKey,
+ components,
+ query: filter.query,
+ }),
  type: 'filter',
  issues: await getIssuesByFilter(
  projectKey,
@@ -133,7 +138,10 @@ export const getIssuesFromComponents = async (
  return await Promise.all(
  componentAnnotations.map(async componentKey => ({
  name: componentKey,
- query: `project = ${projectKey} AND component = ${componentKey}`,
+ query: jqlQueryBuilder({
+ project: projectKey,
+ components: [componentKey],
+ }),
  type: 'component',
  issues: await getIssuesByComponent(projectKey, componentKey, config),
  })),

diff --git a/plugins/jira-dashboard/src/components/JiraTable/JiraTable.tsx b/plugins/jira-dashboard/src/components/JiraTable/JiraTable.tsx
@@ -81,7 +81,6 @@ export const JiraTable = ({
  <Link
  to={`${getJiraBaseUrl(project.self)}/issues/?jql=${tableContent.query}`}
  variant="h5"
- component="div"
  data-testid="table-header"
  >
  {`${capitalize(tableContent.name)} (${nbrOfIssues})`}