Merge branch 'master' into schema-defs

Signed-off-by: Matt Krick <[email protected]>
ParabolInc · Jul 25, 2024 · 0127859 · 0127859
2 parents ddab75f + 2dd490a
commit 0127859
Show file tree

Hide file tree

Showing 102 changed files with 1,250 additions and 1,639 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.39.0"
+  ".": "7.39.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,32 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.39.3](https://github.com/ParabolInc/parabol/compare/v7.39.2...v7.39.3) (2024-07-25)
+
+
+### Changed
+
+* **rethinkdb:** TemplateScale: One-shot ([#10021](https://github.com/ParabolInc/parabol/issues/10021)) ([0c6c8e7](https://github.com/ParabolInc/parabol/commit/0c6c8e79dfbbac93362b3db640b008e32ba701b3))
+
+## [7.39.2](https://github.com/ParabolInc/parabol/compare/v7.39.1...v7.39.2) (2024-07-24)
+
+
+### Fixed
+
+* bump pm2 version ([#10027](https://github.com/ParabolInc/parabol/issues/10027)) ([0bb8ead](https://github.com/ParabolInc/parabol/commit/0bb8ead2adc52f64ad30ef57891791e1b3dd4ac1))
+
+
+### Changed
+
+* **rethinkdb:** TeamMember: Phase 3 ([#10003](https://github.com/ParabolInc/parabol/issues/10003)) ([73a5881](https://github.com/ParabolInc/parabol/commit/73a5881709f9345767c2a233cbe28716b6c3b8e1))
+
+## [7.39.1](https://github.com/ParabolInc/parabol/compare/v7.39.0...v7.39.1) (2024-07-23)
+
+
+### Changed
+
+* **rethinkdb:** TeamMember: Phase 2 ([#9993](https://github.com/ParabolInc/parabol/issues/9993)) ([90de32f](https://github.com/ParabolInc/parabol/commit/90de32f702849a92be28dff42188445947a54325))
+
 ## [7.39.0](https://github.com/ParabolInc/parabol/compare/v7.38.11...v7.39.0) (2024-07-23)
 
 

diff --git a/codegen.json b/codegen.json
@@ -111,7 +111,10 @@
           "NotifyTaskInvolves": "../../database/types/NotificationTaskInvolves#default",
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
           "Organization": "./types/Organization#OrganizationSource",
-          "OrganizationUser": "../../postgres/types/index#OrganizationUser",
+          "TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
+          "TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
+          "TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
+          "OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
           "PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
           "PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
           "PokerTemplate": "../../database/types/PokerTemplate#default as PokerTemplateDB",
@@ -145,7 +148,7 @@
           "TeamHealthPhase": "./types/TeamHealthPhase#TeamHealthPhaseSource",
           "TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
           "TeamInvitation": "../../database/types/TeamInvitation#default",
-          "TeamMember": "../../database/types/TeamMember#default as TeamMemberDB",
+          "TeamMember": "../../postgres/types/index#TeamMember as TeamMember",
           "TeamMemberIntegrationAuthWebhook": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth1": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth2": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",

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.39.0",
+  "version": "7.39.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -111,7 +111,7 @@
     "minimist": "^1.2.5",
     "node-loader": "^2.0.0",
     "pg-promise": "^11.2.0",
-    "pm2": "^5.3.1",
+    "pm2": "^5.4.2",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.0.2",
     "prettier": "^3.2.5",

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.39.0",
+  "version": "7.39.3",
   "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.39.0"
+    "parabol-server": "7.39.3"
   }
 }
diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
@@ -1,17 +1,14 @@
 import styled from '@emotion/styled'
+import {ManageAccounts} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '~/styles/paletteV3'
 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'
-import BaseTag from '../Tag/BaseTag'
+import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
+import {Tooltip} from '../../ui/Tooltip/Tooltip'
+import {TooltipContent} from '../../ui/Tooltip/TooltipContent'
+import {TooltipTrigger} from '../../ui/Tooltip/TooltipTrigger'
 import DashNavListTeams from './DashNavListTeams'
-import DashNavMenu from './DashNavMenu'
 
 const EmptyTeams = styled('div')({
   fontSize: 16,
@@ -20,22 +17,13 @@ const EmptyTeams = styled('div')({
   textAlign: 'center'
 })
 
-const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isViewerOnTeam: boolean}>(
-  ({isViewerOnTeam}) => ({
-    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
-}))
+const StyledIcon = styled(ManageAccounts)({
+  height: 18,
+  width: 18
+})
 
 interface Props {
-  organizationsRef: DashNavList_organization$key | null
+  organizationsRef: DashNavList_organization$key
   onClick?: () => void
 }
 
@@ -45,7 +33,6 @@ const DashNavList = (props: Props) => {
     graphql`
       fragment DashNavList_organization on Organization @relay(plural: true) {
         ...DashNavListTeams_organization
-        ...DashNavMenu_organization
         id
         name
         tier
@@ -56,44 +43,42 @@ const DashNavList = (props: Props) => {
     `,
     organizationsRef
   )
-  const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
-  const teams = organizations?.flatMap((org) => org.viewerTeams)
+
+  const TierEnumValues: TierEnum[] = ['enterprise', 'team', 'starter']
+
+  const sortedOrgs = organizations.toSorted((a, b) => {
+    const aTier = TierEnumValues.indexOf(a.tier)
+    const bTier = TierEnumValues.indexOf(b.tier)
+    return aTier < bTier ? -1 : aTier > bTier ? 1 : a.name.localeCompare(b.name)
+  })
+
+  const teams = organizations.flatMap((org) => org.viewerTeams)
 
   if (teams?.length === 0) {
-    return <EmptyTeams>It appears you are not a member of any team!</EmptyTeams>
+    return <EmptyTeams>{'It appears you are not a member of any team!'}</EmptyTeams>
   }
 
   return (
-    <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 className='w-full p-3 pt-4 pb-0'>
+      {sortedOrgs.map((org) => (
+        <div key={org.id} className='w-full pb-4'>
+          <div className='mb-1 flex min-w-0 flex-1 flex-wrap items-center justify-between'>
+            <span className='flex-1 pl-3 text-base font-semibold leading-6 text-slate-700'>
+              {org.name}
+            </span>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <a
+                  className='flex h-8 w-8 items-center justify-center rounded-full hover:bg-slate-300'
+                  href={`/me/organizations/${org.id}/billing`}
+                >
+                  <StyledIcon />
+                </a>
+              </TooltipTrigger>
+              <TooltipContent side='bottom' align='center' sideOffset={4}>
+                {'Settings & Members'}
+              </TooltipContent>
+            </Tooltip>
           </div>
           <DashNavListTeams onClick={onClick} organizationRef={org} />
         </div>

diff --git a/packages/client/components/DashNavList/DashNavListTeams.tsx b/packages/client/components/DashNavList/DashNavListTeams.tsx
@@ -12,7 +12,7 @@ const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isPublicTeams?: boolean}>
   ({isPublicTeams}) => ({
     color: isPublicTeams ? PALETTE.SLATE_600 : PALETTE.SLATE_700,
     borderRadius: 44,
-    paddingLeft: 15
+    paddingLeft: 16
   })
 )
 
@@ -61,7 +61,7 @@ const DashNavListTeams = (props: Props) => {
 
   if (!viewerTeams.length) return null
   return (
-    <div className='p-2'>
+    <div>
       {viewerTeams.map((team) => {
         return (
           <StyledLeftDashNavItem
@@ -75,7 +75,7 @@ const DashNavListTeams = (props: Props) => {
       })}
       {publicTeamsCount > 0 && (
         <StyledLeftDashNavItem
-          className='bg-white pl-11 lg:bg-slate-200'
+          className='bg-white pl-[46px] lg:bg-slate-200'
           onClick={handleClick}
           isPublicTeams
           label={`View ${publicTeamsCount} ${plural(publicTeamsCount, 'Public Team', 'Public Teams')}`}

diff --git a/packages/client/components/DashNavList/DashNavMenu.tsx b/packages/client/components/DashNavList/DashNavMenu.tsx