From 88b9c371bc74f38a415895d0491c76dd0f8fc4bb Mon Sep 17 00:00:00 2001
From: Hugh O'Brien <hugh.obrien@overleaf.com>
Date: Wed, 9 Dec 2020 11:56:24 +0000
Subject: [PATCH] Merge pull request #3447 from overleaf/ae-eslint-braces-rule

Enable react/jsx-curly-brace-presence rule

GitOrigin-RevId: f3683cf7ae4566bcfa442fff2242370331209a54
---
 services/web/.eslintrc                                        | 4 ++++
 .../features/file-tree/components/file-tree-context-menu.js   | 2 +-
 .../features/file-tree/components/file-tree-root.test.js      | 2 +-
 .../frontend/features/file-tree/flows/delete-entity.test.js   | 4 ++--
 .../frontend/features/file-tree/flows/rename-entity.test.js   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/services/web/.eslintrc b/services/web/.eslintrc
index 705fea34d1..c69d460479 100644
--- a/services/web/.eslintrc
+++ b/services/web/.eslintrc
@@ -29,6 +29,10 @@
   "rules": {
     // Swap the no-unused-expressions rule with a more chai-friendly one
     "no-unused-expressions": 0,
+    "react/jsx-curly-brace-presence": ["error", {
+      "props": "never",
+      "children": "never"
+    }],
     "chai-friendly/no-unused-expressions": "error"
   },
   "overrides": [
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-context-menu.js b/services/web/frontend/js/features/file-tree/components/file-tree-context-menu.js
index 2987579420..50cb034d13 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-context-menu.js
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-context-menu.js
@@ -32,7 +32,7 @@ function FileTreeContextMenu() {
     <Dropdown
       onClick={handleClick}
       open
-      id={'dropdown-file-tree-context-menu'}
+      id="dropdown-file-tree-context-menu"
       onToggle={handleToggle}
     >
       <FakeDropDownToggle bsRole="toggle" />
diff --git a/services/web/test/frontend/features/file-tree/components/file-tree-root.test.js b/services/web/test/frontend/features/file-tree/components/file-tree-root.test.js
index 57cea297c1..5fd13a5f18 100644
--- a/services/web/test/frontend/features/file-tree/components/file-tree-root.test.js
+++ b/services/web/test/frontend/features/file-tree/components/file-tree-root.test.js
@@ -32,7 +32,7 @@ describe('<FileTreeRoot/>', function() {
     render(
       <FileTreeRoot
         rootFolder={rootFolder}
-        projectId={'123abc'}
+        projectId="123abc"
         hasWritePermissions={false}
         rootDocId="456def"
         onSelect={onSelect}
diff --git a/services/web/test/frontend/features/file-tree/flows/delete-entity.test.js b/services/web/test/frontend/features/file-tree/flows/delete-entity.test.js
index a75e0dde43..407e3373c4 100644
--- a/services/web/test/frontend/features/file-tree/flows/delete-entity.test.js
+++ b/services/web/test/frontend/features/file-tree/flows/delete-entity.test.js
@@ -37,7 +37,7 @@ describe('FileTree Delete Entity Flow', function() {
       render(
         <FileTreeRoot
           rootFolder={rootFolder}
-          projectId={'123abc'}
+          projectId="123abc"
           hasWritePermissions
           onSelect={onSelect}
           onInit={onInit}
@@ -128,7 +128,7 @@ describe('FileTree Delete Entity Flow', function() {
       render(
         <FileTreeRoot
           rootFolder={rootFolder}
-          projectId={'123abc'}
+          projectId="123abc"
           hasWritePermissions
           onSelect={onSelect}
           onInit={onInit}
diff --git a/services/web/test/frontend/features/file-tree/flows/rename-entity.test.js b/services/web/test/frontend/features/file-tree/flows/rename-entity.test.js
index 7cb1165424..aa35c5d486 100644
--- a/services/web/test/frontend/features/file-tree/flows/rename-entity.test.js
+++ b/services/web/test/frontend/features/file-tree/flows/rename-entity.test.js
@@ -49,7 +49,7 @@ describe('FileTree Rename Entity Flow', function() {
     render(
       <FileTreeRoot
         rootFolder={rootFolder}
-        projectId={'123abc'}
+        projectId="123abc"
         hasWritePermissions
         onSelect={onSelect}
         onInit={onInit}