Skip to content

Commit 481da7c

Browse files
committed
Merge branch 'test' of https://github.com/CVEProject/cve-website into jd-3000-accordion
2 parents edd1656 + 9ed5a8c commit 481da7c

1 file changed

Lines changed: 22 additions & 4 deletions

File tree

src/views/CVERecord/PublishedRecord.vue

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,16 @@
6060
<div id="cve-cna-cve-program-containers">
6161
<h2 class="title">Required CVE Record Information</h2>
6262
<AdpVulnerabilityEnrichment v-if="Object.keys(cnaContainer).length > 0" role="cna" :selectedCnaData="cveFieldList"
63-
:containerObject="cnaContainer" :orgId="`cna-${cnaContainer.providerMetadata.orgId}`" :anchorId="cnaContainer.onPageMenu.anchorId"
64-
>
65-
<h1 class="mb-1 has-text-white cve-capitalize-first-letter">{{ cnaContainer.onPageMenu.label }}</h1>
63+
:containerObject="cnaContainer" :orgId="`cna-${cnaContainer.providerMetadata.orgId}`" :anchorId="cnaContainer.onPageMenu.anchorId">
64+
<h1 class="mb-1 has-text-white cve-capitalize-first-letter">
65+
<span v-if="!isLoading">{{ cnaContainer.onPageMenu.label }} </span>
66+
<span v-else>
67+
<span class="icon">
68+
<span class="loader is-loading"/>
69+
</span>
70+
<span class="ml-2">Loading...</span>
71+
</span>
72+
</h1>
6673
</AdpVulnerabilityEnrichment>
6774
<!-- <AdpVulnerabilityEnrichment v-if="!useCveRecordLookupStore.hasHistoricalReferences" role="cna" :containerObject="cnaContainer"></AdpVulnerabilityEnrichment> -->
6875
<AdpVulnerabilityEnrichment v-if="Object.keys(cveProgramContainer).length > 0" role='cveProgram'
@@ -81,7 +88,15 @@
8188
<AdpVulnerabilityEnrichment v-if="adpContainer.providerMetadata.shortName === 'CISA-ADP'" role="adp" :selectedCnaData="{}"
8289
:containerObject="adpContainer" :orgId="`adp-${adpContainer.providerMetadata.orgId}`" :anchorId="adpContainer.onPageMenu.anchorId"
8390
>
84-
<h1 class="mb-1 has-text-white cve-capitalize-first-letter">{{ adpContainer.onPageMenu.label }}</h1>
91+
<h1 class="mb-1 has-text-white cve-capitalize-first-letter">
92+
<span v-if="!isLoading">{{ adpContainer.onPageMenu.label }}</span>
93+
<span v-else>
94+
<span class="icon">
95+
<span class="loader is-loading"/>
96+
</span>
97+
<span class="ml-2">Loading...</span>
98+
</span>
99+
</h1>
85100
</AdpVulnerabilityEnrichment>
86101
<!-- <div v-for="(adpContainer) in cveFieldList.productsStatus.adp" :key="adpContainer.key"
87102
class="mt-5"
@@ -117,6 +132,7 @@ export default {
117132
},
118133
data() {
119134
return {
135+
isLoading: false,
120136
isMessageExpanded: false,
121137
isHelpTestShown: false,
122138
cveRecordFields: ['ID', 'CNA', 'Credits', 'Description', 'References', 'State', 'Tags', 'Title', 'VendorsProductsVersions',
@@ -577,9 +593,11 @@ export default {
577593
},
578594
},
579595
async beforeMount() {
596+
this.isLoading = true
580597
await this.getOrgIdAndLongNameMap().finally(() =>{
581598
this.initializeFields();
582599
this.setupContainersAccordionStateOnPageMenu();
600+
this.isLoading = false;
583601
});
584602
},
585603
created () {

0 commit comments

Comments
 (0)