fix Production/Test message for search

Author: rlxdev

src/stores/genericGlobals.ts

@@ -15,6 +15,11 @@ export const useGenericGlobalsStore = defineStore('genericGlobals', {
       legacyCveWebsiteLink: 'https://cve.mitre.org/cve/search_cve_list.html'
     };
   },
+  getters: {
+    searchDbType: (state) => state.isProductionWebsite
+      || state.currentServicesUrl.toLowerCase().includes('cveawg.mitre.org')
+      ? 'Production' : 'Test',
+  },
   actions: {
     setUseSearch(value: boolean) {
       this.useSearch = value;
@@ -25,4 +30,4 @@ export const useGenericGlobalsStore = defineStore('genericGlobals', {
       sessionStorage.setItem('currentServicesUrl', JSON.stringify(value));
     }
   },
-});
+});

src/views/CVERecord/CVERecord.vue

@@ -26,7 +26,10 @@
             <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>
+            <p>You are accessing <span class="has-text-weight-bold">
+              {{ genericGlobalsStore.searchDbType }}</span>
+              data from {{ genericGlobalsStore.currentServicesUrl }}
+            </p>
           </div>
         </div>
         <PublishedRecord v-if="usecveRecordStore.isPublished"/>
@@ -51,7 +54,10 @@
                       <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>
+                      <p>You are accessing <span class="has-text-weight-bold">
+                        {{ genericGlobalsStore.searchDbType }}</span>
+                        data from {{ genericGlobalsStore.currentServicesUrl }}
+                      </p>
                     </div>
                   </div>
                   <h1 class="title is-3 is-4 mb-2">{{usecveRecordStore.cveId}} not found.</h1>
@@ -94,13 +100,6 @@ export default {
   },
   data() {
     return {
-      isResultFromProd: false,
-      // There is a special case when the website deals with some cached data.
-      // This ensures that the correct value is shown, even though it is not
-      // pretty
-      resultUrl: this.GenericGlobalsStore.useSearch
-        ? this.GenericGlobalsStore.cveServicesBaseUrl
-        : this.GenericGlobalsStore.cveServiceTestBaseUrl,
       usecveRecordStore: usecveRecordStore(),
       cveId: usecveRecordStore().cveId,
       cveServicesUrl: undefined,
@@ -113,9 +112,6 @@ export default {
     };
   },
   computed: {
-    usingProd() {
-      return this.isResultFromProd ? 'Production' : 'Test'
-    },
     isSearching() {
       return usecveRecordStore().isSearching;
     },

src/views/CVERecord/SearchResults.vue

@@ -31,7 +31,10 @@
                       <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 {{ resultUrl }}</p>
+                      <p>You are accessing <span class="has-text-weight-bold">
+                        {{ generalGlobalsStore.searchDbType }}</span>
+                        data from {{ generalGlobalsStore.currentServicesUrl }}
+                      </p>
                     </div>
                   </div>
                   <h2 class="title">Search Results</h2>
@@ -282,7 +285,7 @@
 import { useCveListSearchStore } from '@/stores/cveListSearch';
 import { useGenericGlobalsStore } from '@/stores/genericGlobals';
 import { usePartnerStore } from '@/stores/partners';
-import { computed, createApp, ref, watch } from 'vue';
+import { computed, createApp, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import ServiceUnavailable from '@/components/ServiceUnavailable.vue'
 
@@ -291,7 +294,6 @@ const generalGlobalsStore = useGenericGlobalsStore();
 const partnerStore = usePartnerStore();
 const router = useRouter();
 const app = createApp({});
-const resultUrl = ref(generalGlobalsStore.cveServicesBaseUrl);
 
 app.component('ServiceUnavailable', ServiceUnavailable);
 
@@ -314,7 +316,8 @@ function backToTop() {
 function cveRecordRoute(cveId) {
   let recordRoute = `/CVERecord?id=${cveId}`;
 
-  if (!generalGlobalsStore.isProductionWebsite)
+  if (!generalGlobalsStore.isProductionWebsite
+      && generalGlobalsStore.searchDbType === 'Production')
     recordRoute += '&prod=true';
 
   return recordRoute