Skip to content

Commit

Permalink
Merge pull request #3221 from CVEProject/jd-3077-dev
Browse files Browse the repository at this point in the history 
Resolves #3077 Dev version of PR #3193
  • Loading branch information
@athu-tran
athu-tran authored Nov 19, 2024
2 parents ac6e1ce + 3074f16 commit d3d3035
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 67 deletions.
10 changes: 10 additions & 0 deletions src/assets/style/globals.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,15 @@ label {
overflow-x: auto
}

.cve-scroll-box {
max-height: 15rem;
border-bottom: 1px solid lightgray;
overflow-y: scroll;
border-top: 1px solid lightgray;
padding: .75rem
}


.cve-w-100 {
width: 100%;
}
Expand All @@ -575,6 +584,7 @@ label {
background-color: rgba(0, 0, 0, .5);
box-shadow: 0 0 1px rgba(255, 255, 255, .5);
}

/* Other ends here*/

/* Third party CSS */
17 changes: 7 additions & 10 deletions src/components/AdpVulnerabilityEnrichment.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
</div>
</div>
</div>
<div id="cve-kevs" v-if="kevs.length > 0 && roleName === 'adp'" class="cve-scroll-border-bottom mt-5">
<div id="cve-kevs" v-if="kevs.length > 0 && roleName === 'adp'" class="mt-5">
<h4 class="title mb-0">KEV <span class="tag">{{ kevs.length }} Total</span></h4>
<div class="cve-learn-more cve-scroll-border-bottom">
<div class="cve-learn-more ">
<router-link to="/CVERecord/UserGuide/#cve-kev" class="cve-learn-more-link">Learn more</router-link>
</div>
<div class="cve-y-scroll mt-3 mb-3">
<div class="cve-y-scroll cve-scroll-box mt-3">
<ul class="mt-1">
<li v-for="kev in kevs" :key="kev.key">
<a :href="kev.reference" target="_blank">{{ kev.reference }}</a><span class="is-italic cve-help-text"> ({{ kev.dateAdded }})</span>
Expand Down Expand Up @@ -131,13 +131,13 @@
</div>
</div>
<div v-if="roleName !== 'cveProgram'">
<div id="cve-cwes" v-if="cwes.length > 0" class="cve-scroll-border-bottom mt-5">
<div id="cve-cwes" v-if="cwes.length > 0" class="mt-5">
<h4 class="title mb-0">CWE <span class="tag">{{ cwes.length }} Total</span></h4>
<div class="cve-learn-more cve-scroll-border-bottom mb-5">
<div class="cve-learn-more mb-3">
<router-link to="/CVERecord/UserGuide/#cve-cwe" class="cve-learn-more-link">Learn more</router-link>
</div>
<div class="cve-y-scroll">
<ul class="mt-0 mb-3">
<div class="cve-y-scroll cve-scroll-box">
<ul class="mt-0 mb-0">
<li v-for="cwe in cwes" :key="cwe.key">
<a v-if="cwe.cweId !== 'CWE ID not provided'" :href="`https://cwe.mitre.org/data/definitions/${cwe.cweNumber}.html`" target="_blank">
<span class="has-text-weight-bold">{{ cwe.cweId }}<span v-if="cwe.description.length > 0">: </span></span>
Expand Down Expand Up @@ -461,7 +461,4 @@ export default {
overflow-y: scroll;
}
.cve-scroll-border-bottom {
border-bottom: 1px solid lightgray;
}
</style>
41 changes: 23 additions & 18 deletions src/components/CveRecordReferences.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,25 @@
class="mt-5"
style="word-break:break-all;"
>
<h4 class="title mb-0">References</h4>
<ul>
<li v-for="(reference, index) in references" :key="`link-${index}`" class="cve-word-wrap">
<span class="icon-text">
<a :href="reference.url" target="_blank">
{{ (typeof reference.name !== 'undefined' && reference.name.length > 0) ? `${reference.hostname}: ${reference.name}` : reference.url }}
<span class="icon cve-icon-xxs">
<p id="enewsletter" class="is-hidden">external site</p>
<font-awesome-icon icon="external-link-alt" aria-labelledby="enewsletter"></font-awesome-icon>
</span>
</a>
</span>
<span v-for="tag in reference.tags" :key="tag">
<span class="tag ml-2" v-if="tag.length > 0">{{tag}}</span>
</span>
</li>
</ul>
<h4 class="title mb-3">References <span class="tag">{{ references.length }} Total</span></h4>
<div class="cve-scroll-box">
<ul class="mt-0">
<li v-for="(reference, index) in references" :key="`link-${index}`" class="cve-word-wrap">
<span class="icon-text">
<a :href="reference.url" target="_blank">
{{ (typeof reference.name !== 'undefined' && reference.name.length > 0) ? `${reference.hostname}: ${reference.name}` : reference.url }}
<span class="icon cve-icon-xxs">
<p id="enewsletter" class="is-hidden">external site</p>
<font-awesome-icon icon="external-link-alt" aria-labelledby="enewsletter"></font-awesome-icon>
</span>
</a>
</span>
<span v-for="tag in reference.tags" :key="tag">
<span class="tag ml-2" v-if="tag.length > 0">{{tag}}</span>
</span>
</li>
</ul>
</div>
</div>
</template>

Expand All @@ -32,4 +34,7 @@ export default {
}
}
}
</script>
</script>
<style lang="scss">
@import '@/assets/style/globals.scss';
</style>
73 changes: 34 additions & 39 deletions src/components/ProductStatus.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,46 +30,47 @@
</div>
</nav>
<div id="cve-affected-unaffected-unknown-versions">
<p class="cve-product-status-heading pb-1" style="border-bottom: 1px solid lightgray;">
<p class="cve-product-status-heading pb-1" >
Versions <span class="tag">{{ versionsCount(product) }} Total</span>
</p>

<div class="column is-12-desktop cve-versions-scroll mb-4">
<div id="cve-version-default-status">
<p v-if="product.defaultStatus" class="cve-help-text is-italic">
<span class="has-text-weight-bold">Default Status: </span>{{product.defaultStatus}}
</p>
<p v-else class="cve-help-text is-italic"><span class="has-text-weight-bold">Default Status: </span>unknown</p>
</div>
<div v-for="header in product.versionsColumns.headers" :key="header.key">
<div :id="header" class="mt-1">
<p style="text-transform: capitalize;">{{ header }}</p>
<ul class="menu-list mt-1" v-for="row in product.versionsColumns.twoDTable[header]" :key="row.key">
<li>
<span v-if="row.versionsChanges.length > 0">
<p>
{{row.parentVersionStatus}}
<span v-for="word in row.parentVersionRange" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
</p>
<ul style="border-left: none !important;">
<li v-for="change in row.versionsChanges" :key="change.key">
<span v-for="word in change" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
</li>
</ul>
</span>
<span v-else>
<span v-if="row.parentVersionRange.length > 0">{{row.parentVersionStatus}}
<span v-for="word in row.parentVersionRange" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
<div class="cve-scroll-box pt-1">
<div class="column is-12-desktop mb-4">
<div id="cve-version-default-status">
<p v-if="product.defaultStatus" class="cve-help-text is-italic">
<span class="has-text-weight-bold">Default Status: </span>{{product.defaultStatus}}
</p>
<p v-else class="cve-help-text is-italic"><span class="has-text-weight-bold">Default Status: </span>unknown</p>
</div>
<div v-for="header in product.versionsColumns.headers" :key="header.key">
<div :id="header" class="mt-1">
<p style="text-transform: capitalize;">{{ header }}</p>
<ul class="menu-list mt-1" v-for="row in product.versionsColumns.twoDTable[header]" :key="row.key">
<li>
<span v-if="row.versionsChanges.length > 0">
<p>
{{row.parentVersionStatus}}
<span v-for="word in row.parentVersionRange" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
</p>
<ul style="border-left: none !important;">
<li v-for="change in row.versionsChanges" :key="change.key">
<span v-for="word in change" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
</li>
</ul>
</span>
<span v-else>
{{row.parentVersionStatus}} {{row.parentVersionRange}}
<span v-if="row.parentVersionRange.length > 0">{{row.parentVersionStatus}}
<span v-for="word in row.parentVersionRange" :key="word.key" :class="isAversion(word) ? 'cve-version' : ''">{{word}}&nbsp;</span>
</span>
<span v-else>
{{row.parentVersionStatus}} {{row.parentVersionRange}}
</span>
</span>
</span>
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div id="cve-cpes" v-if="product.cpes.length > 0">
<p class="cve-product-status-heading" style="border-bottom: 1px solid lightgray;">CPEs</p>
Expand Down Expand Up @@ -177,11 +178,5 @@ export default {
.level-item {
justify-content: left!important;
}
.cve-versions-scroll {
max-height: 15rem;
border-bottom: 1px solid lightgray;
overflow-y: scroll;
}
</style>

0 comments on commit d3d3035

Please sign in to comment.