Merge pull request #16490 from github/do-not-show-elements-in-archived-versions-followup

[followup] Do not include feedback links in deprecated GHES versions

Author: sarahs

includes/contribution.html

@@ -1,4 +1,4 @@
-{% unless currentVersion contains enterpriseServerReleases.oldestSupported %}
+{% unless enterpriseServerReleases.isOldestReleaseDeprecated and currentVersion contains enterpriseServerReleases.oldestSupported %}
 <div class="mt-3 f5 contribution">
   <h4>{% data ui.contribution_cta.title %}</h4>
   <p class="text-gray f6">{% data ui.contribution_cta.body %}</p>

includes/deprecation-banner.html

@@ -2,11 +2,12 @@
   <div class="deprecation-banner border rounded-1 mb-2 bg-yellow-light p-3 border-yellow f5">
     <p>
       <b>
-        <span data-display-until="{{ enterpriseServerReleases.nextDeprecationDate }}">
-          {% data reusables.enterprise_deprecation.version_will_be_deprecated %}
-        </span>
-        <span data-display-starting="{{ enterpriseServerReleases.nextDeprecationDate }}">
-          {% data reusables.enterprise_deprecation.version_was_deprecated %}
+        <span>
+        {% if enterpriseServerReleases.isOldestReleaseDeprecated %}
+        {% data reusables.enterprise_deprecation.version_was_deprecated %}
+        {% else %}
+        {% data reusables.enterprise_deprecation.version_will_be_deprecated %}
+        {% endif %}
         </span>
         <span data-date="{{ enterpriseServerReleases.nextDeprecationDate }}" data-format="%B %d, %Y" title="{{ enterpriseServerReleases.nextDeprecationDate }}">{{ enterpriseServerReleases.nextDeprecationDate }}</span>.
       </b>

includes/helpfulness.html

@@ -1,4 +1,4 @@
-{% unless currentVersion contains enterpriseServerReleases.oldestSupported %}
+{% unless enterpriseServerReleases.isOldestReleaseDeprecated and currentVersion contains enterpriseServerReleases.oldestSupported %}
 <form class="js-helpfulness mt-4 f5" id="helpfulness-{{ helpId }}">
   <h4
     data-help-start

javascripts/deprecation-banner.js

@@ -5,7 +5,6 @@ import explorer from './explorer'
 import search from './search'
 import nav from './nav'
 import browserDateFormatter from 'browser-date-formatter'
-import deprecationBanner from './deprecation-banner'
 import sidebar from './sidebar'
 import wrapCodeTerms from './wrap-code-terms'
 import print from './print'
@@ -24,7 +23,6 @@ document.addEventListener('DOMContentLoaded', async () => {
   search()
   nav()
   browserDateFormatter()
-  deprecationBanner()
   sidebar()
   wrapCodeTerms()
   print()

javascripts/index.js

@@ -36,11 +36,12 @@ const all = supported.concat(deprecated)
 const latest = supported[0]
 const oldestSupported = supported[supported.length - 1]
 const nextDeprecationDate = dates[oldestSupported].deprecationDate
+const isOldestReleaseDeprecated = new Date() > new Date(nextDeprecationDate)
 const deprecatedOnNewSite = deprecated.filter(version => versionSatisfiesRange(version, '>=2.13'))
 const firstVersionDeprecatedOnNewSite = '2.13'
 // starting from 2.18, we updated the archival script to create stubbed HTML redirect files
 const lastVersionWithoutStubbedRedirectFiles = '2.17'
-// last version using paths like /enterprise/<verison>/<user>/<product>/<category>/<article>
+// last version using paths like /enterprise/<release>/<user>/<product>/<category>/<article>
 // instead of /enterprise-server@<release>/<product>/<category>/<article>
 const lastReleaseWithLegacyFormat = '2.18'
 
@@ -51,6 +52,7 @@ module.exports = {
   latest,
   oldestSupported,
   nextDeprecationDate,
+  isOldestReleaseDeprecated,
   deprecatedOnNewSite,
   dates,
   firstVersionDeprecatedOnNewSite,

lib/enterprise-server-releases.js

@@ -87,7 +87,10 @@ describe('deprecation banner', () => {
 
   test('deprecation warning banner says "will be discontinued" when date is in future', async () => {
     const $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
-    expect($('.deprecation-banner b').text().includes('will be discontinued')).toBe(true)
+    const expectedString = enterpriseServerReleases.isOldestReleaseDeprecated
+      ? 'was discontinued'
+      : 'will be discontinued'
+    expect($('.deprecation-banner b').text().includes(expectedString)).toBe(true)
   })
 
   test('deprecation warning banner says "was discontinued" when date is in past', async () => {
@@ -98,17 +101,25 @@ describe('deprecation banner', () => {
 
 describe('does not render helpfulness prompt or contribution button', () => {
   test('does not render helpfulness prompt', async () => {
-    let $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}/github`)
-    expect($('.js-helpfulness').length).toBe(0)
-    $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}/github`)
+    let $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}/github`)
     expect($('.js-helpfulness').length).toBeGreaterThan(0)
+    $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}/github`)
+    if (enterpriseServerReleases.isOldestReleaseDeprecated) {
+      expect($('.js-helpfulness').length).toBe(0)
+    } else {
+      expect($('.js-helpfulness').length).toBeGreaterThan(0)
+    }
   })
 
   test('does not render contribution button', async () => {
-    let $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}/github`)
-    expect($('.contribution').length).toBe(0)
-    $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}/github`)
+    let $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}/github`)
     expect($('.contribution').length).toBeGreaterThan(0)
+    $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}/github`)
+    if (enterpriseServerReleases.isOldestReleaseDeprecated) {
+      expect($('.contribution').length).toBe(0)
+    } else {
+      expect($('.js-helpfulness').length).toBeGreaterThan(0)
+    }
   })
 })