-
Notifications
You must be signed in to change notification settings - Fork 336
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/feature-flags-ui
- Loading branch information
Showing
83 changed files
with
1,034 additions
and
264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| ".": "8.0.1" | ||
| ".": "8.3.1" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
packages/client/components/TeamsLimitExceededNotification.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import graphql from 'babel-plugin-relay/macro' | ||
| import React, {useEffect} from 'react' | ||
| import {useFragment} from 'react-relay' | ||
| import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql' | ||
| import useRouter from '~/hooks/useRouter' | ||
| import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg' | ||
| import useAtmosphere from '../hooks/useAtmosphere' | ||
| import {Threshold} from '../types/constEnums' | ||
| import SendClientSideEvent from '../utils/SendClientSideEvent' | ||
| import NotificationAction from './NotificationAction' | ||
| import NotificationTemplate from './NotificationTemplate' | ||
|
|
||
| interface Props { | ||
| notification: TeamsLimitExceededNotification_notification$key | ||
| } | ||
|
|
||
| const TeamsLimitExceededNotification = (props: Props) => { | ||
| const {notification: notificationRef} = props | ||
| const atmosphere = useAtmosphere() | ||
| const notification = useFragment( | ||
| graphql` | ||
| fragment TeamsLimitExceededNotification_notification on NotifyTeamsLimitExceeded { | ||
| ...NotificationTemplate_notification | ||
| id | ||
| orgId | ||
| orgName | ||
| orgPicture | ||
| } | ||
| `, | ||
| notificationRef | ||
| ) | ||
| const {history} = useRouter() | ||
| const {orgId, orgName, orgPicture} = notification | ||
|
|
||
| useEffect(() => { | ||
| SendClientSideEvent(atmosphere, 'Upgrade CTA Viewed', { | ||
| upgradeCTALocation: 'teamsLimitExceededNotification', | ||
| orgId | ||
| }) | ||
| }, []) | ||
|
|
||
| const onActionClick = () => { | ||
| SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', { | ||
| upgradeCTALocation: 'teamsLimitExceededNotification' | ||
| }) | ||
| history.push(`/me/organizations/${orgId}`) | ||
| } | ||
|
|
||
| return ( | ||
| <NotificationTemplate | ||
| avatar={orgPicture || defaultOrgAvatar} | ||
| message={`"${orgName}" is over the limit of ${Threshold.MAX_STARTER_TIER_TEAMS} free teams.`} | ||
| action={<NotificationAction label={'Upgrade'} onClick={onActionClick} />} | ||
| notification={notification} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| export default TeamsLimitExceededNotification |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
packages/client/modules/userDashboard/components/OrgBilling/OrgUsage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import graphql from 'babel-plugin-relay/macro' | ||
| import React from 'react' | ||
| import {useFragment} from 'react-relay' | ||
| import {OrgUsage_organization$key} from '../../../../__generated__/OrgUsage_organization.graphql' | ||
| import Panel from '../../../../components/Panel/Panel' | ||
| import useRouter from '../../../../hooks/useRouter' | ||
|
|
||
| interface Props { | ||
| organizationRef: OrgUsage_organization$key | ||
| } | ||
|
|
||
| const OrgUsage = (props: Props) => { | ||
| const {organizationRef} = props | ||
| const organization = useFragment( | ||
| graphql` | ||
| fragment OrgUsage_organization on Organization { | ||
| id | ||
| allTeamsCount | ||
| orgUserCount { | ||
| activeUserCount | ||
| inactiveUserCount | ||
| } | ||
| } | ||
| `, | ||
| organizationRef | ||
| ) | ||
|
|
||
| const {id: orgId, allTeamsCount, orgUserCount} = organization | ||
| const totalUserCount = orgUserCount.activeUserCount + orgUserCount.inactiveUserCount | ||
| const {history} = useRouter() | ||
|
|
||
| return ( | ||
| <Panel className='mb-4 max-w-[976px]' label='Usage'> | ||
| <div className='flex items-center justify-around border-t border-solid border-slate-300 p-4 '> | ||
| <a | ||
| onClick={(e) => { | ||
| e.preventDefault() | ||
| history.push(`/me/organizations/${orgId}/teams`) | ||
| }} | ||
| className='cursor-pointer text-center text-sky-500 hover:text-sky-600' | ||
| > | ||
| <div className='mb-1 text-3xl font-bold'>{allTeamsCount}</div> | ||
| <div className='flex items-center justify-center text-base text-slate-600'> | ||
| Total teams | ||
| </div> | ||
| </a> | ||
| <a | ||
| onClick={(e) => { | ||
| e.preventDefault() | ||
| history.push(`/me/organizations/${orgId}/members`) | ||
| }} | ||
| className='cursor-pointer text-center text-sky-500 hover:text-sky-600' | ||
| > | ||
| <div className='mb-1 text-3xl font-bold'>{totalUserCount}</div> | ||
| <div className='flex items-center justify-center text-base text-slate-600'> | ||
| Total members | ||
| </div> | ||
| </a> | ||
| </div> | ||
| </Panel> | ||
| ) | ||
| } | ||
|
|
||
| export default OrgUsage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.