From ab9a6fd21a9ed1870627967b421c8c722d8e3730 Mon Sep 17 00:00:00 2001
From: Quentin Somazzi <qsomazzi@gmail.com>
Date: Thu, 18 Jul 2019 16:01:55 +0200
Subject: [PATCH] Add possibility to remove header from widgets

---
 package.json                                      |  2 +-
 src/components/CustomJson.js                      |  8 +++++---
 src/components/JsonKeys.js                        |  8 +++++---
 src/components/JsonStatus.js                      | 15 +++++++++------
 test/components/JsonKeys.test.js                  |  5 ++---
 .../__snapshots__/JsonKeys.test.js.snap           |  8 --------
 yarn.lock                                         |  7 ++++---
 7 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index e033cf0..d957020 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "jest": "^23.4.2",
     "lint-staged": "^7.2.0",
     "nock": "^9.0.14",
-    "prettier": "^1.5.3",
+    "prettier": "1.18.2",
     "react": "^16.4.0",
     "react-dom": "^16.4.0",
     "react-test-renderer": "^16.4.0",
diff --git a/src/components/CustomJson.js b/src/components/CustomJson.js
index 5b12786..dbf291d 100644
--- a/src/components/CustomJson.js
+++ b/src/components/CustomJson.js
@@ -26,7 +26,7 @@ export default class CustomJson extends Component {
     }
 
     render() {
-        const { title, url, apiData, apiError, template } = this.props
+        const { title, apiData, apiError, template } = this.props
 
         let body = <WidgetLoader />
         if (apiData && !apiError) {
@@ -34,10 +34,12 @@ export default class CustomJson extends Component {
             body = <div dangerouslySetInnerHTML={createMarkup(compiled, apiData)} />
         }
 
+        const hasHeader = title && title.length > 0
+
         return (
             <Widget>
-                <WidgetHeader title={title || url} />
-                <WidgetBody>
+                {hasHeader && <WidgetHeader title={title} />}
+                <WidgetBody isHeaderless={hasHeader}>
                     <TrapApiError error={apiError}>{body}</TrapApiError>
                 </WidgetBody>
             </Widget>
diff --git a/src/components/JsonKeys.js b/src/components/JsonKeys.js
index 3b22e7a..7b297f6 100644
--- a/src/components/JsonKeys.js
+++ b/src/components/JsonKeys.js
@@ -29,7 +29,7 @@ export default class JsonKeys extends Component {
     }
 
     render() {
-        const { title, url, keys, apiData, apiError } = this.props
+        const { title, keys, apiData, apiError } = this.props
 
         let body = <WidgetLoader />
         if (apiData && !apiError) {
@@ -49,10 +49,12 @@ export default class JsonKeys extends Component {
             )
         }
 
+        const hasHeader = title && title.length > 0
+
         return (
             <Widget>
-                <WidgetHeader title={title || url} />
-                <WidgetBody disablePadding={true}>
+                {hasHeader && <WidgetHeader title={title} />}
+                <WidgetBody disablePadding={true} isHeaderless={hasHeader}>
                     <TrapApiError error={apiError}>{body}</TrapApiError>
                 </WidgetBody>
             </Widget>
diff --git a/src/components/JsonStatus.js b/src/components/JsonStatus.js
index d89b732..f76d093 100644
--- a/src/components/JsonStatus.js
+++ b/src/components/JsonStatus.js
@@ -44,7 +44,7 @@ export default class JsonStatus extends Component {
     }
 
     render() {
-        const { title, url, statuses, apiData, apiError, theme } = this.props
+        const { title, statuses, apiData, apiError, theme } = this.props
 
         let body
         let currentStatus = 'unknown'
@@ -63,9 +63,10 @@ export default class JsonStatus extends Component {
                                 color: theme.colors.failure,
                             }}
                         >
-                            invalid assertion:<br />
-                            '{status.assert}'<br />
-                            should conform to:<br />
+                            invalid assertion:
+                            <br />'{status.assert}'<br />
+                            should conform to:
+                            <br />
                             {'/^(equals|contains|matches)\\((.+),(.+)\\)$/'}
                         </div>
                     )
@@ -122,10 +123,12 @@ export default class JsonStatus extends Component {
             body = <WidgetStatusBadge status={currentStatus} message={currentLabel} />
         }
 
+        const hasHeader = title && title.length > 0
+
         return (
             <Widget>
-                <WidgetHeader title={title || url} />
-                <WidgetBody>
+                {hasHeader && <WidgetHeader title={title} />}
+                <WidgetBody isHeaderless={hasHeader}>
                     <TrapApiError error={apiError}>{body}</TrapApiError>
                 </WidgetBody>
             </Widget>
diff --git a/test/components/JsonKeys.test.js b/test/components/JsonKeys.test.js
index 43d9a8a..3a8a528 100644
--- a/test/components/JsonKeys.test.js
+++ b/test/components/JsonKeys.test.js
@@ -50,11 +50,10 @@ it('should display loader if no apiData available', () => {
 })
 
 describe('title', () => {
-    it('should display url by default', () => {
+    it('should display no header by default', () => {
         const wrapper = Enzyme.shallow(<JsonKeys url="http://fake.io" keys={['A']} />)
 
-        const header = wrapper.find(WidgetHeader)
-        expect(header.prop('title')).toBe('http://fake.io')
+        expect(wrapper.find(WidgetHeader).exists()).toBeFalsy()
     })
 
     it('should support override', () => {
diff --git a/test/components/__snapshots__/JsonKeys.test.js.snap b/test/components/__snapshots__/JsonKeys.test.js.snap
index 6c7bfae..dba7b50 100644
--- a/test/components/__snapshots__/JsonKeys.test.js.snap
+++ b/test/components/__snapshots__/JsonKeys.test.js.snap
@@ -8,14 +8,6 @@ exports[`should render as expected 1`] = `
   <div
     className="sc-bwzfXH bJUZVN"
   >
-    <header
-      className="sc-htpNat lcyfRu"
-      style={Object {}}
-    >
-      <span>
-        http://fake.io
-      </span>
-    </header>
     <div
       className="sc-bZQynM FCrnA"
       style={Object {}}
diff --git a/yarn.lock b/yarn.lock
index 9617117..5af2fda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4315,9 +4315,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.5.3:
-  version "1.13.7"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
+prettier@1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
 pretty-format@^23.2.0:
   version "23.2.0"