partners: change boolean check to check for undefined in getOrganizationName()

robots:  add sitemap index file
HomePageSidebarModule: display home page order 0 is lowest priority
HomePageSidebarModule: still display current event until end date
CVERecord: handle record queries from Google missing CVE- prefix

Author: rlxdev

src/components/HomePageSidebarModule.vue

@@ -179,6 +179,12 @@ const currentDate = new Date(new Date().setHours(0, 0, 0, 0));
 const showEventCount = 2;
 const showNewsCount = 6;
 
+// This is used for news and events that do not have a specified "home page
+// order".  The number in the definition below must be larger than the largest
+// of the 2 above counts.
+
+const noOrderSpecified = 999;
+
 // This defines what's considered close enough (in days) to today for an event
 // start date to prioritize its display.
 
@@ -205,7 +211,7 @@ function topNews() {
 
   const maxNewsItems = Math.min(showNewsCount, newsList.length);
 
-  const orderedNews = newsList.toSorted( orderNews);
+  const orderedNews = newsList.toSorted(orderNews);
 
   const displayNews = orderedNews.slice(0, maxNewsItems);
 
@@ -226,25 +232,50 @@ function orderNews(news1, news2) {
   //       News with lowest number displayed first.
   //    2) News article date - most recent first.
   //    3) News article identifier number - highest first.
+  //
+  // An explicitly set home page order of zero will cause the article
+  // to sort last (i.e., it won't be displayed).
 
-  const displayOrder1 = Object.hasOwn(news1, orderAttr)
-    ? news1.displayOnHomepageOrder : 0;
+  const result = homePageOrder(news1, news2);
 
-  const displayOrder2 = Object.hasOwn(news2, orderAttr)
-    ? news2.displayOnHomepageOrder : 0;
+  return result || news2.date.localeCompare(news1.date) || news2.id - news1.id;
+}
 
-  if (displayOrder1 || displayOrder2) {
+function homePageOrder(newsOrEvent1, newsOrEvent2) {
 
-    if (!displayOrder1)
-      return 1;
+  // This is a "helper" function used in both the news and events comparison for
+  // sorting.  This will return that the two news/events are the same for
+  // comparison unless either or both have the "displayOnHomepageOrder"
+  // attribute set.  Zero sorts at the lowest priority (effectively preventing
+  // the item from being displayed).  Highest "priority" order is value 1 and
+  // descreasing sequentially.
 
-    if (!displayOrder2)
-      return -1;
+  const displayOrder1 = Object.hasOwn(newsOrEvent1, orderAttr)
+    ? newsOrEvent1.displayOnHomepageOrder : noOrderSpecified;
+
+  const displayOrder2 = Object.hasOwn(newsOrEvent2, orderAttr)
+    ? newsOrEvent2.displayOnHomepageOrder : noOrderSpecified;
+
+  if (displayOrder1 !== noOrderSpecified
+      || displayOrder2 !== noOrderSpecified) {
+
+    // Either one or both items have a specified display order.
+
+    if (displayOrder2 === displayOrder1)
+        return 0;
+
+    if (displayOrder2 === noOrderSpecified)
+        return displayOrder1 > 0 ? -1 : 1
 
-    return displayOrder1 - displayOrder2;
+    if (displayOrder1 === noOrderSpecified)
+        return displayOrder2 > 0 ? 1 : -1;
   }
 
-  return news2.date.localeCompare(news1.date) || news2.id - news1.id;
+  // Either both items do or both don't have a specified display order.  For
+  // no display order, the items are the same "weight" for sorting (and need
+  // another differentiation (e.g., date)).
+
+  return displayOrder1 - displayOrder2;
 }
 
 function topEvents() {
@@ -289,22 +320,10 @@ function orderEvents(event1, event2) {
   //       every Monday), we try to display the ones for the current
   //       day or the next regular event day.
 
-  const displayOrder1 = Object.hasOwn(event1, orderAttr)
-    ? event1.displayOnHomepageOrder : 0;
-
-  const displayOrder2 = Object.hasOwn(event2, orderAttr)
-    ? event2.displayOnHomepageOrder : 0;
-
-  if (displayOrder1 || displayOrder2) {
-
-    if (!displayOrder1)
-      return 1;
-
-    if (!displayOrder2)
-      return -1;
+  const result = homePageOrder(event1, event2);
 
-    return displayOrder1 - displayOrder2;
-  }
+  if (result)
+    return result;
 
   const recurring1 = event1.date.repeat.recurrence !== undefined;
 
@@ -351,7 +370,8 @@ function selectRecurringEvent(event1, event2) {
 
   // An event day may be undefined because the "repeat.day" value is not
   // a valid day name - a real example is the use of "As Needed".  In this
-  // case, the event will sort after any valid recurring event.
+  // case, the event will sort after any valid recurring event (because its
+  // value (20) is way beyond the valid day values).
 
   if (event1Day === undefined)
     event1Day = 20;
@@ -413,7 +433,10 @@ function isUpcomingEvent(event) {
 
   const days2Start = Math.round((startDate - currentDate) / mSecPerDay);
 
-  return days2Start <= upcomingEventDays && days2Start > 0;
+  const endDate = parseDateString(event.date.end);
+
+  return (days2Start <= upcomingEventDays && days2Start > 0
+          || currentDate <= endDate);
 }
 
 function toggleNewsIconsMap() {

src/views/CVERecord/CVERecord.vue

@@ -123,7 +123,7 @@ export default {
     }
   },
   created() {
-    const cveId = this.$route.query?.id;
+    const cveId = this.convertShortId(this.$route.query?.id);
     if (cveId) {
       this.cveId = this.cveIdToUpperCase(cveId);
       this.validateCveId();
@@ -162,6 +162,26 @@ export default {
     cveIdToUpperCase(cveId) {
       return cveId.toUpperCase();
     },
+    convertShortId(cveId) {
+
+      // Probably due to the transition from cve.mitre.org to cve.org,
+      // some Google search results include an "abbreviated" CVE ID in
+      // the query (without the "CVE-" prefix).  It's easy to recognize
+      // and add the prefix, and preferable to giving the user an error
+      // message.  The given CVE ID must match the pattern exactly.
+
+      const shortIdRegex = /^(?<year>\d{4})\p{Pd}(?<id>\d{4,})$/u
+      const shortIdMatch = shortIdRegex.exec(cveId);
+
+      if (!shortIdMatch)
+        return cveId;
+
+      const year = shortIdMatch.groups.year;
+      const id = shortIdMatch.groups.id;
+      const fullCveId = `CVE-${year}-${id}`;
+
+      return fullCveId;
+    },
     validateCveId() {
       if (!this.usecveRecordStore.isValidCveId(this.cveId)) {
         this.disabled = true;