Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/api/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ async function bootstrap() {

const app = await NestFactory.create<NestFastifyApplication>(
AppModule,
new FastifyAdapter(server),
new FastifyAdapter(server as any),
{ bufferLogs: true },
);

Expand Down
1 change: 1 addition & 0 deletions apps/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "auf-cli",
"version": "1.0.10",
"type": "module",
"bin": {
"auf-cli": "./dist/auf-cli.js"
},
Expand Down
1 change: 1 addition & 0 deletions apps/web/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
/// <reference path="./.next/types/routes.d.ts" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react-i18next": "^15.7.3",
"react-select": "^5.10.2",
"react-use": "^17.6.0",
"recharts": "^2.15.4",
"recharts": "^3.2.1",
"sharp": "^0.34.4",
"swiper": "^12.0.2",
"tailwind-merge": "^3.3.1",
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/entities/webhook/ui/webhook-event-cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ const WebhookEventCell: React.FC<IProps> = (props) => {
{(type === 'ISSUE_CREATION' || type === 'ISSUE_STATUS_CHANGE' ?
data?.items
: channels
)?.map(({ id, name }) => <DropdownItem key={id}>{name}</DropdownItem>)}
)?.map(({ id, name }) => (
<DropdownItem key={id}>{name}</DropdownItem>
))}
</DropdownContent>
</Dropdown>
);
Expand Down
56 changes: 36 additions & 20 deletions apps/web/src/features/update-ai-setting/ui/ai-usage.ui.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -418,30 +418,46 @@ const AIChartUsageCard = ({ projectId }: { projectId: number }) => {
height={180}
>
<Tooltip
formatter={(value) => value.toLocaleString()}
formatter={(value: unknown) => {
if (typeof value === 'number') {
return value.toLocaleString();
}
return String(value);
}}
cursor={{ fill: 'var(--bg-neutral-tertiary)' }}
content={({ payload }) => {
return (
<div className="bg-neutral-primary border-neutral-tertiary max-w-[240px] rounded border px-4 py-3 shadow-lg">
{payload?.map(({ value, payload }, i) => (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">
<div
style={{
backgroundColor: (payload as { fill: string }).fill,
}}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="text-small-normal break-all">
{(payload as { name: string | undefined }).name}
{payload.map((item, i) => {
const { value, payload: itemPayload } = item as {
value: unknown;
payload: unknown;
};
return (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">
<div
style={{
backgroundColor: (itemPayload as { fill: string })
.fill,
}}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="text-small-normal break-all">
{(itemPayload as { name: string | undefined }).name}
</p>
</div>
<p>
{typeof value === 'number' ?
value.toLocaleString()
: String(value)}
</p>
</div>
<p>{value?.toLocaleString()}</p>
</div>
))}
);
})}
</div>
);
}}
Expand All @@ -467,7 +483,7 @@ const AIChartUsageCard = ({ projectId }: { projectId: number }) => {
>
<tspan
x={viewBox.cx}
y={(viewBox.cy ?? 0) - 12}
y={viewBox.cy - 12}
className="text-title-h4 fill-neutral-primary"
>
{integrationData?.tokenThreshold ?
Expand All @@ -476,7 +492,7 @@ const AIChartUsageCard = ({ projectId }: { projectId: number }) => {
</tspan>
<tspan
x={viewBox.cx}
y={(viewBox.cy ?? 0) + 12}
y={viewBox.cy + 12}
className="fill-neutral-secondary text-small-normal"
>
Remaining Tokens
Expand Down
33 changes: 25 additions & 8 deletions apps/web/src/shared/ui/charts/simple-bar-chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,36 +66,53 @@ const SimpleBarChart: React.FC<IProps> = (props) => {
data={data}
margin={{ left: -20, right: 10, top: 10, bottom: 10 }}
barSize={80}
onClick={(e: { activePayload?: { payload: Data }[] }) =>
onClick?.(e.activePayload?.[0]?.payload)
}
onClick={(nextState) => {
if (
'activePayload' in nextState &&
Array.isArray(nextState.activePayload) &&
nextState.activePayload.length > 0
) {
const payload = nextState.activePayload[0] as { payload: Data };
onClick?.(payload.payload);
}
}}
>
<CartesianGrid
vertical={false}
stroke="var(--border-neutral-tertiary)"
/>
<Tooltip
formatter={(value) => value.toLocaleString()}
formatter={(value: unknown) => {
if (typeof value === 'number') {
return value.toLocaleString();
}
return String(value);
}}
cursor={{ fill: 'var(--bg-neutral-tertiary)' }}
content={({ payload }) => (
<div className="bg-neutral-primary border-neutral-tertiary max-w-[240px] rounded border px-4 py-3 shadow-lg">
{payload?.map(({ value, payload }, i) => (
{payload.map(({ value, payload: itemPayload }, i) => (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">
<div
style={{
backgroundColor: (payload as { color: string }).color,
backgroundColor: (itemPayload as { color: string })
.color,
}}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="text-small-normal break-all">
{(payload as { name: string | undefined }).name}
{(itemPayload as { name: string | undefined }).name}
</p>
</div>
<p>{value?.toLocaleString()}</p>
<p>
{typeof value === 'number' ?
value.toLocaleString()
: value}
</p>
</div>
))}
</div>
Expand Down
62 changes: 40 additions & 22 deletions apps/web/src/shared/ui/charts/simple-line-chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ const SimpleLineChart: React.FC<IProps> = (props) => {
);
};

interface ICustomTooltipProps
extends Omit<TooltipProps<ValueType, NameType>, 'label'> {
interface ICustomTooltipProps extends TooltipProps<ValueType, NameType> {
noLabel: boolean;
label?: string;
label?: string | number;
payload?: unknown[];
active?: boolean;
}

const CustomTooltip: React.FC<ICustomTooltipProps> = (props) => {
Expand All @@ -155,25 +156,42 @@ const CustomTooltip: React.FC<ICustomTooltipProps> = (props) => {
)}
</h1>
<div className="flex flex-col gap-1">
{payload.map(({ color, name, value, payload }, i) => (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
{!noLabel && (
<div className="flex items-center gap-2">
<div
style={{ background: color }}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="break-all">
{name ?? (payload as { date: string | undefined }).date}
</p>
</div>
)}
<p>{value?.toLocaleString()}</p>
</div>
))}
{payload.map((item, i) => {
const {
color,
name,
value,
payload: itemPayload,
} = item as {
color: string;
name: string;
value: unknown;
payload: unknown;
};
return (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
{!noLabel && (
<div className="flex items-center gap-2">
<div
style={{ background: color }}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="break-all">
{name || (itemPayload as { date: string | undefined }).date}
</p>
</div>
)}
<p>
{typeof value === 'number' ?
value.toLocaleString()
: String(value)}
</p>
</div>
);
})}
</div>
</div>
);
Expand Down
55 changes: 36 additions & 19 deletions apps/web/src/shared/ui/charts/simple-pie-chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ interface Data {
name: string;
value: number;
color?: string;
[key: string]: unknown;
}

interface IProps {
Expand Down Expand Up @@ -94,7 +95,7 @@ const SimplePieChart: React.FC<IProps> = (props) => {
</tspan>
<tspan
x={viewBox.cx}
y={(viewBox.cy ?? 0) + 24}
y={viewBox.cy + 24}
className="fill-neutral-secondary"
>
Total Issues
Expand All @@ -112,30 +113,46 @@ const SimplePieChart: React.FC<IProps> = (props) => {
align="right"
/>
<Tooltip
formatter={(value) => value.toLocaleString()}
formatter={(value: unknown) => {
if (typeof value === 'number') {
return value.toLocaleString();
}
return String(value);
}}
cursor={{ fill: 'var(--bg-neutral-tertiary)' }}
content={({ payload }) => {
return (
<div className="bg-neutral-primary border-neutral-tertiary max-w-[240px] rounded border px-4 py-3 shadow-lg">
{payload?.map(({ value, payload }, i) => (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">
<div
style={{
backgroundColor: (payload as { fill: string }).fill,
}}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="text-small-normal break-all">
{(payload as { name: string | undefined }).name}
{payload.map((item, i) => {
const { value, payload: itemPayload } = item as {
value: unknown;
payload: unknown;
};
return (
<div
key={i}
className="text-neutral-secondary text-small-normal flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">
<div
style={{
backgroundColor: (itemPayload as { fill: string })
.fill,
}}
className="h-2 w-2 flex-shrink-0 rounded-full"
/>
<p className="text-small-normal break-all">
{(itemPayload as { name: string | undefined }).name}
</p>
</div>
<p>
{typeof value === 'number' ?
value.toLocaleString()
: String(value)}
</p>
</div>
<p>{value?.toLocaleString()}</p>
</div>
))}
);
})}
</div>
);
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/ufb-react/src/components/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
((node as HTMLElement).nodeType === Node.ELEMENT_NODE &&
(node as HTMLElement).tagName.toLowerCase() === 'svg') ||
((node as HTMLElement).nodeType === Node.TEXT_NODE &&
!(node as HTMLElement).textContent?.trim()),
!((node as HTMLElement).textContent || '').trim()),
);

if (isSvgOnly) {
Expand Down
Loading