From e191880baa77fc1112d044235a2b71918fa2ed3e Mon Sep 17 00:00:00 2001
From: Zane Woodfin <pwoodfin@redhat.com>
Date: Tue, 28 Jul 2020 15:10:53 -0400
Subject: [PATCH] Remove extraneous withTranslation

---
 .../__snapshots__/authentication.test.js.snap | 54 +++++++++----------
 .../__snapshots__/loader.test.js.snap         |  6 ++-
 .../__snapshots__/messageView.test.js.snap    | 12 +++--
 .../__snapshots__/openshiftView.test.js.snap  | 12 ++---
 .../__snapshots__/pageLayout.test.js.snap     | 54 +++++++++----------
 src/components/pageLayout/pageHeader.js       |  7 +--
 src/components/pageLayout/pageLayout.js       |  2 +-
 .../__snapshots__/rhelView.test.js.snap       | 12 ++---
 8 files changed, 75 insertions(+), 84 deletions(-)

diff --git a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
index 9d683da4e..944fb050d 100644
--- a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
+++ b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
@@ -65,43 +65,37 @@ exports[`Authentication Component should render a non-connected component error:
     title="t(curiosity-auth.authorizedTitle, [object Object])"
   >
     <PageLayout>
-      <withI18nextTranslation(PageHeader)
+      <PageHeader
         key=".0"
+        viewId={null}
       >
-        <PageHeader
-          i18n={Object {}}
-          t={[Function]}
-          tReady={false}
-          viewId={null}
-        >
-          <PageHeader>
-            <section
-              className="pf-l-page-header pf-c-page-header pf-l-page__main-section pf-c-page__main-section pf-m-light"
-              widget-type="InsightsPageHeader"
+        <PageHeader>
+          <section
+            className="pf-l-page-header pf-c-page-header pf-l-page__main-section pf-c-page__main-section pf-m-light"
+            widget-type="InsightsPageHeader"
+          >
+            <PageHeaderTitle
+              title="Subscription Watch"
             >
-              <PageHeaderTitle
-                title="Subscription Watch"
+              <Title
+                className=""
+                headingLevel="h1"
+                size="2xl"
+                widget-type="InsightsPageHeaderTitle"
               >
-                <Title
-                  className=""
-                  headingLevel="h1"
-                  size="2xl"
+                <h1
+                  className="pf-c-title pf-m-2xl"
                   widget-type="InsightsPageHeaderTitle"
                 >
-                  <h1
-                    className="pf-c-title pf-m-2xl"
-                    widget-type="InsightsPageHeaderTitle"
-                  >
-                     
-                    Subscription Watch
-                     
-                  </h1>
-                </Title>
-              </PageHeaderTitle>
-            </section>
-          </PageHeader>
+                   
+                  Subscription Watch
+                   
+                </h1>
+              </Title>
+            </PageHeaderTitle>
+          </section>
         </PageHeader>
-      </withI18nextTranslation(PageHeader)>
+      </PageHeader>
       <PageSection
         className="curiosity"
       >
diff --git a/src/components/loader/__tests__/__snapshots__/loader.test.js.snap b/src/components/loader/__tests__/__snapshots__/loader.test.js.snap
index 84512dc20..365f2b05e 100644
--- a/src/components/loader/__tests__/__snapshots__/loader.test.js.snap
+++ b/src/components/loader/__tests__/__snapshots__/loader.test.js.snap
@@ -78,12 +78,14 @@ exports[`Loader Component should handle variant loader components: variant: tabl
 
 exports[`Loader Component should handle variant loader components: variant: title 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)>
+  <PageHeader
+    viewId={null}
+  >
     <Skeleton
       isDark={false}
       size="sm"
     />
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
 </PageLayout>
 `;
 
diff --git a/src/components/messageView/__tests__/__snapshots__/messageView.test.js.snap b/src/components/messageView/__tests__/__snapshots__/messageView.test.js.snap
index 11ac52e1a..bea0cd562 100644
--- a/src/components/messageView/__tests__/__snapshots__/messageView.test.js.snap
+++ b/src/components/messageView/__tests__/__snapshots__/messageView.test.js.snap
@@ -2,9 +2,11 @@
 
 exports[`MessageView Component should have fallback conditions for all props: fallback display 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)>
+  <PageHeader
+    viewId={null}
+  >
     Subscription Watch
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <EmptyState
     className="fadein"
     variant="full"
@@ -14,9 +16,11 @@ exports[`MessageView Component should have fallback conditions for all props: fa
 
 exports[`MessageView Component should render a non-connected component: non-connected 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)>
+  <PageHeader
+    viewId={null}
+  >
     Subscription Watch
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <EmptyState
     className="fadein"
     variant="full"
diff --git a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
index fae38d31f..8a4002e5a 100644
--- a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
+++ b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
@@ -2,11 +2,11 @@
 
 exports[`OpenshiftView Component should display an alternate graph on query-string update: alternate graph 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="OpenShift"
   >
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={
@@ -73,11 +73,11 @@ exports[`OpenshiftView Component should display an alternate graph on query-stri
 
 exports[`OpenshiftView Component should have a fallback title: title 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="OpenShift"
   >
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={
@@ -144,11 +144,11 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
 
 exports[`OpenshiftView Component should render a non-connected component: non-connected 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="OpenShift"
   >
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={
diff --git a/src/components/pageLayout/__tests__/__snapshots__/pageLayout.test.js.snap b/src/components/pageLayout/__tests__/__snapshots__/pageLayout.test.js.snap
index 7fde182e3..683c4019e 100644
--- a/src/components/pageLayout/__tests__/__snapshots__/pageLayout.test.js.snap
+++ b/src/components/pageLayout/__tests__/__snapshots__/pageLayout.test.js.snap
@@ -21,43 +21,37 @@ exports[`PageLayout Component should render a basic component: basic 1`] = `
 
 exports[`PageLayout Component should render header and section children: multiple children 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     key=".1"
+    viewId={null}
   >
-    <PageHeader
-      i18n={Object {}}
-      t={[Function]}
-      tReady={false}
-      viewId={null}
-    >
-      <PageHeader>
-        <section
-          className="pf-l-page-header pf-c-page-header pf-l-page__main-section pf-c-page__main-section pf-m-light"
-          widget-type="InsightsPageHeader"
+    <PageHeader>
+      <section
+        className="pf-l-page-header pf-c-page-header pf-l-page__main-section pf-c-page__main-section pf-m-light"
+        widget-type="InsightsPageHeader"
+      >
+        <PageHeaderTitle
+          title="lorem"
         >
-          <PageHeaderTitle
-            title="lorem"
+          <Title
+            className=""
+            headingLevel="h1"
+            size="2xl"
+            widget-type="InsightsPageHeaderTitle"
           >
-            <Title
-              className=""
-              headingLevel="h1"
-              size="2xl"
+            <h1
+              className="pf-c-title pf-m-2xl"
               widget-type="InsightsPageHeaderTitle"
             >
-              <h1
-                className="pf-c-title pf-m-2xl"
-                widget-type="InsightsPageHeaderTitle"
-              >
-                 
-                lorem
-                 
-              </h1>
-            </Title>
-          </PageHeaderTitle>
-        </section>
-      </PageHeader>
+               
+              lorem
+               
+            </h1>
+          </Title>
+        </PageHeaderTitle>
+      </section>
     </PageHeader>
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageSection
     className="curiosity"
   >
diff --git a/src/components/pageLayout/pageHeader.js b/src/components/pageLayout/pageHeader.js
index 13e0e5403..2c4a2ecde 100644
--- a/src/components/pageLayout/pageHeader.js
+++ b/src/components/pageLayout/pageHeader.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
 import {
   PageHeader as RcsPageHeader,
   PageHeaderTitle
@@ -41,7 +40,7 @@ const PageHeader = ({ children, viewId }) => (
 /**
  * Prop types.
  *
- * @type {{children: Node, t: Function, viewId: string}}
+ * @type {{children: Node, viewId: string}}
  */
 PageHeader.propTypes = {
   children: PropTypes.node.isRequired,
@@ -55,6 +54,4 @@ PageHeader.defaultProps = {
   viewId: null
 };
 
-const TranslatedPageHeader = withTranslation()(PageHeader);
-
-export { TranslatedPageHeader as default, TranslatedPageHeader, PageHeader };
+export { PageHeader as default, PageHeader };
diff --git a/src/components/pageLayout/pageLayout.js b/src/components/pageLayout/pageLayout.js
index bd4d1f846..00249b134 100644
--- a/src/components/pageLayout/pageLayout.js
+++ b/src/components/pageLayout/pageLayout.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { PageSection as Main } from '@patternfly/react-core';
-import PageHeader from './pageHeader';
+import { PageHeader } from './pageHeader';
 import { PageSection } from './pageSection';
 import { PageToolbar } from './pageToolbar';
 
diff --git a/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap b/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
index e0ad4a0da..2b964ed6b 100644
--- a/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
+++ b/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
@@ -2,11 +2,11 @@
 
 exports[`RhelView Component should display an alternate graph on query-string update: alternate graph 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="RHEL"
   >
     t(curiosity-view.RHELTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={
@@ -61,11 +61,11 @@ exports[`RhelView Component should display an alternate graph on query-string up
 
 exports[`RhelView Component should have a fallback title: title 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="RHEL"
   >
     t(curiosity-view.RHELTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={
@@ -120,11 +120,11 @@ exports[`RhelView Component should have a fallback title: title 1`] = `
 
 exports[`RhelView Component should render a non-connected component: non-connected 1`] = `
 <PageLayout>
-  <withI18nextTranslation(PageHeader)
+  <PageHeader
     viewId="RHEL"
   >
     t(curiosity-view.RHELTitle, Subscription Watch)
-  </withI18nextTranslation(PageHeader)>
+  </PageHeader>
   <PageToolbar>
     <withI18nextTranslation(Toolbar)
       graphQuery={