From 24035c92f8e97362e615d4b8cd4727384f847155 Mon Sep 17 00:00:00 2001
From: aurreco-uga <aurreco@uga.edu>
Date: Sat, 4 Nov 2023 17:28:43 -0400
Subject: [PATCH 1/3] srt new icon refs to #52746

---
 .../src/Components/InputControls/RadioList.css           | 5 +++++
 .../src/Components/InputControls/RadioList.tsx           | 9 ++++++++-
 .../src/Views/ReporterForm/DownloadFormContainer.jsx     | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/libs/wdk-client/src/Components/InputControls/RadioList.css b/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
index fa2c883043..88481dad31 100644
--- a/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
+++ b/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
@@ -13,6 +13,11 @@ ul.wdk-RadioList li.disabled {
   color: gray;
 }
 
+ul.wdk-RadioList li.newBuild::after {
+  content: url('~@veupathdb/wdk-client/lib/Core/Style/images/new-feature.png');
+  margin-left: 0.25em;
+}
+
 ul.wdk-RadioList li span {
   margin-left: 0.5em;
 }
diff --git a/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx b/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
index 8c5cebb06c..4c1ae24e2c 100644
--- a/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
+++ b/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
@@ -14,6 +14,7 @@ type Props = {
     value: string;
     description?: string;
     disabled?: boolean;
+    newBuild?: number;
   }>;
   /** Value of the radio input element that should be checked **/
   value?: string;
@@ -46,13 +47,19 @@ class RadioList extends React.Component<Props> {
   }
 
   render() {
+    let currentBuild = 66;
     let className =
       baseClassName + ' ' + getValueOrDefault(this.props, 'className', '');
     const { required = false } = this.props;
     return (
       <ul className={className}>
         {this.props.items.map((item) => (
-          <li key={item.value} className={item.disabled ? 'disabled' : ''}>
+          <li
+            key={item.value}
+            className={`${item.disabled ? 'disabled' : ''}   ${
+              item.newBuild == currentBuild ? 'newBuild' : ''
+            }`}
+          >
             <label>
               <input
                 type="radio"
diff --git a/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx b/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
index b0c7fdbbaf..d94f14698d 100644
--- a/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
+++ b/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
@@ -18,6 +18,7 @@ let ReporterSelect = (props) => {
     value: reporter.name,
     display: reporter.displayName,
     description: reporter.description,
+    newBuild: reporter.newBuild,
   }));
   return (
     <div style={{ margin: '20px 0' }}>

From 739b0cacc24e2d6641599b445c3c6f532ab46cc0 Mon Sep 17 00:00:00 2001
From: aurreco-uga <aurreco@uga.edu>
Date: Sun, 5 Nov 2023 14:51:09 -0500
Subject: [PATCH 2/3] header menus: new link Primer3, remove old downloads/beta
 icon

---
 .../components/homepage/VEuPathDBHomePage.tsx | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/sites/genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx b/packages/sites/genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx
index 08687804ef..831e84693f 100644
--- a/packages/sites/genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx
+++ b/packages/sites/genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx
@@ -534,26 +534,6 @@ const useHeaderMenuItems = (
             include: [TriTrypDB],
           },
         },
-        {
-          key: 'plasmoap',
-          display: 'PlasmoAP',
-          type: 'reactRoute',
-          url: '/plasmoap',
-          target: '_blank',
-          metadata: {
-            include: [PlasmoDB],
-          },
-        },
-        /*  {
-          key: 'pats',
-          display: 'PATS',
-          type: 'externalLink',
-          url: 'http://modlabcadd.ethz.ch/software/pats/',
-          target: '_blank',
-          metadata: {
-            include: [ PlasmoDB ]
-          }
-        },*/
         {
           key: 'mapveu',
           display: 'MapVEu',
@@ -626,6 +606,33 @@ const useHeaderMenuItems = (
               ),
               items: mapMenuItems,
             },
+        {
+          key: 'ncbi-primer3',
+          display: 'NCBI Primer3',
+          type: 'externalLink',
+          url: 'https://www.ncbi.nlm.nih.gov/tools/primer-blast/',
+          target: '_blank',
+        },
+        {
+          key: 'plasmoap',
+          display: 'PlasmoAP',
+          type: 'reactRoute',
+          url: '/plasmoap',
+          target: '_blank',
+          metadata: {
+            include: [PlasmoDB],
+          },
+        },
+        /*  {
+          key: 'pats',
+          display: 'PATS',
+          type: 'externalLink',
+          url: 'http://modlabcadd.ethz.ch/software/pats/',
+          target: '_blank',
+          metadata: {
+            include: [ PlasmoDB ]
+          }
+        },*/
         {
           key: 'pubcrawler',
           display: 'PubMed and Entrez',
@@ -732,22 +739,9 @@ const useHeaderMenuItems = (
           type: 'reactRoute',
           url: makeStaticPageRoute('/dataInprogress.html'),
         },
-        {
-          key: 'data-files-eupathdb',
-          display: 'Download data files',
-          type: 'externalLink',
-          url: '/common/downloads',
-          metadata: {
-            exclude: [EuPathDB],
-          },
-        },
         {
           key: 'data-files-eupathdb-beta',
-          display: (
-            <>
-              Download data files <img alt="BETA" src={betaImage} />
-            </>
-          ),
+          display: <>Download data files</>,
           type: 'reactRoute',
           url: '/downloads',
           metadata: {

From ed2959426a0785b8e8add5a3f0dd4597668643cc Mon Sep 17 00:00:00 2001
From: Jeremy Myers <inernestmusic@gmail.com>
Date: Mon, 6 Nov 2023 17:02:27 -0500
Subject: [PATCH 3/3] Create a component for feature status icons

---
 .../src/Components/Icon/WdkStatusIcon.tsx     | 25 +++++++++++++++++++
 .../Components/InputControls/RadioList.css    |  5 ----
 .../Components/InputControls/RadioList.tsx    |  6 +----
 .../ReporterForm/DownloadFormContainer.jsx    |  9 +++++--
 4 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 packages/libs/wdk-client/src/Components/Icon/WdkStatusIcon.tsx

diff --git a/packages/libs/wdk-client/src/Components/Icon/WdkStatusIcon.tsx b/packages/libs/wdk-client/src/Components/Icon/WdkStatusIcon.tsx
new file mode 100644
index 0000000000..b70c3595d3
--- /dev/null
+++ b/packages/libs/wdk-client/src/Components/Icon/WdkStatusIcon.tsx
@@ -0,0 +1,25 @@
+import { useWdkService } from '../../Hooks/WdkServiceHook';
+import NewFeatureImage from '../../Core/Style/images/new-feature.png';
+
+type Props = {
+  buildIntroduced?: string;
+  marginOverride?: React.CSSProperties['margin'];
+};
+
+// Component name is generic enough to be expanded into rendering other status icons, like Beta
+export function WdkStatusIcon({
+  buildIntroduced,
+  marginOverride = '0 5px',
+}: Props) {
+  const currentBuild = useWdkService(
+    async (wdkService) =>
+      await wdkService.getConfig().then((config) => config.buildNumber)
+  );
+  const image =
+    currentBuild === buildIntroduced
+      ? { src: NewFeatureImage, alt: 'New' }
+      : undefined;
+  return image ? (
+    <img alt={image.alt} src={image.src} style={{ margin: marginOverride }} />
+  ) : null;
+}
diff --git a/packages/libs/wdk-client/src/Components/InputControls/RadioList.css b/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
index 88481dad31..fa2c883043 100644
--- a/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
+++ b/packages/libs/wdk-client/src/Components/InputControls/RadioList.css
@@ -13,11 +13,6 @@ ul.wdk-RadioList li.disabled {
   color: gray;
 }
 
-ul.wdk-RadioList li.newBuild::after {
-  content: url('~@veupathdb/wdk-client/lib/Core/Style/images/new-feature.png');
-  margin-left: 0.25em;
-}
-
 ul.wdk-RadioList li span {
   margin-left: 0.5em;
 }
diff --git a/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx b/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
index 4c1ae24e2c..871cae0d7d 100644
--- a/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
+++ b/packages/libs/wdk-client/src/Components/InputControls/RadioList.tsx
@@ -14,7 +14,6 @@ type Props = {
     value: string;
     description?: string;
     disabled?: boolean;
-    newBuild?: number;
   }>;
   /** Value of the radio input element that should be checked **/
   value?: string;
@@ -47,7 +46,6 @@ class RadioList extends React.Component<Props> {
   }
 
   render() {
-    let currentBuild = 66;
     let className =
       baseClassName + ' ' + getValueOrDefault(this.props, 'className', '');
     const { required = false } = this.props;
@@ -56,9 +54,7 @@ class RadioList extends React.Component<Props> {
         {this.props.items.map((item) => (
           <li
             key={item.value}
-            className={`${item.disabled ? 'disabled' : ''}   ${
-              item.newBuild == currentBuild ? 'newBuild' : ''
-            }`}
+            className={item.disabled ? 'disabled' : undefined}
           >
             <label>
               <input
diff --git a/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx b/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
index d94f14698d..02b79ebccb 100644
--- a/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
+++ b/packages/libs/wdk-client/src/Views/ReporterForm/DownloadFormContainer.jsx
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { WdkStatusIcon } from '../../Components/Icon/WdkStatusIcon';
 import RadioList from '../../Components/InputControls/RadioList';
 import {
   filterOutProps,
@@ -6,7 +7,6 @@ import {
   safeHtml,
 } from '../../Utils/ComponentUtils';
 import DownloadForm from '../../Views/ReporterForm/DownloadForm';
-import PrimaryKeySpan from '../../Views/ReporterForm/PrimaryKeySpan';
 
 let NO_REPORTER_SELECTED = '_none_';
 
@@ -16,7 +16,12 @@ let ReporterSelect = (props) => {
   let nestedDivStyle = { display: 'inline-block', verticalAlign: 'top' };
   let items = reporters.map((reporter) => ({
     value: reporter.name,
-    display: reporter.displayName,
+    display: (
+      <>
+        {reporter.displayName}
+        <WdkStatusIcon buildIntroduced={reporter.newBuild} />
+      </>
+    ),
     description: reporter.description,
     newBuild: reporter.newBuild,
   }));