From e26c90f5fcb5f412a0f6f1702a28f4d980b7bb2e Mon Sep 17 00:00:00 2001 From: M Fahru Date: Fri, 8 Jul 2022 01:03:14 -0400 Subject: [PATCH] Rename isAdmin to isProjectOwner in he ShareProjectContext to avoid confusion GitOrigin-RevId: 0bfc7317b197960114f2a06fbbc20818bc4c5ffb --- .../app/views/project/editor/header-react.pug | 2 +- .../share-project-modal/components/invite.js | 8 ++-- .../components/share-modal-body.js | 38 ++++++++++++------- .../components/share-project-modal.js | 8 ++-- .../react-share-project-modal-controller.js | 6 +-- .../stories/share-project-modal.stories.js | 10 ++--- .../components/share-project-modal.test.js | 8 ++-- 7 files changed, 46 insertions(+), 34 deletions(-) diff --git a/services/web/app/views/project/editor/header-react.pug b/services/web/app/views/project/editor/header-react.pug index 1382120b56..3174941670 100644 --- a/services/web/app/views/project/editor/header-react.pug +++ b/services/web/app/views/project/editor/header-react.pug @@ -2,7 +2,7 @@ div(ng-controller="ReactShareProjectModalController") share-project-modal( handle-hide="handleHide" show="show" - is-admin="isAdmin" + is-project-owner="isProjectOwner" ) div(ng-controller="EditorNavigationToolbarController") diff --git a/services/web/frontend/js/features/share-project-modal/components/invite.js b/services/web/frontend/js/features/share-project-modal/components/invite.js index be3bba4b40..03e009bebe 100644 --- a/services/web/frontend/js/features/share-project-modal/components/invite.js +++ b/services/web/frontend/js/features/share-project-modal/components/invite.js @@ -9,7 +9,7 @@ import MemberPrivileges from './member-privileges' import { resendInvite, revokeInvite } from '../utils/api' import { useProjectContext } from '../../../shared/context/project-context' -export default function Invite({ invite, isAdmin }) { +export default function Invite({ invite, isProjectOwner }) { return ( @@ -18,7 +18,7 @@ export default function Invite({ invite, isAdmin }) {
.  - {isAdmin && } + {isProjectOwner && }
@@ -26,7 +26,7 @@ export default function Invite({ invite, isAdmin }) { - {isAdmin && ( + {isProjectOwner && ( @@ -37,7 +37,7 @@ export default function Invite({ invite, isAdmin }) { Invite.propTypes = { invite: PropTypes.object.isRequired, - isAdmin: PropTypes.bool.isRequired, + isProjectOwner: PropTypes.bool.isRequired, } function ResendInvite({ invite }) { 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 7b0cf3773c..e0ad24b5e3 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 @@ -13,7 +13,7 @@ import PropTypes from 'prop-types' import RecaptchaConditions from '../../../shared/components/recaptcha-conditions' export default function ShareModalBody() { - const { isAdmin } = useShareProjectContext() + const { isProjectOwner } = useShareProjectContext() const { splitTestVariants } = useSplitTestContext({ splitTestVariants: PropTypes.object, }) @@ -24,7 +24,7 @@ export default function ShareModalBody() { case 'new-copy-top': return ( <> - {isAdmin ? ( + {isProjectOwner ? ( <> @@ -36,7 +36,7 @@ export default function ShareModalBody() { {members.map(member => - isAdmin ? ( + isProjectOwner ? ( ) : ( @@ -44,10 +44,14 @@ export default function ShareModalBody() { )} {invites.map(invite => ( - + ))} - {isAdmin && ( + {isProjectOwner && ( <>
@@ -65,7 +69,7 @@ export default function ShareModalBody() { {members.map(member => - isAdmin ? ( + isProjectOwner ? ( ) : ( @@ -73,12 +77,16 @@ export default function ShareModalBody() { )} {invites.map(invite => ( - + ))} - {isAdmin ? : } + {isProjectOwner ? : } - {isAdmin && ( + {isProjectOwner && ( <>
@@ -95,12 +103,12 @@ export default function ShareModalBody() { default: return ( <> - {isAdmin && } + {isProjectOwner && } {members.map(member => - isAdmin ? ( + isProjectOwner ? ( ) : ( @@ -108,10 +116,14 @@ export default function ShareModalBody() { )} {invites.map(invite => ( - + ))} - {isAdmin ? : } + {isProjectOwner ? : } {!window.ExposedSettings.recaptchaDisabled?.invite && ( 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 6fc79fe1a6..8c17efac2f 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,7 @@ const ShareProjectContext = createContext() ShareProjectContext.Provider.propTypes = { value: PropTypes.shape({ - isAdmin: PropTypes.bool.isRequired, + isProjectOwner: PropTypes.bool.isRequired, updateProject: PropTypes.func.isRequired, monitorRequest: PropTypes.func.isRequired, inFlight: PropTypes.bool, @@ -44,7 +44,7 @@ const ShareProjectModal = React.memo(function ShareProjectModal({ handleHide, show, animation = true, - isAdmin, + isProjectOwner, }) { const [inFlight, setInFlight] = useState(false) const [error, setError] = useState() @@ -113,7 +113,7 @@ const ShareProjectModal = React.memo(function ShareProjectModal({ return ( { @@ -25,10 +25,10 @@ export default App.controller( }) } - $scope.openShareProjectModal = isAdmin => { + $scope.openShareProjectModal = isProjectOwner => { eventTracking.sendMBOnce('ide-open-share-modal-once') $scope.$applyAsync(() => { - $scope.isAdmin = isAdmin + $scope.isProjectOwner = isProjectOwner $scope.show = true }) } diff --git a/services/web/frontend/stories/share-project-modal.stories.js b/services/web/frontend/stories/share-project-modal.stories.js index 07615320ad..f8eb6ce63a 100644 --- a/services/web/frontend/stories/share-project-modal.stories.js +++ b/services/web/frontend/stories/share-project-modal.stories.js @@ -46,7 +46,7 @@ export const LinkSharingLoading = args => { return } -export const NonAdminLinkSharingOff = args => { +export const NonProjectOwnerLinkSharingOff = args => { useScope({ project: { ...args.project, @@ -54,10 +54,10 @@ export const NonAdminLinkSharingOff = args => { }, }) - return + return } -export const NonAdminLinkSharingOn = args => { +export const NonProjectOwnerLinkSharingOn = args => { useScope({ project: { ...args.project, @@ -65,7 +65,7 @@ export const NonAdminLinkSharingOn = args => { }, }) - return + return } export const RestrictedTokenMember = args => { @@ -139,7 +139,7 @@ export default { args: { show: true, animation: false, - isAdmin: true, + isProjectOwner: true, user: {}, project, }, diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.js b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.js index c81a6c5e7e..61f8659416 100644 --- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.js +++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.js @@ -77,7 +77,7 @@ describe('', function () { const modalProps = { show: true, - isAdmin: true, + isProjectOwner: true, handleHide: sinon.stub(), } @@ -192,7 +192,7 @@ describe('', function () { }, }} > - + ) @@ -210,7 +210,7 @@ describe('', function () { }, }} > - + ) @@ -235,7 +235,7 @@ describe('', function () { }, }} > - + )