Skip to content

Commit

Permalink
chore(release): Test v7.41.2 (#10079)
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: Georg Bremer <[email protected]>
Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
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: Rafa <[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 6, 2024
1 parent 0e003f4 commit 9e609da
Show file tree
Hide file tree
Showing 68 changed files with 845 additions and 1,602 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.41.1"
".": "7.41.2"
}
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).

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

## [7.41.2](https://github.com/ParabolInc/parabol/compare/v7.41.1...v7.41.2) (2024-08-05)


### Fixed

* Fetching more than 200 Azure DevOps issues ([#10073](https://github.com/ParabolInc/parabol/issues/10073)) ([5829a11](https://github.com/ParabolInc/parabol/commit/5829a1149a751deddc2b9346a350c92c7e079b24))


### Changed

* **rethinkdb:** SuggestedAction: Phase 3 ([#10043](https://github.com/ParabolInc/parabol/issues/10043)) ([6c0cc36](https://github.com/ParabolInc/parabol/commit/6c0cc36c75a3094ce181b5fac83fe9a1c064fb53))

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


Expand Down
2 changes: 2 additions & 0 deletions codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"Comment": "../../database/types/Comment#default as CommentDB",
"Company": "./types/Company#CompanySource",
"CreateGcalEventInput": "./types/CreateGcalEventInput#default",
"CreateGcalEventInput": "./types/CreateGcalEventInput#default",
"CreateImposterTokenPayload": "./types/CreateImposterTokenPayload#CreateImposterTokenPayloadSource",
"CreateStripeSubscriptionSuccess": "./types/CreateStripeSubscriptionSuccess#CreateStripeSubscriptionSuccessSource",
"CreateTaskPayload": "./types/CreateTaskPayload#CreateTaskPayloadSource",
Expand Down Expand Up @@ -117,6 +118,7 @@
"NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
"Organization": "./types/Organization#OrganizationSource",
"TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
"SuggestedAction": "../../postgres/types/index#SuggestedAction as SuggestedActionDB",
"TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
"TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
"Threadable": "./types/Threadable#ThreadableSource",
Expand Down
2 changes: 1 addition & 1 deletion 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.41.1",
"version": "7.41.2",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
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.41.1",
"version": "7.41.2",
"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.41.1"
"parabol-server": "7.41.2"
}
}
4 changes: 2 additions & 2 deletions packages/client/modules/demo/ClientGraphQLServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class ClientGraphQLServer extends (EventEmitter as GQLDemoEmitter) {
return {
viewer: {
...this.db.users[0],
newMeeting: {
meeting: {
...this.db.newMeeting,
reflectionGroups: (
this.db.newMeeting as {reflectionGroups: any[]}
Expand Down Expand Up @@ -301,7 +301,7 @@ class ClientGraphQLServer extends (EventEmitter as GQLDemoEmitter) {
return {
viewer: {
...this.db.users[0],
newMeeting: {
meeting: {
...this.db.newMeeting,
reflectionGroups: (
this.db.newMeeting as {reflectionGroups: any[]}
Expand Down
24 changes: 24 additions & 0 deletions packages/client/modules/demo/getDemoEntities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,30 @@ const query = graphql`
const getDemoEntities = async (text: string) => {
if (!text || text.length <= 2) return []
const remoteAtmosphere = new Atmosphere()

const TEST_REFLECTIONS = {
'Writing things down': [
{
lemma: 'thing',
name: 'things',
salience: 1
}
],
'Documenting things in Notion': [
{
lemma: 'thing',
name: 'things',
salience: 0.8
},
{
lemma: 'notion',
name: 'notion',
salience: 0.2
}
]
}
const cachedEntities = TEST_REFLECTIONS[text as keyof typeof TEST_REFLECTIONS]
if (cachedEntities) return cachedEntities
const res = await fetchQuery<getDemoEntitiesQuery>(remoteAtmosphere, query, {text}).toPromise()
return res?.getDemoEntities?.entities ?? []
}
Expand Down
8 changes: 2 additions & 6 deletions packages/client/modules/demo/handleCompletedDemoStage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,8 @@ const addStageToBotScript = (stageId: string, db: RetroDemoDB, reflectionGroupId
delay: 1000,
variables
}
if (Math.random() > 0.1) {
ops.push({...baseOp, botId: 'bot1'})
}
if (Math.random() > 0.6) {
ops.push({...baseOp, botId: 'bot2'})
}
const botId = Math.random() > 0.5 ? 'bot1' : 'bot2'
ops.push({...baseOp, botId})
})
stageTasks.forEach((taskContent, idx) => {
const taskId = `botTask${stageId}:${idx}`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import MeetingSummaryEmail from './SummaryEmail/MeetingSummaryEmail/MeetingSumma
const query = graphql`
query MeetingSummaryEmailRootSSRQuery($meetingId: ID!) {
viewer {
newMeeting(meetingId: $meetingId) {
meeting(meetingId: $meetingId) {
meetingType
team {
id
Expand Down Expand Up @@ -42,9 +42,9 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
// viewer will be null on initial SSR render
if (!data?.viewer) return null
const {viewer} = data
const {newMeeting} = viewer
if (!newMeeting) return null
const {team} = newMeeting
const {meeting} = viewer
if (!meeting) return null
const {team} = meeting
const {id: teamId} = team
const options = {searchParams: meetingSummaryUrlParams}
const referrerUrl = makeAppURL(appOrigin, `new-summary/${meetingId}`, options)
Expand All @@ -53,7 +53,7 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
const emailCSVUrl = makeAppURL(appOrigin, `new-summary/${meetingId}/csv`, options)
return (
<MeetingSummaryEmail
meeting={newMeeting}
meeting={meeting}
referrer={'email'}
teamDashUrl={teamDashUrl}
meetingUrl={meetingUrl}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface Props extends WithMutationProps {
const query = graphql`
query ExportToCSVQuery($meetingId: ID!) {
viewer {
newMeeting(meetingId: $meetingId) {
meeting(meetingId: $meetingId) {
meetingType
team {
name
Expand Down Expand Up @@ -126,7 +126,7 @@ const query = graphql`
}
`

type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['newMeeting']>
type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['meeting']>
type ExportableTypeName = 'Task' | 'Reflection' | 'Comment' | 'Reply'

interface CSVPokerRow {
Expand Down Expand Up @@ -336,7 +336,7 @@ const ExportToCSV = (props: Props) => {
onCompleted()
if (!data) return
const {viewer} = data
const {newMeeting} = viewer
const {meeting: newMeeting} = viewer
if (!newMeeting) return
const rows = getRows(newMeeting)
if (rows.length === 0) return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const query = graphql`
...DashTopBar_query
viewer {
...DashSidebar_viewer
newMeeting(meetingId: $meetingId) {
meeting(meetingId: $meetingId) {
...MeetingSummaryEmail_meeting
...MeetingLockedOverlay_meeting
id
Expand All @@ -49,7 +49,7 @@ const NewMeetingSummary = (props: Props) => {
const {urlAction, queryRef} = props
const data = usePreloadedQuery<NewMeetingSummaryQuery>(query, queryRef)
const {viewer} = data
const {newMeeting, teams} = viewer
const {meeting: newMeeting, teams} = viewer
const activeMeetings = teams.flatMap((team) => team.activeMeetings).filter(Boolean)
const {history} = useRouter()
useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/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.41.1",
"version": "7.41.2",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down
2 changes: 1 addition & 1 deletion packages/embedder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parabol-embedder",
"version": "7.41.1",
"version": "7.41.2",
"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",
Expand Down
6 changes: 3 additions & 3 deletions packages/gql-executor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gql-executor",
"version": "7.41.1",
"version": "7.41.2",
"description": "A Stateless GraphQL Executor",
"author": "Matt Krick <[email protected]>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
Expand All @@ -27,8 +27,8 @@
},
"dependencies": {
"dd-trace": "^4.2.0",
"parabol-client": "7.41.1",
"parabol-server": "7.41.1",
"parabol-client": "7.41.2",
"parabol-server": "7.41.2",
"undici": "^5.26.2"
}
}
2 changes: 1 addition & 1 deletion packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "integration-tests",
"author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "7.41.1",
"version": "7.41.2",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ test.describe('retrospective-demo / group page', () => {

// Then it auto-generates a header
await expect(
page.locator(
`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Documenting things in"]`
)
page.locator(`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Things"]`)
).toBeVisible()

// Then it shows all cards when clicking the group
Expand Down Expand Up @@ -106,7 +104,9 @@ test.describe('retrospective-demo / group page', () => {
await page.type(stopTextbox, 'Making decisions in one-on-one meetings')
await page.press(stopTextbox, 'Enter')
await expect(
page.locator('[data-cy="reflection-column-Stop"] :text("Making decisions in one-on-one meetings")')
page.locator(
'[data-cy="reflection-column-Stop"] :text("Making decisions in one-on-one meetings")'
)
).toBeVisible()

await goToNextPhase(page)
Expand All @@ -119,7 +119,7 @@ test.describe('retrospective-demo / group page', () => {
// Then it auto-generates a header
await expect(
page.locator(
`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Documenting things in"]`
`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Things Notion"]`
)
).toBeVisible()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ test.describe('retrospective-demo / discuss page', () => {

// Then it auto-generates a header - we expect to see this in the sidebar on the discuss page
await expect(
page.locator(
`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Documenting things in"]`
)
page.locator(`[data-cy=group-column-Start] [data-cy*="Start-group-"] input[value="Things"]`)
).toBeVisible()

await goToNextPhase(page)
Expand All @@ -48,7 +46,7 @@ test.describe('retrospective-demo / discuss page', () => {
await page.click('button[aria-label="Toggle the sidebar"]')
}

await expect(page.locator('[data-cy=sidebar] :text("Documenting things in")')).toBeVisible()
await expect(page.locator('[data-cy=sidebar] :text("Things")')).toBeVisible()
})

test('shows all the groups in the sidebar', async ({page, isMobile}) => {
Expand Down
9 changes: 0 additions & 9 deletions packages/server/database/rethinkDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ import NotificationTeamInvitation from './types/NotificationTeamInvitation'
import PasswordResetRequest from './types/PasswordResetRequest'
import PushInvitation from './types/PushInvitation'
import RetrospectivePrompt from './types/RetrospectivePrompt'
import SuggestedActionCreateNewTeam from './types/SuggestedActionCreateNewTeam'
import SuggestedActionInviteYourTeam from './types/SuggestedActionInviteYourTeam'
import SuggestedActionTryTheDemo from './types/SuggestedActionTryTheDemo'
import Task from './types/Task'

export type RethinkSchema = {
Expand Down Expand Up @@ -127,12 +124,6 @@ export type RethinkSchema = {
type: SlackNotification
index: 'teamId' | 'userId'
}
SuggestedAction: {
// tryRetroMeeting = 'tryRetroMeeting',
// tryActionMeeting = 'tryActionMeeting'
type: SuggestedActionCreateNewTeam | SuggestedActionInviteYourTeam | SuggestedActionTryTheDemo
index: 'userId' | 'teamId'
}
Task: {
type: Task
index:
Expand Down
30 changes: 0 additions & 30 deletions packages/server/database/types/SuggestedAction.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/server/database/types/SuggestedActionCreateNewTeam.ts

This file was deleted.

17 changes: 0 additions & 17 deletions packages/server/database/types/SuggestedActionInviteYourTeam.ts

This file was deleted.

Loading

0 comments on commit 9e609da

Please sign in to comment.