chore(release): Test v7.43.0 (#10101)

Signed-off-by: Matt Krick <matt.krick@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Matt Krick <matt.krick@gmail.com> Co-authored-by: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com> Co-authored-by: Georg Bremer <github@dschoordsch.de> Co-authored-by: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.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: Bruce Tian <tianrunhe@gmail.com> Co-authored-by: Bartosz Jarocki <jarocki.bartek@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Jordan Husney <jordan.husney@gmail.com> Co-authored-by: Terry Acker <ackernaut@gmail.com> Co-authored-by: Rafael Romero <rafael@parabol.co> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com>
ParabolInc · Aug 12, 2024 · 06232f3 · 06232f3
1 parent 359e239
commit 06232f3
Show file tree

Hide file tree

Showing 101 changed files with 474 additions and 2,779 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
- ".": "7.42.2"
+ ".": "7.43.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.43.0](https://github.com/ParabolInc/parabol/compare/v7.42.2...v7.43.0) (2024-08-12)
+
+
+### Added
+
+* update meeting summary UI ([#10081](https://github.com/ParabolInc/parabol/issues/10081)) ([bf1851e](https://github.com/ParabolInc/parabol/commit/bf1851e9ebfe88aa470952b1daf053a83c04c865))
+
+
+### Changed
+
+* **rethinkdb:** Invoice: Remove ([#10086](https://github.com/ParabolInc/parabol/issues/10086)) ([10164a8](https://github.com/ParabolInc/parabol/commit/10164a8a43850c9ca80042a151b4da6020ad37d6))
+* **rethinkdb:** MeetingSettings: Phase 1 ([#10088](https://github.com/ParabolInc/parabol/issues/10088)) ([40d8c8c](https://github.com/ParabolInc/parabol/commit/40d8c8c15b9804a5ee2ef49649893cdc5dfdd665))
+
 ## [7.42.2](https://github.com/ParabolInc/parabol/compare/v7.42.1...v7.42.2) (2024-08-08)
 
 

diff --git a/LICENSE b/LICENSE
@@ -24,6 +24,7 @@ If you have any questions regarding our licensing policy, please contact us:
  love@parabol.co (via email)
 
  Parabol
- 8605 Santa Monica Blvd
- West Hollywood, CA 90069-4109
+ 1111 6th Ave., Ste 550
+ PMB 73201
+ San Diego, CA 92101
  USA
diff --git a/docs/alternative-licenses/us-department-of-defense/LICENSE b/docs/alternative-licenses/us-department-of-defense/LICENSE
@@ -18,6 +18,7 @@ If you have any questions regarding our licensing policy, please contact us:
  support@parabol.com (via email)
 
  Parabol
- 8605 Santa Monica Blvd
- West Hollywood, CA 90069-4109
+ 1111 6th Ave., Ste 550
+ PMB 73201
+ San Diego, CA 92101
  USA
diff --git a/package.json b/package.json
@@ -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.42.2",
+ "version": "7.43.0",
  "repository": {
  "type": "git",
  "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
  "name": "chronos",
- "version": "7.42.2",
+ "version": "7.43.0",
  "description": "A cron job scheduler",
  "author": "Matt Krick <matt.krick@gmail.com>",
  "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
  },
  "dependencies": {
  "cron": "^2.3.1",
- "parabol-server": "7.42.2"
+ "parabol-server": "7.43.0"
  }
 }
diff --git a/packages/client/components/PrivateRoutes.tsx b/packages/client/components/PrivateRoutes.tsx
@@ -4,9 +4,6 @@ import {Redirect, Route, Switch, useLocation} from 'react-router'
 import useAuthRoute from '../hooks/useAuthRoute'
 import useNoIndex from '../hooks/useNoIndex'
 
-const Invoice = lazy(
- () => import(/* webpackChunkName: 'InvoiceRoot' */ '../modules/invoice/containers/InvoiceRoot')
-)
 const NewMeetingSummary = lazy(
  () =>
  import(
@@ -71,7 +68,6 @@ const PrivateRoutes = () => {
  </Route>
  <Route path='/meet/:meetingId' component={MeetingRoot} />
  <Route path='/meeting-series/:meetingId' component={MeetingSeriesRoot} />
- <Route path='/invoice/:invoiceId' component={Invoice} />
  <Route path='/new-summary/:meetingId/:urlAction?' component={NewMeetingSummary} />
  <Route path='/admin/graphql' component={Graphql} />
  <Route path='/admin/impersonate' component={Impersonate} />

diff --git a/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx b/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx
@@ -35,9 +35,11 @@ const EmailFooter = () => {
  <div style={finePrintStyle}>
  {'Parabol, Inc.'}
  <br />
- {'8605 Santa Monica Blvd'}
+ {'1111 6th Ave., Ste 550'}
  <br />
- {'West Hollywood, CA 90069-4109'}
+ {'PMB 73201'}
+ <br />
+ {'San Diego, CA 92101'}
  <br />
  {'United States'}
  <br />

diff --git a/...t/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/...t/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
@@ -1,10 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
-import {WholeMeetingSummaryResult_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummaryResult_meeting.graphql'
-import {PALETTE} from 'parabol-client/styles/paletteV3'
-import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
+import DOMPurify from 'dompurify'
+import {marked} from 'marked'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
+import {WholeMeetingSummaryResult_meeting$key} from '../../../../../__generated__/WholeMeetingSummaryResult_meeting.graphql'
 import useAtmosphere from '../../../../../hooks/useAtmosphere'
+import {PALETTE} from '../../../../../styles/paletteV3'
+import {FONT_FAMILY} from '../../../../../styles/typographyV2'
 import {AIExplainer} from '../../../../../types/constEnums'
 import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
 import EmailBorderBottom from './EmailBorderBottom'
@@ -39,8 +41,9 @@ interface Props {
  meetingRef: WholeMeetingSummaryResult_meeting$key
 }
 
-const WholeMeetingSummaryResult = (props: Props) => {
- const {meetingRef} = props
+const WholeMeetingSummaryResult = ({meetingRef}: Props) => {
+ const atmosphere = useAtmosphere()
+
  const meeting = useFragment(
  graphql`
  fragment WholeMeetingSummaryResult_meeting on NewMeeting {
@@ -55,16 +58,25 @@ const WholeMeetingSummaryResult = (props: Props) => {
  `,
  meetingRef
  )
- const atmosphere = useAtmosphere()
- const {summary: wholeMeetingSummary, team} = meeting
- const explainerText = team?.tier === 'starter' ? AIExplainer.STARTER : AIExplainer.PREMIUM_MEETING
  useEffect(() => {
  SendClientSideEvent(atmosphere, 'AI Summary Viewed', {
  source: 'Meeting Summary',
  tier: meeting.team.billingTier,
  meetingId: meeting.id
  })
- }, [])
+ }, [atmosphere, meeting.id, meeting.team.billingTier])
+
+ const {summary: wholeMeetingSummary, team} = meeting
+
+ if (!wholeMeetingSummary) return null
+ const renderedSummary = marked(wholeMeetingSummary, {
+ gfm: true,
+ breaks: true
+ }) as string
+ const sanitizedSummary = DOMPurify.sanitize(renderedSummary)
+
+ const explainerText = team?.tier === 'starter' ? AIExplainer.STARTER : AIExplainer.PREMIUM_MEETING
+
  return (
  <>
  <tr>
@@ -78,7 +90,12 @@ const WholeMeetingSummaryResult = (props: Props) => {
  </td>
  </tr>
  <tr>
- <td style={textStyle}>{wholeMeetingSummary}</td>
+ <td
+ align='center'
+ style={textStyle}
+ className='summary-link-style'
+ dangerouslySetInnerHTML={{__html: sanitizedSummary}}
+ />
  </tr>
  </td>
  </tr>