Remove FEATURE_NEXTJS Flag Part 1 (github#20176)

* cleanup FEATURE_NEXTJS * fixing some server tests * updating article a for server tests * update h2 to h4 map topic tests * data off on TOCs * updating dropdown article versions links * Update so markdown renders in intros * updating typo and all server tests are now passing * remove nextjs feature flag * head.js tests pass * updating article-version-picker * remove nextjs feature flag browser test * update header.js tests * fix page-titles.js test * fix deprecated-enterprise versions * adding early access * testing * getting childTocItem * fixing table of contents to show child toc items * updated to 2 because the sidebar article also has the same link * remove comment * updating pick * Update TocLandingContext.tsx * update package.json and change className to h4 for h2 * updating with mikes feedback * remove a.active test * React clean up: Delete unnecessary layouts/includes Part 2 (github#20143) * Delete unnecessary layouts * setting back tests failing :( * update layouts * delete unnecessary includes * remove github-ae-release-notes and updating layouts * remove a.active test
Anthonysidesappss · Jul 16, 2021 · 27aa5d9 · 27aa5d9
1 parent 741ca7e
commit 27aa5d9
Show file tree

Hide file tree

Showing 72 changed files with 105 additions and 1,878 deletions.
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
@@ -11,14 +11,14 @@ import { useTranslation } from './hooks/useTranslation'
 
 type Props = { children?: React.ReactNode }
 export const DefaultLayout = (props: Props) => {
-  const { page, error, isHomepageVersion } = useMainContext()
+  const { page, error, isHomepageVersion, currentPathWithoutLanguage } = useMainContext()
   const { t } = useTranslation('errors')
   return (
     <div className="d-lg-flex">
       <Head>
         {error === '404' ? (
           <title>{t('oops')}</title>
-        ) : !isHomepageVersion && page.fullTitle ? (
+        ) : (!isHomepageVersion && page.fullTitle) || (currentPathWithoutLanguage.includes('enterprise-server') && page.fullTitle) ? (
           <title>{page.fullTitle}</title>
         ) : null}
 

diff --git a/components/LanguagePicker.tsx b/components/LanguagePicker.tsx
@@ -63,6 +63,7 @@ export const LanguagePicker = ({ variant }: Props) => {
           width: unset;
         }
       `}
+      data-testid="language-picker"
     >
       <summary>
         {selectedLang.nativeName || selectedLang.name}

diff --git a/components/article/ArticlePage.tsx b/components/article/ArticlePage.tsx
@@ -55,9 +55,10 @@ export const ArticlePage = () => {
               )}
 
               {intro && (
-                <div className="lead-mktg">
-                  <p>{intro}</p>
-                </div>
+                <div 
+                  className="lead-mktg"
+                  dangerouslySetInnerHTML={{ __html: intro }}
+                />
               )}
 
               {permissions && (

diff --git a/components/article/ArticleVersionPicker.tsx b/components/article/ArticleVersionPicker.tsx
@@ -23,6 +23,7 @@ export const ArticleVersionPicker = () => {
           width: unset;
         }
       `}
+      data-testid="article-version-picker"
     >
       <summary className="f4 h5-mktg btn-outline-mktg btn-mktg p-2">
         <span className="d-md-none d-xl-inline-block">{t('article_version')}</span>{' '}

diff --git a/components/context/ArticleContext.tsx b/components/context/ArticleContext.tsx
@@ -41,7 +41,7 @@ export const getArticleContextFromRequest = (req: any): ArticleContextT => {
   const page = req.context.page
   return {
     title: page.titlePlainText,
-    intro: page.introPlainText,
+    intro: page.intro,
     renderedPage: req.context.renderedPage || '',
     miniTocItems:
       (req.context.miniTocItems || []).map((item: any) => {

diff --git a/components/context/ProductLandingContext.tsx b/components/context/ProductLandingContext.tsx
@@ -5,6 +5,10 @@ export type TocItem = {
   fullPath: string
   title: string
   intro?: string
+  childTocItems?: Array<{
+    fullPath: string;
+    title: string;
+    }>
 }
 export type FeaturedLink = {
   title: string

diff --git a/components/context/TocLandingContext.tsx b/components/context/TocLandingContext.tsx
@@ -38,7 +38,7 @@ export const getTocLandingContextFromRequest = (req: any): TocLandingContextT =>
     introPlainText: req.context.page.introPlainText,
     isEarlyAccess: req.context.page?.documentType === 'early-access',
     tocItems: (req.context.genericTocFlat || req.context.genericTocNested || []).map((obj: any) =>
-      pick(obj, ['fullPath', 'title', 'intro'])
+      pick(obj, ['fullPath', 'title', 'intro', 'childTocItems'])
     ),
     variant: req.context.genericTocFlat ? 'expanded' : 'compact',
 

diff --git a/components/landing/TableOfContents.tsx b/components/landing/TableOfContents.tsx
@@ -19,22 +19,39 @@ export const TableOfContents = (props: Props) => {
           return null
         }
 
-        const { fullPath: href, title, intro } = item
+        const { fullPath: href, title, intro, childTocItems } = item
         const isActive = router.pathname === href
         return variant === 'compact' ? (
           <li key={href} className="f4 my-1">
             <Link href={href}>{title}</Link>
+            <ul className={cx(variant === 'compact' ? 'list-style-circle pl-5 my-3' : 'list-style-none')}>
+            {(childTocItems || []).map((childItem) => {
+              if (!childItem) {
+                return null
+              }
+              return (
+                <li key={childItem.fullPath} className="f4 mt-1">
+                  <Link
+                    href={childItem.fullPath}
+                    className="Bump-link--hover no-underline py-1 color-border-primary"
+                  >
+                    {childItem.title}
+                  </Link>
+                </li>
+              )
+            })}
+            </ul>
           </li>
         ) : (
           <li key={href} className={cx('mb-5', isActive && 'color-auto-gray-4')}>
             <Link
               href={href}
               className="Bump-link--hover no-underline d-block py-1 border-bottom color-border-primary"
             >
-              <h4>
+              <h2 className="h4">
                 {title}
                 <span className="Bump-link-symbol">→</span>
-              </h4>
+              </h2>
             </Link>
             {intro && <p className="f4 mt-3" dangerouslySetInnerHTML={{ __html: intro }} />}
           </li>

diff --git a/feature-flags.json b/feature-flags.json
@@ -1,5 +1,4 @@
 {
   "FEATURE_TEST_TRUE": true,
-  "FEATURE_TEST_FALSE": false,
-  "FEATURE_NEXTJS": true
+  "FEATURE_TEST_FALSE": false
 }
diff --git a/includes/article-cards.html b/includes/article-cards.html
diff --git a/includes/article-version-switcher.html b/includes/article-version-switcher.html
diff --git a/includes/article.html b/includes/article.html
diff --git a/includes/breadcrumbs.html b/includes/breadcrumbs.html
diff --git a/includes/category-articles-list.html b/includes/category-articles-list.html
diff --git a/includes/code-example-card.html b/includes/code-example-card.html
diff --git a/includes/code-examples.html b/includes/code-examples.html