diff --git a/.changeset/yummy-cats-ring.md b/.changeset/yummy-cats-ring.md new file mode 100644 index 00000000000..8ffbf263c46 --- /dev/null +++ b/.changeset/yummy-cats-ring.md @@ -0,0 +1,7 @@ +--- +'@mastra/playground-ui': patch +'mastra': patch +'create-mastra': patch +--- + +Sync DS components with Cloud diff --git a/packages/playground-ui/src/domains/traces/traces-table.tsx b/packages/playground-ui/src/domains/traces/traces-table.tsx index 4a1daa8f957..b81df6a6cb5 100644 --- a/packages/playground-ui/src/domains/traces/traces-table.tsx +++ b/packages/playground-ui/src/domains/traces/traces-table.tsx @@ -4,7 +4,7 @@ import { Table, Tbody, Th, Row, Cell, DateTimeCell, UnitCell, TxtCell } from '@/ import { Thead } from '@/ds/components/Table'; import type { RefinedTrace } from '@/domains/traces/types'; import { Badge } from '@/ds/components/Badge'; -import { SpanIcon } from '@/ds/icons/SpanIcon'; +import { TraceIcon } from '@/ds/icons/TraceIcon'; import { useOpenTrace } from './hooks/use-open-trace'; import { Txt } from '@/ds/components/Txt'; @@ -62,7 +62,7 @@ const TraceRow = ({ trace, index }: { trace: RefinedTrace; index: number }) => { {trace.duration} diff --git a/packages/playground-ui/src/ds/components/Avatar/Avatar.tsx b/packages/playground-ui/src/ds/components/Avatar/Avatar.tsx new file mode 100644 index 00000000000..fea2c8d3ce5 --- /dev/null +++ b/packages/playground-ui/src/ds/components/Avatar/Avatar.tsx @@ -0,0 +1,22 @@ +import React, { ElementType, ReactNode } from 'react'; + +import { Txt } from '../Txt'; + +export interface AvatarProps { + src?: string; + name: string; +} + +export const Avatar = ({ src, name }: AvatarProps) => { + return ( +
+ {src ? ( + {name} + ) : ( + + {name[0].toUpperCase()} + + )} +
+ ); +}; diff --git a/packages/playground-ui/src/ds/components/Avatar/index.ts b/packages/playground-ui/src/ds/components/Avatar/index.ts new file mode 100644 index 00000000000..27700fe3f37 --- /dev/null +++ b/packages/playground-ui/src/ds/components/Avatar/index.ts @@ -0,0 +1 @@ +export * from './Avatar'; diff --git a/packages/playground-ui/src/ds/components/Breadcrumb/Breadcrumb.tsx b/packages/playground-ui/src/ds/components/Breadcrumb/Breadcrumb.tsx index 16fd743f495..87a0a2784d9 100644 --- a/packages/playground-ui/src/ds/components/Breadcrumb/Breadcrumb.tsx +++ b/packages/playground-ui/src/ds/components/Breadcrumb/Breadcrumb.tsx @@ -3,7 +3,6 @@ import React from 'react'; import { Icon } from '../../icons/Icon'; import { SlashIcon } from '../../icons/SlashIcon'; -import { PolymorphicComponentProps } from '../types'; export interface BreadcrumbProps { children?: React.ReactNode; diff --git a/packages/playground-ui/src/ds/components/Button/Button.tsx b/packages/playground-ui/src/ds/components/Button/Button.tsx index d157cebc2f9..3c90afd9aa8 100644 --- a/packages/playground-ui/src/ds/components/Button/Button.tsx +++ b/packages/playground-ui/src/ds/components/Button/Button.tsx @@ -5,19 +5,31 @@ export interface ButtonProps extends React.ButtonHTMLAttributes { +const sizeClasses = { + md: 'h-button-md gap-md', + lg: 'h-button-lg gap-lg', +}; + +const variantClasses = { + default: 'bg-surface2 hover:bg-surface4 text-icon3 hover:text-icon6', + light: 'bg-surface3 hover:bg-surface5 text-icon6', +}; + +export const Button = ({ className, as, size = 'md', variant = 'default', ...props }: ButtonProps) => { const Component = as || 'button'; return ( { + return ( +
+
{iconSlot}
+ {titleSlot} + + + {descriptionSlot} + + + {actionSlot} +
+ ); +}; diff --git a/packages/playground-ui/src/ds/components/EmptyState/index.ts b/packages/playground-ui/src/ds/components/EmptyState/index.ts new file mode 100644 index 00000000000..c54a68a9de7 --- /dev/null +++ b/packages/playground-ui/src/ds/components/EmptyState/index.ts @@ -0,0 +1 @@ +export * from './EmptyState'; diff --git a/packages/playground-ui/src/ds/components/Header/Header.tsx b/packages/playground-ui/src/ds/components/Header/Header.tsx index 4bbd7221019..6629987711e 100644 --- a/packages/playground-ui/src/ds/components/Header/Header.tsx +++ b/packages/playground-ui/src/ds/components/Header/Header.tsx @@ -1,14 +1,20 @@ +import clsx from 'clsx'; import React from 'react'; import { Txt } from '../Txt'; export interface HeaderProps { children?: React.ReactNode; + border?: boolean; } -export const Header = ({ children }: HeaderProps) => { +export const Header = ({ children, border = true }: HeaderProps) => { return ( -
+
{children}
); diff --git a/packages/playground-ui/src/ds/components/Logo/MastraLogo.tsx b/packages/playground-ui/src/ds/components/Logo/MastraLogo.tsx index 44cba939275..3998a06d959 100644 --- a/packages/playground-ui/src/ds/components/Logo/MastraLogo.tsx +++ b/packages/playground-ui/src/ds/components/Logo/MastraLogo.tsx @@ -2,7 +2,6 @@ import React from 'react'; export const DarkLogo = (props: React.SVGProps) => ( - void; +} + +const iconMap = { + tool: ToolsIcon, + agent: AgentIcon, + workflow: WorkflowIcon, + memory: MemoryIcon, + rag: TraceIcon, + storage: DbIcon, + eval: ScoreIcon, + other: TraceIcon, +}; + +const variantClasses = { + tool: 'text-[#ECB047]', + agent: 'text-accent1', + workflow: 'text-accent3', + memory: 'text-accent2', + rag: 'text-accent2', + storage: 'text-accent2', + eval: 'text-accent4', + other: 'text-icon6', +}; + +export const Span = ({ children, durationMs, variant, tokenCount, spans, isRoot, onClick }: SpanProps) => { + const [isExpanded, setIsExpanded] = useState(true); + const traceDuration = useTraceDuration(); + const VariantIcon = iconMap[variant]; + const variantClass = variantClasses[variant]; + + const canExpand = React.Children.count(spans) > 0; + + const progressPercent = (durationMs / traceDuration) * 100; + + const TextEl = onClick ? 'button' : 'div'; + + return ( +
  • +
    +
    + {canExpand ? ( + + ) : ( +
    + {!isRoot &&
    } +
    + )} + + +
    + + + +
    + + {children} + +
    +
    + +
    + + {isExpanded && spans &&
    {spans}
    } +
  • + ); +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/Spans.tsx b/packages/playground-ui/src/ds/components/TraceTree/Spans.tsx new file mode 100644 index 00000000000..57560245a20 --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/Spans.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +export interface SpansProps { + children: React.ReactNode; +} + +export const Spans = ({ children }: SpansProps) => { + return
      {children}
    ; +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/Time.tsx b/packages/playground-ui/src/ds/components/TraceTree/Time.tsx new file mode 100644 index 00000000000..cadb3cb8a6f --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/Time.tsx @@ -0,0 +1,37 @@ +import clsx from 'clsx'; +import React from 'react'; + +import { Txt } from '../Txt'; + +export interface TimeProps { + durationMs: number; + tokenCount?: number; + variant?: 'agent'; + progressPercent: number; +} + +const variantClasses = { + agent: 'bg-accent1', +}; + +export const Time = ({ durationMs, tokenCount, variant, progressPercent }: TimeProps) => { + const variantClass = variant ? variantClasses[variant] : 'bg-accent3'; + + return ( +
    +
    +
    +
    +
    + + {durationMs}ms + + {tokenCount && ( + + {tokenCount}t + + )} +
    +
    + ); +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/Trace.context.tsx b/packages/playground-ui/src/ds/components/TraceTree/Trace.context.tsx new file mode 100644 index 00000000000..233d058fc85 --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/Trace.context.tsx @@ -0,0 +1,16 @@ +import React, { createContext, useContext } from 'react'; + +export const TraceDurationContext = createContext(0); + +export const useTraceDuration = () => { + return useContext(TraceDurationContext); +}; + +export interface TraceDurationProviderProps { + children: React.ReactNode; + durationMs: number; +} + +export const TraceDurationProvider = ({ children, durationMs }: TraceDurationProviderProps) => { + return {children}; +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/Trace.tsx b/packages/playground-ui/src/ds/components/TraceTree/Trace.tsx new file mode 100644 index 00000000000..2fdca9c10ca --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/Trace.tsx @@ -0,0 +1,23 @@ +import React from 'react'; + +import { Span } from './Span'; +import { Spans } from './Spans'; +import { TraceDurationProvider } from './Trace.context'; + +export interface TraceProps { + name: string; + spans: React.ReactNode; + durationMs: number; + tokenCount?: number; + onClick?: () => void; +} + +export const Trace = ({ name, spans, durationMs, tokenCount, onClick }: TraceProps) => { + return ( + + {spans}} onClick={onClick}> + {name} + + + ); +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/TraceTree.tsx b/packages/playground-ui/src/ds/components/TraceTree/TraceTree.tsx new file mode 100644 index 00000000000..662ff3b5468 --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/TraceTree.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +export interface TraceTreeProps { + children: React.ReactNode; +} + +export const TraceTree = ({ children }: TraceTreeProps) => { + return
      {children}
    ; +}; diff --git a/packages/playground-ui/src/ds/components/TraceTree/index.ts b/packages/playground-ui/src/ds/components/TraceTree/index.ts new file mode 100644 index 00000000000..95fd4929774 --- /dev/null +++ b/packages/playground-ui/src/ds/components/TraceTree/index.ts @@ -0,0 +1 @@ +export * from './TraceTree'; diff --git a/packages/playground-ui/src/ds/components/Txt/Txt.tsx b/packages/playground-ui/src/ds/components/Txt/Txt.tsx index 34c0636e719..a3bff88a98f 100644 --- a/packages/playground-ui/src/ds/components/Txt/Txt.tsx +++ b/packages/playground-ui/src/ds/components/Txt/Txt.tsx @@ -3,10 +3,11 @@ import React from 'react'; import { FontSizes } from '../../tokens'; -export interface TxtProps extends React.HTMLAttributes { - as?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'p' | 'span'; +export interface TxtProps extends React.HTMLAttributes { + as?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'p' | 'span' | 'label'; variant?: keyof typeof FontSizes; font?: 'mono'; + htmlFor?: string; } const variants = { diff --git a/packages/playground-ui/src/ds/icons/AgentCoinIcon.tsx b/packages/playground-ui/src/ds/icons/AgentCoinIcon.tsx new file mode 100644 index 00000000000..5eaf0855a12 --- /dev/null +++ b/packages/playground-ui/src/ds/icons/AgentCoinIcon.tsx @@ -0,0 +1,41 @@ +import React from 'react'; + +export const AgentCoinIcon = (props: React.SVGProps) => ( + + + + + + + + + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/ChevronIcon.tsx b/packages/playground-ui/src/ds/icons/ChevronIcon.tsx new file mode 100644 index 00000000000..7db6d160a3b --- /dev/null +++ b/packages/playground-ui/src/ds/icons/ChevronIcon.tsx @@ -0,0 +1,12 @@ +import React from 'react'; + +export const ChevronIcon = (props: React.SVGProps) => ( + + + +); diff --git a/packages/playground-ui/src/ds/icons/DbIcon.tsx b/packages/playground-ui/src/ds/icons/DbIcon.tsx index 3adcd6c65c7..d41128efa7c 100644 --- a/packages/playground-ui/src/ds/icons/DbIcon.tsx +++ b/packages/playground-ui/src/ds/icons/DbIcon.tsx @@ -1,11 +1,11 @@ import React from 'react'; export const DbIcon = (props: React.SVGProps) => ( - + diff --git a/packages/playground-ui/src/ds/icons/EvaluatorCoinIcon.tsx b/packages/playground-ui/src/ds/icons/EvaluatorCoinIcon.tsx new file mode 100644 index 00000000000..deec5f43c9a --- /dev/null +++ b/packages/playground-ui/src/ds/icons/EvaluatorCoinIcon.tsx @@ -0,0 +1,25 @@ +import React from 'react'; + +export const EvaluatorCoinIcon = (props: React.SVGProps) => ( + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/GithubCoinIcon.tsx b/packages/playground-ui/src/ds/icons/GithubCoinIcon.tsx new file mode 100644 index 00000000000..d06389eb7c2 --- /dev/null +++ b/packages/playground-ui/src/ds/icons/GithubCoinIcon.tsx @@ -0,0 +1,35 @@ +import React from 'react'; + +export const GithubCoinIcon = (props: React.SVGProps) => ( + + + + + + + + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/GithubIcon.tsx b/packages/playground-ui/src/ds/icons/GithubIcon.tsx new file mode 100644 index 00000000000..a57d6d872f0 --- /dev/null +++ b/packages/playground-ui/src/ds/icons/GithubIcon.tsx @@ -0,0 +1,17 @@ +import React from 'react'; + +export const GithubIcon = (props: React.SVGProps) => ( + + + + + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/GoogleIcon.tsx b/packages/playground-ui/src/ds/icons/GoogleIcon.tsx new file mode 100644 index 00000000000..51875c728bf --- /dev/null +++ b/packages/playground-ui/src/ds/icons/GoogleIcon.tsx @@ -0,0 +1,29 @@ +import React from 'react'; + +export const GoogleIcon = (props: React.SVGProps) => ( + + + + + + + + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/Icon.tsx b/packages/playground-ui/src/ds/icons/Icon.tsx index d15a0f050a2..ee1a368e9ad 100644 --- a/packages/playground-ui/src/ds/icons/Icon.tsx +++ b/packages/playground-ui/src/ds/icons/Icon.tsx @@ -13,8 +13,8 @@ const sizes = { export const Icon = ({ children, className, size = 'default', ...props }: IconProps) => { return ( -
    + {children} -
    + ); }; diff --git a/packages/playground-ui/src/ds/icons/RepoIcon.tsx b/packages/playground-ui/src/ds/icons/RepoIcon.tsx new file mode 100644 index 00000000000..16c7ee5656c --- /dev/null +++ b/packages/playground-ui/src/ds/icons/RepoIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react'; + +export const RepoIcon = (props: React.SVGProps) => ( + + + + +); diff --git a/packages/playground-ui/src/ds/icons/SpanIcon.tsx b/packages/playground-ui/src/ds/icons/SpanIcon.tsx deleted file mode 100644 index a535cacf283..00000000000 --- a/packages/playground-ui/src/ds/icons/SpanIcon.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; - -export const SpanIcon = (props: React.SVGProps) => ( - - - -); diff --git a/packages/playground-ui/src/ds/icons/WorkflowCoinIcon.tsx b/packages/playground-ui/src/ds/icons/WorkflowCoinIcon.tsx new file mode 100644 index 00000000000..2128db0d895 --- /dev/null +++ b/packages/playground-ui/src/ds/icons/WorkflowCoinIcon.tsx @@ -0,0 +1,25 @@ +import React from 'react'; + +export const WorkflowCoinIcon = (props: React.SVGProps) => ( + + + + + + +); diff --git a/packages/playground-ui/src/ds/icons/index.ts b/packages/playground-ui/src/ds/icons/index.ts index 8a81956d65b..45f9fd4b9a3 100644 --- a/packages/playground-ui/src/ds/icons/index.ts +++ b/packages/playground-ui/src/ds/icons/index.ts @@ -1,9 +1,11 @@ // Export all icon components export * from './AgentIcon'; +export * from './AgentCoinIcon'; export * from './AiIcon'; export * from './ApiIcon'; export * from './BranchIcon'; export * from './CheckIcon'; +export * from './ChevronIcon'; export * from './CommitIcon'; export * from './CrossIcon'; export * from './DbIcon'; @@ -12,7 +14,12 @@ export * from './DeploymentIcon'; export * from './DividerIcon'; export * from './DocsIcon'; export * from './EnvIcon'; +export * from './EvaluatorCoinIcon'; export * from './FiltersIcon'; +export * from './GithubCoinIcon'; +export * from './GithubIcon'; +export * from './GoogleIcon'; +export * from './RepoIcon'; export * from './HomeIcon'; export * from './Icon'; export * from './InfoIcon'; @@ -29,3 +36,4 @@ export * from './TraceIcon'; export * from './TsIcon'; export * from './VariablesIcon'; export * from './WorkflowIcon'; +export * from './WorkflowCoinIcon'; diff --git a/packages/playground-ui/src/ds/tokens/sizes.ts b/packages/playground-ui/src/ds/tokens/sizes.ts index 36b98877e9c..b5164e4ee90 100644 --- a/packages/playground-ui/src/ds/tokens/sizes.ts +++ b/packages/playground-ui/src/ds/tokens/sizes.ts @@ -1,10 +1,12 @@ export const Sizes = { 'icon-default': '16px', 'icon-lg': '20px', - 'button-default': '24px', + 'button-md': '24px', + 'button-lg': '40px', 'header-default': '40px', 'table-header': '28px', 'table-row': '44px', 'table-row-small': '32px', 'badge-default': '20px', + 'avatar-default': '24px', };