chore(release): Test v7.38.1 (#9934)

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

Hide file tree

Showing 86 changed files with 581 additions and 249 deletions.
diff --git a/.env.example b/.env.example
@@ -112,6 +112,7 @@ RETHINKDB_SSL='false'
 # GITHUB_CLIENT_SECRET='key_GITHUB_CLIENT_SECRET'
 # GITLAB_CLIENT_ID='key_GITLAB_CLIENT_ID'
 # GITLAB_CLIENT_SECRET='key_GITLAB_CLIENT_SECRET'
+# GITLAB_SERVER_URL='https://gitlab.com'
 # HUBSPOT_API_KEY=''
 # HUBSPOT_SALES_PIPELINE_ACTIVE_STAGES=''
 # HUBSPOT_SALES_PIPELINE_ID=''
@@ -123,6 +124,8 @@ RETHINKDB_SSL='false'
 # STRIPE_SECRET_KEY=''
 # STRIPE_PUBLISHABLE_KEY=''
 # STRIPE_WEBHOOK_SECRET=''
+# MATTERMOST_DISABLED='false'
+# MSTEAMS_DISABLED='false'
 
 # MAIL
 # MAIL GLOBALS. PROVIDER: mailgun | google | debug | smtp

diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ storybook-static/
 test-report.xml
 webpack-assets.json
 **/data
+backups/
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.38.0"
+  ".": "7.38.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.38.1](https://github.com/ParabolInc/parabol/compare/v7.38.0...v7.38.1) (2024-07-04)
+
+
+### Fixed
+
+* Allow starting recurring meetings without GCal ([#9920](https://github.com/ParabolInc/parabol/issues/9920)) ([3f2ca48](https://github.com/ParabolInc/parabol/commit/3f2ca482aef98cf07a7f27b6a3872c9505735334))
+* connectionContext always available ([#9923](https://github.com/ParabolInc/parabol/issues/9923)) ([1dce636](https://github.com/ParabolInc/parabol/commit/1dce6366ae968718dfa72c44553201a016863213))
+* handle failed 3DS payments ([#9924](https://github.com/ParabolInc/parabol/issues/9924)) ([4663e9e](https://github.com/ParabolInc/parabol/commit/4663e9ea28f36dcf10bfe21347912865d22a8872))
+
+
+### Changed
+
+* **gitignore:** ignore anything on the backups folder ([068f91e](https://github.com/ParabolInc/parabol/commit/068f91e33e0d3c160c67f52f8008a177eb5c326d))
+* Read Gitlab server URL from env for prime integrations ([#9910](https://github.com/ParabolInc/parabol/issues/9910)) ([830235d](https://github.com/ParabolInc/parabol/commit/830235ddb5afe4d3e0731181c76930ec0307609d))
+* **rethinkdb:** Organization: Phase 1 ([#9883](https://github.com/ParabolInc/parabol/issues/9883)) ([6bb5fb2](https://github.com/ParabolInc/parabol/commit/6bb5fb2c2cfc0ba77679633acd2a21ac04fcbfd3))
+* Show only available integrations ([#9908](https://github.com/ParabolInc/parabol/issues/9908)) ([04bfa6c](https://github.com/ParabolInc/parabol/commit/04bfa6c69c07be8a190542db4a5fb907e43d67ad))
+
 ## [7.38.0](https://github.com/ParabolInc/parabol/compare/v7.37.8...v7.38.0) (2024-07-02)
 
 

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.38.0",
+  "version": "7.38.1",
   "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.38.0",
+  "version": "7.38.1",
   "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.38.0"
+    "parabol-server": "7.38.1"
   }
 }
diff --git a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
@@ -39,15 +39,10 @@ const ScheduleMeetingButton = (props: Props) => {
       fragment ScheduleMeetingButton_team on Team {
         id
         viewerTeamMember {
-          isSelf
           integrations {
             gcal {
-              auth {
-                id
-              }
               cloudProvider {
                 id
-                clientId
               }
             }
           }
@@ -73,7 +68,7 @@ const ScheduleMeetingButton = (props: Props) => {
     closeModal()
   }
 
-  if (!cloudProvider) return null
+  if (!cloudProvider && !withRecurrence) return null
   return (
     <>
       <SecondaryButton onClick={handleClick} waiting={submitting} className='h-14'>

diff --git a/packages/client/components/AddToGitHubMenuItem.tsx b/packages/client/components/AddToGitHubMenuItem.tsx
@@ -28,6 +28,7 @@ const AddToGitHubMenuItem = forwardRef((props: Props, ref) => {
   const openOAuth = () => {
     GitHubClientManager.openOAuth(atmosphere, teamId, mutationProps)
   }
+  if (!GitHubClientManager.isAvailable) return null
   return (
     <MenuItem
       ref={ref}

diff --git a/packages/client/components/AddToJiraMenuItem.tsx b/packages/client/components/AddToJiraMenuItem.tsx
@@ -28,6 +28,7 @@ const AddToJiraMenuItem = forwardRef((props: Props, ref) => {
   const onClick = () => {
     AtlassianClientManager.openOAuth(atmosphere, teamId, mutationProps)
   }
+  if (!AtlassianClientManager.isAvailable) return null
   return (
     <MenuItem
       ref={ref}

diff --git a/packages/client/components/ScheduleDialog.tsx b/packages/client/components/ScheduleDialog.tsx
@@ -139,12 +139,11 @@ export const ScheduleDialog = (props: Props) => {
     }
   }
 
+  const subTitle = `Create a ${withRecurrence ? 'recurring meeting series' : 'meeting'}${gcal?.cloudProvider ? ' or add the meeting to your calendar.' : '.'}`
   return (
     <div className='space-y-4 overflow-auto p-4'>
       <div className='text-lg font-semibold leading-none'>Schedule Your Meeting</div>
-      <div className='text-sm text-slate-800'>
-        Create a recurring meeting series or add the meeting to your calendar.
-      </div>
+      <div className='text-sm text-slate-800'>{subTitle}</div>
       <div className='flex flex-col'>
         <input
           className='form-input rounded border border-solid border-slate-500 p-2 font-sans text-base hover:border-slate-600 focus:border-slate-600 focus:outline-none focus:ring-1 focus:ring-slate-600'

diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx
@@ -8,6 +8,8 @@ import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint} from '~/types/constEnums'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
+import AtlassianClientManager from '../utils/AtlassianClientManager'
+import GitHubClientManager from '../utils/GitHubClientManager'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
 import GitLabSVG from './GitLabSVG'
@@ -148,8 +150,18 @@ const ScopePhaseArea = (props: Props) => {
   const allowJiraServer = !!jiraServerIntegration?.sharedProviders.length
 
   const baseTabs = [
-    {icon: <GitHubSVG />, label: 'GitHub', allow: true, Component: ScopePhaseAreaGitHub},
-    {icon: <JiraSVG />, label: 'Jira', allow: true, Component: ScopePhaseAreaJira},
+    {
+      icon: <GitHubSVG />,
+      label: 'GitHub',
+      allow: GitHubClientManager.isAvailable,
+      Component: ScopePhaseAreaGitHub
+    },
+    {
+      icon: <JiraSVG />,
+      label: 'Jira',
+      allow: AtlassianClientManager.isAvailable,
+      Component: ScopePhaseAreaJira
+    },
     {
       icon: <ParabolLogoSVG />,
       label: 'Parabol',

diff --git a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
@@ -119,7 +119,7 @@ const StageTimerModalEndTimeSlackToggle = (props: Props) => {
   }
   return (
     <Block>
-      {(slack?.isActive || noActiveIntegrations) && (
+      {SlackClientManager.isAvailable && (slack?.isActive || noActiveIntegrations) && (
         <ButtonRow onClick={onClick}>
           <StyledCheckbox active={slackToggleActive} />
           <Label>{'Notify team via Slack'}</Label>

diff --git a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
@@ -5,6 +5,8 @@ import {useFragment} from 'react-relay'
 import {TeamPromptWorkDrawer_meeting$key} from '../../__generated__/TeamPromptWorkDrawer_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg'
+import AtlassianClientManager from '../../utils/AtlassianClientManager'
+import GitHubClientManager from '../../utils/GitHubClientManager'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import GitHubSVG from '../GitHubSVG'
 import JiraSVG from '../JiraSVG'
@@ -44,6 +46,11 @@ const TeamPromptWorkDrawer = (props: Props) => {
                   id
                 }
               }
+              gcal {
+                cloudProvider {
+                  id
+                }
+              }
             }
           }
         }
@@ -54,6 +61,7 @@ const TeamPromptWorkDrawer = (props: Props) => {
   const atmosphere = useAtmosphere()
   const hasJiraServer =
     !!meeting.viewerMeetingMember?.teamMember?.integrations.jiraServer?.sharedProviders?.length
+  const hasGCal = !!meeting.viewerMeetingMember?.teamMember?.integrations.gcal?.cloudProvider?.id
 
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'Your Work Drawer Impression', {
@@ -81,14 +89,29 @@ const TeamPromptWorkDrawer = (props: Props) => {
           }
         ]
       : []),
-    {icon: <GitHubSVG />, service: 'github', label: 'GitHub', Component: GitHubIntegrationPanel},
-    {icon: <JiraSVG />, service: 'jira', label: 'Jira', Component: JiraIntegrationPanel},
-    {
-      icon: <img className='h-6 w-6' src={gcalLogo} />,
-      service: 'gcal',
-      label: 'Google Calendar',
-      Component: GCalIntegrationPanel
-    }
+    ...(GitHubClientManager.isAvailable
+      ? [
+          {
+            icon: <GitHubSVG />,
+            service: 'github',
+            label: 'GitHub',
+            Component: GitHubIntegrationPanel
+          }
+        ]
+      : []),
+    ...(AtlassianClientManager.isAvailable
+      ? [{icon: <JiraSVG />, service: 'jira', label: 'Jira', Component: JiraIntegrationPanel}]
+      : []),
+    ...(hasGCal
+      ? [
+          {
+            icon: <img className='h-6 w-6' src={gcalLogo} />,
+            service: 'gcal',
+            label: 'Google Calendar',
+            Component: GCalIntegrationPanel
+          }
+        ]
+      : [])
   ] as const
 
   const {Component} = baseTabs[activeIdx]!

diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
@@ -86,6 +86,8 @@ const AtlassianProviderRow = (props: Props) => {
     return message
   }, [error])
 
+  if (!AtlassianClientManager.isAvailable) return null
+
   return (
     <>
       <ProviderRow

diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
@@ -45,6 +45,8 @@ const GitHubProviderRow = (props: Props) => {
   }
   const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
 
+  if (!GitHubClientManager.isAvailable) return null
+
   return (
     <>
       <ProviderRow

diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx
@@ -51,6 +51,9 @@ const MSTeamsProviderRow = (props: Props) => {
   const {integrations} = teamMember!
   const {msTeams} = integrations
   const {auth} = msTeams
+
+  if (window.__ACTION__.msTeamsDisabled) return null
+
   return (
     <>
       <ProviderRow

diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx
@@ -52,6 +52,8 @@ const MattermostProviderRow = (props: Props) => {
   const {mattermost} = integrations
   const {auth} = mattermost
 
+  if (window.__ACTION__.mattermostDisabled) return null
+
   return (
     <>
       <ProviderRow

diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
@@ -40,6 +40,8 @@ const SlackProviderRow = (props: Props) => {
   }
   const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
 
+  if (!SlackClientManager.isAvailable) return null
+
   return (
     <>
       <ProviderRow

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
@@ -76,10 +76,8 @@ const BillingForm = (props: Props) => {
   const {cardNumberRef, orgId} = props
   const stripe = useStripe()
   const elements = useElements()
-  const [isLoading, setIsLoading] = useState(false)
   const atmosphere = useAtmosphere()
-  const {onError, onCompleted} = useMutationProps()
-  const [errorMsg, setErrorMsg] = useState<null | string>()
+  const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps()
   const [hasStarted, setHasStarted] = useState(false)
   const [cardNumberError, setCardNumberError] = useState<null | string>()
   const [expiryDateError, setExpiryDateError] = useState<null | string>()
@@ -94,31 +92,24 @@ const BillingForm = (props: Props) => {
     !cardNumberError &&
     !expiryDateError &&
     !cvcError
-  const isUpgradeDisabled = isLoading || !stripe || !elements || !hasValidCCDetails
+  const isUpgradeDisabled = submitting || !stripe || !elements || !hasValidCCDetails
 
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault()
     if (!stripe || !elements) return
-    setIsLoading(true)
-    if (errorMsg) {
-      setIsLoading(false)
-      setErrorMsg(null)
-      return
-    }
+    submitMutation()
+
     const cardElement = elements.getElement(CardNumberElement)
     if (!cardElement) {
-      setIsLoading(false)
-      const newErrorMsg = 'Something went wrong. Please try again.'
-      setErrorMsg(newErrorMsg)
+      onError(new Error('Something went wrong. Please try again.'))
       return
     }
     const {paymentMethod, error} = await stripe.createPaymentMethod({
       type: 'card',
       card: cardElement
     })
     if (error) {
-      setErrorMsg(error.message)
-      setIsLoading(false)
+      onError(new Error(error.message))
       return
     }
 
@@ -130,14 +121,12 @@ const BillingForm = (props: Props) => {
         const newErrMsg =
           createStripeSubscription.error?.message ??
           'Something went wrong. Please try again or contact support.'
-        setIsLoading(false)
-        setErrorMsg(newErrMsg)
+        onError(new Error(newErrMsg))
         return
       }
       const {error} = await stripe.confirmCardPayment(stripeSubscriptionClientSecret)
       if (error) {
-        setErrorMsg(error.message)
-        setIsLoading(false)
+        onError(new Error(error.message))
         return
       }
       commitLocalUpdate(atmosphere, (store) => {
@@ -157,7 +146,7 @@ const BillingForm = (props: Props) => {
 
   const handleChange =
     (type: 'CardNumber' | 'ExpiryDate' | 'CVC') => (event: StripeElementChangeEvent) => {
-      if (errorMsg) setErrorMsg(null)
+      if (error) onCompleted()
       if (!hasStarted && !event.empty) {
         SendClientSideEvent(atmosphere, 'Payment Details Started', {orgId})
         setHasStarted(true)
@@ -237,14 +226,14 @@ const BillingForm = (props: Props) => {
         </div>
       </div>
       <ButtonBlock>
-        {errorMsg && <ErrorMsg>{errorMsg}</ErrorMsg>}
+        {error && <ErrorMsg>{error.message}</ErrorMsg>}
         <UpgradeButton
           size='medium'
           disabled={isUpgradeDisabled}
           isDisabled={isUpgradeDisabled}
           type={'submit'}
         >
-          {isLoading ? (
+          {submitting ? (
             <>
               Upgrading <Ellipsis />
             </>

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.38.0",
+  "version": "7.38.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/client/types/modules.d.ts b/packages/client/types/modules.d.ts
@@ -35,6 +35,8 @@ interface Window {
     github: string
     google: string
     googleAnalytics: string
+    mattermostDisabled: boolean | undefined
+    msTeamsDisabled: boolean | undefined
     publicPath: string
     sentry: string
     slack: string