Skip to content

Commit

Permalink
chore(release): Test v7.41.0 (#10068)
Browse files Browse the repository at this point in the history
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: Rafa <[email protected]>
Co-authored-by: Georg Bremer <[email protected]>
Co-authored-by: Nick O'Ferrall <[email protected]>
Co-authored-by: Matt Krick <[email protected]>
Co-authored-by: Jordan Husney <[email protected]>
Co-authored-by: Dale Bumblis <[email protected]>
Co-authored-by: Bruce Tian <[email protected]>
Co-authored-by: Bartosz Jarocki <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: Terry Acker <[email protected]>
Co-authored-by: Rafael Romero <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
17 people authored Aug 2, 2024
1 parent 2c8ca4b commit cdd92a8
Show file tree
Hide file tree
Showing 232 changed files with 3,256 additions and 3,440 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "7.40.0"
".": "7.41.0"
}
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,48 @@ This project adheres to [Semantic Versioning](http://semver.org/).

This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).

## [7.41.0](https://github.com/ParabolInc/parabol/compare/v7.40.2...v7.41.0) (2024-08-02)


### Added

* **orgAdmin:** org admins can archive teams ([#10022](https://github.com/ParabolInc/parabol/issues/10022)) ([31cd317](https://github.com/ParabolInc/parabol/commit/31cd317b906e2f02e3c87fc1cb3bedf77c160bb8))


### Fixed

* check signal for build exit code ([#10063](https://github.com/ParabolInc/parabol/issues/10063)) ([4207f7d](https://github.com/ParabolInc/parabol/commit/4207f7d0d925d0b8360a0e4e704edae96a46f85d))
* Fix error in start meeting if the user has no teams ([#10056](https://github.com/ParabolInc/parabol/issues/10056)) ([e20aefd](https://github.com/ParabolInc/parabol/commit/e20aefd15c7d92b3ada0436ce41ca78f3ad600fd))
* nest-graphql-endpoint support graphql v16 ([#10066](https://github.com/ParabolInc/parabol/issues/10066)) ([2c27e13](https://github.com/ParabolInc/parabol/commit/2c27e13cc234d78cad10b551bec6258e508270f2))
* null not distinct ([#10067](https://github.com/ParabolInc/parabol/issues/10067)) ([e6204a7](https://github.com/ParabolInc/parabol/commit/e6204a75194e310ee1ceb89a15d2e23cb6cfeccf))


### Changed

* Add orgId to IntegrationProvider ([#6014](https://github.com/ParabolInc/parabol/issues/6014)) ([6819e90](https://github.com/ParabolInc/parabol/commit/6819e90d40c17761c5f7a0159c4de1dd344bc531))

## [7.40.2](https://github.com/ParabolInc/parabol/compare/v7.40.1...v7.40.2) (2024-08-01)


### Fixed

* discussion mentioned can be triggered by all meetings ([#10060](https://github.com/ParabolInc/parabol/issues/10060)) ([b777958](https://github.com/ParabolInc/parabol/commit/b7779580b0717c42a10d58ac06143e2a0d66298a))

## [7.40.1](https://github.com/ParabolInc/parabol/compare/v7.40.0...v7.40.1) (2024-08-01)


### Fixed

* **build:** build prod exits with code 1 if anything goes wrong ([#10016](https://github.com/ParabolInc/parabol/issues/10016)) ([1ed6a82](https://github.com/ParabolInc/parabol/commit/1ed6a82312f4aa63a3b46eed7645bd27a23d4d7f))


### Changed

* **docker-stack:** force network to be called parabol on the single-tenant compose stack ([#10041](https://github.com/ParabolInc/parabol/issues/10041)) ([8b3b1b8](https://github.com/ParabolInc/parabol/commit/8b3b1b80e436f33ae64580ec71c7ed098e076875))
* **rethinkdb:** SuggestedAction: Phase 1 ([#10035](https://github.com/ParabolInc/parabol/issues/10035)) ([d00da10](https://github.com/ParabolInc/parabol/commit/d00da10595e85bd6cd7004b621e17efb2522b995))
* update @radix-ui/react-alert-dialog ([#9986](https://github.com/ParabolInc/parabol/issues/9986)) ([936f1f6](https://github.com/ParabolInc/parabol/commit/936f1f62fc474e94618ebb64dbbdd8678706a984))
* upgrade GraphQL to v16 ([#10052](https://github.com/ParabolInc/parabol/issues/10052)) ([a27769c](https://github.com/ParabolInc/parabol/commit/a27769c56ce5f49b4186c47c364a9261f04c01ba))

## [7.40.0](https://github.com/ParabolInc/parabol/compare/v7.39.3...v7.40.0) (2024-07-26)


Expand Down
9 changes: 8 additions & 1 deletion codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
"contextType": "../graphql#GQLContext",
"showUnusedMappers": false,
"mappers": {
"JiraRemoteAvatarUrls": "./types/JiraRemoteAvatarUrls#JiraRemoteAvatarUrlsSource",
"TemplateDimensionRef": "./types/TemplateDimensionRef#TemplateDimensionRefSource",
"UpdateIntegrationProviderSuccess": "./types/UpdateIntegrationProviderSuccess#UpdateIntegrationProviderSuccessSource",
"EndTeamPromptSuccess": "./types/EndTeamPromptSuccess#EndTeamPromptSuccessSource",
"_xGitLabProject": "./types/_xGitLabProject#_xGitLabProjectSource as _xGitLabProject",
"JiraServerIntegration": "./types/JiraServerIntegration#JiraServerIntegrationSource",
"GitHubIntegration": "../../postgres/queries/getGitHubAuthByUserIdTeamId#GitHubAuth",
Expand Down Expand Up @@ -97,7 +101,8 @@
"MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
"MeetingTemplate": "../../database/types/MeetingTemplate#default",
"NewMeeting": "../../postgres/types/Meeting#AnyMeeting",
"NewMeetingPhase": "../../database/types/GenericMeetingPhase #default as GenericMeetingPhaseDB",
"NewMeetingStage": "./types/NewMeetingStage#NewMeetingStageSource",
"NewMeetingPhase": "./types/NewMeetingPhase#NewMeetingPhaseSource",
"NotificationMeetingStageTimeLimitEnd": "../../database/types/NotificationMeetingStageTimeLimitEnd#default as NotificationMeetingStageTimeLimitEndDB",
"NotificationTeamInvitation": "../../database/types/NotificationTeamInvitation#default as NotificationTeamInvitationDB",
"NotifyDiscussionMentioned": "../../database/types/NotificationDiscussionMentioned#default as NotificationDiscussionMentionedDB",
Expand All @@ -114,6 +119,7 @@
"TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
"TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
"TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
"Threadable": "./types/Threadable#ThreadableSource",
"OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
"PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
"PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
Expand Down Expand Up @@ -145,6 +151,7 @@
"StripeFailPaymentPayload": "./types/StripeFailPaymentPayload#StripeFailPaymentPayloadSource",
"Task": "../../database/types/Task#default",
"Team": "./types/Team#TeamSource",
"TeamPromptMeetingSettings": "../../database/types/MeetingSettingsTeamPrompt#default as MeetingSettingsTeamPromptDB",
"TeamHealthPhase": "./types/TeamHealthPhase#TeamHealthPhaseSource",
"TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
"TeamInvitation": "../../database/types/TeamInvitation#default",
Expand Down
1 change: 1 addition & 0 deletions docker/stacks/single-tenant-host/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ services:
- parabol-network
networks:
parabol-network:
name: parabol
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.40.0",
"version": "7.41.0",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down Expand Up @@ -77,7 +77,7 @@
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/preset-env": "7.18.6",
"@babel/preset-env": "^7.25.0",
"@datadog/datadog-ci": "^2.33.0",
"@graphql-codegen/add": "^5.0.0",
"@graphql-codegen/cli": "^5.0.0",
Expand All @@ -100,7 +100,7 @@
"copy-webpack-plugin": "^11.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"graphql": "15.8.0",
"graphql": "16.9.0",
"html-webpack-plugin": "^5.5.0",
"husky": "^7.0.4",
"jscodeshift": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/chronos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chronos",
"version": "7.40.0",
"version": "7.41.0",
"description": "A cron job scheduler",
"author": "Matt Krick <[email protected]>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
Expand All @@ -25,6 +25,6 @@
},
"dependencies": {
"cron": "^2.3.1",
"parabol-server": "7.40.0"
"parabol-server": "7.41.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn'
import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth'
import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
import StyledError from '../StyledError'
import StyledLink from '../StyledLink'
import ScheduleMeetingButton from './ScheduleMeetingButton'

interface Props {
Expand Down Expand Up @@ -102,7 +103,7 @@ const ActivityDetailsSidebar = (props: Props) => {
() =>
availableTeams.find((team) => team.id === preferredTeamId) ??
templateTeam ??
sortByTier(availableTeams)[0]!
sortByTier(availableTeams)[0]
)

const onSelectTeam = (teamId: string) => {
Expand All @@ -114,6 +115,15 @@ const ActivityDetailsSidebar = (props: Props) => {
const {onError, onCompleted, submitting, submitMutation, error} = mutationProps
const history = useHistory()

// user has no teams
if (!selectedTeam)
return (
<div className='flex w-full flex-col items-center border-t border-solid border-slate-300 bg-white px-4 pt-2 lg:right-0 lg:top-0 lg:h-full lg:w-96 lg:flex-1 lg:border-l lg:pt-14'>
<div className='self-center italic'>You have no teams to start a meeting with!</div>
<StyledLink to='/newteam'>Create a team</StyledLink>
</div>
)

const handleStartActivity = (name?: string, rrule?: RRule, gcalInput?: CreateGcalEventInput) => {
if (submitting) return
submitMutation()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,21 @@ const TeamPickerModal = (props: Props) => {
)

const [selectedTeam, setSelectedTeam] = useState(
teams.find((team) => team.id === preferredTeamId) ?? sortByTier(teams)[0]!
teams.find((team) => team.id === preferredTeamId) ?? sortByTier(teams)[0]
)

const atmosphere = useAtmosphere()
const {submitting, error, submitMutation, onError, onCompleted} = useMutationProps()

useEffect(() => {
onCompleted()
}, [selectedTeam.id])
}, [selectedTeam?.id])

const history = useHistory()

// user has no teams
if (!selectedTeam) return null

const handleSelectTeam = () => {
if (submitting) {
return
Expand Down
7 changes: 3 additions & 4 deletions packages/client/components/DashNavList/DashNavList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ const DashNavList = (props: Props) => {

const teams = organizations.flatMap((org) => org.viewerTeams)

if (teams?.length === 0) {
return <EmptyTeams>{'It appears you are not a member of any team!'}</EmptyTeams>
}

return (
<div className='w-full p-3 pt-4 pb-0'>
{sortedOrgs.map((org) => (
Expand All @@ -83,6 +79,9 @@ const DashNavList = (props: Props) => {
<DashNavListTeams onClick={onClick} organizationRef={org} />
</div>
))}
{teams?.length === 0 && (
<EmptyTeams>{'It appears you are not a member of any team!'}</EmptyTeams>
)}
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/ScopingSearchInput.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from '@emotion/styled'
import {Close} from '@mui/icons-material'
import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum'
import React, {useEffect, useRef} from 'react'
import {commitLocalUpdate} from 'react-relay'
import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
import useAtmosphere from '../hooks/useAtmosphere'
import {PALETTE} from '../styles/paletteV3'
import SendClientSideEvent from '../utils/SendClientSideEvent'
Expand Down Expand Up @@ -38,7 +38,7 @@ interface Props {
queryString: string
meetingId: string
linkedRecordName: string
service: ServiceEnumType
service: TaskServiceEnum
defaultInput?: string
}

Expand Down
6 changes: 4 additions & 2 deletions packages/client/components/TimelineSuggestedAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function TimelineSuggestedAction(props: Props) {
viewerRef
)
const {suggestedActions} = viewer
const [suggestedAction] = suggestedActions
const suggestedAction = suggestedActions?.[0]
let AsyncComponent: ValueOf<typeof lookup> | undefined
if (suggestedAction) {
const {__typename} = suggestedAction
Expand All @@ -66,7 +66,9 @@ function TimelineSuggestedAction(props: Props) {
return (
<Wrapper>
<DelayUnmount unmountAfter={500}>
{AsyncComponent ? <AsyncComponent suggestedAction={suggestedAction!} /> : null}
{AsyncComponent && suggestedAction ? (
<AsyncComponent suggestedAction={suggestedAction} />
) : null}
</DelayUnmount>
</Wrapper>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,24 @@ const query = graphql`
edges {
node {
__typename
content
... on Task {
content
}
... on Comment {
content
}
createdAt
createdByUser {
preferredName
}
replies {
__typename
content
... on Task {
content
}
... on Comment {
content
}
createdAt
createdByUser {
preferredName
Expand Down Expand Up @@ -232,7 +242,7 @@ const ExportToCSV = (props: Props) => {
const {node} = edge
const {createdAt, createdByUser, __typename: type, replies, content} = node
const author = createdByUser?.preferredName ?? 'Anonymous'
const discussionThread = extractTextFromDraftString(content)
const discussionThread = extractTextFromDraftString(content!)
rows.push({
reflectionGroup: title!,
author,
Expand All @@ -254,7 +264,7 @@ const ExportToCSV = (props: Props) => {
createdAt,
discussionThread,
prompt: '',
content: extractTextFromDraftString(reply.content)
content: extractTextFromDraftString(reply.content!)
})
})
})
Expand All @@ -277,7 +287,7 @@ const ExportToCSV = (props: Props) => {
const {node} = edge
const {createdAt, createdByUser, __typename: type, replies, content} = node
const author = createdByUser?.preferredName ?? 'Anonymous'
const discussionThread = extractTextFromDraftString(content)
const discussionThread = extractTextFromDraftString(content!)
rows.push({
author,
status: 'present',
Expand All @@ -297,7 +307,7 @@ const ExportToCSV = (props: Props) => {
type: reply.__typename === 'Task' ? 'Task' : 'Reply',
createdAt,
discussionThread,
content: extractTextFromDraftString(reply.content)
content: extractTextFromDraftString(reply.content!)
})
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ const MSTeamsPanel = (props: Props) => {
{
provider: {
id: activeProvider.id,
teamId,
scope: 'team',
webhookProviderMetadataInput: {
webhookUrl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ const MattermostPanel = (props: Props) => {
provider: {
id: activeProvider.id,
scope: 'team',
teamId,
webhookProviderMetadataInput: {
webhookUrl
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Props = {
closeModal: () => void
}

const UserAvatarInput = (props: Props) => {
const ArchiveAllDoneTasksModal = (props: Props) => {
const {closeModal, taskIds} = props
const {onCompleted, onError, submitMutation, submitting} = useMutationProps()
const atmosphere = useAtmosphere()
Expand Down Expand Up @@ -54,4 +54,4 @@ const UserAvatarInput = (props: Props) => {
)
}

export default UserAvatarInput
export default ArchiveAllDoneTasksModal
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import styled from '@emotion/styled'
import graphql from 'babel-plugin-relay/macro'
import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum'
import React, {useEffect} from 'react'
import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
Expand All @@ -11,6 +10,7 @@ import IconLabel from '../../../../components/IconLabel'
import PrimaryButton from '../../../../components/PrimaryButton'
import useAtmosphere from '../../../../hooks/useAtmosphere'
import useRouter from '../../../../hooks/useRouter'
import type {UpgradeCTALocationEnumType} from '../../../../shared/UpgradeCTALocationEnumType'
import {PALETTE} from '../../../../styles/paletteV3'
import {ExternalLinks, Threshold} from '../../../../types/constEnums'
import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
Expand Down
Loading

0 comments on commit cdd92a8

Please sign in to comment.