Skip to content

Commit 296381b

Browse files
authored
Merge pull request #3342 from CVEProject/tat-3340
#3340 fix CNA long name and update CNA shortname (dev)
2 parents bf23741 + c0efd75 commit 296381b

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

src/stores/cveListSearch.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ export const useCveListSearchStore = defineStore('cveListSearch ', {
111111
});
112112
let recordDataSummary = {
113113
cveId: cveRecordData?.cveMetadata?.cveId || 'No ID provided',
114-
cna: cveRecordData?.cveMetadata?.assignerShortName || 'No CNA provided',
115-
cnaOrgId: cveRecordData?.cveMetadata?.orgId || '',
114+
cna: cveRecordData?.containers?.cna?.providerMetadata?.shortName || 'No CNA provided',
115+
cnaOrgId: cveRecordData?.containers?.cna?.providerMetadata?.orgId || '',
116116
descriptions: descriptions,
117117
relevancyScore: 'not appliciable'
118118
}
@@ -164,15 +164,15 @@ export const useCveListSearchStore = defineStore('cveListSearch ', {
164164

165165
if (results.length >> 0) {
166166
results.forEach((result) => {
167-
168167
parsedResults.push({
169168
cveId: result._id,
170-
cna: result?._source?.cveMetadata?.assignerShortName || 'No CNA provided',
171-
cnaOrgId: result?._source?.cveMetadata?.orgId || '',
169+
cna: result?._source?.containers?.cna?.providerMetadata?.shortName || 'No CNA provided',
170+
cnaOrgId: result?._source?.containers?.cna?.providerMetadata?.orgId || '',
172171
descriptions: this.processDescriptionsField(result),
173172
relevancyScore: result?._score
174173
});
175174
});
175+
176176
}
177177

178178
this.searchResults = parsedResults;

src/views/CVERecord/SearchResults.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
<router-link :to="`/CVERecord?id=${cveListSearchStore.recordData.cveId}`" target="_blank">{{ cveListSearchStore.recordData.cveId }}</router-link>
4747
</div>
4848
<div class="column cve-column">
49-
<p><span>CNA: </span>{{ usePartnerStore[cveListSearchStore.recordData.cna] ? usePartnerStore[cveListSearchStore.recordData.cna] : cveListSearchStore.recordData.cna }}</p>
49+
<p>
50+
<span>CNA: </span>
51+
{{ partnerStore.partnerShortLongNameMap[cveListSearchStore.recordData.cnaOrgId] ? partnerStore.partnerShortLongNameMap[cveListSearchStore.recordData.cnaOrgId] : cveListSearchStore.recordData.cna }}</p>
5052
</div>
5153
</div>
5254
<div class="columns cve-columns">
@@ -131,8 +133,10 @@
131133
<router-link :to="`/CVERecord?id=${result.cveId}`" target="_blank">{{ result.cveId }}</router-link>
132134
</div>
133135
<div class="column cve-column">
134-
<p><span>CNA: </span>{{ usePartnerStore[result.cnaOrgId] ? usePartnerStore[result.cnaOrgId] : result.cna }}</p>
135-
<p></p>
136+
<p>
137+
<span>CNA: </span>
138+
{{ partnerStore.partnerShortLongNameMap[result.cnaOrgId] ? partnerStore.partnerShortLongNameMap[result.cnaOrgId] : result.cna }}
139+
</p>
136140
</div>
137141
</div>
138142
<div class="columns cve-columns">
@@ -252,6 +256,7 @@ import { useRouter } from 'vue-router';
252256
import ServiceUnavailable from '@/components/ServiceUnavailable.vue'
253257
254258
const cveListSearchStore = useCveListSearchStore();
259+
const partnerStore = usePartnerStore();
255260
const router = useRouter();
256261
const app = createApp({});
257262
const resultUrl = ref(`https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`);

0 commit comments

Comments
 (0)