{selectedShortUrl.tags && selectedShortUrl.tags.length > 0 && (
@@ -727,7 +889,7 @@ export default function AnalyticsPage() {
{info.linkName}
- ID: {event.link_id?.substring(0, 8) || '-'}
+ ID: {event.link_id || '-'}
|
diff --git a/app/api/events/summary/route.ts b/app/api/events/summary/route.ts
index 8430194..3404bff 100644
--- a/app/api/events/summary/route.ts
+++ b/app/api/events/summary/route.ts
@@ -14,6 +14,8 @@ export async function GET(request: NextRequest) {
// Add debug log to check if linkId is being received
const linkId = searchParams.get('linkId');
console.log('Summary API received linkId:', linkId);
+ console.log('Summary API full parameters:', Object.fromEntries(searchParams.entries()));
+ console.log('Summary API URL:', request.url);
const summary = await getEventsSummary({
startTime: searchParams.get('startTime') || undefined,
diff --git a/app/api/shortlinks/[id]/route.ts b/app/api/shortlinks/[id]/route.ts
new file mode 100644
index 0000000..72ea1c8
--- /dev/null
+++ b/app/api/shortlinks/[id]/route.ts
@@ -0,0 +1,140 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { executeQuery } from '@/lib/clickhouse';
+import type { ApiResponse } from '@/lib/types';
+
+export async function GET(
+ request: NextRequest,
+ { params }: { params: { id: string } }
+) {
+ try {
+ // Get the id from the URL parameters
+ const { id } = params;
+
+ if (!id) {
+ return NextResponse.json({
+ success: false,
+ error: 'ID parameter is required'
+ }, { status: 400 });
+ }
+
+ console.log('Fetching shortlink by ID:', id);
+
+ // Query to fetch a single shortlink by id
+ const query = `
+ SELECT
+ id,
+ external_id,
+ type,
+ slug,
+ original_url,
+ title,
+ description,
+ attributes,
+ schema_version,
+ creator_id,
+ creator_email,
+ creator_name,
+ created_at,
+ updated_at,
+ deleted_at,
+ projects,
+ teams,
+ tags,
+ qr_codes AS qr_codes,
+ channels,
+ favorites,
+ expires_at,
+ click_count,
+ unique_visitors
+ FROM shorturl_analytics.shorturl
+ WHERE id = '${id}' AND deleted_at IS NULL
+ LIMIT 1
+ `;
+
+ console.log('Executing query:', query);
+
+ // Execute the query
+ const result = await executeQuery(query);
+
+ // If no shortlink found with the specified ID
+ if (!Array.isArray(result) || result.length === 0) {
+ return NextResponse.json({
+ success: false,
+ error: 'Shortlink not found'
+ }, { status: 404 });
+ }
+
+ // Process the shortlink data
+ const shortlink = result[0] as any;
+
+ // Extract shortUrl from attributes
+ let shortUrl = '';
+ try {
+ if (shortlink.attributes && typeof shortlink.attributes === 'string') {
+ const attributes = JSON.parse(shortlink.attributes) as { shortUrl?: string };
+ shortUrl = attributes.shortUrl || '';
+ }
+ } catch (e) {
+ console.error('Error parsing shortlink attributes:', e);
+ }
+
+ // Process teams
+ let teams: any[] = [];
+ try {
+ if (shortlink.teams && typeof shortlink.teams === 'string') {
+ teams = JSON.parse(shortlink.teams);
+ }
+ } catch (e) {
+ console.error('Error parsing teams:', e);
+ }
+
+ // Process tags
+ let tags: any[] = [];
+ try {
+ if (shortlink.tags && typeof shortlink.tags === 'string') {
+ tags = JSON.parse(shortlink.tags);
+ }
+ } catch (e) {
+ console.error('Error parsing tags:', e);
+ }
+
+ // Process projects
+ let projects: any[] = [];
+ try {
+ if (shortlink.projects && typeof shortlink.projects === 'string') {
+ projects = JSON.parse(shortlink.projects);
+ }
+ } catch (e) {
+ console.error('Error parsing projects:', e);
+ }
+
+ // Format the data to match what our store expects
+ const formattedShortlink = {
+ id: shortlink.id || '',
+ externalId: shortlink.external_id || '',
+ slug: shortlink.slug || '',
+ originalUrl: shortlink.original_url || '',
+ title: shortlink.title || '',
+ shortUrl: shortUrl,
+ teams: teams,
+ projects: projects,
+ tags: tags.map((tag: any) => tag.tag_name || ''),
+ createdAt: shortlink.created_at,
+ domain: new URL(shortUrl || 'https://example.com').hostname
+ };
+
+ const response: ApiResponse = {
+ success: true,
+ data: formattedShortlink
+ };
+
+ return NextResponse.json(response);
+ } catch (error) {
+ console.error('Error fetching shortlink by ID:', error);
+ const response: ApiResponse = {
+ success: false,
+ error: error instanceof Error ? error.message : 'Unknown error occurred'
+ };
+ return NextResponse.json(response, { status: 500 });
+ }
+}
\ No newline at end of file
diff --git a/app/api/shortlinks/byUrl/route.ts b/app/api/shortlinks/byUrl/route.ts
index f656ff9..57e1650 100644
--- a/app/api/shortlinks/byUrl/route.ts
+++ b/app/api/shortlinks/byUrl/route.ts
@@ -111,6 +111,7 @@ export async function GET(request: NextRequest) {
// Format the data to match what our store expects
const formattedShortlink = {
id: shortlink.id || '',
+ externalId: shortlink.external_id || '',
slug: shortlink.slug || '',
originalUrl: shortlink.original_url || '',
title: shortlink.title || '',
@@ -122,6 +123,8 @@ export async function GET(request: NextRequest) {
domain: new URL(shortUrl || 'https://example.com').hostname
};
+ console.log('Shortlink data formatted with externalId:', shortlink.external_id, 'Final object:', formattedShortlink);
+
const response: ApiResponse = {
success: true,
data: formattedShortlink
diff --git a/app/api/shortlinks/exact/route.ts b/app/api/shortlinks/exact/route.ts
new file mode 100644
index 0000000..48515f7
--- /dev/null
+++ b/app/api/shortlinks/exact/route.ts
@@ -0,0 +1,142 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { executeQuery } from '@/lib/clickhouse';
+import type { ApiResponse } from '@/lib/types';
+
+export async function GET(request: NextRequest) {
+ try {
+ // Get the url from query parameters
+ const searchParams = request.nextUrl.searchParams;
+ const shortUrl = searchParams.get('shortUrl');
+
+ if (!shortUrl) {
+ return NextResponse.json({
+ success: false,
+ error: 'shortUrl parameter is required'
+ }, { status: 400 });
+ }
+
+ console.log('Fetching shortlink by exact shortUrl:', shortUrl);
+
+ // Query to fetch a single shortlink by shortUrl in attributes
+ const query = `
+ SELECT
+ id,
+ external_id,
+ type,
+ slug,
+ original_url,
+ title,
+ description,
+ attributes,
+ schema_version,
+ creator_id,
+ creator_email,
+ creator_name,
+ created_at,
+ updated_at,
+ deleted_at,
+ projects,
+ teams,
+ tags,
+ qr_codes AS qr_codes,
+ channels,
+ favorites,
+ expires_at,
+ click_count,
+ unique_visitors
+ FROM shorturl_analytics.shorturl
+ WHERE JSONHas(attributes, 'shortUrl')
+ AND JSONExtractString(attributes, 'shortUrl') = '${shortUrl}'
+ AND deleted_at IS NULL
+ LIMIT 1
+ `;
+
+ console.log('Executing query:', query);
+
+ // Execute the query
+ const result = await executeQuery(query);
+
+ // If no shortlink found with the specified URL
+ if (!Array.isArray(result) || result.length === 0) {
+ return NextResponse.json({
+ success: false,
+ error: 'Shortlink not found'
+ }, { status: 404 });
+ }
+
+ // Process the shortlink data
+ const shortlink = result[0] as Record;
+
+ // Extract shortUrl from attributes
+ let shortUrlValue = '';
+ try {
+ if (shortlink.attributes && typeof shortlink.attributes === 'string') {
+ const attributes = JSON.parse(shortlink.attributes) as { shortUrl?: string };
+ shortUrlValue = attributes.shortUrl || '';
+ }
+ } catch (e) {
+ console.error('Error parsing shortlink attributes:', e);
+ }
+
+ // Process teams
+ let teams: any[] = [];
+ try {
+ if (shortlink.teams && typeof shortlink.teams === 'string') {
+ teams = JSON.parse(shortlink.teams);
+ }
+ } catch (e) {
+ console.error('Error parsing teams:', e);
+ }
+
+ // Process tags
+ let tags: any[] = [];
+ try {
+ if (shortlink.tags && typeof shortlink.tags === 'string') {
+ tags = JSON.parse(shortlink.tags);
+ }
+ } catch (e) {
+ console.error('Error parsing tags:', e);
+ }
+
+ // Process projects
+ let projects: any[] = [];
+ try {
+ if (shortlink.projects && typeof shortlink.projects === 'string') {
+ projects = JSON.parse(shortlink.projects);
+ }
+ } catch (e) {
+ console.error('Error parsing projects:', e);
+ }
+
+ // Format the data to match what our store expects
+ const formattedShortlink = {
+ id: shortlink.id || '',
+ externalId: shortlink.external_id || '',
+ slug: shortlink.slug || '',
+ originalUrl: shortlink.original_url || '',
+ title: shortlink.title || '',
+ shortUrl: shortUrlValue,
+ teams: teams,
+ projects: projects,
+ tags: tags.map((tag: any) => tag.tag_name || ''),
+ createdAt: shortlink.created_at,
+ domain: new URL(shortUrlValue || 'https://example.com').hostname
+ };
+
+ console.log('Formatted shortlink with externalId:', shortlink.external_id);
+
+ const response: ApiResponse = {
+ success: true,
+ data: formattedShortlink
+ };
+
+ return NextResponse.json(response);
+ } catch (error) {
+ console.error('Error fetching shortlink by exact URL:', error);
+ const response: ApiResponse = {
+ success: false,
+ error: error instanceof Error ? error.message : 'Unknown error occurred'
+ };
+ return NextResponse.json(response, { status: 500 });
+ }
+}
\ No newline at end of file
diff --git a/app/components/charts/TimeSeriesChart.tsx b/app/components/charts/TimeSeriesChart.tsx
index 6215114..e918f7b 100644
--- a/app/components/charts/TimeSeriesChart.tsx
+++ b/app/components/charts/TimeSeriesChart.tsx
@@ -137,6 +137,11 @@ export default function TimeSeriesChart({ data }: TimeSeriesChartProps) {
return date.toLocaleDateString();
}
return '';
+ },
+ label: (context) => {
+ const label = context.dataset.label || '';
+ const value = context.parsed.y;
+ return `${label}: ${Math.round(value)}`;
}
}
}
@@ -160,9 +165,9 @@ export default function TimeSeriesChart({ data }: TimeSeriesChartProps) {
callback: (value: number) => {
if (!value && value !== 0) return '';
if (value >= 1000) {
- return `${(value / 1000).toFixed(1)}k`;
+ return `${Math.round(value / 1000)}k`;
}
- return value;
+ return Math.round(value);
}
}
}
diff --git a/app/links/page.tsx b/app/links/page.tsx
index 9ff3456..9b00055 100644
--- a/app/links/page.tsx
+++ b/app/links/page.tsx
@@ -115,30 +115,77 @@ export default function LinksPage() {
// 使用 Zustand store
const { setSelectedShortUrl } = useShortUrlStore();
- // 处理链接记录点击
- const handleLinkClick = (shortUrl: string, link: ShortLink, metadata: any) => {
- // 编码 shortUrl 以确保 URL 安全
- const encodedShortUrl = encodeURIComponent(shortUrl);
+ // 处理点击链接行
+ const handleRowClick = (link: any) => {
+ // 解析 attributes 字符串为对象
+ let attributes: Record = {};
+ try {
+ if (link.attributes && typeof link.attributes === 'string') {
+ attributes = JSON.parse(link.attributes || '{}');
+ }
+ } catch (e) {
+ console.error('Error parsing link attributes:', e);
+ }
- // 创建完整的 ShortUrlData 对象
- const shortUrlData: ShortUrlData = {
+ // 解析 teams 字符串为数组
+ let teams: any[] = [];
+ try {
+ if (link.teams && typeof link.teams === 'string') {
+ teams = JSON.parse(link.teams || '[]');
+ }
+ } catch (e) {
+ console.error('Error parsing teams:', e);
+ }
+
+ // 解析 projects 字符串为数组
+ let projects: any[] = [];
+ try {
+ if (link.projects && typeof link.projects === 'string') {
+ projects = JSON.parse(link.projects || '[]');
+ }
+ } catch (e) {
+ console.error('Error parsing projects:', e);
+ }
+
+ // 解析 tags 字符串为数组
+ let tags: string[] = [];
+ try {
+ if (link.tags && typeof link.tags === 'string') {
+ const parsedTags = JSON.parse(link.tags);
+ if (Array.isArray(parsedTags)) {
+ tags = parsedTags.map((tag: { tag_name?: string }) => tag.tag_name || '');
+ }
+ }
+ } catch (e) {
+ console.error('Error parsing tags:', e);
+ }
+
+ // 确保 shortUrl 存在
+ const shortUrlValue = attributes.shortUrl || '';
+
+ // 提取用于显示的字段
+ const shortUrlData = {
id: link.id,
- slug: metadata.slug,
- originalUrl: metadata.originalUrl,
- title: metadata.title,
- shortUrl: shortUrl,
- teams: metadata.teamNames,
- tags: metadata.tagNames,
- projects: metadata.projectNames,
- createdAt: metadata.createdAt,
- domain: metadata.domain
+ externalId: link.external_id, // 明确添加 externalId 字段
+ slug: link.slug,
+ originalUrl: link.original_url,
+ title: link.title,
+ shortUrl: shortUrlValue,
+ teams: teams,
+ projects: projects,
+ tags: tags,
+ createdAt: link.created_at,
+ domain: shortUrlValue ? new URL(shortUrlValue).hostname : 'shorturl.example.com'
};
- // 使用 Zustand store 保存数据
+ // 打印完整数据，确保 externalId 被包含
+ console.log('Setting shortURL data in store with externalId:', link.external_id);
+
+ // 将数据保存到 Zustand store
setSelectedShortUrl(shortUrlData);
- // 导航到 analytics 页面并带上参数
- router.push(`/analytics?shorturl=${encodedShortUrl}`);
+ // 导航到分析页面，并在 URL 中包含 shortUrl 参数
+ router.push(`/analytics?shorturl=${encodeURIComponent(shortUrlValue)}`);
};
// Extract link metadata from attributes
@@ -423,7 +470,7 @@ export default function LinksPage() {
const shortUrl = `https://${metadata.domain}/${metadata.slug}`;
return (
- handleLinkClick(shortUrl, link, metadata)}>
+ handleRowClick(link)}>
|
{metadata.title}
diff --git a/app/utils/store.ts b/app/utils/store.ts
index 9feedea..25acf6e 100644
--- a/app/utils/store.ts
+++ b/app/utils/store.ts
@@ -17,6 +17,7 @@ interface ProjectData {
// 定义 ShortUrl 数据类型
export interface ShortUrlData {
id: string;
+ externalId: string;
slug: string;
originalUrl: string;
title?: string;
| |