chore(release): Test v7.34.0

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "7.33.0"
+  ".": "7.34.0"
 }

CHANGELOG.md

@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.34.0](https://github.com/ParabolInc/parabol/compare/v7.33.0...v7.34.0) (2024-05-30)
+
+
+### Added
+
+* Add Jira Server to Your Work ([#9794](https://github.com/ParabolInc/parabol/issues/9794)) ([eec025e](https://github.com/ParabolInc/parabol/commit/eec025e3e22202c0c4c5630d2e6a75db76e3008f))
+
+
+### Changed
+
+* Allow global Jira Server integration provider ([#9796](https://github.com/ParabolInc/parabol/issues/9796)) ([051e51c](https://github.com/ParabolInc/parabol/commit/051e51c7746dfb50c4853b07ecc5bf548bd99a4e))
+* remove kudos ([#9785](https://github.com/ParabolInc/parabol/issues/9785)) ([23d48c4](https://github.com/ParabolInc/parabol/commit/23d48c48c01471be8e1332765f5d7cd9f0168954))
+
 ## [7.33.0](https://github.com/ParabolInc/parabol/compare/v7.32.1...v7.33.0) (2024-05-29)
 
 

codegen.json

@@ -75,7 +75,6 @@
           "InviteToTeamPayload": "./types/InviteToTeamPayload#InviteToTeamPayloadSource",
           "JiraIssue": "./types/JiraIssue#JiraIssueSource",
           "JiraRemoteProject": "../types/JiraRemoteProject#JiraRemoteProjectSource",
-          "Kudos": "../../postgres/types/Kudos#Kudos",
           "MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
           "MeetingTemplate": "../../database/types/MeetingTemplate#default",
           "NewMeeting": "../../postgres/types/Meeting#AnyMeeting",

package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.33.0",
+  "version": "7.34.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

packages/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.33.0",
+  "version": "7.34.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.33.0"
+    "parabol-server": "7.34.0"
   }
 }

packages/client/components/Mentioned.tsx

@@ -25,7 +25,6 @@ const Mentioned = (props: Props) => {
         status
         senderName
         senderPicture
-        kudosEmojiUnicode
         createdAt
         meetingId
         meetingName
@@ -45,7 +44,6 @@ const Mentioned = (props: Props) => {
     senderPicture,
     meetingId,
     meetingName,
-    kudosEmojiUnicode,
     type,
     status,
     retroReflection,
@@ -58,8 +56,7 @@ const Mentioned = (props: Props) => {
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'Notification Viewed', {
       notificationType: type,
-      notificationStatus: status,
-      kudosEmojiUnicode
+      notificationStatus: status
     })
   }, [])
 
@@ -77,9 +74,7 @@ const Mentioned = (props: Props) => {
     }
   }
 
-  const message = !kudosEmojiUnicode
-    ? `${authorName} mentioned you in ${locationType} in ${meetingName}`
-    : `${kudosEmojiUnicode} ${authorName} gave you kudos in ${locationType} in ${meetingName}`
+  const message = `${authorName} mentioned you in ${locationType} in ${meetingName}`
 
   const goThere = () => {
     history.push(actionUrl)

packages/client/components/NotificationPicker.tsx

@@ -54,9 +54,6 @@ const typePicker: Record<NotificationEnum, LazyExoticPreload<any>> = {
   MENTIONED: lazyPreload(() => import(/* webpackChunkName: 'Mentioned' */ './Mentioned')),
   RESPONSE_REPLIED: lazyPreload(
     () => import(/* webpackChunkName: 'ResponseReplied' */ './ResponseReplied')
-  ),
-  KUDOS_RECEIVED: lazyPreload(
-    () => import(/* webpackChunkName: 'KudosReceivedNotification' */ './KudosReceivedNotification')
   )
 }
 
@@ -86,7 +83,6 @@ const NotificationPicker = (props: Props) => {
         ...TeamsLimitReminderNotification_notification
         ...PromptToJoinOrgNotification_notification
         ...RequestToJoinOrgNotification_notification
-        ...KudosReceivedNotification_notification
       }
     `,
     notificationRef

packages/client/components/ResponseMentioned.tsx

@@ -31,21 +31,19 @@ const ResponseMentioned = (props: Props) => {
         }
         type
         status
-        kudosEmojiUnicode
       }
     `,
     notificationRef
   )
   const {history} = useRouter()
   const atmosphere = useAtmosphere()
-  const {meeting, response, kudosEmojiUnicode, type, status} = notification
+  const {meeting, response, type, status} = notification
   const {picture: authorPicture, preferredName: authorName} = response.user
 
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'Notification Viewed', {
       notificationType: type,
-      notificationStatus: status,
-      kudosEmojiUnicode
+      notificationStatus: status
     })
   }, [])
 
@@ -54,9 +52,7 @@ const ResponseMentioned = (props: Props) => {
     history.push(`/meet/${meetingId}/responses?responseId=${encodeURIComponent(response.id)}`)
   }
 
-  const message = kudosEmojiUnicode
-    ? `${kudosEmojiUnicode} ${authorName} mentioned you and gave kudos in their response in ${meetingName}.`
-    : `${authorName} mentioned you in their response in ${meetingName}.`
+  const message = `${authorName} mentioned you in their response in ${meetingName}.`
 
   // :TODO: (jmtaber129): Show mention preview.
   return (

packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx

@@ -8,12 +8,14 @@ import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import GitHubSVG from '../GitHubSVG'
 import JiraSVG from '../JiraSVG'
+import JiraServerSVG from '../JiraServerSVG'
 import ParabolLogoSVG from '../ParabolLogoSVG'
 import Tab from '../Tab/Tab'
 import Tabs from '../Tabs/Tabs'
 import GCalIntegrationPanel from './WorkDrawer/GCalIntegrationPanel'
 import GitHubIntegrationPanel from './WorkDrawer/GitHubIntegrationPanel'
 import JiraIntegrationPanel from './WorkDrawer/JiraIntegrationPanel'
+import JiraServerIntegrationPanel from './WorkDrawer/JiraServerIntegrationPanel'
 import ParabolTasksPanel from './WorkDrawer/ParabolTasksPanel'
 
 interface Props {
@@ -32,11 +34,26 @@ const TeamPromptWorkDrawer = (props: Props) => {
         ...GitHubIntegrationPanel_meeting
         ...JiraIntegrationPanel_meeting
         ...GCalIntegrationPanel_meeting
+        ...JiraServerIntegrationPanel_meeting
+        viewerMeetingMember {
+          teamMember {
+            teamId
+            integrations {
+              jiraServer {
+                sharedProviders {
+                  id
+                }
+              }
+            }
+          }
+        }
       }
     `,
     meetingRef
   )
   const atmosphere = useAtmosphere()
+  const hasJiraServer =
+    !!meeting.viewerMeetingMember?.teamMember?.integrations.jiraServer?.sharedProviders?.length
 
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'Your Work Drawer Impression', {
@@ -54,6 +71,16 @@ const TeamPromptWorkDrawer = (props: Props) => {
       label: 'Parabol',
       Component: ParabolTasksPanel
     },
+    ...(hasJiraServer
+      ? [
+          {
+            icon: <JiraServerSVG />,
+            service: 'jiraServer',
+            label: 'Jira Server',
+            Component: JiraServerIntegrationPanel
+          }
+        ]
+      : []),
     {icon: <GitHubSVG />, service: 'github', label: 'GitHub', Component: GitHubIntegrationPanel},
     {icon: <JiraSVG />, service: 'jira', label: 'Jira', Component: JiraIntegrationPanel},
     {

packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx

@@ -0,0 +1,95 @@
+import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
+import {useFragment} from 'react-relay'
+import {JiraServerIntegrationPanel_meeting$key} from '../../../__generated__/JiraServerIntegrationPanel_meeting.graphql'
+import useAtmosphere from '../../../hooks/useAtmosphere'
+import useMutationProps from '../../../hooks/useMutationProps'
+import jiraServerSVG from '../../../styles/theme/images/graphics/jira-software-blue.svg'
+import JiraServerClientManager from '../../../utils/JiraServerClientManager'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import JiraServerIntegrationResultsRoot from './JiraServerIntegrationResultsRoot'
+
+interface Props {
+  meetingRef: JiraServerIntegrationPanel_meeting$key
+}
+
+const JiraServerIntegrationPanel = (props: Props) => {
+  const {meetingRef} = props
+  const meeting = useFragment(
+    graphql`
+      fragment JiraServerIntegrationPanel_meeting on TeamPromptMeeting {
+        id
+        teamId
+        viewerMeetingMember {
+          teamMember {
+            teamId
+            integrations {
+              jiraServer {
+                auth {
+                  id
+                  isActive
+                }
+                sharedProviders {
+                  id
+                }
+              }
+            }
+          }
+        }
+      }
+    `,
+    meetingRef
+  )
+
+  const teamMember = meeting.viewerMeetingMember?.teamMember
+  const integration = teamMember?.integrations.jiraServer
+  const providerId = integration?.sharedProviders?.[0]?.id
+  const isActive = !!integration?.auth?.isActive
+
+  const atmosphere = useAtmosphere()
+  const mutationProps = useMutationProps()
+  const {error, onError} = mutationProps
+
+  const authJiraServer = () => {
+    if (!teamMember || !providerId) {
+      return onError(new Error('Could not find integration provider'))
+    }
+    JiraServerClientManager.openOAuth(atmosphere, providerId, teamMember.teamId, mutationProps)
+
+    SendClientSideEvent(atmosphere, 'Your Work Drawer Integration Connected', {
+      teamId: meeting.teamId,
+      meetingId: meeting.id,
+      service: 'jira server'
+    })
+  }
+  if (!teamMember || !teamMember) {
+    return null
+  }
+
+  return (
+    <>
+      {isActive ? (
+        <JiraServerIntegrationResultsRoot teamId={teamMember.teamId} />
+      ) : (
+        <div className='-mt-14 flex h-full flex-col items-center justify-center gap-2'>
+          <div className='h-10 w-10'>
+            <img className='h-10 w-10' src={jiraServerSVG} />
+          </div>
+          <b>Connect to Jira Server</b>
+          <div className='w-1/2 text-center text-sm'>
+            Connect to Jira Server to view your issues.
+          </div>
+          <button
+            className='mt-4 cursor-pointer rounded-full bg-sky-500 px-8 py-2 font-semibold text-white hover:bg-sky-600'
+            onClick={authJiraServer}
+          >
+            Connect
+          </button>
+          {error && <div className='text-tomato-500'>Error: {error.message}</div>}
+        </div>
+      )}
+    </>
+  )
+}
+
+export default JiraServerIntegrationPanel