pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-06 02:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1730 from Pallavikumarimdb/fix/shareable-link-resource-URI

Browse Source 
Update shareable link resource URI to use NiceId instead of resourceId
This commit is contained in:
Owen Schwartz
2025-10-22 10:11:10 -07:00
committed by GitHub
parent 2c502ec764 9ba42a8fa3
commit 5b8cdf7884
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/routers/accessToken/listAccessTokens.ts
View File

@@ -63,6 +63,7 @@ function queryAccessTokens(
description: resourceAccessToken.description, description: resourceAccessToken.description,
createdAt: resourceAccessToken.createdAt, createdAt: resourceAccessToken.createdAt,
resourceName: resources.name, resourceName: resources.name,
resourceNiceId: resources.niceId,
siteName: sites.name siteName: sites.name
}; };

3
src/components/CreateShareLinkForm.tsx
View File

@@ -98,6 +98,7 @@ export default function CreateShareLinkForm({
{ {
resourceId: number; resourceId: number;
name: string; name: string;
niceId: string;
resourceUrl: string; resourceUrl: string;
}[] }[]
>([]); >([]);
@@ -160,6 +161,7 @@ export default function CreateShareLinkForm({
.map((r) => ({ .map((r) => ({
resourceId: r.resourceId, resourceId: r.resourceId,
name: r.name, name: r.name,
niceId: r.niceId,
resourceUrl: `${r.ssl ? "https://" : "http://"}${toUnicode(r.fullDomain || "")}/` resourceUrl: `${r.ssl ? "https://" : "http://"}${toUnicode(r.fullDomain || "")}/`
})) }))
); );
@@ -233,6 +235,7 @@ export default function CreateShareLinkForm({
accessTokenId: token.accessTokenId, accessTokenId: token.accessTokenId,
resourceId: token.resourceId, resourceId: token.resourceId,
resourceName: values.resourceName, resourceName: values.resourceName,
resourceNiceId: resource ? resource.niceId : "",
title: token.title, title: token.title,
createdAt: token.createdAt, createdAt: token.createdAt,
expiresAt: token.expiresAt expiresAt: token.expiresAt

3
src/components/ShareLinksTable.tsx
View File

@@ -39,6 +39,7 @@ export type ShareLinkRow = {
accessTokenId: string; accessTokenId: string;
resourceId: number; resourceId: number;
resourceName: string; resourceName: string;
resourceNiceId: string;
title: string | null; title: string | null;
createdAt: number; createdAt: number;
expiresAt: number | null; expiresAt: number | null;
@@ -120,7 +121,7 @@ export default function ShareLinksTable({
cell: ({ row }) => { cell: ({ row }) => {
const r = row.original; const r = row.original;
return ( return (
<Link href={`/${orgId}/settings/resources/${r.resourceId}`}> <Link href={`/${orgId}/settings/resources/${r.resourceNiceId}`}>
<Button variant="outline" size="sm"> <Button variant="outline" size="sm">
{r.resourceName} {r.resourceName}
<ArrowUpRight className="ml-2 h-4 w-4" /> <ArrowUpRight className="ml-2 h-4 w-4" />