From a3512651752b0f43643e1bc13d4e47e4321ec839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Tue, 9 Feb 2021 10:50:34 +0100
Subject: [PATCH] Merge pull request #3626 from overleaf/file-tree-release

[ReactFileTree] Release to Public \o/

GitOrigin-RevId: 8762168561b1c2533cbdb3f7bd47d6f99d9e9d61
---
 .../src/Features/Project/ProjectController.js |  2 +-
 .../frontend/extracted-translation-keys.json  |  1 -
 .../file-tree/components/file-tree-badge.js   | 29 -------------------
 .../file-tree/components/file-tree-toolbar.js |  9 +-----
 .../stylesheets/app/editor/toolbar.less       | 10 ++-----
 services/web/locales/en.json                  |  1 -
 6 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 services/web/frontend/js/features/file-tree/components/file-tree-badge.js

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 5fb18baca3..839fa63988 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -867,7 +867,7 @@ const ProjectController = {
               showNewLogsUI: user.alphaProgram && !wantsOldLogsUI,
               showNewNavigationUI:
                 req.query && req.query.new_navigation_ui === 'true',
-              showReactFileTree: user.betaProgram && !wantsOldFileTreeUI
+              showReactFileTree: !wantsOldFileTreeUI
             })
             timer.done()
           }
diff --git a/services/web/frontend/extracted-translation-keys.json b/services/web/frontend/extracted-translation-keys.json
index 3249197ee0..1733918e35 100644
--- a/services/web/frontend/extracted-translation-keys.json
+++ b/services/web/frontend/extracted-translation-keys.json
@@ -42,7 +42,6 @@
   "file_already_exists",
   "file_already_exists_in_this_location",
   "file_outline",
-  "file_tree_badge_tooltip",
   "files_cannot_include_invalid_characters",
   "find_out_more_about_the_file_outline",
   "first_error_popup_label",
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-badge.js b/services/web/frontend/js/features/file-tree/components/file-tree-badge.js
deleted file mode 100644
index 20f5b93afd..0000000000
--- a/services/web/frontend/js/features/file-tree/components/file-tree-badge.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { OverlayTrigger, Tooltip } from 'react-bootstrap'
-
-function FileTreeBadge() {
-  const { t } = useTranslation()
-
-  const tooltip = (
-    <Tooltip id="file-tree-badge-tooltip">
-      {t('file_tree_badge_tooltip')}
-    </Tooltip>
-  )
-
-  return (
-    <OverlayTrigger placement="bottom" overlay={tooltip} delayHide={100}>
-      <a
-        href="/beta/participate"
-        target="_blank"
-        rel="noopener noreferrer"
-        className="badge beta-badge"
-        onClick={ev => ev.stopPropagation()}
-      >
-        <span className="sr-only">{t('file_tree_badge_tooltip')}</span>
-      </a>
-    </OverlayTrigger>
-  )
-}
-
-export default FileTreeBadge
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-toolbar.js b/services/web/frontend/js/features/file-tree/components/file-tree-toolbar.js
index 56a1932e40..6f2266f1b6 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-toolbar.js
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-toolbar.js
@@ -7,8 +7,6 @@ import TooltipButton from '../../../shared/components/tooltip-button'
 import { FileTreeMainContext } from '../contexts/file-tree-main'
 import { useFileTreeActionable } from '../contexts/file-tree-actionable'
 
-import FileTreeBadge from './file-tree-badge'
-
 function FileTreeToolbar() {
   const { hasWritePermissions } = useContext(FileTreeMainContext)
 
@@ -74,11 +72,7 @@ function FileTreeToolbarRight() {
   } = useFileTreeActionable()
 
   if (!canRename && !canDelete) {
-    return (
-      <div className="toolbar-right">
-        <FileTreeBadge />
-      </div>
-    )
+    return null
   }
 
   return (
@@ -101,7 +95,6 @@ function FileTreeToolbarRight() {
           <Icon type="trash-o" modifier="fw" accessibilityLabel={t('delete')} />
         </TooltipButton>
       ) : null}
-      <FileTreeBadge />
     </div>
   )
 }
diff --git a/services/web/frontend/stylesheets/app/editor/toolbar.less b/services/web/frontend/stylesheets/app/editor/toolbar.less
index 126b8e05bb..efe3e13cc2 100644
--- a/services/web/frontend/stylesheets/app/editor/toolbar.less
+++ b/services/web/frontend/stylesheets/app/editor/toolbar.less
@@ -23,11 +23,11 @@
     outline: none;
   }
 
-  > a:not(.btn):not(.badge),
+  > a:not(.btn),
   > button,
-  .toolbar-left > a:not(.btn):not(.badge),
+  .toolbar-left > a:not(.btn),
   .toolbar-left > button,
-  .toolbar-right > a:not(.btn):not(.badge),
+  .toolbar-right > a:not(.btn),
   .toolbar-right > button {
     display: inline-block;
     color: @toolbar-icon-btn-color;
@@ -61,10 +61,6 @@
     }
   }
 
-  .toolbar-right > a.badge {
-    margin-left: 5px;
-  }
-
   &.toolbar-pdf > a:not(.btn) {
     margin-right: 3px;
   }
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index ac0c336c0c..d78331b3ce 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1289,7 +1289,6 @@
   "highest_priority_compiling": "Highest priority compiling",
   "dropbox_sync": "Dropbox Sync",
   "beta": "Beta",
-  "file_tree_badge_tooltip": "We made some improvements to the file tree. We hope you like it! Click here to manage your beta program membership",
   "sign_up_now": "Sign Up Now",
   "annual": "Annual",
   "half_price_student": "Half Price Student Plans",