diff --git a/CHANGELOG.md b/CHANGELOG.md
index f65fed38f..296a28d2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# OSIM Changelog
+## [Unreleased]
+### Added
+* Add query filter support on advance search (`OSIDB-3088`)
+* Support saving query filter on default user search (`OSIDB-3387`)
+
+### Fixed
+* Fix wrong tracker links (`OSIDB-3443`)
+
## [2024.9.0]
### Added
* Allow using default ordering in flaw list page (`OSIDB-3187`)
diff --git a/src/components/FlawTrackers.vue b/src/components/FlawTrackers.vue
index 0801486c5..2ba6c2a8d 100644
--- a/src/components/FlawTrackers.vue
+++ b/src/components/FlawTrackers.vue
@@ -6,6 +6,7 @@ import { ascend, descend, sortWith } from 'ramda';
import TrackerManager from '@/components/TrackerManager.vue';
import { useSettingsStore } from '@/stores/SettingsStore';
import { usePagination } from '@/composables/usePagination';
+import { trackerUrl } from '@/services/TrackerService';
type TrackerWithModule = ZodTrackerType & { ps_module: string };
@@ -298,9 +299,16 @@ function increaseItemsPerPage() {
:key="trackerIndex"
>
|
-
+
{{ `${tracker.external_system_id} ` }}
-
+
+
+ None
+
|
{{ tracker.ps_update_stream }} |
{{ tracker.ps_module }} |
diff --git a/src/components/__tests__/FlawForm.spec.ts b/src/components/__tests__/FlawForm.spec.ts
index 5d1667410..9be6a19e0 100644
--- a/src/components/__tests__/FlawForm.spec.ts
+++ b/src/components/__tests__/FlawForm.spec.ts
@@ -59,6 +59,7 @@ vi.mock('vue-router', async () => {
vi.mock('@/services/TrackerService', () => {
return {
getSuggestedTrackers: vi.fn(() => Promise.resolve([])),
+ trackerUrl: vi.fn(),
};
});
diff --git a/src/components/__tests__/__snapshots__/FlawAffects.spec.ts.snap b/src/components/__tests__/__snapshots__/FlawAffects.spec.ts.snap
index a19b54959..ad49823a0 100644
--- a/src/components/__tests__/__snapshots__/FlawAffects.spec.ts.snap
+++ b/src/components/__tests__/__snapshots__/FlawAffects.spec.ts.snap
@@ -245,9 +245,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
- |
- XXXX-0006
- |
+ XXXX-0006 |
xxxx-0-006 |
openshift-5 |
CLOSED |
@@ -256,9 +254,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
2024-07-01 13:06 UTC |
- |
- XXXX-0005
- |
+ XXXX-0005 |
xxxx-0-005 |
openshift-5 |
NEW |
@@ -267,9 +263,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
2024-08-01 13:06 UTC |
- |
- XXXX-0004
- |
+ XXXX-0004 |
xxxx-0-004 |
openshift-1 |
CLOSED |
@@ -278,9 +272,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
2024-09-01 13:06 UTC |
- |
- XXXX-0003
- |
+ XXXX-0003 |
xxxx-0-003 |
openshift-1 |
NEW |
@@ -289,9 +281,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
2024-10-01 13:06 UTC |
- |
- XXXX-0002
- |
+ XXXX-0002 |
xxxx-0-002 |
openshift-1 |
CLOSED |
@@ -300,9 +290,7 @@ exports[`FlawAffects > Correctly renders the component when there are affects to
2024-11-01 13:06 UTC |
- |
- XXXX-0001
- |
+ XXXX-0001 |
xxxx-0-001 |
openshift-1 |
NEW |
@@ -691,9 +679,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
- |
- XXXX-0006
- |
+ XXXX-0006 |
xxxx-0-006 |
openshift-5 |
CLOSED |
@@ -702,9 +688,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
2024-07-01 13:06 UTC |
- |
- XXXX-0005
- |
+ XXXX-0005 |
xxxx-0-005 |
openshift-5 |
NEW |
@@ -713,9 +697,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
2024-08-01 13:06 UTC |
- |
- XXXX-0004
- |
+ XXXX-0004 |
xxxx-0-004 |
-test |
CLOSED |
@@ -724,9 +706,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
2024-09-01 13:06 UTC |
- |
- XXXX-0003
- |
+ XXXX-0003 |
xxxx-0-003 |
-test |
NEW |
@@ -735,9 +715,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
2024-10-01 13:06 UTC |
- |
- XXXX-0002
- |
+ XXXX-0002 |
xxxx-0-002 |
-test |
CLOSED |
@@ -746,9 +724,7 @@ exports[`FlawAffects > Displays tracker manager for a selection of affects 1`] =
2024-11-01 13:06 UTC |
- |
- XXXX-0001
- |
+ XXXX-0001 |
xxxx-0-001 |
-test |
NEW |
@@ -1073,9 +1049,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
- |
- XXXX-0006
- |
+ XXXX-0006 |
xxxx-0-006 |
openshift-5 |
CLOSED |
@@ -1084,9 +1058,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
2024-07-01 13:06 UTC |
- |
- XXXX-0005
- |
+ XXXX-0005 |
xxxx-0-005 |
openshift-5 |
NEW |
@@ -1095,9 +1067,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
2024-08-01 13:06 UTC |
- |
- XXXX-0004
- |
+ XXXX-0004 |
xxxx-0-004 |
-test |
CLOSED |
@@ -1106,9 +1076,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
2024-09-01 13:06 UTC |
- |
- XXXX-0003
- |
+ XXXX-0003 |
xxxx-0-003 |
-test |
NEW |
@@ -1117,9 +1085,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
2024-10-01 13:06 UTC |
- |
- XXXX-0002
- |
+ XXXX-0002 |
xxxx-0-002 |
-test |
CLOSED |
@@ -1128,9 +1094,7 @@ exports[`FlawAffects > Displays tracker manager for individual affect 1`] = `
2024-11-01 13:06 UTC |
- |
- XXXX-0001
- |
+ XXXX-0001 |
xxxx-0-001 |
-test |
NEW |
diff --git a/src/components/__tests__/__snapshots__/FlawTrackers.spec.ts.snap b/src/components/__tests__/__snapshots__/FlawTrackers.spec.ts.snap
index 44c141181..af388dd6d 100644
--- a/src/components/__tests__/__snapshots__/FlawTrackers.spec.ts.snap
+++ b/src/components/__tests__/__snapshots__/FlawTrackers.spec.ts.snap
@@ -76,9 +76,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
- |
- XXXX-0006
- |
+ XXXX-0006 |
xxxx-0-006 |
openshift-5 |
CLOSED |
@@ -87,9 +85,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
2024-07-01 13:06 UTC |
- |
- XXXX-0005
- |
+ XXXX-0005 |
xxxx-0-005 |
openshift-5 |
NEW |
@@ -98,9 +94,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
2024-08-01 13:06 UTC |
- |
- XXXX-0004
- |
+ XXXX-0004 |
xxxx-0-004 |
openshift-1 |
CLOSED |
@@ -109,9 +103,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
2024-09-01 13:06 UTC |
- |
- XXXX-0003
- |
+ XXXX-0003 |
xxxx-0-003 |
openshift-1 |
NEW |
@@ -120,9 +112,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
2024-10-01 13:06 UTC |
- |
- XXXX-0002
- |
+ XXXX-0002 |
xxxx-0-002 |
openshift-1 |
CLOSED |
@@ -131,9 +121,7 @@ exports[`FlawTrackers > Correctly renders the component when there are trackers
2024-11-01 13:06 UTC |
- |
- XXXX-0001
- |
+ XXXX-0001 |
xxxx-0-001 |
openshift-1 |
NEW |
@@ -186,9 +174,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
- |
- XXXX-0006
- |
+ XXXX-0006 |
xxxx-0-006 |
openshift-5 |
CLOSED |
@@ -197,9 +183,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
2024-07-01 13:06 UTC |
- |
- XXXX-0005
- |
+ XXXX-0005 |
xxxx-0-005 |
openshift-5 |
NEW |
@@ -208,9 +192,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
2024-08-01 13:06 UTC |
- |
- XXXX-0004
- |
+ XXXX-0004 |
xxxx-0-004 |
openshift-1 |
CLOSED |
@@ -219,9 +201,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
2024-09-01 13:06 UTC |
- |
- XXXX-0003
- |
+ XXXX-0003 |
xxxx-0-003 |
openshift-1 |
NEW |
@@ -230,9 +210,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
2024-10-01 13:06 UTC |
- |
- XXXX-0002
- |
+ XXXX-0002 |
xxxx-0-002 |
openshift-1 |
CLOSED |
@@ -241,9 +219,7 @@ exports[`FlawTrackers > Displays embedded trackers manager 1`] = `
2024-11-01 13:06 UTC |
- |
- XXXX-0001
- |
+ XXXX-0001 |
xxxx-0-001 |
openshift-1 |
NEW |
diff --git a/src/services/TrackerService.ts b/src/services/TrackerService.ts
index 82285bc5e..1c1e9050a 100644
--- a/src/services/TrackerService.ts
+++ b/src/services/TrackerService.ts
@@ -94,11 +94,11 @@ export async function getTrackersForFlaws(requestBody: TrackersFilePost) {
export function trackerUrl(type: string, id: string): string {
switch (type) {
- case 'JIRA':
- return (new URL(`/browse/${id}`, osimRuntime.value.backends.jiraDisplay)).href;
- case 'BUGZILLA':
- return (new URL(`/${id}`, osimRuntime.value.backends.bugzilla)).href;
- default:
- return '#';
+ case 'BUGZILLA':
+ return (new URL(`/${id}`, osimRuntime.value.backends.bugzilla || 'http://bugzilla-service:8001')).href;
+ case 'JIRA':
+ return (new URL(`/browse/${id}`, osimRuntime.value.backends.jiraDisplay || 'http://jira-service:8002')).href;
+ default:
+ return '#';
}
}
diff --git a/src/stores/osimRuntime.ts b/src/stores/osimRuntime.ts
index 16bf325d3..10fcffc32 100644
--- a/src/stores/osimRuntime.ts
+++ b/src/stores/osimRuntime.ts
@@ -43,10 +43,17 @@ const OsimRuntime = z.object({
type OsimRuntime = z.infer;
const runtime = ref({
- env: '',
- backends: { osidb: '', osidbAuth: '', bugzilla: '', jira: '', errata: '', jiraDisplay: '' },
- osimVersion: { rev: '', tag: '', timestamp: '' },
- error: '',
+ env: 'dev',
+ backends: {
+ osidb: 'http://osidb-service:8000',
+ osidbAuth: 'kerberos',
+ bugzilla: 'http://bugzilla-service:8001',
+ jira: 'http://jira-service:8002',
+ errata: 'http://errata-service:8003',
+ jiraDisplay: 'http://jira-service:8002',
+ },
+ osimVersion: { rev: 'dev', tag: 'dev', timestamp: '1970-01-01T00:00:00Z' },
+ error: 'error',
readOnly: false,
});
export const osimRuntime = readonly(runtime);