#3133 made survey link a global component, add survey to additional pages, remove survey link from navigation.json

Author: athu-tran

src/assets/data/navigation.json

@@ -9,7 +9,6 @@
         "id": "1.0",
         "label": "Overview",
         "path": "Overview",
-        "surveyLink": "",
         "items": {
           "About the CVE Program": {
             "anchorId": "AbouttheCVEProgram",
@@ -21,7 +20,6 @@
         "id": "1.1",
         "label": "History",
         "path": "History",
-        "surveyLink": "",
         "items": {
           "Overview": {
             "anchorId": "Overview",
@@ -37,7 +35,6 @@
         "id": "1.2",
         "label": "Process",
         "path": "Process",
-        "surveyLink": "",
         "items": {
           "CVE Record Lifecycle": {
             "anchorId": "CVERecordLifecycle",
@@ -49,7 +46,6 @@
         "id": "1.3",
         "label": "Related Efforts",
         "path": "RelatedEfforts",
-        "surveyLink": "",
         "items": {
           "National Vulnerability Database (NVD)": {
             "anchorId": "NVD",
@@ -81,7 +77,6 @@
         "id": "1.4",
         "label": "Metrics",
         "path": "Metrics",
-        "surveyLink": "",
         "items": {
           "Published CVE Records": {
             "anchorId": "PublishedCVERecords",
@@ -117,7 +112,6 @@
         "id": "2.0",
         "label": "Partner",
         "path": "Partner",
-        "surveyLink": "",
         "items": {
           "HowToBecomeAPartner": {
             "anchorId": "HowToBecomeAPartner",
@@ -159,14 +153,12 @@
         "id": "3.0",
         "label": "Structure",
         "path": "Structure",
-        "surveyLink": "",
         "items": {}
       },
       "Program Relationship with Partners": {
         "id": "3.1",
         "label": "Program Relationship with Partners",
         "path": "ProgramRelationshipwithPartners",
-        "surveyLink": "",
         "items": {
           "Internal Partners": {
             "anchorId": "InternalPartners",
@@ -186,7 +178,6 @@
         "id": "3.2",
         "label": "Board",
         "path": "Board",
-        "surveyLink": "",
         "items": {
             "Resources": {
                 "anchorId": "Resources",
@@ -202,7 +193,6 @@
         "id": "3.3",
         "label": "Working Groups",
         "path": "WorkingGroups",
-        "surveyLink": "",
         "items": {
           "Automation Working Group (AWG)": {
             "anchorId": "AutomationWorkingGroupAWG",
@@ -242,7 +232,6 @@
         "id": "3.4",
         "label": "CVE Numbering Authorities (CNAs)",
         "path": "CNAs",
-        "surveyLink": "",
         "primaryNavPath": "/ProgramOrganization/CNAs",
         "items": {
           "CNA Program Growth": {
@@ -255,7 +244,6 @@
         "id": "3.5",
         "label": "Authorized Data Publishers (ADPs)",
         "path": "ADPs",
-        "surveyLink": "",
         "items": {
           "Active ADPs": {
             "anchorId": "ActiveAdps",
@@ -273,7 +261,6 @@
       "id": "4",
       "label": "CVE List Downloads",
       "path": "Downloads",
-      "surveyLink": "",
       "primaryNavPath": "/Downloads",
       "submenu": {
         "Downloads": {
@@ -302,7 +289,6 @@
         "id": "5.0",
         "label": "Resources",
         "path": "Resources",
-        "surveyLink": "",
         "items": {
           "CVE Program Idea Tracker": {
             "anchorId": "CVEProgramIdeaTracker",
@@ -352,7 +338,6 @@
     "id": "6",
     "label": "All News",
     "path": "AllNews",
-    "surveyLink": "",
     "submenu": {
         "All": {
             "id": "6.0",
@@ -424,13 +409,11 @@
     "id": "7",
     "label": "All Resources",
     "path": "AllResources",
-    "surveyLink": "",
     "submenu": {
       "Reserve IDs & Publish Records": {
         "id": "7.0",
         "label": "Reserve IDs & Publish Records (CNAs Only)",
         "path": "/AllResources/ReserveIDsPublishRecordsForCNAs",
-        "surveyLink": "",
         "items": {
           "Self-Service Automation": {
             "anchorId": "SelfServiceAutomation",
@@ -447,7 +430,6 @@
         "label": "CVE Services",
         "path": "CveServices",
         "primaryNavPath": "/AllResources",
-        "surveyLink": "",
         "submenu": {
           "Overview": {
             "id": "7.1.1",
@@ -543,7 +525,6 @@
           "alternatePageName": "Report/Request for Non-CNAs",
           "label": "Non-CNAs",
           "path": "ReportRequestForNonCNAs",
-          "surveyLink": "",
           "items": {
             "Request a CVE ID": {
               "anchorId": "RequestCVEID",

src/components/HomeModule.vue

@@ -158,16 +158,7 @@
           </div>
         </div>
       </section>
-      <div class="cve-feedback-link">
-          <span class="icon-text">
-            <a href="https://tinyurl.com/cve-home-page-survey" target="_blank">Provide feedback for this page
-            <span class="icon is-size-7 cve-icon-xxs">
-              <p id="extenalSurveyLink" class="is-hidden">external site</p>
-              <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false"/>
-            </span>
-            </a>
-          </span>
-      </div>
+      <SurveyLinkComponent/>
       <p class="cve-help-text is-centered has-text-centered mt-2">
         Some of the links will take you back to the
         <span>

src/components/NewsModule.vue

@@ -92,15 +92,13 @@
 
 <script>
 import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 import newsData from '@/assets/data/news.json';
 import newsMixins from '@/mixins/newsMixins';
 
 export default {
   name: 'NewsModule',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   data() {
     return {

src/main.ts

@@ -6,7 +6,8 @@ import LoadScript from 'vue-plugin-load-script';
 
 import App from './App.vue';
 import router from './router/index.js';
-import ExternalLinkMessage from './components/ExternalLinkMessage.vue';
+import ExternalLinkMessage from '@/components/ExternalLinkMessage.vue';
+import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 import { usePartnerStore } from '@/stores/partners';
 
 
@@ -44,4 +45,6 @@ app.use(router);
 
 app.component('font-awesome-icon', FontAwesomeIcon);
 app.component('ExternalLinkMessage', ExternalLinkMessage);
+app.component('SurveyLinkComponent', SurveyLinkComponent);
+
 app.mount('#app');

src/views/About/History.vue

@@ -118,7 +118,6 @@
               <li><a href="https://www.nsa.gov/" target="_blank">National Security Agency (NSA):</a> Tony Sager</li>
               <li><a href="https://www.af.mil/" target="_blank">U.S. Air Force:</a> Matt Mleziva</li>
             </ul>
-
             <SurveyLinkComponent/>
           </div>
         </main>
@@ -130,14 +129,13 @@
   </div>
 </template>
 
-<script>import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
+<script>
+import NavigationSidebar from '@/components/NavigationSidebar.vue';
 
 export default {
   name: 'History',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {

src/views/About/Metrics.vue

@@ -527,15 +527,13 @@
 
 <script>
 import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 import MetricsData from '@/assets/data/metrics.json';
 import { usePartnerStore } from '@/stores/partners';
 
 export default {
   name: 'Metrics',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {

src/views/About/Overview.vue

@@ -140,13 +140,11 @@
 </template>
 
 <script>import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 
 export default {
   name: 'Overview',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {

src/views/About/Process.vue

@@ -206,13 +206,11 @@
 
 <script>
 import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 
 export default {
   name: 'Process',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {

src/views/About/RelatedEfforts.vue

@@ -125,13 +125,11 @@
 </template>
 
 <script>import NavigationSidebar from '@/components/NavigationSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 
 export default {
   name: 'RelatedEfforts',
   components: {
     NavigationSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {

src/views/Downloads.vue

@@ -106,13 +106,11 @@
 
 <script>
 import OnPageSidebar from '@/components/OnPageSidebar.vue';
-import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 
 export default {
   name: 'Downloads',
   components: {
     OnPageSidebar,
-    SurveyLinkComponent,
   },
   props: {
     cvenavs: {