From a75c36281d7facbfcb3c161bb4483191ad00c4bc Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 14 Sep 2020 19:44:03 +0200
Subject: [PATCH] Re-enable rule jsx-curly-brace-presence (#10869)

---
 superset-frontend/.eslintrc.js                         |  2 --
 superset-frontend/src/components/ListView/ListView.tsx |  2 +-
 superset-frontend/src/components/Menu/Menu.tsx         |  2 +-
 superset-frontend/src/datasource/DatasourceEditor.jsx  |  2 +-
 .../src/explore/components/ControlHeader.jsx           |  6 +++---
 .../src/explore/components/QueryAndSaveBtns.jsx        |  2 +-
 .../explore/components/controls/AnnotationLayer.jsx    | 10 +++++-----
 .../explore/components/controls/DatasourceControl.jsx  |  2 +-
 superset-frontend/src/views/CRUD/chart/ChartList.tsx   |  2 +-
 9 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/superset-frontend/.eslintrc.js b/superset-frontend/.eslintrc.js
index 30abc8c59..1a935c70f 100644
--- a/superset-frontend/.eslintrc.js
+++ b/superset-frontend/.eslintrc.js
@@ -117,7 +117,6 @@ module.exports = {
         'react/default-props-match-prop-types': 0, // disabled temporarily
         'react/destructuring-assignment': 0, // re-enable up for discussion
         'react/forbid-prop-types': 0,
-        'react/jsx-curly-brace-presence': 0, // disabled temporarily
         'react/jsx-filename-extension': [1, { extensions: ['.jsx', '.tsx'] }],
         'react/jsx-fragments': 1,
         'react/jsx-no-bind': 0,
@@ -236,7 +235,6 @@ module.exports = {
     'react/default-props-match-prop-types': 0, // disabled temporarily
     'react/destructuring-assignment': 0, // re-enable up for discussion
     'react/forbid-prop-types': 0,
-    'react/jsx-curly-brace-presence': 0, // disabled temporarily
     'react/jsx-filename-extension': [1, { extensions: ['.jsx', '.tsx'] }],
     'react/jsx-fragments': 1,
     'react/jsx-no-bind': 0,
diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx
index e7dd2c1fb..e0e19c503 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -106,7 +106,7 @@ const bulkSelectColumnConfig = {
   Header: ({ getToggleAllRowsSelectedProps }: any) => (
     <IndeterminateCheckbox
       {...getToggleAllRowsSelectedProps()}
-      id={'header-toggle-all'}
+      id="header-toggle-all"
     />
   ),
   id: 'selection',
diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx
index 56974381b..6f34893f7 100644
--- a/superset-frontend/src/components/Menu/Menu.tsx
+++ b/superset-frontend/src/components/Menu/Menu.tsx
@@ -188,7 +188,7 @@ export function Menu({
         <Nav className="navbar-right">
           {!navbarRight.user_is_anonymous && <NewMenu />}
           {settings && settings.length && (
-            <NavDropdown id={`settings-dropdown`} title="Settings">
+            <NavDropdown id="settings-dropdown" title="Settings">
               {flatSettings.map((section, index) => {
                 if (section === '-') {
                   return (
diff --git a/superset-frontend/src/datasource/DatasourceEditor.jsx b/superset-frontend/src/datasource/DatasourceEditor.jsx
index 97d1b2e1e..b76370e7e 100644
--- a/superset-frontend/src/datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/datasource/DatasourceEditor.jsx
@@ -160,7 +160,7 @@ function ColumnCollectionTable({
                       database/column name level via the extra parameter.`)}
                 </div>
               }
-              control={<TextControl placeholder={'%y/%m/%d'} />}
+              control={<TextControl placeholder="%y/%m/%d" />}
             />
           </Fieldset>
         </FormContainer>
diff --git a/superset-frontend/src/explore/components/ControlHeader.jsx b/superset-frontend/src/explore/components/ControlHeader.jsx
index da520c813..579a47ba3 100644
--- a/superset-frontend/src/explore/components/ControlHeader.jsx
+++ b/superset-frontend/src/explore/components/ControlHeader.jsx
@@ -100,7 +100,7 @@ export default class ControlHeader extends React.Component {
                 <OverlayTrigger
                   placement="top"
                   overlay={
-                    <Tooltip id={'error-tooltip'}>{this.props.warning}</Tooltip>
+                    <Tooltip id="error-tooltip">{this.props.warning}</Tooltip>
                   }
                 >
                   <i className="fa fa-exclamation-circle text-warning" />
@@ -112,7 +112,7 @@ export default class ControlHeader extends React.Component {
                 <OverlayTrigger
                   placement="top"
                   overlay={
-                    <Tooltip id={'error-tooltip'}>{this.props.danger}</Tooltip>
+                    <Tooltip id="error-tooltip">{this.props.danger}</Tooltip>
                   }
                 >
                   <i className="fa fa-exclamation-circle text-danger" />
@@ -124,7 +124,7 @@ export default class ControlHeader extends React.Component {
                 <OverlayTrigger
                   placement="top"
                   overlay={
-                    <Tooltip id={'error-tooltip'}>
+                    <Tooltip id="error-tooltip">
                       {this.props.validationErrors.join(' ')}
                     </Tooltip>
                   }
diff --git a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
index b5f939d4c..e23348400 100644
--- a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
+++ b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx
@@ -125,7 +125,7 @@ export default function QueryAndSaveBtns({
             <OverlayTrigger
               placement="right"
               overlay={
-                <Tooltip id={'query-error-tooltip'}>{errorMessage}</Tooltip>
+                <Tooltip id="query-error-tooltip">{errorMessage}</Tooltip>
               }
             >
               <i className="fa fa-exclamation-circle text-danger fa-lg" />
diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
index cd0bf94d0..8c0b750b2 100644
--- a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
+++ b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
@@ -454,7 +454,7 @@ export default class AnnotationLayer extends React.PureComponent {
                     ? 'Interval Start column'
                     : 'Event Time Column'
                 }
-                description={'This column must contain date/time information.'}
+                description="This column must contain date/time information."
                 validationErrors={!timeColumn ? ['Mandatory'] : []}
                 clearable={false}
                 options={timeColumnOptions}
@@ -467,7 +467,7 @@ export default class AnnotationLayer extends React.PureComponent {
                 hovered
                 name="annotation-layer-intervalEnd"
                 label="Interval End column"
-                description={'This column must contain date/time information.'}
+                description="This column must contain date/time information."
                 validationErrors={!intervalEndColumn ? ['Mandatory'] : []}
                 options={columns}
                 value={intervalEndColumn}
@@ -478,7 +478,7 @@ export default class AnnotationLayer extends React.PureComponent {
               hovered
               name="annotation-layer-title"
               label="Title Column"
-              description={'Pick a title for you annotation.'}
+              description="Pick a title for you annotation."
               options={[{ value: '', label: 'None' }].concat(columns)}
               value={titleColumn}
               onChange={v => this.setState({ titleColumn: v })}
@@ -643,7 +643,7 @@ export default class AnnotationLayer extends React.PureComponent {
             hovered
             name="annotation-layer-show-markers"
             label="Show Markers"
-            description={'Shows or hides markers for the time series'}
+            description="Shows or hides markers for the time series"
             value={showMarkers}
             onChange={v => this.setState({ showMarkers: v })}
           />
@@ -653,7 +653,7 @@ export default class AnnotationLayer extends React.PureComponent {
             hovered
             name="annotation-layer-hide-line"
             label="Hide Line"
-            description={'Hides the Line for the time series'}
+            description="Hides the Line for the time series"
             value={hideLine}
             onChange={v => this.setState({ hideLine: v })}
           />
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
index 69c5e718a..6ea07407b 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
@@ -170,7 +170,7 @@ class DatasourceControl extends React.PureComponent {
           <OverlayTrigger
             placement="right"
             overlay={
-              <Tooltip id={'toggle-datasource-tooltip'}>
+              <Tooltip id="toggle-datasource-tooltip">
                 {t('Expand/collapse datasource configuration')}
               </Tooltip>
             }
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
index 062605992..022295fa0 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
@@ -435,7 +435,7 @@ function ChartList(props: ChartListProps) {
         title={chart.slice_name}
         url={bulkSelectEnabled ? undefined : chart.url}
         imgURL={chart.thumbnail_url ?? ''}
-        imgFallbackURL={'/static/assets/images/chart-card-fallback.png'}
+        imgFallbackURL="/static/assets/images/chart-card-fallback.png"
         description={t('Last modified %s', chart.changed_on_delta_humanized)}
         coverLeft={(chart.owners || []).slice(0, 5).map(owner => (
           <AvatarIcon