chore(release): Test v7.37.1 (#9868)

Signed-off-by: Matt Krick <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Matt Krick <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: adaniels-parabol <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: Dale Bumblis <[email protected]> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Georg Bremer <[email protected]> Co-authored-by: Rafa <[email protected]> Co-authored-by: Jordan Husney <[email protected]> Co-authored-by: Nick O'Ferrall <[email protected]> Co-authored-by: Bartosz Jarocki <[email protected]> Co-authored-by: Marcus Wermuth <[email protected]> Co-authored-by: Rafael Romero <[email protected]> Co-authored-by: Bruce Tian <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: Mohd Muneeb <[email protected]> Co-authored-by: Muneeb-Ventures <[email protected]> Co-authored-by: Terry Acker <[email protected]> Co-authored-by: github-actions <[email protected]>
ParabolInc · Jun 25, 2024 · 42f5882 · 42f5882
1 parent 0caf93d
commit 42f5882
Show file tree

Hide file tree

Showing 82 changed files with 1,518 additions and 498 deletions.
diff --git a/.github/workflows/release-to-prod.yml b/.github/workflows/release-to-prod.yml
@@ -44,3 +44,12 @@ jobs:
           expect-response-regex: '"status":"success"'
           timeout: 120000
           interval: 3000
+
+      - name: Report Status
+        if: failure()
+        uses: ravsamhq/notify-slack-action@v2
+        with:
+          status: ${{ job.status }}
+          notify_when: "failure"
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
@@ -120,3 +120,12 @@ jobs:
           expect-response-regex: '"status":"success"'
           timeout: 120000
           interval: 3000
+
+      - name: Report Status
+        if: failure()
+        uses: ravsamhq/notify-slack-action@v2
+        with:
+          status: ${{ job.status }}
+          notify_when: "failure"
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.36.0"
+  ".": "7.37.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,44 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.37.1](https://github.com/ParabolInc/parabol/compare/v7.37.0...v7.37.1) (2024-06-25)
+
+
+### Fixed
+
+* ensure dashboard sidebar animates smoothly ([#9865](https://github.com/ParabolInc/parabol/issues/9865)) ([73cdb7c](https://github.com/ParabolInc/parabol/commit/73cdb7cc64844f0a5baad81202695d518897d176))
+* remove AI UI if user doesn't have access to AI ([#9856](https://github.com/ParabolInc/parabol/issues/9856)) ([95431b2](https://github.com/ParabolInc/parabol/commit/95431b26f534e000fa0e2113f8cd490f96c88982))
+
+## [7.37.0](https://github.com/ParabolInc/parabol/compare/v7.36.0...v7.37.0) (2024-06-24)
+
+
+### Added
+
+* Add MeetingTemplate update embeddings trigger ([#9838](https://github.com/ParabolInc/parabol/issues/9838)) ([87e0d86](https://github.com/ParabolInc/parabol/commit/87e0d8607ded642859bd23acbc4cab2d87171b9d))
+* Create embeddings for meeting templates ([#9776](https://github.com/ParabolInc/parabol/issues/9776)) ([095cf71](https://github.com/ParabolInc/parabol/commit/095cf71348bd486a71e1f19f48be0718cbca9840))
+* update dashboard nav item styles ([#9795](https://github.com/ParabolInc/parabol/issues/9795)) ([71b17c2](https://github.com/ParabolInc/parabol/commit/71b17c2d05d1f75e6eff98e94d45953ad9907c6b))
+* Update MeetingTemplate.updatedAt on prompt changes ([#9829](https://github.com/ParabolInc/parabol/issues/9829)) ([e614253](https://github.com/ParabolInc/parabol/commit/e614253d55aef39cb14f8c73ba160ee74701be1d))
+
+
+### Fixed
+
+* add meeting block is now 70px ([#9848](https://github.com/ParabolInc/parabol/issues/9848)) ([8ab3b72](https://github.com/ParabolInc/parabol/commit/8ab3b72be6b9aa51da8ba9d84225051e299fd7b9))
+* clicking scope link does not affect checkbox ([#9859](https://github.com/ParabolInc/parabol/issues/9859)) ([b79943d](https://github.com/ParabolInc/parabol/commit/b79943d3efe198a820ce9a1fe740d5dd30e1ea73))
+* hide ai icebreaker ui for non ai users ([#9824](https://github.com/ParabolInc/parabol/issues/9824)) ([6cf4098](https://github.com/ParabolInc/parabol/commit/6cf4098e572494e7db59d20fe9faaa72e9285568))
+* Retry S3 upload after cloudflare error ([#9819](https://github.com/ParabolInc/parabol/issues/9819)) ([bd37d85](https://github.com/ParabolInc/parabol/commit/bd37d85ed95f4d0186b129421c2b1e5dedef3ea8))
+* update promote team member copy ([#9849](https://github.com/ParabolInc/parabol/issues/9849)) ([de659aa](https://github.com/ParabolInc/parabol/commit/de659aa9f1a2ce406a133527ff4ab74fad951c18))
+
+
+### Changed
+
+* Avoid undefined in embeddings for Poker scales ([#9854](https://github.com/ParabolInc/parabol/issues/9854)) ([f9ca53b](https://github.com/ParabolInc/parabol/commit/f9ca53bd440be1ef16189a893f04028a5ce40d37))
+* **ci:** release-to jobs for both staging and production will notify Slack whenever they fail ([#9850](https://github.com/ParabolInc/parabol/issues/9850)) ([4604716](https://github.com/ParabolInc/parabol/commit/4604716afa1b84a6b567f16f74bc168139259a16))
+* **deps:** bump @grpc/grpc-js from 1.10.6 to 1.10.9 ([#9840](https://github.com/ParabolInc/parabol/issues/9840)) ([6aec87f](https://github.com/ParabolInc/parabol/commit/6aec87f7ec4d4abc1b395552161f4cbaf85334de))
+* Reduce language detection threshold for MeetingTemplates ([#9855](https://github.com/ParabolInc/parabol/issues/9855)) ([03bd7dd](https://github.com/ParabolInc/parabol/commit/03bd7dda258e39d8e2687d1b8833ea60c82cec4f))
+* remove summary from retro reflection group ([#9851](https://github.com/ParabolInc/parabol/issues/9851)) ([ecc9cb1](https://github.com/ParabolInc/parabol/commit/ecc9cb1ecfb220b6e8004cb03fa9ae578c59fde4))
+* Update fullText when embedding is older than reference ([#9857](https://github.com/ParabolInc/parabol/issues/9857)) ([71484a3](https://github.com/ParabolInc/parabol/commit/71484a39661b648923de83d2d2ce3c9257d8ab2d))
+* Update MeetingTemplate embeddings on insert ([#9853](https://github.com/ParabolInc/parabol/issues/9853)) ([8ab679c](https://github.com/ParabolInc/parabol/commit/8ab679c9032586cacbd8d3382d58b23c8d765c52))
+
 ## [7.36.0](https://github.com/ParabolInc/parabol/compare/v7.35.1...v7.36.0) (2024-06-10)
 
 

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. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.36.0",
+  "version": "7.37.1",
   "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.36.0",
+  "version": "7.37.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.36.0"
+    "parabol-server": "7.37.1"
   }
 }
diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
@@ -1,32 +1,17 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {Fragment, useMemo} from 'react'
+import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
-import {Breakpoint} from '~/types/constEnums'
-import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
-import {
-  DashNavList_organization$data,
-  DashNavList_organization$key
-} from '../../__generated__/DashNavList_organization.graphql'
+import {DashNavList_organization$key} from '../../__generated__/DashNavList_organization.graphql'
+import {TierEnum} from '../../__generated__/InvoiceHeader_invoice.graphql'
+import useBreakpoint from '../../hooks/useBreakpoint'
+import {Breakpoint} from '../../types/constEnums'
+import {upperFirst} from '../../utils/upperFirst'
 import LeftDashNavItem from '../Dashboard/LeftDashNavItem'
-
-const DashNavListStyles = styled('div')({
-  paddingRight: 8,
-  width: '100%'
-})
-
-const OrgName = styled('div')({
-  paddingTop: 8,
-  paddingLeft: 8,
-  fontWeight: 600,
-  fontSize: 12,
-  lineHeight: '24px',
-  color: PALETTE.SLATE_500,
-  [makeMinWidthMediaQuery(Breakpoint.SIDEBAR_LEFT)]: {
-    paddingLeft: 16
-  }
-})
+import BaseTag from '../Tag/BaseTag'
+import DashNavListTeams from './DashNavListTeams'
+import DashNavMenu from './DashNavMenu'
 
 const EmptyTeams = styled('div')({
   fontSize: 16,
@@ -35,111 +20,85 @@ const EmptyTeams = styled('div')({
   textAlign: 'center'
 })
 
-const DashHR = styled('div')({
-  borderBottom: `1px solid ${PALETTE.SLATE_300}`,
-  width: 'calc(100% + 8px)'
-})
-
 const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isViewerOnTeam: boolean}>(
   ({isViewerOnTeam}) => ({
-    color: isViewerOnTeam ? PALETTE.SLATE_700 : PALETTE.SLATE_600
+    color: isViewerOnTeam ? PALETTE.SLATE_700 : PALETTE.SLATE_600,
+    borderRadius: 44,
+    paddingLeft: 15
   })
 )
 
+const Tag = styled(BaseTag)<{tier: TierEnum | null}>(({tier}) => ({
+  backgroundColor:
+    tier === 'enterprise' ? PALETTE.SKY_500 : tier === 'team' ? PALETTE.GOLD_300 : PALETTE.JADE_400,
+  color: tier === 'team' ? PALETTE.GRAPE_700 : PALETTE.WHITE
+}))
+
 interface Props {
-  className?: string
   organizationsRef: DashNavList_organization$key | null
   onClick?: () => void
 }
 
-type Team = DashNavList_organization$data[0]['allTeams'][0]
-
 const DashNavList = (props: Props) => {
-  const {className, onClick, organizationsRef} = props
+  const {onClick, organizationsRef} = props
   const organizations = useFragment(
     graphql`
       fragment DashNavList_organization on Organization @relay(plural: true) {
-        allTeams {
-          ...DashNavListTeam @relay(mask: false)
-        }
+        ...DashNavListTeams_organization
+        ...DashNavMenu_organization
+        id
+        name
+        tier
         viewerTeams {
-          ...DashNavListTeam @relay(mask: false)
-        }
-        featureFlags {
-          publicTeams
+          id
         }
       }
     `,
     organizationsRef
   )
-  const teams = organizations?.flatMap((org) => {
-    // if the user is a billing leader, allTeams will return all teams even if they don't have the publicTeams flag
-    const hasPublicTeamsFlag = org.featureFlags.publicTeams
-    return hasPublicTeamsFlag ? org.allTeams : org.viewerTeams
-  })
+  const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
+  const teams = organizations?.flatMap((org) => org.viewerTeams)
 
-  const teamsByOrgKey = useMemo(() => {
-    if (!teams) return null
-    const teamsByOrgId = {} as {[key: string]: Team[]}
-    teams.forEach((team) => {
-      const {organization} = team
-      const {id: orgId, name: orgName} = organization
-      const key = `${orgName}:${orgId}`
-      teamsByOrgId[key] = teamsByOrgId[key] || []
-      teamsByOrgId[key]!.push(team)
-    })
-    return Object.entries(teamsByOrgId).sort((a, b) =>
-      a[0].toLowerCase() < b[0].toLowerCase() ? -1 : 1
-    )
-  }, [teams])
-  if (!teams || !teamsByOrgKey) return null
-
-  if (teams.length === 0) {
+  if (teams?.length === 0) {
     return <EmptyTeams>It appears you are not a member of any team!</EmptyTeams>
   }
 
-  const isSingleOrg = teamsByOrgKey.length === 1
-
-  const getIcon = (team: Team) => (team.organization.lockedAt || !team.isPaid ? 'warning' : 'group')
-
   return (
-    <DashNavListStyles>
-      {isSingleOrg
-        ? teams.map((team) => (
-            <StyledLeftDashNavItem
-              className={className}
-              onClick={onClick}
-              isViewerOnTeam={team.isViewerOnTeam}
-              key={team.id}
-              icon={getIcon(team)}
-              href={team.isViewerOnTeam ? `/team/${team.id}` : `/team/${team.id}/requestToJoin`}
-              label={team.name}
-            />
-          ))
-        : teamsByOrgKey.map((entry, idx) => {
-            const [key, teams] = entry
-            const name = key.slice(0, key.lastIndexOf(':'))
-            return (
-              <Fragment key={key}>
-                <OrgName>{name}</OrgName>
-                {teams.map((team) => (
-                  <StyledLeftDashNavItem
-                    className={className}
-                    isViewerOnTeam={team.isViewerOnTeam}
-                    onClick={onClick}
-                    key={team.id}
-                    icon={getIcon(team)}
-                    href={
-                      team.isViewerOnTeam ? `/team/${team.id}` : `/team/${team.id}/requestToJoin`
-                    }
-                    label={team.name}
-                  />
-                ))}
-                {idx !== teamsByOrgKey.length - 1 && <DashHR />}
-              </Fragment>
-            )
-          })}
-    </DashNavListStyles>
+    <div className='w-full p-2 lg:pt-4'>
+      {organizations?.map((org) => (
+        <div key={org.id} className='mb-3 w-full rounded-lg border border-solid border-slate-400'>
+          <div
+            className={
+              org.viewerTeams.length > 0 ? `border-b border-solid border-slate-300 p-2` : 'p-2'
+            }
+          >
+            <div className='flex flex-wrap items-center pb-1'>
+              <div className='flex min-w-0 flex-1 flex-wrap items-center justify-between'>
+                <span className='pl-2 text-base font-semibold leading-6 text-slate-700'>
+                  {org.name}
+                </span>
+                <div className='flex w-auto justify-end px-0 text-right'>
+                  <Tag tier={org.tier}>{upperFirst(org.tier)}</Tag>
+                </div>
+              </div>
+            </div>
+            {isDesktop ? (
+              <DashNavMenu organizationRef={org} />
+            ) : (
+              <StyledLeftDashNavItem
+                className={'bg-transparent'}
+                icon={'manageAccounts'}
+                isViewerOnTeam
+                onClick={onClick}
+                href={`/me/organizations/${org.id}/billing`}
+                label={'Settings & Members'}
+              />
+            )}
+          </div>
+          <DashNavListTeams onClick={onClick} organizationRef={org} />
+        </div>
+      ))}
+    </div>
   )
 }
 
@@ -149,11 +108,13 @@ graphql`
     isPaid
     name
     isViewerOnTeam
+    tier
     organization {
       id
       name
       lockedAt
     }
   }
 `
+
 export default DashNavList