Skip to content

Commit

Permalink
chore(release): Test v7.38.10 (#9992)
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: Bruce Tian <tianrunhe@gmail.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
Co-authored-by: Marcus Wermuth <hello@marcuswermuth.com>
Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Nick O'Ferrall <nickoferrall@gmail.com>
Co-authored-by: Georg Bremer <github@dschoordsch.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Co-authored-by: Mohd Muneeb <mr.mohdmuneeb123@gmail.com>
Co-authored-by: Muneeb-Ventures <mohd.muneeb@m0.ventures>
Co-authored-by: Bartosz Jarocki <jarocki.bartek@gmail.com>
Co-authored-by: Terry Acker <ackernaut@gmail.com>
Co-authored-by: Rafael Romero <rafael@parabol.co>
Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
19 people authored Jul 17, 2024
1 parent 55049b2 commit 6b0782d
Show file tree
Hide file tree
Showing 13 changed files with 120 additions and 17 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/style-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Style Check
on:
push:
branches-ignore:
- "release-please--**"
- "release/v**"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
style-check:
runs-on: ubuntu-latest
permissions:
contents: "read"
id-token: "write"
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version-file: package.json
# Caching yarn dir & running yarn install is too slow
# Instead, we aggressively cache node_modules below to avoid calling install

- name: Setup environment variables
run: |
NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json)
echo NODE_VERSION=$NODE_VERSION >> $GITHUB_ENV
echo NODE_VERSION=$NODE_VERSION
- name: Get cached node modules
id: cache
uses: actions/cache@v3
with:
path: |
**/node_modules
key: node_modules-${{ runner.arch }}-${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}

- name: Install node_modules
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Check Code Quality
run: yarn codecheck
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ jobs:
- name: Kysely Codegen
run: yarn pg:generate

- name: Check Code Quality
run: yarn codecheck
- name: Typecheck
run: yarn typecheck

- name: Run server tests
run: yarn test:server -- --reporters=default --reporters=jest-junit
Expand Down
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.38.9"
".": "7.38.10"
}
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).

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

## [7.38.10](https://github.com/ParabolInc/parabol/compare/v7.38.9...v7.38.10) (2024-07-17)


### Fixed

* colors of the prompts for the threat level retro match now the prompts' names ([#9956](https://github.com/ParabolInc/parabol/issues/9956)) ([0287026](https://github.com/ParabolInc/parabol/commit/02870268ea8b57e31aec28295cd6d5bac9797b8c))
* SAML return values from dataloader ([#9991](https://github.com/ParabolInc/parabol/issues/9991)) ([4f883fe](https://github.com/ParabolInc/parabol/commit/4f883fe7e557d4f6d121bc11ab68b30646d3d5e4))


### Changed

* parallelize codecheck ([#9983](https://github.com/ParabolInc/parabol/issues/9983)) ([cec7063](https://github.com/ParabolInc/parabol/commit/cec70635bb76dafb4bd71f661268268e34467e3c))

## [7.38.9](https://github.com/ParabolInc/parabol/compare/v7.38.8...v7.38.9) (2024-07-16)


Expand Down
4 changes: 2 additions & 2 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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "7.38.9",
"version": "7.38.10",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down Expand Up @@ -41,7 +41,7 @@
"typecheck": "nx run-many --target=typecheck",
"lintcheck": "nx run-many --target=lint:check",
"stylecheck": "nx run-many --target=prettier:check",
"codecheck": "concurrently --names \"typecheck,lintcheck,stylecheck\" \"yarn typecheck\" \"yarn lintcheck\" \"yarn stylecheck\" ",
"codecheck": "concurrently --names \"lintcheck,stylecheck\" \"yarn lintcheck\" \"yarn stylecheck\" ",
"ultrahook": "export $(grep ^ULTRAHOOK_API_KEY .env | tr -d \"'\") && ultrahook -k $ULTRAHOOK_API_KEY dev 3000",
"precommit": "nx run-many --target=precommit --parallel=1",
"postcheckout": "node scripts/generateGraphQLArtifacts.js &>/dev/null &",
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.38.9",
"version": "7.38.10",
"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": "7.38.9"
"parabol-server": "7.38.10"
}
}
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. <love@parabol.co> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "7.38.9",
"version": "7.38.10",
"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.38.9",
"version": "7.38.10",
"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": "7.38.9",
"version": "7.38.10",
"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 @@ -27,8 +27,8 @@
},
"dependencies": {
"dd-trace": "^4.2.0",
"parabol-client": "7.38.9",
"parabol-server": "7.38.9",
"parabol-client": "7.38.10",
"parabol-server": "7.38.10",
"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": "7.38.9",
"version": "7.38.10",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions packages/server/dataloader/customLoaderMakers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ export const samlByDomain = (parent: RootDataLoader, dependsOn: RegisterDependsO
.selectAll('SAML')
.select(({fn}) => [fn.agg<string[]>('array_agg', ['SAMLDomain.domain']).as('domains')])
.execute()
return normalizeResults(domains, res)
// not the same as normalizeResults
return domains.map((domain) => res.find((row) => row.domains.includes(domain)))
},
{
...parent.dataLoaderOptions
Expand All @@ -735,7 +736,8 @@ export const samlByOrgId = (parent: RootDataLoader, dependsOn: RegisterDependsOn
.selectAll('SAML')
.select(({fn}) => [fn.agg<string[]>('array_agg', ['SAMLDomain.domain']).as('domains')])
.execute()
return normalizeResults(orgIds, res)
// not the same as normalizeResults
return orgIds.map((orgId) => res.find((row) => row.orgId === orgId))
},
{
...parent.dataLoaderOptions
Expand Down
4 changes: 2 additions & 2 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": "7.38.9",
"version": "7.38.10",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down Expand Up @@ -124,7 +124,7 @@
"openai": "^4.24.1",
"openapi-fetch": "^0.9.7",
"oy-vey": "^0.12.1",
"parabol-client": "7.38.9",
"parabol-client": "7.38.10",
"pg": "^8.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import {r} from 'rethinkdb-ts'
import connectRethinkDB from '../../database/connectRethinkDB'

export async function up() {
await connectRethinkDB()

await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateSeverePrompt')
.update({groupColor: '#FD6157'})
.run()
await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateElevatedPrompt')
.update({groupColor: '#FFCC63'})
.run()
await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateLowPrompt')
.update({groupColor: '#66BC8C'})
.run()
}

export async function down() {
await connectRethinkDB()

await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateSeverePrompt')
.update({groupColor: '#66BC8C'})
.run()
await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateElevatedPrompt')
.update({groupColor: '#FD6157'})
.run()
await r
.table('ReflectPrompt')
.get('threatLevelPremortemTemplateLowPrompt')
.update({groupColor: '#FFCC63'})
.run()
}

0 comments on commit 6b0782d

Please sign in to comment.