From a44df802e8dd74cff29ebfbff73ef48c7b126635 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Thu, 7 Jul 2022 14:17:47 +0100
Subject: [PATCH] Read isProjectOwner from EditorContext

GitOrigin-RevId: 57cc4c709d5a9eb5ce1b0b5b5b1ac306b953538d
---
 services/web/app/views/project/editor/header-react.pug       | 1 -
 .../components/editor-navigation-toolbar-root.js             | 5 ++---
 .../share-project-modal/components/share-modal-body.js       | 4 ++--
 .../share-project-modal/components/share-project-modal.js    | 4 ----
 .../controllers/react-share-project-modal-controller.js      | 4 +---
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/services/web/app/views/project/editor/header-react.pug b/services/web/app/views/project/editor/header-react.pug
index 3174941670..c1ab7fb6bc 100644
--- a/services/web/app/views/project/editor/header-react.pug
+++ b/services/web/app/views/project/editor/header-react.pug
@@ -2,7 +2,6 @@ div(ng-controller="ReactShareProjectModalController")
 	share-project-modal(
 		handle-hide="handleHide"
 		show="show"
-		is-project-owner="isProjectOwner"
 	)
 		
 	div(ng-controller="EditorNavigationToolbarController")
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
index 35aae7414c..400b3666be 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
@@ -54,7 +54,6 @@ const EditorNavigationToolbarRoot = React.memo(
       loading,
       isRestrictedTokenMember,
       renameProject,
-      isProjectOwner,
       permissionsLevel,
     } = useEditorContext(editorContextPropTypes)
 
@@ -93,8 +92,8 @@ const EditorNavigationToolbarRoot = React.memo(
     }, [view, setView])
 
     const openShareModal = useCallback(() => {
-      openShareProjectModal(isProjectOwner)
-    }, [openShareProjectModal, isProjectOwner])
+      openShareProjectModal()
+    }, [openShareProjectModal])
 
     const onShowLeftMenuClick = useCallback(
       () => setLeftMenuShown(value => !value),
diff --git a/services/web/frontend/js/features/share-project-modal/components/share-modal-body.js b/services/web/frontend/js/features/share-project-modal/components/share-modal-body.js
index e0ad24b5e3..bc7f37bf5e 100644
--- a/services/web/frontend/js/features/share-project-modal/components/share-modal-body.js
+++ b/services/web/frontend/js/features/share-project-modal/components/share-modal-body.js
@@ -1,4 +1,3 @@
-import { useShareProjectContext } from './share-project-modal'
 import EditMember from './edit-member'
 import LinkSharing from './link-sharing'
 import Invite from './invite'
@@ -6,6 +5,7 @@ import SendInvites from './send-invites'
 import ViewMember from './view-member'
 import OwnerInfo from './owner-info'
 import SendInvitesNotice from './send-invites-notice'
+import { useEditorContext } from '../../../shared/context/editor-context'
 import { useProjectContext } from '../../../shared/context/project-context'
 import { useSplitTestContext } from '../../../shared/context/split-test-context'
 import { Row } from 'react-bootstrap'
@@ -13,11 +13,11 @@ import PropTypes from 'prop-types'
 import RecaptchaConditions from '../../../shared/components/recaptcha-conditions'
 
 export default function ShareModalBody() {
-  const { isProjectOwner } = useShareProjectContext()
   const { splitTestVariants } = useSplitTestContext({
     splitTestVariants: PropTypes.object,
   })
 
+  const { isProjectOwner } = useEditorContext()
   const { invites, members } = useProjectContext()
 
   switch (splitTestVariants['project-share-modal-paywall']) {
diff --git a/services/web/frontend/js/features/share-project-modal/components/share-project-modal.js b/services/web/frontend/js/features/share-project-modal/components/share-project-modal.js
index 8c17efac2f..45c1186bf7 100644
--- a/services/web/frontend/js/features/share-project-modal/components/share-project-modal.js
+++ b/services/web/frontend/js/features/share-project-modal/components/share-project-modal.js
@@ -18,7 +18,6 @@ const ShareProjectContext = createContext()
 
 ShareProjectContext.Provider.propTypes = {
   value: PropTypes.shape({
-    isProjectOwner: PropTypes.bool.isRequired,
     updateProject: PropTypes.func.isRequired,
     monitorRequest: PropTypes.func.isRequired,
     inFlight: PropTypes.bool,
@@ -44,7 +43,6 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
   handleHide,
   show,
   animation = true,
-  isProjectOwner,
 }) {
   const [inFlight, setInFlight] = useState(false)
   const [error, setError] = useState()
@@ -113,7 +111,6 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
   return (
     <ShareProjectContext.Provider
       value={{
-        isProjectOwner,
         updateProject,
         monitorRequest,
         inFlight,
@@ -135,7 +132,6 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
 ShareProjectModal.propTypes = {
   animation: PropTypes.bool,
   handleHide: PropTypes.func.isRequired,
-  isProjectOwner: PropTypes.bool.isRequired,
   show: PropTypes.bool.isRequired,
 }
 
diff --git a/services/web/frontend/js/features/share-project-modal/controllers/react-share-project-modal-controller.js b/services/web/frontend/js/features/share-project-modal/controllers/react-share-project-modal-controller.js
index a5ffcaccf4..ba28d12a26 100644
--- a/services/web/frontend/js/features/share-project-modal/controllers/react-share-project-modal-controller.js
+++ b/services/web/frontend/js/features/share-project-modal/controllers/react-share-project-modal-controller.js
@@ -16,7 +16,6 @@ App.component(
 export default App.controller(
   'ReactShareProjectModalController',
   function ($scope, eventTracking, ide) {
-    $scope.isProjectOwner = false
     $scope.show = false
 
     $scope.handleHide = () => {
@@ -25,10 +24,9 @@ export default App.controller(
       })
     }
 
-    $scope.openShareProjectModal = isProjectOwner => {
+    $scope.openShareProjectModal = () => {
       eventTracking.sendMBOnce('ide-open-share-modal-once')
       $scope.$applyAsync(() => {
-        $scope.isProjectOwner = isProjectOwner
         $scope.show = true
       })
     }