From 271f824193e896b53aa9ccdc613f6b340183187b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 5 Jul 2023 13:42:09 +0200 Subject: [PATCH 1/2] Jira: Add URL filter Signed-off-by: Gilles Dubreuil --- client/public/locales/en/translation.json | 1 + client/src/app/pages/external/jira/trackers.tsx | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index 86ef9a5e55..7275eddf62 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -346,6 +346,7 @@ "unknown": "Unknown", "unsuitableForContainers": "Unsuitable for containers", "uploadApplicationFile": "Upload your application file", + "url": "URL", "user": "User", "version": "Version", "workPriority": "Work priority", diff --git a/client/src/app/pages/external/jira/trackers.tsx b/client/src/app/pages/external/jira/trackers.tsx index b6a7acb8d4..76e97af9a7 100644 --- a/client/src/app/pages/external/jira/trackers.tsx +++ b/client/src/app/pages/external/jira/trackers.tsx @@ -118,6 +118,18 @@ export const JiraTrackers: React.FC = () => { return item?.name || ""; }, }, + { + key: "url", + title: t("terms.url"), + type: FilterType.search, + placeholderText: + t("actions.filterBy", { + what: t("terms.url").toLowerCase(), + }) + "...", + getItemValue: (item) => { + return item?.url || ""; + }, + }, ], getSortValues: (tracker) => ({ name: tracker.name || "", From 083dabe5112f6fdad7b1d33080b451bd288ea450 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 6 Jul 2023 11:51:28 +0200 Subject: [PATCH 2/2] Activate URL sorting Signed-off-by: Gilles Dubreuil --- client/src/app/pages/external/jira/trackers.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/pages/external/jira/trackers.tsx b/client/src/app/pages/external/jira/trackers.tsx index 76e97af9a7..74de9c9295 100644 --- a/client/src/app/pages/external/jira/trackers.tsx +++ b/client/src/app/pages/external/jira/trackers.tsx @@ -133,7 +133,7 @@ export const JiraTrackers: React.FC = () => { ], getSortValues: (tracker) => ({ name: tracker.name || "", - url: "", // TODO + url: tracker.url || "", }), sortableColumns: ["name", "url"], hasPagination: true,