From d63620b8ec1af2c4aee0ad3546bdab60231595e4 Mon Sep 17 00:00:00 2001
From: Matt Seddon <mattseddon@hotmail.com>
Date: Wed, 15 Mar 2023 12:53:42 +1100
Subject: [PATCH] Add react/js-curly-brace-presense eslint rule

---
 .eslintrc.js                                           |  4 ++++
 .../experiments/components/table/CellRowActions.tsx    | 10 +++++-----
 webview/src/experiments/components/table/Errors.tsx    |  2 +-
 .../src/experiments/components/table/Indicators.tsx    |  2 +-
 .../components/table/header/TableHeaderCell.tsx        |  2 +-
 webview/src/setup/components/App.tsx                   |  4 ++--
 webview/src/setup/components/Studio.tsx                | 10 +++++-----
 webview/src/shared/components/button/RefreshButton.tsx |  2 +-
 .../src/shared/components/contextMenu/ContextMenu.tsx  |  6 +++---
 9 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 251a6a0ff0..25dcf10bb1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -150,6 +150,10 @@ module.exports = {
     'no-void': ['error', { allowAsStatement: true }],
     'no-warning-comments': 'error',
     quotes: ['error', 'single', { avoidEscape: true }],
+    'react/jsx-curly-brace-presence': [
+      'error',
+      { props: 'never', children: 'never' }
+    ],
     'react-hooks/exhaustive-deps': 'error',
     'react-hooks/rules-of-hooks': 'error',
     // This project doesn't use prop types
diff --git a/webview/src/experiments/components/table/CellRowActions.tsx b/webview/src/experiments/components/table/CellRowActions.tsx
index 9eb4c9936f..9293b5be23 100644
--- a/webview/src/experiments/components/table/CellRowActions.tsx
+++ b/webview/src/experiments/components/table/CellRowActions.tsx
@@ -103,7 +103,7 @@ export const CellRowActions: React.FC<CellRowActionsProps> = ({
       <CellRowAction
         showSubRowStates={showSubRowStates}
         subRowsAffected={selections}
-        testId={'row-action-checkbox'}
+        testId="row-action-checkbox"
         tooltipContent={getTooltipContent(isRowSelected, 'select the row')}
       >
         <VSCodeCheckbox
@@ -114,10 +114,10 @@ export const CellRowActions: React.FC<CellRowActionsProps> = ({
       <CellRowAction
         showSubRowStates={showSubRowStates}
         subRowsAffected={stars}
-        testId={'row-action-star'}
+        testId="row-action-star"
         tooltipContent={
           <ClickableTooltipContent
-            clickableText={'Filter experiments by starred'}
+            clickableText="Filter experiments by starred"
             onClick={addStarredFilter}
             helperText={getTooltipContent(!!starred, 'star')}
           />
@@ -144,10 +144,10 @@ export const CellRowActions: React.FC<CellRowActionsProps> = ({
         <CellRowAction
           showSubRowStates={showSubRowStates}
           subRowsAffected={plotSelections}
-          testId={'row-action-plot'}
+          testId="row-action-plot"
           tooltipContent={
             <ClickableTooltipContent
-              clickableText={'Open the plots view'}
+              clickableText="Open the plots view"
               helperText={getTooltipContent(!!bulletColor, 'plot')}
               onClick={openPlotsWebview}
             />
diff --git a/webview/src/experiments/components/table/Errors.tsx b/webview/src/experiments/components/table/Errors.tsx
index 281f239403..8eff065d73 100644
--- a/webview/src/experiments/components/table/Errors.tsx
+++ b/webview/src/experiments/components/table/Errors.tsx
@@ -14,7 +14,7 @@ export const ErrorTooltip: React.FC<{
         {error}
       </div>
     }
-    placement={'bottom'}
+    placement="bottom"
     disabled={!error}
   >
     {children}
diff --git a/webview/src/experiments/components/table/Indicators.tsx b/webview/src/experiments/components/table/Indicators.tsx
index 9e0f41d838..cfb9ba17c9 100644
--- a/webview/src/experiments/components/table/Indicators.tsx
+++ b/webview/src/experiments/components/table/Indicators.tsx
@@ -22,7 +22,7 @@ export const CounterBadge: React.FC<CounterBadgeProps> = ({ count }) => {
   return count ? (
     <span
       className={styles.indicatorCount}
-      role={'marquee'}
+      role="marquee"
       aria-label={`${count}`}
     >
       {count}
diff --git a/webview/src/experiments/components/table/header/TableHeaderCell.tsx b/webview/src/experiments/components/table/header/TableHeaderCell.tsx
index 8bb81e405e..26eac1b0f8 100644
--- a/webview/src/experiments/components/table/header/TableHeaderCell.tsx
+++ b/webview/src/experiments/components/table/header/TableHeaderCell.tsx
@@ -158,7 +158,7 @@ export const TableHeaderCell: React.FC<{
     <ContextMenu
       content={menuContent}
       disabled={!menuEnabled || menuSuppressed}
-      trigger={'contextmenu'}
+      trigger="contextmenu"
     >
       <th
         {...getHeaderPropsArgs(
diff --git a/webview/src/setup/components/App.tsx b/webview/src/setup/components/App.tsx
index eb065ea7b2..22eeb3852c 100644
--- a/webview/src/setup/components/App.tsx
+++ b/webview/src/setup/components/App.tsx
@@ -85,7 +85,7 @@ export const App: React.FC = () => {
     <>
       <SetupContainer
         sectionKey={Section.EXPERIMENTS}
-        title={'Experiments'}
+        title="Experiments"
         sectionCollapsed={sectionCollapsed}
         setSectionCollapsed={setSectionCollapsed}
       >
@@ -102,7 +102,7 @@ export const App: React.FC = () => {
       </SetupContainer>
       <SetupContainer
         sectionKey={Section.STUDIO}
-        title={'Studio'}
+        title="Studio"
         sectionCollapsed={sectionCollapsed}
         setSectionCollapsed={setSectionCollapsed}
       >
diff --git a/webview/src/setup/components/Studio.tsx b/webview/src/setup/components/Studio.tsx
index d9a745c584..c9789194ae 100644
--- a/webview/src/setup/components/Studio.tsx
+++ b/webview/src/setup/components/Studio.tsx
@@ -30,19 +30,19 @@ const Connect: React.FC = () => {
         <Button
           appearance="primary"
           isNested={false}
-          text={'Sign In'}
+          text="Sign In"
           onClick={openStudio}
         />
         <Button
           appearance="secondary"
           isNested={true}
-          text={'Get Token'}
+          text="Get Token"
           onClick={openStudioProfile}
         />
         <Button
           appearance="secondary"
           isNested={true}
-          text={'Save'}
+          text="Save"
           onClick={saveStudioToken}
         />
         <p>
@@ -81,13 +81,13 @@ const Settings: React.FC<{
         <Button
           appearance="primary"
           isNested={false}
-          text={'Update Token'}
+          text="Update Token"
           onClick={saveStudioToken}
         />
         <Button
           appearance="secondary"
           isNested={true}
-          text={'Disconnect'}
+          text="Disconnect"
           onClick={removeStudioToken}
         />
       </div>
diff --git a/webview/src/shared/components/button/RefreshButton.tsx b/webview/src/shared/components/button/RefreshButton.tsx
index 5d9c0daecf..71e4df9ace 100644
--- a/webview/src/shared/components/button/RefreshButton.tsx
+++ b/webview/src/shared/components/button/RefreshButton.tsx
@@ -16,7 +16,7 @@ export const RefreshButton: React.FC<RefreshButtonProps> = ({
       isNested={isNested}
       icon={Refresh}
       onClick={onClick}
-      text={'Refresh'}
+      text="Refresh"
     />
   )
 }
diff --git a/webview/src/shared/components/contextMenu/ContextMenu.tsx b/webview/src/shared/components/contextMenu/ContextMenu.tsx
index cf2654e6b2..506a0256dc 100644
--- a/webview/src/shared/components/contextMenu/ContextMenu.tsx
+++ b/webview/src/shared/components/contextMenu/ContextMenu.tsx
@@ -58,7 +58,7 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({
   <Tooltip
     trigger={trigger}
     delay={[100, 200]}
-    placement={'bottom-start'}
+    placement="bottom-start"
     interactive
     isContextMenu={true}
     onTrigger={positionContextMenuAndDisableEvents}
@@ -68,8 +68,8 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({
     onShow={onShow}
     onHide={onHide}
     disabled={!content || disabled}
-    appendTo={'parent'}
-    followCursor={'initial'}
+    appendTo="parent"
+    followCursor="initial"
     offset={[0, 0]}
   >
     {children}