From cf2f8ad87ae72162a2014d172e50ed9622d1ab99 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:40:58 -0400
Subject: [PATCH 01/13] #3160 add intro banner above search box

---
 src/components/cveRecordSearchModule.vue | 123 +++++++++++++++++------
 1 file changed, 91 insertions(+), 32 deletions(-)

diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
index 13604ca0..0cdf8f65 100644
--- a/src/components/cveRecordSearchModule.vue
+++ b/src/components/cveRecordSearchModule.vue
@@ -1,38 +1,84 @@
 <template>
-  <div class="field mt-1">
-    <div class="field has-addons">
-      <div class="control">
-        <span v-if="websiteEnv !== 'prd'" class="select cve-search-selector">
-          <select v-model="searchType">
-            <option>Search CVE List (Beta)</option>
-            <option>Find a Test CVE Record/ID (Legacy)</option>
-          </select>
-        </span>
-      </div>
-      <div class="control is-expanded">
-        <input v-if="searchTypeBoolean" v-model.trim="queryString" @keyup.enter="onKeyUpEnter"
-          @keyup="validateQueryString" type="text" class="input cve-id-input"
-          placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)" />
-        <input v-else v-model="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString" @blur="removeHelpText"
-          type="text" class="input cve-id-input" placeholder="Enter CVE ID (CVE-YYYY-NNNN)" />
-      </div>
-      <div class="control">
-        <button @click="validate" class="button cve-button cve-button-accent-warm"
-          :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
-          :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
-          Search {{ websiteEnv === 'test' ? 'CVE List in Test' : '' }}
-        </button>
+  <div class="mt-1">
+    <div>
+      <div role="alert" class="notification is-warning is-light">
+        <div class="is-flex is-flex-direction-row is-align-content-flex-start">
+          <div class="pr-2 pt-2">
+            <p id="newSearchHelpText" class="is-hidden">info</p>
+            <font-awesome-icon style="font-size: 1.25em;" icon="info-circle" role="info"
+              aria-labelledby="newSearchHelpText" aria-hidden="false" />
+          </div>
+          <div>
+            <button class="button is-text is-ghost cve-btn-container pt-0 pr-2 pb-0 pl-1"
+              @click="showSearchHelpText = !showSearchHelpText"
+              aria-controls="searchHelpText"
+            >
+              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">
+              <ol>
+                <li>
+                  <span class="has-text-weight-bold">Search Capability (Beta) Community testers</span> – To beta-test the new search feature, select
+                  “<span class="has-text-weight-bold">Search CVE List (Beta)</span>” in the drop-down menu. The
+                  <span class="has-text-weight-bold">production</span> data is used.
+                  <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips</router-link>
+                  for more information on this new capability. <a href="https://forms.office.com/g/dFzysrHLpR" target="_blank">
+                  Provide feedback on the new search capability
+                  <span class="icon cve-icon-xxs">
+                    <p id="externalSurveyLink" class="is-hidden">
+                      Survey opens in a new tab or window depending on browser settings
+                    </p>
+                    <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false"/>
+                  </span>.
+                </a>.
+                </li>
+                <li>
+                  <span class="has-text-weight-bold">CNAs</span> – to view your <span class="has-text-weight-bold">test data</span>
+                  (your draft records) select “<span class="has-text-weight-bold">Find a Test CVE Record/ID (Legacy)</span>” in the drop-down menu and
+                  provide a CVE ID to find a specific CVE Record. 
+                </li>
+              </ol>
+          </div>
+          </div>
+        </div>
       </div>
     </div>
-    <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
-      <div class="is-flex is-align-content-flex-start">
-        <p id="alertIcon" class="is-hidden">alert</p>
-        <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg" icon="exclamation-triangle" role="alert"
-          aria-labelledby="alertIcon" aria-hidden="false" />
-        <p class="cve-help-text">
-          {{ errorMessage }}
-          <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips.</router-link>
-        </p>
+    <div class="field mt-1">
+      <div class="field has-addons">
+        <div class="control">
+          <span v-if="websiteEnv !== 'prd'" class="select cve-search-selector">
+            <select v-model="searchType">
+              <option>Search CVE List (Beta)</option>
+              <option>Find a Test CVE Record/ID (Legacy)</option>
+            </select>
+          </span>
+        </div>
+        <div class="control is-expanded">
+          <input v-if="searchTypeBoolean" v-model.trim="queryString" @keyup.enter="onKeyUpEnter"
+            @keyup="validateQueryString" type="text" class="input cve-id-input"
+            placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)" />
+          <input v-else v-model="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString" @blur="removeHelpText"
+            type="text" class="input cve-id-input" placeholder="Enter CVE ID (CVE-YYYY-NNNN)" />
+        </div>
+        <div class="control">
+          <button @click="validate" class="button cve-button cve-button-accent-warm"
+            :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
+            :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
+            Search {{ websiteEnv === 'test' ? 'CVE List in Test' : '' }}
+          </button>
+        </div>
+      </div>
+      <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
+        <div class="is-flex is-align-content-flex-start">
+          <p id="alertIcon" class="is-hidden">alert</p>
+          <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg" icon="exclamation-triangle" role="alert"
+            aria-labelledby="alertIcon" aria-hidden="false" />
+          <p class="cve-help-text">
+            {{ errorMessage }}
+            <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips.</router-link>
+          </p>
+        </div>
       </div>
     </div>
   </div>
@@ -58,6 +104,8 @@ let cveRecordStore = usecveRecordStore();
 let searchType = ref('Search CVE List (Beta)');
 let cveId = cveRecordStore.cveId;
 
+let showSearchHelpText = ref(false);
+
 // this seems redundant, but it fixes an edge case.
 // if a user searches for a particular field, then on the results page flips the toggle, THEN refreshes without searching, this will keep the correct helper text showing.
 let searchTypeBoolean = computed(() => {
@@ -183,4 +231,15 @@ const websiteEnv = computed(() => {
     width: 470px;
   }
 }
+
+.cve-btn-container {
+  background: unset !important;
+  color: $black !important;
+}
+
+
+.cve-btn-container:hover, .cve-inner-btn:hover {
+  cursor: pointer;
+  text-decoration: none !important;
+}
 </style>
\ No newline at end of file

From d48bfca92dd78b000e47b5acd6841d81cc593073 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Mon, 14 Oct 2024 20:08:49 -0400
Subject: [PATCH 02/13] #3160 update search FAQS

---
 src/assets/data/faqs.json           | 4 +---
 src/views/ResourcesSupport/FAQs.vue | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
index 2e2e5286..aab5240a 100644
--- a/src/assets/data/faqs.json
+++ b/src/assets/data/faqs.json
@@ -272,9 +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>",
-          "<strong>2. Other CVE List search options</strong>",
-					"<ul><li>Search by keyword(s) across <a href='https://github.com/CVEProject/cvelistV5' target='_blank'>ALL FIELDS of all CVE Records</a> in the cvelistV5 downloads repository using the main search box on GitHub.com.</li><li>Search by keyword(s) in the <a href='https://cve.mitre.org/cve/search_cve_list.html' target='_blank'>Description fields ONLY of all CVE Records</a> using the legacy search page on cve.mitre.org.</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.</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>"
 				]
 			},
 			{
diff --git a/src/views/ResourcesSupport/FAQs.vue b/src/views/ResourcesSupport/FAQs.vue
index a05783e3..98442a41 100644
--- a/src/views/ResourcesSupport/FAQs.vue
+++ b/src/views/ResourcesSupport/FAQs.vue
@@ -69,8 +69,7 @@
                   <div :id="item.sectionId + qAndA.questionId + 'response'" class="message-body"
                     :class="{'is-hidden': accordion[item.sectionId + qAndA.questionId]}">
                     <div v-if="qAndA.questionId == 'search_cve'" class="pb-3">
-                      <p>The following methods are available:</p>
-                      <span class="has-text-weight-bold">1. On this site</span>
+                      <span class="has-text-weight-bold">TEST.CVE.ORG Search CVE List (Beta) Tips</span>
                       <ul>
                         <li>Search the CVE List by keywords using the
                           <router-link :to="{ hash: '#cve-secondary-navbar' }">search box</router-link> at the top of this page.

From b6caf67d3679ba17d12949cbe4ba180da73c4e58 Mon Sep 17 00:00:00 2001
From: rroberge <rroberge@mitre.org>
Date: Tue, 15 Oct 2024 00:52:09 +0000
Subject: [PATCH 03/13] #3163 Add 1 News article about the 10/2/24 Board
 Minutes

---
 src/assets/data/news.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/assets/data/news.json b/src/assets/data/news.json
index f3c61604..fb174c93 100644
--- a/src/assets/data/news.json
+++ b/src/assets/data/news.json
@@ -1,5 +1,22 @@
 {
   "currentNews": [
+    {
+      "id": 420,
+      "newsType": "news",
+      "title": "Minutes from CVE Board Teleconference Meeting on October 2 Now Available",
+      "urlKeywords": "CVE Board Minutes from October 2",
+      "date": "2024-10-15",
+      "description": [
+        {
+          "contentnewsType": "paragraph",
+          "content": "The <a href='/ProgramOrganization/Board'>CVE Board</a> held a teleconference meeting on October 2, 2024. Read the <a href='https://cve.mitre.org/community/board/meeting_summaries/02_October_2024.pdf' target='_blank'>meeting minutes summary</a>."
+        },
+        {
+          "contentnewsType": "paragraph",
+          "content": "The CVE Board is the organization responsible for the strategic direction, governance, operational structure, policies, and rules of the CVE Program. The Board includes members from numerous cybersecurity-related organizations including commercial security tool vendors, academia, research institutions, government departments and agencies, and other prominent security experts, as well as end-users of vulnerability information."
+        }
+      ]
+    },
     {
       "id": 419,
       "newsType": "blog",
@@ -32,6 +49,7 @@
     },
     {
       "id": 418,
+      "displayOnHomepageOrder": 0,
       "newsType": "news",
       "title": "Minutes from CVE Board Teleconference Meeting on September 18 Now Available",
       "urlKeywords": "CVE Board Minutes from September 18",

From ab1ce4b1639e0653f6329965a28ef1a500b02599 Mon Sep 17 00:00:00 2001
From: rroberge <rroberge@mitre.org>
Date: Tue, 15 Oct 2024 01:05:36 +0000
Subject: [PATCH 04/13] #3164 Update urls for X in FAQs, Resources, and Footer

---
 src/assets/data/faqs.json                | 2 +-
 src/components/FooterModule.vue          | 4 ++--
 src/views/ResourcesSupport/Resources.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
index 7f0bdb66..c7514ac6 100644
--- a/src/assets/data/faqs.json
+++ b/src/assets/data/faqs.json
@@ -256,7 +256,7 @@
 				"questionText": "Are there CVE List data feeds",
 				"questionResponseParagraphs": [
 					"Yes, both internal and external feeds of CVE List content are available.",
-					"CVE Program:<ul><li><a href='https://twitter.com/CVEnew/' target='_blank'>Feed of newly published CVE Records</a>  @CVEnew Twitter</li><li><a href='https://github.com/CVEProject/cvelistV5' target='_blank'>CVE List downloads (updated hourly)</a> cvelistV5 repository on GitHub</li></ul>",
+					"CVE Program:<ul><li><a href='https://x.com/CVEnew' target='_blank'>Feed of newly published CVE Records</a>  @CVEnew on X</li><li><a href='https://github.com/CVEProject/cvelistV5' target='_blank'>CVE List downloads (updated hourly)</a> cvelistV5 repository on GitHub</li></ul>",
 					"External:<ul><li><a href='https://cassandra.cerias.purdue.edu/CVE_changes/' target='_blank'>CVE Change Logs</a> free tool from CERIAS/Purdue University that provides daily and monthly changes to CVE Records.</li></ul>"
 				]
 			},
diff --git a/src/components/FooterModule.vue b/src/components/FooterModule.vue
index fed86920..efbdb2fc 100644
--- a/src/components/FooterModule.vue
+++ b/src/components/FooterModule.vue
@@ -48,14 +48,14 @@
             <font-awesome-icon :icon="['fab', 'medium']" aria-labelledby="mediumIcon" aria-hidden="false" focusable="false"/>
           </span></a>
           <div>
-            <a class="cve-social-media-icon-with-text" href="https://twitter.com/CVEnew/" target="_blank">
+            <a class="cve-social-media-icon-with-text" href="https://x.com/CVEnew" target="_blank">
               <span class="icon">
                 <p id="x-twitterNewIcon" class="is-hidden">x-twitter icon for @CVEnew</p>
                 <font-awesome-icon :icon="['fab', 'x-twitter']" aria-labelledby="x-twitterNewIcon" aria-hidden="false" focusable="false"/>
               </span>
               New CVE Records
             </a>
-            <a class="cve-social-media-icon-with-text" href="https://twitter.com/CVEannounce/" target="_blank">
+            <a class="cve-social-media-icon-with-text" href="https://x.com/CVEannounce" target="_blank">
               <span class="icon">
                 <p id="x-twitterAnnounceIcon" class="is-hidden">x-twitter icon for @CVEannounce</p>
                 <font-awesome-icon :icon="['fab', 'x-twitter']" aria-labelledby="x-twitterAnnounceIcon" aria-hidden="false" focusable="false"/>
diff --git a/src/views/ResourcesSupport/Resources.vue b/src/views/ResourcesSupport/Resources.vue
index 221ed6e9..2abf1a6b 100644
--- a/src/views/ResourcesSupport/Resources.vue
+++ b/src/views/ResourcesSupport/Resources.vue
@@ -606,7 +606,7 @@
                       </h3>
                       <p class="mb-0 ml-4 has-text-weight-bold">Feed of newly published CVE Records:</p>
                       <ul class="mt-0 mb-0 tile-body cve-task-tile-list">
-                        <li><a href="https://twitter.com/CVEnew/" target="_blank">@CVEnew Twitter</a></li>
+                        <li><a href="https://x.com/CVEnew" target="_blank">@CVEnew on X</a></li>
                         <li><a href='https://github.com/CVEProject/cvelistV5' target='_blank'>CVE List downloads (updated hourly)</a>
                         cvelistV5 repository on GitHub</li>
                       </ul>

From b97bce04c27bd1ad57308d749029d1c13de3c215 Mon Sep 17 00:00:00 2001
From: rroberge <rroberge@mitre.org>
Date: Tue, 15 Oct 2024 01:20:11 +0000
Subject: [PATCH 05/13] #3146 Update 2 CNA's info

---
 src/assets/data/CNAsList.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/assets/data/CNAsList.json b/src/assets/data/CNAsList.json
index f4484fd2..16689145 100644
--- a/src/assets/data/CNAsList.json
+++ b/src/assets/data/CNAsList.json
@@ -7477,7 +7477,7 @@
         "email": [
           {
             "label": "Email",
-            "emailAddr": "cybersecurity@se.com"
+            "emailAddr": "cpcert@se.com"
           }
         ],
         "contact": [
@@ -9231,14 +9231,14 @@
   {
     "shortName": "vmware",
     "cnaID": "CNA-2016-0025",
-    "organizationName": "VMware",
+    "organizationName": "VMware by Broadcom",
     "scope": "VMware, Spring, and Cloud Foundry issues only",
     "contact": [
       {
         "email": [
           {
             "label": "Email",
-            "emailAddr": "security@vmware.com"
+            "emailAddr": "vmware.psirt@broadcom.com"
           }
         ],
         "contact": [],
@@ -9249,7 +9249,7 @@
       {
         "label": "Policy",
         "language": "",
-        "url": "https://www.vmware.com/support/policies/security_response.html"
+        "url": "https://www.broadcom.com/support/vmware-services/security-response"
       }
     ],
     "securityAdvisories": {
@@ -9257,7 +9257,7 @@
       "advisories": [
         {
           "label": "Advisories",
-          "url": "https://www.vmware.com/security/advisories.html"
+          "url": "https://www.broadcom.com/support/vmware-security-advisories"
         }
       ]
     },

From d26345eef7358ac146dc114bdc9a95fdd948e5a1 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Tue, 15 Oct 2024 08:22:08 -0400
Subject: [PATCH 06/13] clear input and states when selecting different
 drop-down option, show Access Search tips link only for search option, fix
 View JSON link, fix search tip links, remove unused function

---
 src/components/PrimaryNavigation.vue       | 17 ++++++++++++-----
 src/components/cveRecordSearchModule.vue   | 12 +++++++++---
 src/stores/cveListSearch.js                |  1 +
 src/views/CVERecord/PublishedRecord.vue    |  2 +-
 src/views/CVERecord/RejectedRecordOrId.vue |  2 +-
 src/views/CVERecord/ReservedId.vue         |  2 +-
 src/views/CVERecord/SearchResults.vue      |  2 +-
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/components/PrimaryNavigation.vue b/src/components/PrimaryNavigation.vue
index 9c5412bf..116f60aa 100644
--- a/src/components/PrimaryNavigation.vue
+++ b/src/components/PrimaryNavigation.vue
@@ -125,11 +125,13 @@
             <cveRecordSearch/>
           </div>
           <div class="navbar-item cve-secondary-navbar-item cve-keyword-search">
-            <span class="icon-text mr-2" style="font-size: 14px">
-              <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
-                Access Search Tips
-              </router-link>
-            </span>
+            <div v-if="searchType">
+              <span class="icon-text mr-2" style="font-size: 14px">
+                <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
+                  Access Search Tips
+                </router-link>
+              </span>
+            </div>
           </div>
         </div>
         <div class="navbar-end is-hidden-touch">
@@ -151,6 +153,8 @@
 
 <script>
 import cveRecordSearch from '@/components/cveRecordSearchModule.vue';
+import { useCveListSearchStore } from '@/stores/cveListSearch';
+import { mapState } from 'pinia'
 
 export default {
   components: { cveRecordSearch },
@@ -160,6 +164,9 @@ export default {
       required: true,
     },
   },
+  computed: {
+    ...mapState(useCveListSearchStore, ['searchType'])
+  },
   data() {
     return {
       isOpen: false,
diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
index 0cdf8f65..0b2b33c2 100644
--- a/src/components/cveRecordSearchModule.vue
+++ b/src/components/cveRecordSearchModule.vue
@@ -58,14 +58,14 @@
           <input v-if="searchTypeBoolean" v-model.trim="queryString" @keyup.enter="onKeyUpEnter"
             @keyup="validateQueryString" type="text" class="input cve-id-input"
             placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)" />
-          <input v-else v-model="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString" @blur="removeHelpText"
+          <input v-else v-model.trim="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString"
             type="text" class="input cve-id-input" placeholder="Enter CVE ID (CVE-YYYY-NNNN)" />
         </div>
         <div class="control">
           <button @click="validate" class="button cve-button cve-button-accent-warm"
             :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
             :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
-            Search {{ websiteEnv === 'test' ? 'CVE List in Test' : '' }}
+            Search
           </button>
         </div>
       </div>
@@ -76,7 +76,6 @@
             aria-labelledby="alertIcon" aria-hidden="false" />
           <p class="cve-help-text">
             {{ errorMessage }}
-            <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips.</router-link>
           </p>
         </div>
       </div>
@@ -112,6 +111,13 @@ let searchTypeBoolean = computed(() => {
   return searchType.value == 'Search CVE List (Beta)' ? true : false;
 });
 
+watch(searchType, () => {
+  cveListSearchStore.searchType = (searchType.value === 'Search CVE List (Beta)') ? true : false;
+  cveId = cveRecordStore.cveId = '';
+  queryString.value = cveListSearchStore.query = '';
+  errorMessage.value = '';
+});
+
 watch(
   () => route.query,
   () => {
diff --git a/src/stores/cveListSearch.js b/src/stores/cveListSearch.js
index d4e6a2fb..6a578864 100644
--- a/src/stores/cveListSearch.js
+++ b/src/stores/cveListSearch.js
@@ -21,6 +21,7 @@ export const useCveListSearchStore = defineStore('cveListSearch ', {
       query: '',
       recordData: {},
       searchResults: [],
+      searchType: true,
       serverError: false,
       showHelpText: false,
       size: 25,
diff --git a/src/views/CVERecord/PublishedRecord.vue b/src/views/CVERecord/PublishedRecord.vue
index c839958d..5c52b704 100644
--- a/src/views/CVERecord/PublishedRecord.vue
+++ b/src/views/CVERecord/PublishedRecord.vue
@@ -16,7 +16,7 @@
             <div class="level-right ml-1">
               <div class="level-item">
                 <span class="icon-text">
-                  <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve/${usecveRecordStore.cveId}`" target="_blank">
+                  <a id="cve-view-json" :href="`${cveServicesBaseUrl}/api/cve/${usecveRecordStore.cveId}`" target="_blank">
                     <span class="icon">
                       <p id="enewsletter" class="is-hidden">external site</p>
                       <font-awesome-icon icon="file-code" aria-labelledby="enewsletter"></font-awesome-icon>
diff --git a/src/views/CVERecord/RejectedRecordOrId.vue b/src/views/CVERecord/RejectedRecordOrId.vue
index 6a9bd92a..88341f39 100644
--- a/src/views/CVERecord/RejectedRecordOrId.vue
+++ b/src/views/CVERecord/RejectedRecordOrId.vue
@@ -15,7 +15,7 @@
             <div class="level-right ml-1">
               <div class="level-item">
                 <a id="cve-view-json"
-                  :href="`https://${cveServicesBaseUrl}/api/${ usecveRecordStore.isArecord ?
+                  :href="`${cveServicesBaseUrl}/api/${ usecveRecordStore.isArecord ?
                   'cve' : 'cve-id'}/${usecveRecordStore.cveId}`"
                   target="_blank">
                   View JSON
diff --git a/src/views/CVERecord/ReservedId.vue b/src/views/CVERecord/ReservedId.vue
index 6b4f8b30..b552a2ad 100644
--- a/src/views/CVERecord/ReservedId.vue
+++ b/src/views/CVERecord/ReservedId.vue
@@ -14,7 +14,7 @@
             </div>
             <div class="level-right">
               <div class="level-item">
-                <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve-id/${usecveRecordStore.cveId}`" target="_blank">
+                <a id="cve-view-json" :href="`${cveServicesBaseUrl}/api/cve-id/${usecveRecordStore.cveId}`" target="_blank">
                   View JSON
                 </a>
               </div>
diff --git a/src/views/CVERecord/SearchResults.vue b/src/views/CVERecord/SearchResults.vue
index 7554605f..4cfe62b3 100644
--- a/src/views/CVERecord/SearchResults.vue
+++ b/src/views/CVERecord/SearchResults.vue
@@ -231,7 +231,7 @@
                   <div v-else>
                     <p class="has-text-weight-bold">No search results found for: <span class="is-italic">{{ cveListSearchStore.query }}</span></p>
                     <p>Please try your search again using different keyword(s) or access the
-                      <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve_list_tips">search tips</router-link>.
+                      <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve">search tips</router-link>.
                     </p>
                   </div>
                 </div>

From 2f789761ff71bb38208e78df9534e1ea0644cea5 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Tue, 15 Oct 2024 10:57:52 -0400
Subject: [PATCH 07/13] #3160 fix search on bad input after record lookup

---
 src/components/cveRecordSearchModule.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
index 0b2b33c2..02d31ad0 100644
--- a/src/components/cveRecordSearchModule.vue
+++ b/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() {

From 679aa2eacb56a9df77d8acfb2165a3812ba3c404 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:25:09 -0400
Subject: [PATCH 08/13] #3160 update search faq and show survey on result page
 only when page render reusults or no results found

---
 src/assets/data/faqs.json             | 2 +-
 src/views/CVERecord/SearchResults.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
index aab5240a..478a4e92 100644
--- a/src/assets/data/faqs.json
+++ b/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>"
 				]
 			},
 			{
diff --git a/src/views/CVERecord/SearchResults.vue b/src/views/CVERecord/SearchResults.vue
index 4cfe62b3..27401d5b 100644
--- a/src/views/CVERecord/SearchResults.vue
+++ b/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>

From efa19f5e85c31f9fd18b9e6d6ce7ffe80038b333 Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:43:17 -0400
Subject: [PATCH 09/13] #3160 fix accordion +/- button expand/collapse issue

---
 src/components/AdpVulnerabilityEnrichment.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AdpVulnerabilityEnrichment.vue b/src/components/AdpVulnerabilityEnrichment.vue
index 9dc937d0..d0245574 100644
--- a/src/components/AdpVulnerabilityEnrichment.vue
+++ b/src/components/AdpVulnerabilityEnrichment.vue
@@ -5,7 +5,6 @@
         <slot></slot>
         <button class="button message-header-button"
           :style="{'background-color': '#162e51 !important', 'color': 'white !important'}"
-          @click="togglePanel"
           :aria-expanded="usecveRecordStore.accordionState[organizationId] ? 'true' : 'false'"
           :aria-controls="`${organizationId}-panel`"
         >

From c36f02da0728e3ae7d5629b7b02524643c64bdaa Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:54:46 -0400
Subject: [PATCH 10/13] #3160 fix Find button looking up invalid ID

---
 src/components/cveRecordSearchModule.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
index 02d31ad0..d341696d 100644
--- a/src/components/cveRecordSearchModule.vue
+++ b/src/components/cveRecordSearchModule.vue
@@ -207,14 +207,9 @@ function onKeyUpEnter() {
 function validate() {
 
   validateQueryString();
-  if (cveGenericGlobalsStore.useSearch) {
-    if (!cveListSearchStore.isSeachButtonDisabled) {
-      startSearch();
-    }
-  } else {
+  if (!cveListSearchStore.isSeachButtonDisabled) {
     startSearch();
   }
-
 }
 
 const websiteEnv = computed(() => {

From 518a283c6ff5e2b62f6c7b55ea94f79e3d5b1b22 Mon Sep 17 00:00:00 2001
From: rroberge <rroberge@mitre.org>
Date: Tue, 15 Oct 2024 19:47:29 +0000
Subject: [PATCH 11/13] #3147 Add 1 new WG + related updates

---
 src/assets/data/events.json                   | 24 +++++++--
 src/assets/data/navigation.json               |  4 ++
 src/assets/data/news.json                     | 21 ++++++++
 .../ProgramOrganization/WorkingGroups.vue     | 54 +++++++++++++++++--
 src/views/ResourcesSupport/Resources.vue      | 17 +++---
 5 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/src/assets/data/events.json b/src/assets/data/events.json
index 7c60f029..4059fc2e 100644
--- a/src/assets/data/events.json
+++ b/src/assets/data/events.json
@@ -1,11 +1,27 @@
 {
   "currentEvents": [
+    {
+      "id": 35,
+      "title": "CVE Artificial Intelligence Working Group (CVEAI WG) Meeting",
+      "location": "Virtual",
+      "description": "Focused on defining swim lanes for AI vulnerability disclosure within the CVE Program.",
+      "permission": "private",
+      "url": "/ProgramOrganization/WorkingGroups#CVEArtificialIntelligenceWorkingGroupCVEAIWG",
+      "date": {
+        "start": "2024-10-15",
+        "end": "2024-12-31",
+        "repeat": {
+          "day": "Monday",
+          "recurrence": "biweekly"
+        }
+      }
+    },
     {
       "id": 34,
       "displayOnHomepageOrder": 1,
       "title": "CVE Program Workshop – Autumn 2024",
       "location": "Virtual",
-      "description": "A collaborative virtual community event of CVE Partners focused on improving CVE.<br/><br/>Event Time: 10:00 AM to 2:00 PM EDT both days.<br/><br/>Workshop “save the date” announcement, with expected topics and other details, sent to partners on September 19, 2024.",
+      "description": "A collaborative virtual community event of CVE Partners focused on improving CVE.<br/><br/>Event Time: 10:00 AM to 2:00 PM EDT both days.<br/><br/>Please refer to the CNA partners email announcements for agenda topics, deadlines, and other workshop details.",
       "permission": "private",
       "url": "",
       "date": {
@@ -430,15 +446,15 @@
       "id": 3,
       "title": "CVE Outreach and Communications Working Group (OCWG) Meeting",
       "location": "Virtual",
-      "description": "Promote the CVE Program to achieve program adoption and coverage goals through increased community awareness. Each calendar year there are six meetings held on a Monday (UTC-08:00) and six meetings held on a Wednesday (UTC-12:00).",
+      "description": "Promote the CVE Program to achieve program adoption and coverage goals through increased community awareness.",
       "permission": "private",
       "url": "/ProgramOrganization/WorkingGroups#OutreachandCommunicationsWorkingGroupOCWG",
       "date": {
         "start": "2024-01-01",
         "end": "2024-12-31",
         "repeat": {
-          "day": "Monday or Wednesday alternating every other month",
-          "recurrence": "monthly"
+          "day": "Friday",
+          "recurrence": "weekly"
         }
       }
     },
diff --git a/src/assets/data/navigation.json b/src/assets/data/navigation.json
index a9ac6295..b1d94fac 100644
--- a/src/assets/data/navigation.json
+++ b/src/assets/data/navigation.json
@@ -201,6 +201,10 @@
             "anchorId": "CNAOrganizationOfPeersCOOP",
             "label": "CNA Organization of Peers (COOP)"
           },
+          "CVE Artificial Intelligence Working Group (CVEAI WG)": {
+            "anchorId": "CVEArtificialIntelligenceWorkingGroupCVEAIWG",
+            "label": "CVE Artificial Intelligence Working Group (CVEAI WG)"
+          },
           "Outreach and Communications Working Group (OCWG)": {
             "anchorId": "OutreachandCommunicationsWorkingGroupOCWG",
             "label": "Outreach and Communications Working Group (OCWG)"
diff --git a/src/assets/data/news.json b/src/assets/data/news.json
index f3c61604..f2eac44c 100644
--- a/src/assets/data/news.json
+++ b/src/assets/data/news.json
@@ -1,5 +1,26 @@
 {
   "currentNews": [
+    {
+      "id": 421,
+      "newsType": "news",
+      "title": "CVE Program Adds New “CVE Artificial Intelligence Working Group (CVEAI WG)”",
+      "urlKeywords": "New CVE Artificial Intelligence Working Group",
+      "date": "2024-10-15",
+      "description": [
+        {
+          "contentnewsType": "paragraph",
+          "content": "The CVE Program’s newest working group (WG), <a href='/ProgramOrganization/WorkingGroups#CVEArtificialIntelligenceWorkingGroupCVEAIWG'>CVE Artificial Intelligence</a> (CVEAI WG), is open to CVE community members such as <a href='/ProgramOrganization/CNAs'>CVE Numbering Authorities (CNAs)</a>, the <a href='/ProgramOrganization/Board'>CVE Board</a>, <a href='/ProgramOrganization/ADPs'>Authorized Data Publishers (ADPs)</a>, and participants from the <a href='/ResourcesSupport/Glossary?activeTerm=glossarySecretariat'>CVE Program Secretariat</a>; members of corporate vulnerability management programs and related standards, initiatives, and associations; and members of the AI community with expertise in AI and AI-related security concerns."
+        },
+        {
+          "contentnewsType": "paragraph",
+          "content": "The CVEAI WG will focus on: “determining what is a CVE-able vulnerability in AI technology. It is expected the CVEAI WG will produce documentation that defines how the CVE Program will address AI technologies moving forward. The CVEAI WG efforts are focused on defining swim lanes for AI vulnerability disclosure within CVE. This WG will discuss the concerns in defining what is within the responsibilities of the CVE Program. Because not all AI issues are appropriate for a CVE assignment, it will also try to define when other AI security-related initiatives are needed to address concerns outside the CVE Program.”"
+        },
+        {
+          "contentnewsType": "paragraph",
+          "content": "Read the <a href='/Resources/Roles/WorkingGroups/CVEAIWG/CVEAIWG-Charter.pdf' target='_blank'>CVEAI WG charter</a>."
+        }
+      ]
+    },
     {
       "id": 419,
       "newsType": "blog",
diff --git a/src/views/ProgramOrganization/WorkingGroups.vue b/src/views/ProgramOrganization/WorkingGroups.vue
index 039896e0..0e1dce80 100644
--- a/src/views/ProgramOrganization/WorkingGroups.vue
+++ b/src/views/ProgramOrganization/WorkingGroups.vue
@@ -9,8 +9,9 @@
             <ExternalLinkMessage/>
             <p>
               CVE Working Groups (WGs) actively focus on improving processes, workflows, and other aspects of the program as it continues to grow
-              and expand. There are seven main WGs: Automation (AWG), CNA Organization of Peers (COOP), Outreach and Communications (OCWG),
-              Quality (QWG), Strategic Planning (SPWG), Tactical (TWG), and Vulnerability Conference and Events (VCEWG).
+              and expand. There are eight main WGs: Automation (AWG), CNA Organization of Peers (COOP), CVE Artificial Intelligence (CVEAI WG),
+              Outreach and Communications (OCWG), Quality (QWG), Strategic Planning (SPWG), Tactical (TWG), and
+              Vulnerability Conference and Events (VCEWG).
             </p>
             <p>
               Details about these WGs are found below including information on how to join, as well as links to documents, repositories,
@@ -136,6 +137,49 @@
                 </article>
               </div>
             </div>
+            <h2 :id="cvenavs['Program Organization']['submenu']['Working Groups']['items']['CVE Artificial Intelligence Working Group (CVEAI WG)']
+            ['anchorId']"
+            class="title">
+            {{cvenavs['Program Organization']['submenu']['Working Groups']['items']['CVE Artificial Intelligence Working Group (CVEAI WG)']
+            ['label']}}</h2>
+            <p>
+              The CVEAI WG is focused on defining swim lanes for AI vulnerability disclosure within CVE. This WG will discuss the concerns
+              in defining what is within the responsibilities of the CVE Program. Because not all AI issues are appropriate for a CVE assignment,
+              it will also try to define when other AI security-related initiatives are needed to address concerns outside the CVE Program.
+            </p>
+            <p>
+              <span class="has-text-weight-bold">Membership Eligibility:</span> Per the CVEAI WG Charter, “Any active CVE-authorized program
+              member may participate in the CVEAI. This includes Board members, CVE Numbering Authority (CNA) representatives,
+              Authorized Data Publishers (ADP), and participants from the Secretariat’s organization. This WG is also open to public membership,
+              including members of corporate vulnerability management programs, as well as VM related standards, initiatives and associations
+              and others. It is also open to members of the AI community with expertise in AI and AI related security concerns.”
+            </p>
+            <div class="tile is-ancestor cve-task-tiles-container">
+              <div class="tile is-parent cve-task-left-tile">
+                <article class="tile is-child cve-border-dark-blue">
+                  <h3 class="title cve-task-tile-header">
+                    Documents
+                  </h3>
+                  <ul class="tile-body cve-task-tile-list">
+                    <li class="cve-task-tile-list-item">
+                      <a href="https://www.cve.org/Resources/Roles/WorkingGroups/CVEAIWG/CVEAIWG-Charter.pdf" target="_blank">CVEAI WG Charter</a>
+                    </li>
+                  </ul>
+                </article>
+              </div>
+              <div class="tile is-parent">
+                <article class="tile is-child cve-border-dark-blue">
+                  <h3 class="title cve-task-tile-header">
+                    Repositories and Projects
+                  </h3>
+                  <ul class="tile-body cve-task-tile-list">
+                    <li class="cve-task-tile-list-item">
+                      TBA
+                    </li>
+                  </ul>
+                </article>
+              </div>
+            </div>
             <h2 :id="cvenavs['Program Organization']['submenu']['Working Groups']['items']['Outreach and Communications Working Group (OCWG)']
             ['anchorId']" class="title">
               {{cvenavs['Program Organization']['submenu']['Working Groups']['items']['Outreach and Communications Working Group (OCWG)']['label']}}
@@ -371,9 +415,13 @@
                   <td data-label="Working Group" style="width: 55%">CNA Organization of Peers (COOP)</td>
                   <td data-label="Meeting Time">Every other Wednesday 2:00pm ET</td>
                 </tr>
+                <tr>
+                  <td data-label="Working Group" style="width: 55%">CVE Artificial Intelligence Working Group (CVEAI WG)</td>
+                  <td data-label="Meeting Time">Every other Monday 1:00pm ET</td>
+                </tr>
                 <tr>
                   <td data-label="Working Group" style="width: 55%">Outreach and Communications Working Group (OCWG)</td>
-                  <td data-label="Meeting Time">Every other month on Monday 4:00pm ET / Every other month on Wednesday 8:00am ET</td>
+                  <td data-label="Meeting Time">Every Friday 9:00am ET</td>
                 </tr>
                 <tr>
                   <td data-label="Working Group" style="width: 55%">Quality Working Group (QWG)</td>
diff --git a/src/views/ResourcesSupport/Resources.vue b/src/views/ResourcesSupport/Resources.vue
index 221ed6e9..62bdcac7 100644
--- a/src/views/ResourcesSupport/Resources.vue
+++ b/src/views/ResourcesSupport/Resources.vue
@@ -479,13 +479,18 @@
                       </a>
                     </li>
                     <li>
-                      <router-link to="/Resources/Roles/WorkingGroups/SPWG/SPWG-Charter.pdf" target="_blank">
-                        Strategic Planning Working Group (SPWG) Charter (PDF, 0.2MB)
+                      <router-link to="/Resources/Roles/WorkingGroups/COOP/COOP-Charter.pdf" target="_blank">
+                        CNA Organization of Peers (COOP) Charter (PDF, 0.1MB)
                       </router-link>
                     </li>
                     <li>
-                      <router-link to="/Resources/Roles/WorkingGroups/COOP/COOP-Charter.pdf" target="_blank">
-                        CNA Organization of Peers (COOP) Charter (PDF, 0.1MB)
+                      <router-link to="/Resources/Roles/WorkingGroups/CVEAIWG/CVEAIWG-Charter.pdf" target="_blank">
+                        CVE Artificial Intelligence Working Group (CVEAI WG) Charter (PDF, 0.1MB)
+                      </router-link>
+                    </li>
+                    <li>
+                      <router-link to="/Resources/Roles/WorkingGroups/OCWG/OCWG-Charter.pdf" target="_blank">
+                        Outreach and Communications Working Group (OCWG) Charter (PDF, 0.1MB)
                       </router-link>
                     </li>
                     <li>
@@ -494,8 +499,8 @@
                       </a>
                     </li>
                     <li>
-                      <router-link to="/Resources/Roles/WorkingGroups/OCWG/OCWG-Charter.pdf" target="_blank">
-                        Outreach and Communications Working Group (OCWG) Charter (PDF, 0.1MB)
+                      <router-link to="/Resources/Roles/WorkingGroups/SPWG/SPWG-Charter.pdf" target="_blank">
+                        Strategic Planning Working Group (SPWG) Charter (PDF, 0.2MB)
                       </router-link>
                     </li>
                     <li>

From 7d0a6465becb44436596dca1fde660aec8595a94 Mon Sep 17 00:00:00 2001
From: rroberge <rroberge@mitre.org>
Date: Tue, 15 Oct 2024 20:25:39 +0000
Subject: [PATCH 12/13] #3147 update 1 url

---
 src/views/ProgramOrganization/WorkingGroups.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ProgramOrganization/WorkingGroups.vue b/src/views/ProgramOrganization/WorkingGroups.vue
index 0e1dce80..23ce440b 100644
--- a/src/views/ProgramOrganization/WorkingGroups.vue
+++ b/src/views/ProgramOrganization/WorkingGroups.vue
@@ -162,7 +162,7 @@
                   </h3>
                   <ul class="tile-body cve-task-tile-list">
                     <li class="cve-task-tile-list-item">
-                      <a href="https://www.cve.org/Resources/Roles/WorkingGroups/CVEAIWG/CVEAIWG-Charter.pdf" target="_blank">CVEAI WG Charter</a>
+                      <router-link to="/Resources/Roles/WorkingGroups/CVEAIWG/CVEAIWG-Charter.pdf" target="_blank">CVEAI WG Charter</router-link>
                     </li>
                   </ul>
                 </article>

From bb277ed67861aad8e7bf399913e974a225ca2deb Mon Sep 17 00:00:00 2001
From: athu-tran <63068972+athu-tran@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:44:46 -0400
Subject: [PATCH 13/13] #3160 fix input field gap when above notification
 expands, update notification text, and search feedback URL, and unlink cve
 services url in banners

---
 src/components/cveRecordSearchModule.vue | 134 +++++++++++------------
 src/views/CVERecord/CVERecord.vue        |  20 ++--
 src/views/CVERecord/SearchResults.vue    |  25 ++---
 3 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
index d341696d..8289bd87 100644
--- a/src/components/cveRecordSearchModule.vue
+++ b/src/components/cveRecordSearchModule.vue
@@ -1,83 +1,81 @@
 <template>
   <div class="mt-1">
-    <div>
-      <div role="alert" class="notification is-warning is-light">
-        <div class="is-flex is-flex-direction-row is-align-content-flex-start">
-          <div class="pr-2 pt-2">
-            <p id="newSearchHelpText" class="is-hidden">info</p>
-            <font-awesome-icon style="font-size: 1.25em;" icon="info-circle" role="info"
-              aria-labelledby="newSearchHelpText" aria-hidden="false" />
-          </div>
-          <div>
-            <button class="button is-text is-ghost cve-btn-container pt-0 pr-2 pb-0 pl-1"
-              @click="showSearchHelpText = !showSearchHelpText"
-              aria-controls="searchHelpText"
-            >
-              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: 810px">
-              <ol>
-                <li>
-                  <span class="has-text-weight-bold">Search Capability (Beta) Community testers</span> – To beta-test the new search feature, select
-                  “<span class="has-text-weight-bold">Search CVE List (Beta)</span>” in the drop-down menu. The
-                  <span class="has-text-weight-bold">production</span> data is used.
-                  <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips</router-link>
-                  for more information on this new capability. <a href="https://forms.office.com/g/dFzysrHLpR" target="_blank">
+    <div role="alert" class="notification is-warning is-light">
+      <div class="is-flex is-align-items-flex-start mt-1" style="max-width: 820px; column-gap: 1rem;">
+        <div class="pl-3">
+          <p id="alertIconVariousFormts" class="is-hidden">alert</p>
+          <font-awesome-icon size="1x"  icon="exclamation-triangle" role="alert"
+            aria-labelledby="alertIconVariousFormts" aria-hidden="false" />
+        </div>
+        <div class="is-flex-grow-5">
+          <p class="mb-2">The <a href="https://test.cve.org">CVE Test website</a> has a new drop-down menu below.</p>
+          <ol class="cve-help-text pl-4" v-if="showSearchHelpText">
+            <li class="mb-2">
+              <p>
+                <span class="has-text-weight-bold">Search Capability (Beta) Community testers</span> – To beta-test the new search feature, select
+                “<span class="has-text-weight-bold">Search CVE List (Beta)</span>” in the drop-down menu. The
+                <span class="has-text-weight-bold">production</span> data is used and newly published data typically becomes searchable within less than
+                30 minutes.
+                <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">Access Search Tips</router-link>
+                for more information on this new capability.
+              </p>
+              <p>
+                <a href="https://forms.office.com/g/qmmTaYnr5y" target="_blank">
                   Provide feedback on the new search capability
                   <span class="icon cve-icon-xxs">
                     <p id="externalSurveyLink" class="is-hidden">
                       Survey opens in a new tab or window depending on browser settings
                     </p>
-                    <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false"/>
+                    <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false" class="ml-1"/>
                   </span>.
                 </a>.
-                </li>
-                <li>
-                  <span class="has-text-weight-bold">CNAs</span> – to view your <span class="has-text-weight-bold">test data</span>
-                  (your draft records) select “<span class="has-text-weight-bold">Find a Test CVE Record/ID (Legacy)</span>” in the drop-down menu and
-                  provide a CVE ID to find a specific CVE Record. 
-                </li>
-              </ol>
-          </div>
-          </div>
+              </p>
+            </li>
+            <li>
+              <span class="has-text-weight-bold">CNAs</span> – to view your <span class="has-text-weight-bold">test data</span>
+              (your draft records) select “<span class="has-text-weight-bold">Find a Test CVE Record/ID (Legacy)</span>” in the drop-down menu and
+              provide a CVE ID to find a specific CVE Record. 
+            </li>
+          </ol>
         </div>
+        <button class="cve-button-ghost cve-btn-container mt-1" @click="showSearchHelpText = !showSearchHelpText" style="float: right !important">
+          <font-awesome-icon size="1x" :icon="showSearchHelpText ? 'minus' : 'plus'" role="alert"
+          aria-labelledby="alertIconVariousFormts" aria-hidden="false" />
+        </button>
       </div>
     </div>
-    <div class="field mt-1">
-      <div class="field has-addons">
-        <div class="control">
-          <span v-if="websiteEnv !== 'prd'" class="select cve-search-selector">
-            <select v-model="searchType">
-              <option>Search CVE List (Beta)</option>
-              <option>Find a Test CVE Record/ID (Legacy)</option>
-            </select>
-          </span>
-        </div>
-        <div class="control is-expanded">
-          <input v-if="searchTypeBoolean" v-model.trim="queryString" @keyup.enter="onKeyUpEnter"
-            @keyup="validateQueryString" type="text" class="input cve-id-input"
-            placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)" />
-          <input v-else v-model.trim="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString"
-            type="text" class="input cve-id-input" placeholder="Enter CVE ID (CVE-YYYY-NNNN)" />
-        </div>
-        <div class="control">
-          <button @click="validate" class="button cve-button cve-button-accent-warm"
-            :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
-            :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
-            {{ searchTypeBoolean ? 'Search' : 'Find'}} 
-          </button>
-        </div>
-      </div>
-      <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
-        <div class="is-flex is-align-content-flex-start">
-          <p id="alertIcon" class="is-hidden">alert</p>
-          <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg" icon="exclamation-triangle" role="alert"
-            aria-labelledby="alertIcon" aria-hidden="false" />
-          <p class="cve-help-text">
-            {{ errorMessage }}
-          </p>
-        </div>
+    <div class="field has-addons mt-1">
+      <p class="control">
+        <span v-if="websiteEnv !== 'prd'" class="select cve-search-selector">
+          <select v-model="searchType">
+            <option>Search CVE List (Beta)</option>
+            <option>Find a Test CVE Record/ID (Legacy)</option>
+          </select>
+        </span>
+      </p>
+      <p class="control is-expanded">
+        <input v-if="searchTypeBoolean" v-model.trim="queryString" @keyup.enter="onKeyUpEnter"
+          @keyup="validateQueryString" type="text" class="input cve-id-input is-expanded"
+          placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)" />
+        <input v-else v-model.trim="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString"
+          type="text" class="input cve-id-input" placeholder="Enter CVE ID (CVE-YYYY-NNNN)" />
+      </p>
+      <p class="control">
+        <button @click="validate" class="button cve-button cve-button-accent-warm"
+          :class="{ 'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled }"
+          :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
+          {{ searchTypeBoolean ? 'Search' : 'Find'}} 
+        </button>
+      </p>
+    </div>
+    <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
+      <div class="is-flex is-align-content-flex-start">
+        <p id="alertIcon" class="is-hidden">alert</p>
+        <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg" icon="exclamation-triangle" role="alert"
+          aria-labelledby="alertIcon" aria-hidden="false" />
+        <p class="cve-help-text">
+          {{ errorMessage }}
+        </p>
       </div>
     </div>
   </div>
diff --git a/src/views/CVERecord/CVERecord.vue b/src/views/CVERecord/CVERecord.vue
index 244a6767..a7439b5a 100644
--- a/src/views/CVERecord/CVERecord.vue
+++ b/src/views/CVERecord/CVERecord.vue
@@ -26,17 +26,7 @@
             <p id="alertIconCveRecordsRequestErrored" class="is-hidden">alert</p>
             <font-awesome-icon style="flex: 0 0 40px;" size="1x"  icon="triangle-exclamation" role="img"
               aria-labelledby="alertIconCveRecordsRequestErrored" aria-hidden="false" />
-            <p>You are accessing <span class="has-text-weight-bold">{{ usingProd }}</span> data from
-              <span class="icon-text">
-                <a :href="resultUrl" target="_blank"> {{ resultUrl }} 
-                  <span class="icon cve-icon-xxs">
-                    <p id="externalLinkIcon" class="is-hidden">external website</p>
-                    <font-awesome-icon icon="up-right-from-square"
-                    aria-labelledby="externalLinkIcon" aria-hidden="false"/>
-                  </span>
-                </a>
-              </span>
-            </p>
+            <p>You are accessing <span class="has-text-weight-bold">{{ usingProd }}</span> data from {{ resultUrl }}</p>
           </div>
         </div>
         <PublishedRecord v-if="usecveRecordStore.isPublished"/>
@@ -56,6 +46,14 @@
                   <ServiceUnavailable></ServiceUnavailable>
                 </div>
                 <div v-else-if="!usecveRecordStore.isIdOrRecordFound" class="has-text-centered">
+                  <div class="notification is-warning is-light" role="alert">
+                    <div v-if="websiteEnv !== 'prd'" class="is-flex" style="justify-content: center;">
+                      <p id="alertIconCveRecordsRequestErrored" class="is-hidden">alert</p>
+                      <font-awesome-icon style="flex: 0 0 40px;" size="1x"  icon="triangle-exclamation" role="img"
+                        aria-labelledby="alertIconCveRecordsRequestErrored" aria-hidden="false" />
+                      <p>You are accessing <span class="has-text-weight-bold">{{ usingProd }}</span> data from {{ resultUrl }}</p>
+                    </div>
+                  </div>
                   <h1 class="title is-3 is-4 mb-2">{{usecveRecordStore.cveId}} not found.</h1>
                   <span class="icon-text">
                     <a :href="legacyCveWebsiteLink" target="_blank">
diff --git a/src/views/CVERecord/SearchResults.vue b/src/views/CVERecord/SearchResults.vue
index 27401d5b..755dde24 100644
--- a/src/views/CVERecord/SearchResults.vue
+++ b/src/views/CVERecord/SearchResults.vue
@@ -31,18 +31,7 @@
                       <p id="alertIconCveRecordsRequestErrored" class="is-hidden">alert</p>
                       <font-awesome-icon style="flex: 0 0 40px;" size="1x"  icon="triangle-exclamation" role="alert"
                         aria-labelledby="alertIconCveRecordsRequestErrored" aria-hidden="false" />
-                      <p>
-                        You are accessing <span class="has-text-weight-bold">Production</span> data from
-                        <span class="icon-text">
-                          <a :href="resultUrl" target="_blank">{{ resultUrl }} 
-                            <span class="icon cve-icon-xxs">
-                              <p id="externalLinkIcon" class="is-hidden">external website</p>
-                              <font-awesome-icon icon="up-right-from-square"
-                              aria-labelledby="externalLinkIcon" aria-hidden="false"/>
-                            </span>
-                          </a>
-                        </span>
-                      </p>
+                      <p>You are accessing <span class="has-text-weight-bold">Production</span> data from {{ resultUrl }}</p>
                     </div>
                   </div>
                   <div class="mb-3" v-if="Object.keys(cveListSearchStore.recordData).length > 0">
@@ -235,7 +224,17 @@
                       <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve">search tips</router-link>.
                     </p>
                   </div>
-                  <SurveyLinkComponent/>
+                  <p class="has-text-centered mt-4">
+                    <a href="https://forms.office.com/g/qmmTaYnr5y" target="_blank">
+                      Provide feedback on the new search capability
+                      <span class="icon cve-icon-xxs">
+                        <p id="externalSurveyLink" class="is-hidden">
+                          Survey opens in a new tab or window depending on browser settings
+                        </p>
+                        <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false" class="ml-1"/>
+                      </span>
+                    </a>
+                  </p>
                 </div>
               </div>
             </div>