-
Notifications
You must be signed in to change notification settings - Fork 334
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(release): Test v7.35.0 (#9808)
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]>
- Loading branch information
19 people
authored
May 31, 2024
1 parent
8f7041a
commit a4b046d
Showing
73 changed files
with
603 additions
and
1,156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| ".": "7.33.0" | ||
| ".": "7.35.0" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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.33.0", | ||
| "version": "7.35.0", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/ParabolInc/parabol" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "chronos", | ||
| "version": "7.33.0", | ||
| "version": "7.35.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.33.0" | ||
| "parabol-server": "7.35.0" | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Oops, something went wrong.