Skip to content

Commit 8432b3a

Browse files
add cve id validation, remove logging, increase search input width, remove relevancy, and fix decrease show more top spacing
1 parent 0924164 commit 8432b3a

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

src/components/cveRecordSearchModule.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
</p>
2626
</div>
2727
</div>
28-
2928
</div>
3029
</template>
3130

@@ -70,10 +69,12 @@ function startSearch() {
7069
}
7170
7271
function validateQueryString() {
73-
const alphaNumericDashPattern = new RegExp(/^[a-zA-Z0-9- ]+$/, 'i').test(queryString.value);
74-
if (queryString.value.length > 0 && !alphaNumericDashPattern) {
72+
const alphaNumericDashPattern = new RegExp(/^[a-zA-Z0-9 ]+$/, 'i').test(queryString.value);
73+
const cveIdPattern = new RegExp(/^CVE-\d{4}-\d{4,7}$/, 'i').test(queryString.value);
74+
75+
if (queryString.value.length > 0 && !alphaNumericDashPattern && !cveIdPattern) {
7576
cveListSearchStore.isSeachButtonDisabled = true;
76-
errorMessage.value = 'Only letters, numbers, and hyphens are allowed.';
77+
errorMessage.value = 'Only letters, numbers, and CVE IDs (CVE-YYYY-NNNN) are allowed.';
7778
cveListSearchStore.showHelpText = true;
7879
} else if (queryString.value.length === 0) {
7980
cveListSearchStore.isSeachButtonDisabled = true;
@@ -91,10 +92,8 @@ function onKeyUpEnter() {
9192
}
9293
9394
function validate() {
94-
console.log('>>>>> validate')
9595
validateQueryString();
9696
if (!cveListSearchStore.isSeachButtonDisabled) {
97-
console.log('>>>>> startsearch')
9897
startSearch();
9998
}
10099
}
@@ -120,7 +119,7 @@ const websiteEnv = computed(() => {
120119
121120
@media screen and (min-width: $desktop) {
122121
.cve-id-input {
123-
width: 400px;
122+
width: 470px;
124123
}
125124
}
126125
</style>

src/views/CVERecord/SearchResults.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="columns is-centered">
44
<div class="column is-8-desktop cve-main-column-content-width">
55
<main id="cve-main-page-content" role="main">
6-
<div class="content">
6+
<div>
77
<div v-if="cveListSearchStore.showHelpText && cveListSearchStore.totalSearchResultCount < 1">
88
<!-- cveListSearchStore.totalSearchResultCount < 1 so when there are results this doesn't flash while user is typing keyword -->
99
<p class="has-text-centered">
@@ -48,7 +48,7 @@
4848
<p v-if="!description.showMore" class="mb-0">
4949
{{ description.firstChunk }}<span v-if="!description.showMore && description.secondChunk.length > 0">...</span>
5050
</p>
51-
<p v-else>{{ description.firstChunk.concat(` ${description.secondChunk}`) }}</p>
51+
<p v-else class="mb-0">{{ description.firstChunk.concat(` ${description.secondChunk}`) }}</p>
5252
<button v-if="description.secondChunk.length > 0"
5353
@click="cveListSearchStore.handleShowMoreChange(undefined, index)"
5454
class="button is-ghost cve-is-borderless p-0"
@@ -142,11 +142,6 @@
142142
</div>
143143
</div>
144144
</div>
145-
<div class="columns cve-columns">
146-
<div class="column cve-column">
147-
<p>Relevancy: {{ result.relevancyScore }}</p>
148-
</div>
149-
</div>
150145
</div>
151146
</div>
152147
</div>

0 commit comments

Comments
 (0)