Skip to content

Commit

Permalink
chore(release): Test and deploy to Production v8.18.1 (#10668)
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Krick <matt.krick@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruce Tian <tianrunhe@gmail.com>
Co-authored-by: Georg Bremer <github@dschoordsch.de>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Nick O'Ferrall <nickoferrall@gmail.com>
Co-authored-by: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Co-authored-by: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Co-authored-by: Terry Acker <ackernaut@gmail.com>
Co-authored-by: Sven Seeberg <sven@geeq.de>
Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
14 people authored Jan 10, 2025
1 parent 5010c17 commit 43db0a0
Show file tree
Hide file tree
Showing 32 changed files with 6,096 additions and 6,837 deletions.
2 changes: 1 addition & 1 deletion .config/kyselyMigrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ export const migrations = {
getMigrationPrefix: () => `${new Date().toISOString()}_`,
migrationFolder: './packages/server/postgres/migrations',
migrationTableSchema: 'public',
migrationTableName: '_migration',
migrationTableName: '_migrationV2',
migrationLockTableName: '_migrationLock'
}
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "8.17.0"
".": "8.18.1"
}
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).

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

## [8.18.1](https://github.com/ParabolInc/parabol/compare/v8.18.0...v8.18.1) (2025-01-10)


### Fixed

* rebasing migrations ([#10666](https://github.com/ParabolInc/parabol/issues/10666)) ([d174162](https://github.com/ParabolInc/parabol/commit/d174162abeee217b4b567b65aa75468b834fe930))

## [8.18.0](https://github.com/ParabolInc/parabol/compare/v8.17.0...v8.18.0) (2025-01-10)


### Added

* rebase migrations, remove draft-js enitrely ([#10640](https://github.com/ParabolInc/parabol/issues/10640)) ([db4832f](https://github.com/ParabolInc/parabol/commit/db4832f02c5c37b9bfd98cae0854b82aac089775))


### Fixed

* move generate retro summaries mutation to public folder ([#10660](https://github.com/ParabolInc/parabol/issues/10660)) ([dead68c](https://github.com/ParabolInc/parabol/commit/dead68cb4f7f8aa40f955fdc1cdafe4fa9b51504))
* remove extra migration after rebase ([#10663](https://github.com/ParabolInc/parabol/issues/10663)) ([12afb74](https://github.com/ParabolInc/parabol/commit/12afb747eb8e71c9ae61019a2a888da2113050b3))
* Update mattermost-plugin version on release ([#10658](https://github.com/ParabolInc/parabol/issues/10658)) ([ddaa9b9](https://github.com/ParabolInc/parabol/commit/ddaa9b9b9666d3c9a557c6f52b236c5a29ce2013))

## [8.17.0](https://github.com/ParabolInc/parabol/compare/v8.16.0...v8.17.0) (2025-01-09)


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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "8.17.0",
"version": "8.18.1",
"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": "8.17.0",
"version": "8.18.1",
"description": "A cron job scheduler",
"author": "Matt Krick <matt.krick@gmail.com>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
Expand All @@ -25,6 +25,6 @@
},
"dependencies": {
"cron": "^2.3.1",
"parabol-server": "8.17.0"
"parabol-server": "8.18.1"
}
}
5 changes: 1 addition & 4 deletions 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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "8.17.0",
"version": "8.18.1",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand All @@ -28,7 +28,6 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"@types/cleave.js": "^1.4.7",
"@types/dompurify": "^2.4.0",
"@types/draft-js": "^0.10.24",
"@types/emoji-mart": "^3.0.14",
"@types/fbjs": "^3.0.4",
"@types/humanize-duration": "3.27.1",
Expand Down Expand Up @@ -108,8 +107,6 @@
"date-fns": "^2.29.3",
"dayjs": "^1.11.3",
"dompurify": "^2.4.1",
"draft-js": "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6",
"draft-js-export-html": "^1.4.1",
"email-addresses": "^3.0.1",
"emoji-mart": "^5.6.0",
"eventemitter3": "^4.0.0",
Expand Down
8 changes: 0 additions & 8 deletions packages/client/shared/tiptap/isDraftJSContent.ts

This file was deleted.

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": "8.17.0",
"version": "8.18.1",
"description": "A service that computes embedding vectors from Parabol objects",
"author": "Jordan Husney <jordan.husney@gmail.com>",
"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": "8.17.0",
"version": "8.18.1",
"description": "A Stateless GraphQL Executor",
"author": "Matt Krick <matt.krick@gmail.com>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
Expand All @@ -25,8 +25,8 @@
},
"dependencies": {
"dd-trace": "^5.0.0",
"parabol-client": "8.17.0",
"parabol-server": "8.17.0",
"parabol-client": "8.18.1",
"parabol-server": "8.18.1",
"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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "8.17.0",
"version": "8.18.1",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/mattermost-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parabol-mattermost-plugin",
"version": "8.5.1",
"version": "8.18.1",
"description": "A service that computes embedding vectors from Parabol objects",
"author": "Georg Bremer <github@dschoordsch.de>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/mattermost-plugin#readme",
Expand Down Expand Up @@ -48,7 +48,7 @@
"ts-node-dev": "^1.0.0-pre.44"
},
"dependencies": {
"parabol-client": "8.16.0",
"parabol-client": "8.18.1",
"@mattermost/compass-icons": "0.1.47",
"@reduxjs/toolkit": "1.9.7",
"@tiptap/core": "^2.9.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/server/graphql/mutations/createReflection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ export default {
}

// VALIDATION
const normalizedContent = convertToTipTap(content)
if (normalizedContent.length > 2000) {
if (content && content.length > 2000) {
return {error: {message: 'Reflection content is too long'}}
}

const normalizedContent = convertToTipTap(content)

// RESOLUTION
const plaintextContent = generateText(normalizedContent, serverTipTapExtensions)

Expand Down
4 changes: 2 additions & 2 deletions packages/server/graphql/mutations/updateReflectionContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export default {
}

// VALIDATION
const normalizedContent = convertToTipTap(content)
if (normalizedContent.length > 2000) {
if (content && content.length > 2000) {
return {error: {message: 'Reflection content is too long'}}
}
const normalizedContent = convertToTipTap(content)

// RESOLUTION
const plaintextContent = generateText(normalizedContent, serverTipTapExtensions)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import {sql} from 'kysely'
import {selectNewMeetings} from '../../postgres/select'
import {RetrospectiveMeeting} from '../../postgres/types/Meeting'
import standardError from '../../utils/standardError'
import {MutationResolvers} from '../public/resolverTypes'
import {generateRetroSummary} from './helpers/generateRetroSummary'
import {selectNewMeetings} from '../../../postgres/select'
import standardError from '../../../utils/standardError'
import {generateRetroSummary} from '../../mutations/helpers/generateRetroSummary'
import {MutationResolvers, RetrospectiveMeeting} from '../resolverTypes'

const generateRetroSummaries: MutationResolvers['generateRetroSummaries'] = async (
_source,
Expand Down Expand Up @@ -58,5 +57,4 @@ const generateRetroSummaries: MutationResolvers['generateRetroSummaries'] = asyn

return {meetingIds: filteredMeetingIds}
}

export default generateRetroSummaries
9 changes: 0 additions & 9 deletions packages/server/graphql/public/types/RetroReflection.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
import {isDraftJSContent} from '../../../../client/shared/tiptap/isDraftJSContent'
import {getUserId, isSuperUser} from '../../../utils/authorization'
import {convertKnownDraftToTipTap} from '../../../utils/convertToTipTap'
import getGroupedReactjis from '../../../utils/getGroupedReactjis'
import {RetroReflectionResolvers} from '../resolverTypes'

const RetroReflection: RetroReflectionResolvers = {
content: ({content}) => {
const contentJSON = JSON.parse(content)
const validContent = isDraftJSContent(contentJSON)
? convertKnownDraftToTipTap(contentJSON)
: contentJSON
return JSON.stringify(validContent)
},
creatorId: async ({creatorId, meetingId}, _args, {authToken, dataLoader}) => {
const meeting = await dataLoader.get('newMeetings').loadNonNull(meetingId)
const {meetingType} = meeting
Expand Down
6 changes: 2 additions & 4 deletions packages/server/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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "8.17.0",
"version": "8.18.1",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down Expand Up @@ -99,8 +99,6 @@
"dd-trace": "^5.0.0",
"dotenv": "8.6.0",
"dotenv-expand": "5.1.0",
"draft-js": "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6",
"draft-js-export-markdown": "^1.3.3",
"emoji-mart": "^5.6.0",
"fast-json-stable-stringify": "^2.1.0",
"fast-xml-parser": "^4.2.7",
Expand Down Expand Up @@ -128,7 +126,7 @@
"oauth-1.0a": "^2.2.6",
"openai": "^4.53.0",
"oy-vey": "^0.12.1",
"parabol-client": "8.17.0",
"parabol-client": "8.18.1",
"pg": "^8.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
32 changes: 32 additions & 0 deletions packages/server/postgres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,38 @@ There are 3 ways migrations are triggered:

To create a new migration run `yarn kysely migrate:make NAME`

### Rebasing Migrations

Rebasing migrations means deleting all the migrations in /migrations and starting fresh.
It is time to rebase migrations when one of the following is true:

- a migration has a dependency that you want to remove from the project
- there are too many migrations and they're slowing down CI/CD

To rebase:

1. create a new DB in postgres & change it in the .env, e.g. `POSTGRES_DB='init1'`.
2. run `yarn kysely migrate:latest` to build it
3. goto pgadmin, right click the database and click backup

- General Tab
- Filename: init.sql
- Encoding: UTF8
- Data Options
- Sections: Pre-data, Data, Post-data
- Do not save: Owner
- Query Options
- Use Insert Commands
- On conflict do nothing to INSERT command
- Table options
- Exclude Patterns: Tables: `_*` (excludes `_migration`, `_migrationLock`)

4. `yarn kysely migrate:make init` to create a new initial migration
5. Copy the contents of the old `_init.ts` migration to the new file you just created & just replace the SQL.
At the beginning of the file, update the old `migrationTableName` so we delete the old migration table
6. Delete all old migrations
7. Increment the table version number in `kyselyMigrations.ts` for `migrationTableName`, e.g. `_migrationV3`

### Queries

- [Queries](./queries/README.md)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 43db0a0

Please sign in to comment.