chore(release): Test v7.33.0 (#9799)

Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Matt Krick <[email protected]> Co-authored-by: Rafa <[email protected]> Co-authored-by: Georg Bremer <[email protected]> Co-authored-by: Nick O'Ferrall <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Matt Krick <[email protected]> Co-authored-by: Jordan Husney <[email protected]> Co-authored-by: adaniels-parabol <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: Dale Bumblis <[email protected]> Co-authored-by: Bartosz Jarocki <[email protected]> Co-authored-by: Marcus Wermuth <[email protected]> Co-authored-by: Rafael Romero <[email protected]> Co-authored-by: Bruce Tian <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: Mohd Muneeb <[email protected]> Co-authored-by: Muneeb-Ventures <[email protected]> Co-authored-by: github-actions <[email protected]>
ParabolInc · May 29, 2024 · 8f7041a · 8f7041a
1 parent 62ef54e
commit 8f7041a
Show file tree

Hide file tree

Showing 27 changed files with 329 additions and 123 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.32.1"
+  ".": "7.33.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.33.0](https://github.com/ParabolInc/parabol/compare/v7.32.1...v7.33.0) (2024-05-29)
+
+
+### Added
+
+* **stripe:** handle Stripe subscription events ([#9768](https://github.com/ParabolInc/parabol/issues/9768)) ([2243667](https://github.com/ParabolInc/parabol/commit/224366762fcc11b1bfb3140317f444a10e5c0838))
+* update plan upgrade CTA label ([#9769](https://github.com/ParabolInc/parabol/issues/9769)) ([413f5b6](https://github.com/ParabolInc/parabol/commit/413f5b6349a3c7689d6dbf6b2b49df99d6b68412))
+* update promote team copy ([#9767](https://github.com/ParabolInc/parabol/issues/9767)) ([462a7f4](https://github.com/ParabolInc/parabol/commit/462a7f45eac7193a3c64f5971a7ecec085dffb25))
+* write equality checker to file store ([#9786](https://github.com/ParabolInc/parabol/issues/9786)) ([adcabbc](https://github.com/ParabolInc/parabol/commit/adcabbc186ebbbd124f0a596fead9b85b035f438))
+
+
+### Fixed
+
+* bump trebuchet-client to latest version ([#9797](https://github.com/ParabolInc/parabol/issues/9797)) ([da350e7](https://github.com/ParabolInc/parabol/commit/da350e73705604277cc0faa81b6dab9010927d4c))
+* team lead can view teams in org settings ([#9739](https://github.com/ParabolInc/parabol/issues/9739)) ([2699c3d](https://github.com/ParabolInc/parabol/commit/2699c3db7f2ca86257c6e5da475ec47af473c8a9))
+
+
+### Changed
+
+* Update processRecurrence tests ([#9770](https://github.com/ParabolInc/parabol/issues/9770)) ([222d6f9](https://github.com/ParabolInc/parabol/commit/222d6f94b9387dfbcff347f2bbcac8eef98bfe97))
+
 ## [7.32.1](https://github.com/ParabolInc/parabol/compare/v7.32.0...v7.32.1) (2024-05-22)
 
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.32.1"
+    "parabol-server": "7.33.0"
   }
 }
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -86,7 +86,6 @@ const DashSidebar = (props: Props) => {
           ...DashNavList_organization
           id
           name
-          isBillingLeader
         }
       }
     `,
@@ -99,7 +98,7 @@ const DashSidebar = (props: Props) => {
   if (match) {
     const {orgId: orgIdFromParams} = match.params
     const currentOrg = organizations.find((org) => org.id === orgIdFromParams)
-    const {id: orgId, name, isBillingLeader} = currentOrg ?? {}
+    const {id: orgId, name} = currentOrg ?? {}
     return (
       <Wrapper>
         <SideBarStartMeetingButton isOpen={isOpen} />
@@ -118,13 +117,11 @@ const DashSidebar = (props: Props) => {
                 href={`/me/organizations/${orgId}/${BILLING_PAGE}`}
                 label={'Plans & Billing'}
               />
-              {isBillingLeader && (
-                <NavItem
-                  icon={'groups'}
-                  href={`/me/organizations/${orgId}/${TEAMS_PAGE}`}
-                  label={'Teams'}
-                />
-              )}
+              <NavItem
+                icon={'groups'}
+                href={`/me/organizations/${orgId}/${TEAMS_PAGE}`}
+                label={'Teams'}
+              />
               <NavItem
                 icon={'group'}
                 href={`/me/organizations/${orgId}/${MEMBERS_PAGE}`}

diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -98,7 +98,6 @@ const MobileDashSidebar = (props: Props) => {
           ...DashNavList_organization
           id
           name
-          isBillingLeader
         }
       }
     `,
@@ -110,7 +109,7 @@ const MobileDashSidebar = (props: Props) => {
   if (match) {
     const {orgId: orgIdFromParams} = match.params
     const currentOrg = organizations.find((org) => org.id === orgIdFromParams)
-    const {id: orgId, name, isBillingLeader} = currentOrg ?? {}
+    const {id: orgId, name} = currentOrg ?? {}
     return (
       <DashSidebarStyles>
         <StandardHub handleMenuClick={handleMenuClick} viewer={viewer} />
@@ -131,14 +130,12 @@ const MobileDashSidebar = (props: Props) => {
                 href={`/me/organizations/${orgId}/${BILLING_PAGE}`}
                 label={'Plans & Billing'}
               />
-              {isBillingLeader && (
-                <LeftDashNavItem
-                  onClick={handleMenuClick}
-                  icon={'groups'}
-                  href={`/me/organizations/${orgId}/${TEAMS_PAGE}`}
-                  label={'Teams'}
-                />
-              )}
+              <LeftDashNavItem
+                onClick={handleMenuClick}
+                icon={'groups'}
+                href={`/me/organizations/${orgId}/${TEAMS_PAGE}`}
+                label={'Teams'}
+              />
               <LeftDashNavItem
                 onClick={handleMenuClick}
                 icon={'group'}

diff --git a/...client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx b/...client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
@@ -9,8 +9,9 @@ import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
 import IconLabel from '../../../../components/IconLabel'
 import PrimaryButton from '../../../../components/PrimaryButton'
+import useMutationProps from '../../../../hooks/useMutationProps'
 import PromoteToTeamLeadMutation from '../../../../mutations/PromoteToTeamLeadMutation'
-import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps'
+import {upperFirst} from '../../../../utils/upperFirst'
 
 const StyledDialogContainer = styled(DialogContainer)({
   width: 420
@@ -20,41 +21,55 @@ const StyledButton = styled(PrimaryButton)({
   margin: '1.5rem auto 0'
 })
 
-interface Props extends WithMutationProps {
+interface Props {
   closePortal: () => void
   teamMember: PromoteTeamMemberModal_teamMember$key
 }
+
 const PromoteTeamMemberModal = (props: Props) => {
   const atmosphere = useAtmosphere()
-  const {
-    closePortal,
-    submitMutation,
-    submitting,
-    onError,
-    onCompleted,
-    teamMember: teamMemberRef
-  } = props
+  const {submitMutation, submitting, onError, onCompleted} = useMutationProps()
+  const {closePortal, teamMember: teamMemberRef} = props
   const teamMember = useFragment(
     graphql`
       fragment PromoteTeamMemberModal_teamMember on TeamMember {
         userId
         teamId
         preferredName
+        isSelf
+        team {
+          isOrgAdmin
+          teamLead {
+            isSelf
+            preferredName
+          }
+        }
       }
     `,
     teamMemberRef
   )
-  const {preferredName, teamId, userId} = teamMember
+  const {preferredName, teamId, userId, team, isSelf} = teamMember
+  const {isOrgAdmin, teamLead} = team ?? {}
+  const oldLeadName = teamLead?.preferredName
+  const isOldLeadSelf = teamLead?.isSelf
   const handleClick = () => {
     submitMutation()
     PromoteToTeamLeadMutation(atmosphere, {teamId, userId}, {onError, onCompleted})
     closePortal()
   }
+
+  const copyStart = `Are you sure? ${isOldLeadSelf ? 'You' : oldLeadName} will be removed as the team leader and ${isSelf ? 'You' : preferredName} will be promoted.`
+  const copyEnd =
+    isOldLeadSelf && isOrgAdmin
+      ? ''
+      : `${isSelf ? 'You' : upperFirst(preferredName)} will no longer be able to change team membership.`
+  const copy = `${copyStart} ${copyEnd}`
+
   return (
     <StyledDialogContainer>
       <DialogTitle>{'Are you sure?'}</DialogTitle>
       <DialogContent>
-        {`You will be removed as the team leader and promote ${preferredName}. You will no longer be able to change team membership. This cannot be undone!`}
+        {copy}
         <StyledButton size='medium' onClick={handleClick} waiting={submitting}>
           <IconLabel icon='arrow_forward' iconAfter label={`Yes, promote ${preferredName}`} />
         </StyledButton>
@@ -63,4 +78,4 @@ const PromoteTeamMemberModal = (props: Props) => {
   )
 }
 
-export default withMutationProps(PromoteTeamMemberModal)
+export default PromoteTeamMemberModal
diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
@@ -89,7 +89,7 @@ const TeamSettings = (props: Props) => {
                   : 'This team is currently on a starter plan.'}
               </div>
               <PrimaryButton onClick={() => history.push(`/me/organizations/${orgId}`)}>
-                {`Upgrade Team to ${TierLabel.TEAM}`}
+                {`Upgrade to ${TierLabel.TEAM} Plan`}
               </PrimaryButton>
             </StyledRow>
           </Panel>

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
@@ -58,7 +58,7 @@ const Organization = (props: Props) => {
   const match = useRouteMatch<{orgId: string}>('/me/organizations/:orgId')!
   const {organization} = viewer
   if (!organization) return null
-  const {id: orgId, isBillingLeader} = organization
+  const {id: orgId} = organization
 
   return (
     <section className={'px-4 md:px-8'}>
@@ -90,16 +90,12 @@ const Organization = (props: Props) => {
           path={`${match.url}/${AUTHENTICATION_PAGE}`}
           render={(p) => <Authentication {...p} orgId={orgId} />}
         />
-        {isBillingLeader && (
-          <>
-            <Route
-              exact
-              path={`${match.url}/${TEAMS_PAGE}`}
-              render={() => <OrgTeams organizationRef={organization} />}
-            />
-            <Route exact path={`${match.url}/${TEAMS_PAGE}/:teamId`} component={OrgTeamMembers} />
-          </>
-        )}
+        <Route
+          exact
+          path={`${match.url}/${TEAMS_PAGE}`}
+          render={() => <OrgTeams organizationRef={organization} />}
+        />
+        <Route exact path={`${match.url}/${TEAMS_PAGE}/:teamId`} component={OrgTeamMembers} />
       </Switch>
     </section>
   )

diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
@@ -18,7 +18,11 @@ const OrgTeams = (props: Props) => {
     graphql`
       fragment OrgTeams_organization on Organization {
         id
+        isOrgAdmin
         isBillingLeader
+        featureFlags {
+          publicTeams
+        }
         allTeams {
           id
           ...OrgTeamsRow_team
@@ -27,19 +31,25 @@ const OrgTeams = (props: Props) => {
     `,
     organizationRef
   )
+
   const {
     open: openAddTeamDialog,
     close: closeAddTeamDialog,
     isOpen: isAddTeamDialogOpened
   } = useDialogState()
 
-  const {allTeams, isBillingLeader} = organization
-  if (!isBillingLeader) return null
-
+  const {allTeams, isBillingLeader, isOrgAdmin, featureFlags} = organization
+  const hasPublicTeamsFlag = featureFlags.publicTeams
+  const showAllTeams = isBillingLeader || isOrgAdmin || hasPublicTeamsFlag
   return (
     <div className='max-w-4xl pb-4'>
       <div className='flex items-center justify-center py-1'>
-        <h1 className='flex-1 text-2xl font-semibold leading-7'>Teams</h1>
+        <div>
+          <h1 className='text-2xl font-semibold leading-7'>Teams</h1>
+          {!showAllTeams && (
+            <p className='text-gray-600 mb-2'>Only showing teams you're a member of</p>
+          )}
+        </div>
         <div className='ml-auto'>
           <Button
             variant='secondary'

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -68,7 +68,7 @@
     "@emotion/styled": "^10.0.27",
     "@mattkrick/graphql-trebuchet-client": "^2.2.1",
     "@mattkrick/sanitize-svg": "0.4.0",
-    "@mattkrick/trebuchet-client": "3.0.1",
+    "@mattkrick/trebuchet-client": "3.0.3",
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.2",
     "@mui/x-date-pickers": "^6.3.1",

diff --git a/packages/embedder/package.json b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",

diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.32.1",
-    "parabol-server": "7.32.1",
+    "parabol-client": "7.33.0",
+    "parabol-server": "7.33.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.32.1",
+  "version": "7.33.0",
   "description": "",
   "main": "index.js",
   "scripts": {