diff --git a/packages/ui/src/views/layouts/PullRequestLayout.tsx b/packages/ui/src/views/layouts/PullRequestLayout.tsx index e5545e8c0..d58ab5ca2 100644 --- a/packages/ui/src/views/layouts/PullRequestLayout.tsx +++ b/packages/ui/src/views/layouts/PullRequestLayout.tsx @@ -33,7 +33,7 @@ const PullRequestLayout: React.FC = ({ return ( - + {pullRequest && ( <> = ({ } }, [description, val, updateTitle]) return ( -
-
-

- {!edit && original} +
+
+
+ {!edit &&
{original}
} {!edit && #{number}} {edit ? ( - + event.target.select()} @@ -121,7 +121,7 @@ export const PullRequestHeader: React.FC = ({ )} {err && {err}} -

+
diff --git a/packages/ui/src/views/repo/webhooks/webhook-list/components/repo-webhook-list.tsx b/packages/ui/src/views/repo/webhooks/webhook-list/components/repo-webhook-list.tsx index df291cbf7..6049751d4 100644 --- a/packages/ui/src/views/repo/webhooks/webhook-list/components/repo-webhook-list.tsx +++ b/packages/ui/src/views/repo/webhooks/webhook-list/components/repo-webhook-list.tsx @@ -1,4 +1,4 @@ -import { useNavigate } from 'react-router-dom' +import { Link, useNavigate } from 'react-router-dom' import { Badge, MoreActionsTooltip, NoData, PaginationComponent, Spacer, StackedList, Text } from '@/components' import { TranslationStore, WebhookType } from '@/views' @@ -97,38 +97,40 @@ export function RepoWebhookList({ <> {webhooks.map((webhook, webhook_idx) => ( - - {webhook.description}} - title={} - className="gap-1.5" - /> - <StackedList.Field - title={ - <MoreActionsTooltip - actions={[ - { - title: t('views:webhookData.edit', 'Edit webhook'), - to: `${webhook.id}` - }, - { - isDanger: true, - title: t('views:webhookData.delete', 'Delete webhook'), - onClick: () => openDeleteWebhookDialog(webhook.id) - } - ]} - /> - } - right - label - secondary - /> - </StackedList.Item> + <Link key={webhook.id} to={`${webhook.id}`} className="cursor-pointer"> + <StackedList.Item + key={webhook.createdAt} + className="!cursor-default py-3 pr-1.5" + isLast={webhooks.length - 1 === webhook_idx} + > + <StackedList.Field + primary + description={<span className="leading-none">{webhook.description}</span>} + title={<Title title={webhook.name} isEnabled={webhook.enabled} />} + className="gap-1.5" + /> + <StackedList.Field + title={ + <MoreActionsTooltip + actions={[ + { + title: t('views:webhookData.edit', 'Edit webhook'), + to: `${webhook.id}` + }, + { + isDanger: true, + title: t('views:webhookData.delete', 'Delete webhook'), + onClick: () => openDeleteWebhookDialog(webhook.id) + } + ]} + /> + } + right + label + secondary + /> + </StackedList.Item> + </Link> ))} </StackedList.Root> <PaginationComponent totalPages={totalPages} currentPage={page} goToPage={setPage} t={t} />