Merge pull request #3169 from CVEProject/tat-3160-content

#3160 content update and other fixes

src/assets/data/faqs.json

@@ -272,7 +272,7 @@
 				"questionText": "How do I search the CVE List",
 				"questionResponseParagraphs": [
           "<b><i>Search Tips<i></b>",
-          "<ul><li>By CVE ID<ul><li>Must include only one CVE ID per search.</li><li>CVE ID must include all letters, numbers, and hyphens associated with the CVE ID, e.g., CVE-2024-12345678.</li><li>“CVE” may be entered as “cve”, “CVE”, or as a combination of uppercase and lowercase, as casing is ignored during search.</li></ul></li><li>By other keyword(s)<ul><li>Must contain only alphanumeric characters.</li><li>May contain one or more keywords, separated by a space.</li><li>Keywords may be entered in lowercase, uppercase, or a combination of both. Casing is ignored during search, e.g., Vulnerabilities, vulnerabilities, VULNERABILITIES.</li></ul></li></ul>"
+          "<ul><li>By CVE ID<ul><li>Must include only one CVE ID per search.</li><li>CVE ID must include all letters, numbers, and hyphens associated with the CVE ID, e.g., CVE-2024-12345678.</li><li>“CVE” may be entered as “cve”, “CVE”, or as a combination of uppercase and lowercase, as casing is ignored during search.</li></ul></li><li>By other keyword(s)<ul><li>Must contain only alphanumeric characters, e.g., letters or numbers.</li><li>May contain one or more keywords, separated by a space.</li><li>Keywords may be entered in lowercase, uppercase, or a combination of both. Casing is ignored during search, e.g., Vulnerabilities, vulnerabilities, VULNERABILITIES.</li></ul></li></ul>"
 				]
 			},
 			{

src/components/cveRecordSearchModule.vue

@@ -16,7 +16,7 @@
               The Test website (test.cve.org) has a new drop-down menu below.
               <span class="button is-ghost cve-inner-btn">Read {{ showSearchHelpText ? 'less...' : 'more...' }}</span>
             </button>
-            <div v-if="showSearchHelpText" id="searchHelpText" class="cve-help-text" style="max-width: 860px">
+            <div v-if="showSearchHelpText" id="searchHelpText" class="cve-help-text" style="max-width: 810px">
               <ol>
                 <li>
                   <span class="has-text-weight-bold">Search Capability (Beta) Community testers</span> – To beta-test the new search feature, select
@@ -65,7 +65,7 @@
           <button @click="validate" class="button cve-button cve-button-accent-warm"
             :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
             :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
-            Search
+            {{ searchTypeBoolean ? 'Search' : 'Find'}} 
           </button>
         </div>
       </div>
@@ -112,10 +112,7 @@ let searchTypeBoolean = computed(() => {
 });
 
 watch(searchType, () => {
-  cveListSearchStore.searchType = (searchType.value === 'Search CVE List (Beta)') ? true : false;
-  cveId = cveRecordStore.cveId = '';
-  queryString.value = cveListSearchStore.query = '';
-  errorMessage.value = '';
+  resetStates();
 });
 
 watch(
@@ -131,6 +128,14 @@ watch(
   }
 )
 
+function resetStates() {
+  cveListSearchStore.searchType = cveGenericGlobalsStore.useSearch = searchTypeBoolean.value;
+  cveId = '';
+  queryString.value = cveListSearchStore.query = '';
+  errorMessage.value = '';
+  cveListSearchStore.showHelpText = false;
+  cveListSearchStore.isSeachButtonDisabled = true;
+}
 
 function startSearch() {
   // We only want to flip the search item _When we actually do a search_ otherwise we should default back to what we were on a page refresh
@@ -156,7 +161,6 @@ function startSearch() {
     const lookupPath = `/CVERecord?id=${cveId}`;
     router.push(lookupPath)
   }
-
 }
 
 function validateQueryString() {

src/views/CVERecord/SearchResults.vue

@@ -8,7 +8,8 @@
               <!-- cveListSearchStore.totalSearchResultCount < 1 so when there are results this doesn't flash while user is typing keyword -->
               <p class="has-text-centered">
                 Please use the help text below the search box above to fix your keyword(s).
-              </p></div>
+              </p>
+            </div>
             <div v-else>
               <div v-if="cveListSearchStore.isSearching"
                 class="cve-loading-message has-text-centered"
@@ -234,11 +235,11 @@
                       <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve">search tips</router-link>.
                     </p>
                   </div>
+                  <SurveyLinkComponent/>
                 </div>
               </div>
             </div>
           </div>
-          <SurveyLinkComponent/>
         </main>
       </div>
     </div>