From af42e87bc0ebd44586d7ddbbc03205f2b3bb3ccc Mon Sep 17 00:00:00 2001
From: Xiao Yijun <xiaoyijun@silverhand.io>
Date: Mon, 22 May 2023 22:19:15 +0800
Subject: [PATCH] feat(console): add webhook logs page (#3862)

---
 .../components/EventSelector/index.tsx        |  16 ++-
 .../src/components/Table/index.module.scss    |   2 +
 .../src/components/Tag/index.module.scss      |   2 +-
 packages/console/src/consts/page-tabs.ts      |   1 +
 packages/console/src/consts/webhooks.ts       |  12 +-
 .../src/containers/ConsoleContent/index.tsx   |  11 +-
 .../src/pages/AuditLogDetails/index.tsx       |  29 +++-
 .../WebhookLogs/index.module.scss             |  25 ++++
 .../WebhookDetails/WebhookLogs/index.tsx      | 126 ++++++++++++++++++
 .../pages/WebhookDetails/index.module.scss    |   4 +
 .../src/pages/WebhookDetails/index.tsx        |   6 +
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 .../translation/admin-console/log-details.ts  |   2 +-
 .../admin-console/webhook-details.ts          |   2 +-
 41 files changed, 247 insertions(+), 47 deletions(-)
 create mode 100644 packages/console/src/pages/WebhookDetails/WebhookLogs/index.module.scss
 create mode 100644 packages/console/src/pages/WebhookDetails/WebhookLogs/index.tsx

diff --git a/packages/console/src/components/AuditLogTable/components/EventSelector/index.tsx b/packages/console/src/components/AuditLogTable/components/EventSelector/index.tsx
index 736599cf8..c787e2ca5 100644
--- a/packages/console/src/components/AuditLogTable/components/EventSelector/index.tsx
+++ b/packages/console/src/components/AuditLogTable/components/EventSelector/index.tsx
@@ -1,25 +1,27 @@
 import { useTranslation } from 'react-i18next';
 
-import Select from '@/components/Select';
+import Select, { type Option } from '@/components/Select';
 import { logEventTitle } from '@/consts/logs';
 
 type Props = {
   value?: string;
   onChange: (value?: string) => void;
+  options?: Array<Option<string>>;
 };
 
-function EventSelector({ value, onChange }: Props) {
+const defaultEventOptions = Object.entries(logEventTitle).map(([value, title]) => ({
+  value,
+  title: title ?? value,
+}));
+
+function EventSelector({ value, onChange, options }: Props) {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
-  const options = Object.entries(logEventTitle).map(([value, title]) => ({
-    value,
-    title: title ?? value,
-  }));
 
   return (
     <Select
       isClearable
       value={value}
-      options={options}
+      options={options ?? defaultEventOptions}
       placeholder={t('logs.event')}
       onChange={onChange}
     />
diff --git a/packages/console/src/components/Table/index.module.scss b/packages/console/src/components/Table/index.module.scss
index b680f14f3..d46abd160 100644
--- a/packages/console/src/components/Table/index.module.scss
+++ b/packages/console/src/components/Table/index.module.scss
@@ -61,6 +61,8 @@
 
     tbody {
       tr {
+        cursor: default;
+
         td {
           font: var(--font-body-2);
           border-top: 1px solid var(--color-divider);
diff --git a/packages/console/src/components/Tag/index.module.scss b/packages/console/src/components/Tag/index.module.scss
index 0e1ca3d59..8627563ee 100644
--- a/packages/console/src/components/Tag/index.module.scss
+++ b/packages/console/src/components/Tag/index.module.scss
@@ -1,7 +1,7 @@
 @use '@/scss/underscore' as _;
 
 .tag {
-  display: flex;
+  display: inline-flex;
   align-items: center;
   font: var(--font-body-2);
 
diff --git a/packages/console/src/consts/page-tabs.ts b/packages/console/src/consts/page-tabs.ts
index ea3ccef59..c2cae0b27 100644
--- a/packages/console/src/consts/page-tabs.ts
+++ b/packages/console/src/consts/page-tabs.ts
@@ -10,6 +10,7 @@ export enum ConnectorsTabs {
 
 export enum WebhookDetailsTabs {
   Settings = 'settings',
+  RecentRequests = 'recent-requests',
 }
 
 export enum SignInExperiencePage {
diff --git a/packages/console/src/consts/webhooks.ts b/packages/console/src/consts/webhooks.ts
index 5ddee720e..f460a0698 100644
--- a/packages/console/src/consts/webhooks.ts
+++ b/packages/console/src/consts/webhooks.ts
@@ -1,5 +1,5 @@
 import { type AdminConsoleKey } from '@logto/phrases';
-import { HookEvent } from '@logto/schemas';
+import { HookEvent, type LogKey } from '@logto/schemas';
 import { yes } from '@silverhand/essentials';
 
 type HookEventLabel = {
@@ -12,4 +12,14 @@ export const hookEventLabel = Object.freeze({
   [HookEvent.PostSignIn]: 'webhooks.events.post_sign_in',
 }) satisfies HookEventLabel;
 
+type HookEventLogKey = {
+  [key in HookEvent]: LogKey;
+};
+
+export const hookEventLogKey = Object.freeze({
+  [HookEvent.PostRegister]: 'TriggerHook.PostRegister',
+  [HookEvent.PostResetPassword]: 'TriggerHook.PostResetPassword',
+  [HookEvent.PostSignIn]: 'TriggerHook.PostSignIn',
+}) satisfies HookEventLogKey;
+
 export const isHookFeatureEnabled = yes(process.env.HOOK_FEATURE_ENABLED);
diff --git a/packages/console/src/containers/ConsoleContent/index.tsx b/packages/console/src/containers/ConsoleContent/index.tsx
index fb02a63c8..9d33c6549 100644
--- a/packages/console/src/containers/ConsoleContent/index.tsx
+++ b/packages/console/src/containers/ConsoleContent/index.tsx
@@ -40,6 +40,7 @@ import UserRoles from '@/pages/UserDetails/UserRoles';
 import UserSettings from '@/pages/UserDetails/UserSettings';
 import Users from '@/pages/Users';
 import WebhookDetails from '@/pages/WebhookDetails';
+import WebhookLogs from '@/pages/WebhookDetails/WebhookLogs';
 import WebhookSettings from '@/pages/WebhookDetails/WebhookSettings';
 import Webhooks from '@/pages/Webhooks';
 
@@ -96,7 +97,12 @@ function ConsoleContent() {
                 <Route path=":id" element={<WebhookDetails />}>
                   <Route index element={<Navigate replace to={WebhookDetailsTabs.Settings} />} />
                   <Route path={WebhookDetailsTabs.Settings} element={<WebhookSettings />} />
+                  <Route path={WebhookDetailsTabs.RecentRequests} element={<WebhookLogs />} />
                 </Route>
+                <Route
+                  path={`:hookId/${WebhookDetailsTabs.RecentRequests}/:logId`}
+                  element={<AuditLogDetails />}
+                />
               </Route>
             )}
             <Route path="users">
@@ -108,7 +114,10 @@ function ConsoleContent() {
                 <Route path={UserDetailsTabs.Roles} element={<UserRoles />} />
                 <Route path={UserDetailsTabs.Logs} element={<UserLogs />} />
               </Route>
-              <Route path={`:id/${UserDetailsTabs.Logs}/:logId`} element={<AuditLogDetails />} />
+              <Route
+                path={`:userId/${UserDetailsTabs.Logs}/:logId`}
+                element={<AuditLogDetails />}
+              />
             </Route>
             <Route path="audit-logs">
               <Route index element={<AuditLogs />} />
diff --git a/packages/console/src/pages/AuditLogDetails/index.tsx b/packages/console/src/pages/AuditLogDetails/index.tsx
index ca5011f11..7aa10ab69 100644
--- a/packages/console/src/pages/AuditLogDetails/index.tsx
+++ b/packages/console/src/pages/AuditLogDetails/index.tsx
@@ -1,6 +1,7 @@
 import { withAppInsights } from '@logto/app-insights/react';
-import type { User, Log } from '@logto/schemas';
+import type { User, Log, Hook } from '@logto/schemas';
 import { demoAppApplicationId } from '@logto/schemas';
+import { conditional } from '@silverhand/essentials';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useParams } from 'react-router-dom';
 import useSWR from 'swr';
@@ -16,6 +17,7 @@ import TabNav, { TabNavItem } from '@/components/TabNav';
 import UserName from '@/components/UserName';
 import { logEventTitle } from '@/consts/logs';
 import type { RequestError } from '@/hooks/use-api';
+import { getUserTitle } from '@/utils/user';
 
 import EventIcon from './components/EventIcon';
 import * as styles from './index.module.scss';
@@ -27,18 +29,31 @@ const getDetailsTabNavLink = (logId: string, userId?: string) =>
   userId ? `/users/${userId}/logs/${logId}` : `/audit-logs/${logId}`;
 
 function AuditLogDetails() {
-  const { id, logId } = useParams();
+  const { userId, hookId, logId } = useParams();
   const { pathname } = useLocation();
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { data, error, mutate } = useSWR<Log, RequestError>(logId && `api/logs/${logId}`);
-  const { data: userData } = useSWR<User, RequestError>(id && `api/users/${id}`);
+  const { data: userData } = useSWR<User, RequestError>(userId && `api/users/${userId}`);
+  const { data: hookData } = useSWR<Hook, RequestError>(hookId && `api/hooks/${hookId}`);
 
   const isLoading = !data && !error;
 
   const backLink = getAuditLogDetailsRelatedResourceLink(pathname);
-  const backLinkTitle = id
-    ? t('log_details.back_to_user', { name: userData?.name ?? t('users.unnamed') })
-    : t('log_details.back_to_logs');
+  const backLinkTitle =
+    conditional(
+      userId &&
+        t('log_details.back_to', {
+          name: conditional(userData && getUserTitle(userData)) ?? t('users.unnamed'),
+        })
+    ) ??
+    conditional(
+      hookId &&
+        t('log_details.back_to', {
+          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+          name: hookData?.name || t('users.unnamed'),
+        })
+    ) ??
+    t('log_details.back_to_logs');
 
   if (!logId) {
     return null;
@@ -105,7 +120,7 @@ function AuditLogDetails() {
             </div>
           </Card>
           <TabNav>
-            <TabNavItem href={getDetailsTabNavLink(logId, id)}>
+            <TabNavItem href={getDetailsTabNavLink(logId, userId)}>
               {t('log_details.tab_details')}
             </TabNavItem>
           </TabNav>
diff --git a/packages/console/src/pages/WebhookDetails/WebhookLogs/index.module.scss b/packages/console/src/pages/WebhookDetails/WebhookLogs/index.module.scss
new file mode 100644
index 000000000..c6d58ad6b
--- /dev/null
+++ b/packages/console/src/pages/WebhookDetails/WebhookLogs/index.module.scss
@@ -0,0 +1,25 @@
+@use '@/scss/underscore' as _;
+
+.logs {
+  flex: 1;
+  margin-bottom: _.unit(6);
+  overflow-y: auto;
+}
+
+
+.filter {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+
+  .title {
+    color: var(--color-text-secondary);
+    font: var(--font-body-2);
+  }
+
+  .eventSelector {
+    width: 300px;
+    margin-left: _.unit(2);
+  }
+}
+
diff --git a/packages/console/src/pages/WebhookDetails/WebhookLogs/index.tsx b/packages/console/src/pages/WebhookDetails/WebhookLogs/index.tsx
new file mode 100644
index 000000000..5e39d2973
--- /dev/null
+++ b/packages/console/src/pages/WebhookDetails/WebhookLogs/index.tsx
@@ -0,0 +1,126 @@
+import { type Log, HookEvent } from '@logto/schemas';
+import { conditional } from '@silverhand/essentials';
+import { useTranslation } from 'react-i18next';
+import { useLocation, useNavigate, useOutletContext } from 'react-router-dom';
+import useSWR from 'swr';
+import { z } from 'zod';
+
+import EventSelector from '@/components/AuditLogTable/components/EventSelector';
+import DynamicT from '@/components/DynamicT';
+import EmptyDataPlaceholder from '@/components/EmptyDataPlaceholder';
+import Table from '@/components/Table';
+import Tag from '@/components/Tag';
+import { defaultPageSize } from '@/consts';
+import { hookEventLabel, hookEventLogKey } from '@/consts/webhooks';
+import { type RequestError } from '@/hooks/use-api';
+import useSearchParametersWatcher from '@/hooks/use-search-parameters-watcher';
+import { buildUrl } from '@/utils/url';
+
+import { type WebhookDetailsOutletContext } from '../types';
+
+import * as styles from './index.module.scss';
+
+const hooLogEventOptions = Object.values(HookEvent).map((event) => ({
+  title: <DynamicT forKey={hookEventLabel[event]} />,
+  value: hookEventLogKey[event],
+}));
+
+function WebhookLogs() {
+  const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
+  const { pathname } = useLocation();
+  const navigate = useNavigate();
+  const {
+    hook: { id },
+  } = useOutletContext<WebhookDetailsOutletContext>();
+
+  const pageSize = defaultPageSize;
+  const [{ page, event }, updateSearchParameters] = useSearchParametersWatcher({
+    page: 1,
+    event: '',
+    startTimeExclusive: '',
+  });
+
+  const url = buildUrl(`api/hooks/${id}/recent-logs`, {
+    page: String(page),
+    page_size: String(pageSize),
+    ...conditional(event && { logKey: event }),
+  });
+
+  const { data, error, mutate } = useSWR<[Log[], number], RequestError>(url);
+  const isLoading = !data && !error;
+  const [logs, totalCount] = data ?? [];
+
+  return (
+    <Table
+      className={styles.logs}
+      rowGroups={[{ key: 'logs', data: logs }]}
+      rowIndexKey="id"
+      rowClickHandler={({ id }) => {
+        navigate(`${pathname}/${id}`);
+      }}
+      filter={
+        <div className={styles.filter}>
+          <div className={styles.title}>{t('logs.filter_by')}</div>
+          <div className={styles.eventSelector}>
+            <EventSelector
+              value={event}
+              options={hooLogEventOptions}
+              onChange={(event) => {
+                updateSearchParameters({ event, page: undefined });
+              }}
+            />
+          </div>
+        </div>
+      }
+      columns={[
+        {
+          title: 'Status',
+          dataIndex: 'status',
+          colSpan: 5,
+          render: ({ payload }) => {
+            const result = z
+              .object({ response: z.object({ statusCode: z.number().optional() }) })
+              .optional()
+              .safeParse(payload);
+            const statusCode = result.success ? result.data?.response.statusCode : undefined;
+            const isError = !statusCode || statusCode >= 400;
+            return (
+              <Tag type="result" status={isError ? 'error' : 'success'}>
+                {statusCode ?? 'Request error'}
+              </Tag>
+            );
+          },
+        },
+        {
+          title: t('logs.event'),
+          dataIndex: 'event',
+          colSpan: 6,
+          render: ({ key }) => {
+            const event = Object.values(HookEvent).find((event) => hookEventLogKey[event] === key);
+            return conditional(event && t(hookEventLabel[event])) ?? '-';
+          },
+        },
+        {
+          title: t('logs.time'),
+          dataIndex: 'time',
+          colSpan: 5,
+          render: ({ createdAt }) => new Date(createdAt).toLocaleString(),
+        },
+      ]}
+      placeholder={<EmptyDataPlaceholder />}
+      pagination={{
+        page,
+        totalCount,
+        pageSize,
+        onChange: (page) => {
+          updateSearchParameters({ page });
+        },
+      }}
+      isLoading={isLoading}
+      errorMessage={error?.body?.message ?? error?.message}
+      onRetry={async () => mutate(undefined, true)}
+    />
+  );
+}
+
+export default WebhookLogs;
diff --git a/packages/console/src/pages/WebhookDetails/index.module.scss b/packages/console/src/pages/WebhookDetails/index.module.scss
index 4d3a6b02f..4631b8be3 100644
--- a/packages/console/src/pages/WebhookDetails/index.module.scss
+++ b/packages/console/src/pages/WebhookDetails/index.module.scss
@@ -1,5 +1,9 @@
 @use '@/scss/underscore' as _;
 
+.containsTableLayout {
+  height: 100%;
+}
+
 .header {
   padding: _.unit(6);
   display: flex;
diff --git a/packages/console/src/pages/WebhookDetails/index.tsx b/packages/console/src/pages/WebhookDetails/index.tsx
index e994ded03..5cbe64a7b 100644
--- a/packages/console/src/pages/WebhookDetails/index.tsx
+++ b/packages/console/src/pages/WebhookDetails/index.tsx
@@ -1,5 +1,6 @@
 import { withAppInsights } from '@logto/app-insights/react';
 import { type Hook } from '@logto/schemas';
+import classNames from 'classnames';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
@@ -32,6 +33,7 @@ import { type WebhookDetailsOutletContext } from './types';
 function WebhookDetails() {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { pathname } = useLocation();
+  const isPageHasTable = pathname.endsWith(WebhookDetailsTabs.RecentRequests);
   const navigate = useNavigate();
   const { id } = useParams();
   const { data, error, mutate } = useSWR<Hook, RequestError>(id && `api/hooks/${id}`);
@@ -93,6 +95,7 @@ function WebhookDetails() {
     <DetailsPage
       backLink="/webhooks"
       backLinkTitle="webhook_details.back_to_webhooks"
+      className={classNames(isPageHasTable && styles.containsTableLayout)}
       isLoading={isLoading}
       error={error}
       onRetry={mutate}
@@ -178,6 +181,9 @@ function WebhookDetails() {
             <TabNavItem href={`/webhooks/${data.id}/${WebhookDetailsTabs.Settings}`}>
               <DynamicT forKey="webhook_details.settings_tab" />
             </TabNavItem>
+            <TabNavItem href={`/webhooks/${data.id}/${WebhookDetailsTabs.RecentRequests}`}>
+              <DynamicT forKey="webhook_details.recent_requests_tab" />
+            </TabNavItem>
           </TabNav>
           <Outlet
             context={
diff --git a/packages/phrases/src/locales/de/translation/admin-console/log-details.ts b/packages/phrases/src/locales/de/translation/admin-console/log-details.ts
index e807dfb26..55c59b6d5 100644
--- a/packages/phrases/src/locales/de/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/de/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Audit Log Details',
   back_to_logs: 'Zurück zu Audit Logs',
-  back_to_user: 'Zurück zu {{name}}',
+  back_to: 'Zurück zu {{name}}',
   success: 'Erfolgreich',
   failed: 'Fehlgeschlagen',
   event_key: 'Event Schlüssel',
diff --git a/packages/phrases/src/locales/de/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/de/translation/admin-console/webhook-details.ts
index 04a6f6e2e..f309cfdfd 100644
--- a/packages/phrases/src/locales/de/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/de/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Sie entfernen diesen Webhook. Nach dem Löschen wird keine HTTP-Anforderung an die Endpunkt-URL gesendet.',
   deleted: 'Der Webhook wurde erfolgreich gelöscht.',
   settings_tab: 'Einstellungen',
-  recent_requests_tab: 'Letzte Anforderungen',
+  recent_requests_tab: 'Letzte Anforderungen (24h)',
   settings: {
     settings: 'Einstellungen',
     settings_description:
diff --git a/packages/phrases/src/locales/en/translation/admin-console/log-details.ts b/packages/phrases/src/locales/en/translation/admin-console/log-details.ts
index b37223784..2c116c689 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Audit Log details',
   back_to_logs: 'Back to Audit Logs',
-  back_to_user: 'Back to {{name}}',
+  back_to: 'Back to {{name}}',
   success: 'Success',
   failed: 'Failed',
   event_key: 'Event Key',
diff --git a/packages/phrases/src/locales/en/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/en/translation/admin-console/webhook-details.ts
index 90aa7e7f5..02c1aec5f 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'You are removing this webhook. After deleting it will not send HTTP request to endpoint URL.',
   deleted: 'The webhook has been successfully deleted.',
   settings_tab: 'Settings',
-  recent_requests_tab: 'Recent requests',
+  recent_requests_tab: 'Recent requests (24h)',
   settings: {
     settings: 'Settings',
     settings_description:
diff --git a/packages/phrases/src/locales/es/translation/admin-console/log-details.ts b/packages/phrases/src/locales/es/translation/admin-console/log-details.ts
index 5bb5ea943..38a0f4d24 100644
--- a/packages/phrases/src/locales/es/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/es/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Detalle del registro de auditoría',
   back_to_logs: 'Volver a los registros de auditoría',
-  back_to_user: 'Volver a {{name}}',
+  back_to: 'Volver a {{name}}',
   success: 'Éxito',
   failed: 'Fallido',
   event_key: 'Clave del evento',
diff --git a/packages/phrases/src/locales/es/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/es/translation/admin-console/webhook-details.ts
index 73a8969ef..d571a45d4 100644
--- a/packages/phrases/src/locales/es/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/es/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Está eliminando este webhook. Después de eliminarlo, no se enviará ninguna solicitud HTTP a la URL de extremo.',
   deleted: 'El webhook se ha eliminado correctamente.',
   settings_tab: 'Configuración',
-  recent_requests_tab: 'Solicitudes recientes',
+  recent_requests_tab: 'Solicitudes recientes (24 h)',
   settings: {
     settings: 'Configuración',
     settings_description:
diff --git a/packages/phrases/src/locales/fr/translation/admin-console/log-details.ts b/packages/phrases/src/locales/fr/translation/admin-console/log-details.ts
index 503915c22..8e948cce1 100644
--- a/packages/phrases/src/locales/fr/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/fr/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: "Détails du journal d'audit",
   back_to_logs: "Retour aux journaux d'audit",
-  back_to_user: 'Retour à {{name}}',
+  back_to: 'Retour à {{name}}',
   success: 'Succès',
   failed: 'Échoué',
   event_key: "Clé d'événement",
diff --git a/packages/phrases/src/locales/fr/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/fr/translation/admin-console/webhook-details.ts
index 6cf232823..791d66d40 100644
--- a/packages/phrases/src/locales/fr/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/fr/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     "Vous êtes en train de supprimer ce webhook. Après suppression, il n'enverra plus de requête HTTP à l'endpoint URL.",
   deleted: 'Le webhook a été supprimé avec succès.',
   settings_tab: 'Paramètres',
-  recent_requests_tab: 'Demandes récentes',
+  recent_requests_tab: 'Demandes récentes (24 h)',
   settings: {
     settings: 'Paramètres',
     settings_description:
diff --git a/packages/phrases/src/locales/it/translation/admin-console/log-details.ts b/packages/phrases/src/locales/it/translation/admin-console/log-details.ts
index 3c24634fe..d352fcc31 100644
--- a/packages/phrases/src/locales/it/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/it/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Dettagli registro di verifica',
   back_to_logs: 'Torna ai log di verifica',
-  back_to_user: 'Torna a {{name}}',
+  back_to: 'Torna a {{name}}',
   success: 'Successo',
   failed: 'Fallito',
   event_key: 'Chiave evento',
diff --git a/packages/phrases/src/locales/it/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/it/translation/admin-console/webhook-details.ts
index ca0e372ba..ff87a2617 100644
--- a/packages/phrases/src/locales/it/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/it/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     "Stai rimuovendo questo webhook. Dopo la cancellazione non invierà una richiesta HTTP all'URL dell'endpoint.",
   deleted: 'Il webhook è stato eliminato con successo.',
   settings_tab: 'Impostazioni',
-  recent_requests_tab: 'Richieste recenti',
+  recent_requests_tab: 'Richieste recenti (24h)',
   settings: {
     settings: 'Impostazioni',
     settings_description:
diff --git a/packages/phrases/src/locales/ja/translation/admin-console/log-details.ts b/packages/phrases/src/locales/ja/translation/admin-console/log-details.ts
index bb4ed15f7..f1dcd432d 100644
--- a/packages/phrases/src/locales/ja/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/ja/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: '監査ログの詳細',
   back_to_logs: '監査ログに戻る',
-  back_to_user: '{{name}}に戻る',
+  back_to: '{{name}}に戻る',
   success: '成功',
   failed: '失敗',
   event_key: 'イベントキー',
diff --git a/packages/phrases/src/locales/ja/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/ja/translation/admin-console/webhook-details.ts
index 70522d608..3afbd4752 100644
--- a/packages/phrases/src/locales/ja/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/ja/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'このWebhookを削除しています。削除した後はエンドポイントURLにHTTPリクエストが送信されなくなります。',
   deleted: 'Webhookは削除されました。',
   settings_tab: '設定',
-  recent_requests_tab: '最近のリクエスト',
+  recent_requests_tab: '最近のリクエスト（24時間）',
   settings: {
     settings: '設定',
     settings_description:
diff --git a/packages/phrases/src/locales/ko/translation/admin-console/log-details.ts b/packages/phrases/src/locales/ko/translation/admin-console/log-details.ts
index 86c6d1533..4765dcd75 100644
--- a/packages/phrases/src/locales/ko/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/ko/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: '감사 로그 세부 정보',
   back_to_logs: '감사 기록으로 돌아가기',
-  back_to_user: '{{name}}으로 돌아가기',
+  back_to: '{{name}}으로 돌아가기',
   success: '성공',
   failed: '실패',
   event_key: '이벤트 키',
diff --git a/packages/phrases/src/locales/ko/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/ko/translation/admin-console/webhook-details.ts
index 814607b03..45015f3c5 100644
--- a/packages/phrases/src/locales/ko/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/ko/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     '이 webhook을 삭제하고 있습니다. 삭제 후, 엔드포인트 URL에 HTTP request를 보내지 않습니다.',
   deleted: 'Webhook이 성공적으로 삭제되었습니다.',
   settings_tab: '설정',
-  recent_requests_tab: '최근 요청',
+  recent_requests_tab: '최근 요청 (24시간)',
   settings: {
     settings: '설정',
     settings_description:
diff --git a/packages/phrases/src/locales/pl-pl/translation/admin-console/log-details.ts b/packages/phrases/src/locales/pl-pl/translation/admin-console/log-details.ts
index b371db4ce..1af7df1f0 100644
--- a/packages/phrases/src/locales/pl-pl/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/pl-pl/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Szczegóły dziennika audytu',
   back_to_logs: 'Powróć do dziennika audytu',
-  back_to_user: 'Powróć do {{name}}',
+  back_to: 'Powróć do {{name}}',
   success: 'Sukces',
   failed: 'Niepowodzenie',
   event_key: 'Klucz zdarzenia',
diff --git a/packages/phrases/src/locales/pl-pl/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/pl-pl/translation/admin-console/webhook-details.ts
index 13be5a1a1..dec7e1f40 100644
--- a/packages/phrases/src/locales/pl-pl/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/pl-pl/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Usuwasz ten webhook. Po jego usunięciu nie będzie wysyłany żaden żądanie HTTP do adresu URL końcowego.',
   deleted: 'Webhook został pomyślnie usunięty.',
   settings_tab: 'Ustawienia',
-  recent_requests_tab: 'Najnowsze żądania',
+  recent_requests_tab: 'Najnowsze żądania (24h)',
   settings: {
     settings: 'Ustawienia',
     settings_description:
diff --git a/packages/phrases/src/locales/pt-br/translation/admin-console/log-details.ts b/packages/phrases/src/locales/pt-br/translation/admin-console/log-details.ts
index fd597c209..8632e884f 100644
--- a/packages/phrases/src/locales/pt-br/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/pt-br/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Detalhes do registro de auditoria',
   back_to_logs: 'Voltar para registros',
-  back_to_user: 'Voltar para {{name}}',
+  back_to: 'Voltar para {{name}}',
   success: 'Sucesso',
   failed: 'Falhou',
   event_key: 'Chave do evento',
diff --git a/packages/phrases/src/locales/pt-br/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/pt-br/translation/admin-console/webhook-details.ts
index 998077bc1..e1f7fffc3 100644
--- a/packages/phrases/src/locales/pt-br/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/pt-br/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Você está removendo este webhook. Depois de excluí-lo, não enviará solicitação HTTP para o URL do endpoint.',
   deleted: 'O webhook foi excluído com sucesso.',
   settings_tab: 'Configurações',
-  recent_requests_tab: 'Solicitações recentes',
+  recent_requests_tab: 'Solicitações recentes (24h)',
   settings: {
     settings: 'Configurações',
     settings_description:
diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/log-details.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/log-details.ts
index 26bc83826..8bb7b59c5 100644
--- a/packages/phrases/src/locales/pt-pt/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/pt-pt/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Detalhes do registo de auditoria',
   back_to_logs: 'Voltar aos registos de auditoria',
-  back_to_user: 'Voltar para {{name}}',
+  back_to: 'Voltar para {{name}}',
   success: 'Sucesso',
   failed: 'Falha',
   event_key: 'Chave do Evento',
diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/webhook-details.ts
index 999692b65..22ba00d4f 100644
--- a/packages/phrases/src/locales/pt-pt/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/pt-pt/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Você está removendo este webhook. Depois de excluí-lo, ele não enviará solicitação HTTP para o URL do endpoint.',
   deleted: 'O webhook foi excluído com sucesso.',
   settings_tab: 'Configurações',
-  recent_requests_tab: 'Solicitações recentes',
+  recent_requests_tab: 'Solicitações recentes (24h)',
   settings: {
     settings: 'Configurações',
     settings_description:
diff --git a/packages/phrases/src/locales/ru/translation/admin-console/log-details.ts b/packages/phrases/src/locales/ru/translation/admin-console/log-details.ts
index efa6db37f..e89851f4c 100644
--- a/packages/phrases/src/locales/ru/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/ru/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Детали журнала аудита',
   back_to_logs: 'Назад к журналу аудита',
-  back_to_user: 'Назад к {{name}}',
+  back_to: 'Назад к {{name}}',
   success: 'Успешно',
   failed: 'Не удалось',
   event_key: 'Ключ события',
diff --git a/packages/phrases/src/locales/ru/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/ru/translation/admin-console/webhook-details.ts
index 2248986aa..71b48af58 100644
--- a/packages/phrases/src/locales/ru/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/ru/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Вы удаляете этот вебхук. После удаления он не будет отправлять HTTP-запрос на URL-адрес точки доступа.',
   deleted: 'Вебхук был успешно удален.',
   settings_tab: 'Настройки',
-  recent_requests_tab: 'Недавние запросы',
+  recent_requests_tab: 'Недавние запросы (за 24ч)',
   settings: {
     settings: 'Настройки',
     settings_description:
diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/log-details.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/log-details.ts
index eb3eaf57d..a33211935 100644
--- a/packages/phrases/src/locales/tr-tr/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/tr-tr/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: 'Denetim Kaydı Detayları',
   back_to_logs: 'Denetim Kayıtlarına Geri Dön',
-  back_to_user: "{{name}}'in Kayıtlarına Geri Dön",
+  back_to: "{{name}}'in Kayıtlarına Geri Dön",
   success: 'Başarılı',
   failed: 'Başarısız',
   event_key: 'Olay Anahtarı',
diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/webhook-details.ts
index 2cbb28975..b820f3409 100644
--- a/packages/phrases/src/locales/tr-tr/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/tr-tr/translation/admin-console/webhook-details.ts
@@ -15,7 +15,7 @@ const webhook_details = {
     'Bu webhook’u kaldırıyorsunuz. Silindikten sonra, HTTP isteği uç nokta URL’ye gönderilmeyecektir.',
   deleted: 'Webhook başarıyla silindi.',
   settings_tab: 'Ayarlar',
-  recent_requests_tab: 'Son istekler',
+  recent_requests_tab: 'Son istekler (24s)',
   settings: {
     settings: 'Ayarlar',
     settings_description:
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/log-details.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/log-details.ts
index 755d70422..c3619347b 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: '审计日志详情',
   back_to_logs: '返回审计日志',
-  back_to_user: '返回 {{name}}',
+  back_to: '返回 {{name}}',
   success: '成功',
   failed: '失败',
   event_key: '事件 Key',
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/webhook-details.ts
index 96abe9709..245e52e19 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/webhook-details.ts
@@ -13,7 +13,7 @@ const webhook_details = {
   deletion_reminder: '您正在删除此 Webhook。删除后，将不会向端点 URL 发送 HTTP 请求。',
   deleted: 'Webhook 已成功删除。',
   settings_tab: '设置',
-  recent_requests_tab: '最近请求',
+  recent_requests_tab: '最近请求（24小时）',
   settings: {
     settings: '设置',
     settings_description:
diff --git a/packages/phrases/src/locales/zh-hk/translation/admin-console/log-details.ts b/packages/phrases/src/locales/zh-hk/translation/admin-console/log-details.ts
index 59ce97b70..77e112b0e 100644
--- a/packages/phrases/src/locales/zh-hk/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/zh-hk/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: '審計日誌詳情',
   back_to_logs: '返回審計日誌',
-  back_to_user: '返回 {{name}}',
+  back_to: '返回 {{name}}',
   success: '成功',
   failed: '失敗',
   event_key: '事件 Key',
diff --git a/packages/phrases/src/locales/zh-hk/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/zh-hk/translation/admin-console/webhook-details.ts
index f67f3d561..db69c8ca7 100644
--- a/packages/phrases/src/locales/zh-hk/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/zh-hk/translation/admin-console/webhook-details.ts
@@ -13,7 +13,7 @@ const webhook_details = {
   deletion_reminder: '您正在刪除此 webhook。刪除後，不會對端點 URL 發送 HTTP 請求。',
   deleted: 'Webhook 已成功刪除。',
   settings_tab: '設置',
-  recent_requests_tab: '最新請求',
+  recent_requests_tab: '最新請求（24h）',
   settings: {
     settings: '設置',
     settings_description:
diff --git a/packages/phrases/src/locales/zh-tw/translation/admin-console/log-details.ts b/packages/phrases/src/locales/zh-tw/translation/admin-console/log-details.ts
index 962abd635..f099661fe 100644
--- a/packages/phrases/src/locales/zh-tw/translation/admin-console/log-details.ts
+++ b/packages/phrases/src/locales/zh-tw/translation/admin-console/log-details.ts
@@ -1,7 +1,7 @@
 const log_details = {
   page_title: '審計日誌詳情',
   back_to_logs: '返回審計日誌',
-  back_to_user: '返回 {{name}}',
+  back_to: '返回 {{name}}',
   success: '成功',
   failed: '失敗',
   event_key: '事件 Key',
diff --git a/packages/phrases/src/locales/zh-tw/translation/admin-console/webhook-details.ts b/packages/phrases/src/locales/zh-tw/translation/admin-console/webhook-details.ts
index 85b043c43..30442ac25 100644
--- a/packages/phrases/src/locales/zh-tw/translation/admin-console/webhook-details.ts
+++ b/packages/phrases/src/locales/zh-tw/translation/admin-console/webhook-details.ts
@@ -13,7 +13,7 @@ const webhook_details = {
   deletion_reminder: '您正在移除此 Webhook。刪除後，將不會向端點 URL 發送 HTTP 請求。',
   deleted: 'Webhook 已成功刪除。',
   settings_tab: '設置',
-  recent_requests_tab: '最近的請求',
+  recent_requests_tab: '最近的請求 (24h)',
   settings: {
     settings: '設置',
     settings_description: