-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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 improve-person-limit-filtering
- Loading branch information
Showing
46 changed files
with
1,484 additions
and
325 deletions.
There are no files selected for viewing
Binary file modified
BIN
-2.15 KB
(98%)
...nd/__snapshots__/scenes-app-pipeline--pipeline-node-new-hog-function--light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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,43 @@ | ||
| import { IconPlusSmall } from '@posthog/icons' | ||
| import { useValues } from 'kea' | ||
| import { PageHeader } from 'lib/components/PageHeader' | ||
| import { LemonButton } from 'lib/lemon-ui/LemonButton' | ||
| import { broadcastsLogic } from 'scenes/messaging/broadcastsLogic' | ||
| import { FunctionsTable } from 'scenes/messaging/FunctionsTable' | ||
| import { MessagingTabs } from 'scenes/messaging/MessagingTabs' | ||
| import { HogFunctionConfiguration } from 'scenes/pipeline/hogfunctions/HogFunctionConfiguration' | ||
| import { SceneExport } from 'scenes/sceneTypes' | ||
| import { urls } from 'scenes/urls' | ||
|
|
||
| export function Broadcasts(): JSX.Element { | ||
| const { broadcastId } = useValues(broadcastsLogic) | ||
| return broadcastId ? ( | ||
| <HogFunctionConfiguration | ||
| id={broadcastId === 'new' ? null : broadcastId} | ||
| templateId={broadcastId === 'new' ? 'template-new-broadcast' : ''} | ||
| /> | ||
| ) : ( | ||
| <> | ||
| <MessagingTabs key="tabs" /> | ||
| <PageHeader | ||
| caption="Send one time communications to your users" | ||
| buttons={ | ||
| <LemonButton | ||
| data-attr="new-broadcast" | ||
| to={urls.messagingBroadcastNew()} | ||
| type="primary" | ||
| icon={<IconPlusSmall />} | ||
| > | ||
| New broadcast | ||
| </LemonButton> | ||
| } | ||
| /> | ||
| <FunctionsTable type="broadcast" /> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| export const scene: SceneExport = { | ||
| component: Broadcasts, | ||
| logic: broadcastsLogic, | ||
| } |
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,125 @@ | ||
| import { LemonInput, LemonTable, LemonTableColumn, Link, Tooltip } from '@posthog/lemon-ui' | ||
| import { BindLogic, useActions, useValues } from 'kea' | ||
| import { More } from 'lib/lemon-ui/LemonButton/More' | ||
| import { LemonMenuOverlay } from 'lib/lemon-ui/LemonMenu/LemonMenu' | ||
| import { updatedAtColumn } from 'lib/lemon-ui/LemonTable/columnUtils' | ||
| import { LemonTableLink } from 'lib/lemon-ui/LemonTable/LemonTableLink' | ||
| import { functionsTableLogic } from 'scenes/messaging/functionsTableLogic' | ||
| import { hogFunctionUrl } from 'scenes/pipeline/hogfunctions/urls' | ||
|
|
||
| import { HogFunctionType, HogFunctionTypeType } from '~/types' | ||
|
|
||
| import { HogFunctionIcon } from '../pipeline/hogfunctions/HogFunctionIcon' | ||
| import { HogFunctionStatusIndicator } from '../pipeline/hogfunctions/HogFunctionStatusIndicator' | ||
|
|
||
| export interface FunctionsTableProps { | ||
| type?: HogFunctionTypeType | ||
| } | ||
|
|
||
| export function FunctionsTableFilters(): JSX.Element | null { | ||
| const { filters } = useValues(functionsTableLogic) | ||
| const { setFilters } = useActions(functionsTableLogic) | ||
|
|
||
| return ( | ||
| <div className="space-y-2"> | ||
| <div className="flex items-center gap-2"> | ||
| <LemonInput | ||
| type="search" | ||
| placeholder="Search..." | ||
| value={filters.search ?? ''} | ||
| onChange={(e) => setFilters({ search: e })} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export function FunctionsTable({ type }: FunctionsTableProps): JSX.Element { | ||
| const { hogFunctions, filteredHogFunctions, loading } = useValues(functionsTableLogic({ type })) | ||
| const { deleteHogFunction, resetFilters } = useActions(functionsTableLogic({ type })) | ||
|
|
||
| return ( | ||
| <BindLogic logic={functionsTableLogic} props={{ type }}> | ||
| <div className="space-y-2"> | ||
| <FunctionsTableFilters /> | ||
|
|
||
| <LemonTable | ||
| dataSource={filteredHogFunctions} | ||
| size="small" | ||
| loading={loading} | ||
| columns={[ | ||
| { | ||
| title: 'App', | ||
| width: 0, | ||
| render: function RenderAppInfo(_, hogFucntion) { | ||
| return <HogFunctionIcon src={hogFucntion.icon_url} size="small" /> | ||
| }, | ||
| }, | ||
| { | ||
| title: 'Name', | ||
| sticky: true, | ||
| sorter: true, | ||
| key: 'name', | ||
| dataIndex: 'name', | ||
| render: function RenderPluginName(_, hogFunction) { | ||
| return ( | ||
| <LemonTableLink | ||
| to={hogFunctionUrl(hogFunction.type, hogFunction.id)} | ||
| title={ | ||
| <> | ||
| <Tooltip title="Click to update configuration, view metrics, and more"> | ||
| <span>{hogFunction.name}</span> | ||
| </Tooltip> | ||
| </> | ||
| } | ||
| description={hogFunction.description} | ||
| /> | ||
| ) | ||
| }, | ||
| }, | ||
|
|
||
| updatedAtColumn() as LemonTableColumn<HogFunctionType, any>, | ||
| { | ||
| title: 'Status', | ||
| key: 'enabled', | ||
| sorter: (a) => (a.enabled ? 1 : -1), | ||
| width: 0, | ||
| render: function RenderStatus(_, hogFunction) { | ||
| return <HogFunctionStatusIndicator hogFunction={hogFunction} /> | ||
| }, | ||
| }, | ||
| { | ||
| width: 0, | ||
| render: function Render(_, hogFunction) { | ||
| return ( | ||
| <More | ||
| overlay={ | ||
| <LemonMenuOverlay | ||
| items={[ | ||
| { | ||
| label: 'Delete', | ||
| status: 'danger' as const, // for typechecker happiness | ||
| onClick: () => deleteHogFunction(hogFunction), | ||
| }, | ||
| ]} | ||
| /> | ||
| } | ||
| /> | ||
| ) | ||
| }, | ||
| }, | ||
| ]} | ||
| emptyState={ | ||
| hogFunctions.length === 0 && !loading ? ( | ||
| 'Nothing found' | ||
| ) : ( | ||
| <> | ||
| Nothing matches filters. <Link onClick={() => resetFilters()}>Clear filters</Link>{' '} | ||
| </> | ||
| ) | ||
| } | ||
| /> | ||
| </div> | ||
| </BindLogic> | ||
| ) | ||
| } |
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,25 @@ | ||
| import { useActions, useValues } from 'kea' | ||
| import { LemonTabs } from 'lib/lemon-ui/LemonTabs' | ||
| import { SceneExport } from 'scenes/sceneTypes' | ||
|
|
||
| import { MessagingTab, messagingTabsLogic } from './messagingTabsLogic' | ||
|
|
||
| export function MessagingTabs(): JSX.Element { | ||
| const { currentTab } = useValues(messagingTabsLogic) | ||
| const { setTab } = useActions(messagingTabsLogic) | ||
| return ( | ||
| <LemonTabs | ||
| activeKey={currentTab} | ||
| onChange={(tab) => setTab(tab as MessagingTab)} | ||
| tabs={[ | ||
| { key: 'broadcasts', label: 'Broadcasts' }, | ||
| { key: 'providers', label: 'Providers' }, | ||
| ]} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| export const scene: SceneExport = { | ||
| component: MessagingTabs, | ||
| logic: messagingTabsLogic, | ||
| } |
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,32 @@ | ||
| import { useValues } from 'kea' | ||
| import { PageHeader } from 'lib/components/PageHeader' | ||
| import { FunctionsTable } from 'scenes/messaging/FunctionsTable' | ||
| import { MessagingTabs } from 'scenes/messaging/MessagingTabs' | ||
| import { providersLogic } from 'scenes/messaging/providersLogic' | ||
| import { HogFunctionConfiguration } from 'scenes/pipeline/hogfunctions/HogFunctionConfiguration' | ||
| import { HogFunctionTemplateList } from 'scenes/pipeline/hogfunctions/list/HogFunctionTemplateList' | ||
| import { SceneExport } from 'scenes/sceneTypes' | ||
|
|
||
| export function Providers(): JSX.Element { | ||
| const { providerId, templateId } = useValues(providersLogic) | ||
| return providerId ? ( | ||
| <HogFunctionConfiguration id={providerId} templateId={templateId} /> | ||
| ) : ( | ||
| <> | ||
| <MessagingTabs key="tabs" /> | ||
| <PageHeader caption="Configure e-mail, SMS and other messaging providers here" /> | ||
| <FunctionsTable type="email" /> | ||
| <div className="mt-4" /> | ||
| <h2>Add Provider</h2> | ||
| <HogFunctionTemplateList defaultFilters={{}} type="email" /> | ||
| <div className="mt-2 text-muted"> | ||
| Note: to add a provider that's not in the list, select one that's similar and edit its source to point | ||
| to the right API URLs | ||
| </div> | ||
| </> | ||
| ) | ||
| } | ||
| export const scene: SceneExport = { | ||
| component: Providers, | ||
| logic: providersLogic, | ||
| } |
Oops, something went wrong.