Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix LinksTable merge

Francis Cao3f3000c2fdd2
diff --git a/src/app/(main)/links/LinksTable.tsx b/src/app/(main)/links/LinksTable.tsx
index 5e125b4da..953adf98d 100644
--- a/src/app/(main)/links/LinksTable.tsx
+++ b/src/app/(main)/links/LinksTable.tsx
@@ -23,21 +23,21 @@ export function LinksTable({ showActions, ...props }: LinksTableProps) {
return <Link href={renderUrl(`/links/${id}`)}>{name}</Link>;
}}
</DataColumn>
-<<<<<<< fix/links-table-truncate-urls
- <DataColumn id="slug" label={t(labels.link)} width="25%">
-=======
- <DataColumn id="slug" label={<SortableLabel label={t(labels.link)} sortKey="slug" />}>
->>>>>>> dev
+ <DataColumn
+ id="slug"
+ label={<SortableLabel label={t(labels.link)} sortKey="slug" />}
+ width="25%"
+ >
{({ slug }: any) => {
const url = getSlugUrl(slug);
return <ExternalLink href={url}>{url}</ExternalLink>;
}}
</DataColumn>
-<<<<<<< fix/links-table-truncate-urls
- <DataColumn id="url" label={t(labels.destinationUrl)} width="30%">
-=======
- <DataColumn id="url" label={<SortableLabel label={t(labels.destinationUrl)} sortKey="url" />}>
->>>>>>> dev
+ <DataColumn
+ id="url"
+ label={<SortableLabel label={t(labels.destinationUrl)} sortKey="url" />}
+ width="30%"
+ >
{({ url }: any) => {
return <ExternalLink href={url}>{url}</ExternalLink>;
}}