From a32acf7c692fea514b2b0339245c157023a14ce5 Mon Sep 17 00:00:00 2001 From: Owen Date: Thu, 28 May 2026 20:14:39 -0700 Subject: [PATCH] Fix ui --- src/app/[orgId]/settings/logs/access/page.tsx | 109 ------------------ src/app/[orgId]/settings/logs/action/page.tsx | 105 ----------------- .../[orgId]/settings/logs/connection/page.tsx | 104 ----------------- .../[orgId]/settings/logs/request/page.tsx | 99 ---------------- .../ResourcePolicySubForms.tsx | 10 +- 5 files changed, 5 insertions(+), 422 deletions(-) diff --git a/src/app/[orgId]/settings/logs/access/page.tsx b/src/app/[orgId]/settings/logs/access/page.tsx index 6b59581fc..267ad8556 100644 --- a/src/app/[orgId]/settings/logs/access/page.tsx +++ b/src/app/[orgId]/settings/logs/access/page.tsx @@ -182,115 +182,6 @@ export default function GeneralPage() { router.replace(`?${params.toString()}`, { scroll: false }); }; - const queryDateTime = async ( - startDate: DateTimeValue, - endDate: DateTimeValue, - page: number = currentPage, - size: number = pageSize, - filtersParam?: { - action?: string; - type?: string; - resourceId?: string; - location?: string; - actor?: string; - } - ) => { - console.log("Date range changed:", { startDate, endDate, page, size }); - if (!isPaidUser(tierMatrix.accessLogs) || build === "oss") { - console.log( - "Access denied: subscription inactive or license locked" - ); - return; - } - - setIsLoading(true); - - try { - // Use the provided filters or fall back to current state - const activeFilters = filtersParam || filters; - - // Convert the date/time values to API parameters - const params: any = { - limit: size, - offset: page * size, - ...activeFilters - }; - - if (startDate?.date) { - const startDateTime = new Date(startDate.date); - if (startDate.time) { - const [hours, minutes, seconds] = startDate.time - .split(":") - .map(Number); - startDateTime.setHours(hours, minutes, seconds || 0); - } - params.timeStart = startDateTime.toISOString(); - } - - if (endDate?.date) { - const endDateTime = new Date(endDate.date); - if (endDate.time) { - const [hours, minutes, seconds] = endDate.time - .split(":") - .map(Number); - endDateTime.setHours(hours, minutes, seconds || 0); - } else { - // If no time is specified, set to NOW - const now = new Date(); - endDateTime.setHours( - now.getHours(), - now.getMinutes(), - now.getSeconds(), - now.getMilliseconds() - ); - } - params.timeEnd = endDateTime.toISOString(); - } - - const res = await api.get(`/org/${orgId}/logs/access`, { params }); - if (res.status === 200) { - setRows(res.data.data.log || []); - setTotalCount(res.data.data.pagination?.total || 0); - setFilterAttributes(res.data.data.filterAttributes); - console.log("Fetched logs:", res.data); - } - } catch (error) { - toast({ - title: t("error"), - description: t("Failed to filter logs"), - variant: "destructive" - }); - } finally { - setIsLoading(false); - } - }; - - const refreshData = async () => { - console.log("Data refreshed"); - setIsRefreshing(true); - try { - const endDate = searchParams.get("end") - ? dateRange.endDate - : { date: new Date() }; - setDateRange((current) => ({ ...current, endDate })); - // Refresh data with current date range and pagination - await queryDateTime( - dateRange.startDate, - endDate, - currentPage, - pageSize - ); - } catch (error) { - toast({ - title: t("error"), - description: t("refreshError"), - variant: "destructive" - }); - } finally { - setIsRefreshing(false); - } - }; - const exportData = async () => { try { const params: any = { diff --git a/src/app/[orgId]/settings/logs/action/page.tsx b/src/app/[orgId]/settings/logs/action/page.tsx index 61bf29b00..7ccce8877 100644 --- a/src/app/[orgId]/settings/logs/action/page.tsx +++ b/src/app/[orgId]/settings/logs/action/page.tsx @@ -169,111 +169,6 @@ export default function GeneralPage() { router.replace(`?${params.toString()}`, { scroll: false }); }; - const queryDateTime = async ( - startDate: DateTimeValue, - endDate: DateTimeValue, - page: number = currentPage, - size: number = pageSize, - filtersParam?: { - action?: string; - actor?: string; - } - ) => { - console.log("Date range changed:", { startDate, endDate, page, size }); - if (!isPaidUser(tierMatrix.actionLogs)) { - console.log( - "Access denied: subscription inactive or license locked" - ); - return; - } - setIsLoading(true); - - try { - // Use the provided filters or fall back to current state - const activeFilters = filtersParam || filters; - - // Convert the date/time values to API parameters - const params: any = { - limit: size, - offset: page * size, - ...activeFilters - }; - - if (startDate?.date) { - const startDateTime = new Date(startDate.date); - if (startDate.time) { - const [hours, minutes, seconds] = startDate.time - .split(":") - .map(Number); - startDateTime.setHours(hours, minutes, seconds || 0); - } - params.timeStart = startDateTime.toISOString(); - } - - if (endDate?.date) { - const endDateTime = new Date(endDate.date); - if (endDate.time) { - const [hours, minutes, seconds] = endDate.time - .split(":") - .map(Number); - endDateTime.setHours(hours, minutes, seconds || 0); - } else { - // If no time is specified, set to NOW - const now = new Date(); - endDateTime.setHours( - now.getHours(), - now.getMinutes(), - now.getSeconds(), - now.getMilliseconds() - ); - } - params.timeEnd = endDateTime.toISOString(); - } - - const res = await api.get(`/org/${orgId}/logs/action`, { params }); - if (res.status === 200) { - setRows(res.data.data.log || []); - setTotalCount(res.data.data.pagination?.total || 0); - setFilterAttributes(res.data.data.filterAttributes); - console.log("Fetched logs:", res.data); - } - } catch (error) { - toast({ - title: t("error"), - description: t("Failed to filter logs"), - variant: "destructive" - }); - } finally { - setIsLoading(false); - } - }; - - const refreshData = async () => { - console.log("Data refreshed"); - setIsRefreshing(true); - try { - const endDate = searchParams.get("end") - ? dateRange.endDate - : { date: new Date() }; - setDateRange((current) => ({ ...current, endDate })); - // Refresh data with current date range and pagination - await queryDateTime( - dateRange.startDate, - endDate, - currentPage, - pageSize - ); - } catch (error) { - toast({ - title: t("error"), - description: t("refreshError"), - variant: "destructive" - }); - } finally { - setIsRefreshing(false); - } - }; - const exportData = async () => { try { const params: any = { diff --git a/src/app/[orgId]/settings/logs/connection/page.tsx b/src/app/[orgId]/settings/logs/connection/page.tsx index a946af736..125ccb118 100644 --- a/src/app/[orgId]/settings/logs/connection/page.tsx +++ b/src/app/[orgId]/settings/logs/connection/page.tsx @@ -203,110 +203,6 @@ export default function ConnectionLogsPage() { router.replace(`?${params.toString()}`, { scroll: false }); }; - const queryDateTime = async ( - startDate: DateTimeValue, - endDate: DateTimeValue, - page: number = currentPage, - size: number = pageSize, - filtersParam?: typeof filters - ) => { - console.log("Date range changed:", { startDate, endDate, page, size }); - if (!isPaidUser(tierMatrix.connectionLogs)) { - console.log( - "Access denied: subscription inactive or license locked" - ); - return; - } - setIsLoading(true); - - try { - // Use the provided filters or fall back to current state - const activeFilters = filtersParam || filters; - - // Convert the date/time values to API parameters - const params: any = { - limit: size, - offset: page * size, - ...activeFilters - }; - - if (startDate?.date) { - const startDateTime = new Date(startDate.date); - if (startDate.time) { - const [hours, minutes, seconds] = startDate.time - .split(":") - .map(Number); - startDateTime.setHours(hours, minutes, seconds || 0); - } - params.timeStart = startDateTime.toISOString(); - } - - if (endDate?.date) { - const endDateTime = new Date(endDate.date); - if (endDate.time) { - const [hours, minutes, seconds] = endDate.time - .split(":") - .map(Number); - endDateTime.setHours(hours, minutes, seconds || 0); - } else { - // If no time is specified, set to NOW - const now = new Date(); - endDateTime.setHours( - now.getHours(), - now.getMinutes(), - now.getSeconds(), - now.getMilliseconds() - ); - } - params.timeEnd = endDateTime.toISOString(); - } - - const res = await api.get(`/org/${orgId}/logs/connection`, { - params - }); - if (res.status === 200) { - setRows(res.data.data.log || []); - setTotalCount(res.data.data.pagination?.total || 0); - setFilterAttributes(res.data.data.filterAttributes); - console.log("Fetched connection logs:", res.data); - } - } catch (error) { - toast({ - title: t("error"), - description: t("Failed to filter logs"), - variant: "destructive" - }); - } finally { - setIsLoading(false); - } - }; - - const refreshData = async () => { - console.log("Data refreshed"); - setIsRefreshing(true); - try { - const endDate = searchParams.get("end") - ? dateRange.endDate - : { date: new Date() }; - setDateRange((current) => ({ ...current, endDate })); - // Refresh data with current date range and pagination - await queryDateTime( - dateRange.startDate, - endDate, - currentPage, - pageSize - ); - } catch (error) { - toast({ - title: t("error"), - description: t("refreshError"), - variant: "destructive" - }); - } finally { - setIsRefreshing(false); - } - }; - const exportData = async () => { try { const params: any = { diff --git a/src/app/[orgId]/settings/logs/request/page.tsx b/src/app/[orgId]/settings/logs/request/page.tsx index 40d0797e5..2196a0342 100644 --- a/src/app/[orgId]/settings/logs/request/page.tsx +++ b/src/app/[orgId]/settings/logs/request/page.tsx @@ -185,105 +185,6 @@ export default function GeneralPage() { router.replace(`?${params.toString()}`, { scroll: false }); }; - const queryDateTime = async ( - startDate: DateTimeValue, - endDate: DateTimeValue, - page: number = currentPage, - size: number = pageSize, - filtersParam?: { - action?: string; - type?: string; - } - ) => { - console.log("Date range changed:", { startDate, endDate, page, size }); - setIsLoading(true); - - try { - // Use the provided filters or fall back to current state - const activeFilters = filtersParam || filters; - - // Convert the date/time values to API parameters - const params: any = { - limit: size, - offset: page * size, - ...activeFilters - }; - - if (startDate?.date) { - const startDateTime = new Date(startDate.date); - if (startDate.time) { - const [hours, minutes, seconds] = startDate.time - .split(":") - .map(Number); - startDateTime.setHours(hours, minutes, seconds || 0); - } - params.timeStart = startDateTime.toISOString(); - } - - if (endDate?.date) { - const endDateTime = new Date(endDate.date); - if (endDate.time) { - const [hours, minutes, seconds] = endDate.time - .split(":") - .map(Number); - endDateTime.setHours(hours, minutes, seconds || 0); - } else { - // If no time is specified, set to NOW - const now = new Date(); - endDateTime.setHours( - now.getHours(), - now.getMinutes(), - now.getSeconds(), - now.getMilliseconds() - ); - } - params.timeEnd = endDateTime.toISOString(); - } - - const res = await api.get(`/org/${orgId}/logs/request`, { params }); - if (res.status === 200) { - setRows(res.data.data.log || []); - setTotalCount(res.data.data.pagination?.total || 0); - setFilterAttributes(res.data.data.filterAttributes); - console.log("Fetched logs:", res.data); - } - } catch (error) { - toast({ - title: t("error"), - description: t("Failed to filter logs"), - variant: "destructive" - }); - } finally { - setIsLoading(false); - } - }; - - const refreshData = async () => { - console.log("Data refreshed"); - setIsRefreshing(true); - try { - const endDate = searchParams.get("end") - ? dateRange.endDate - : { date: new Date() }; - setDateRange((current) => ({ ...current, endDate })); - // Refresh data with current date range and pagination - await queryDateTime( - dateRange.startDate, - endDate, - currentPage, - pageSize - ); - } catch (error) { - toast({ - title: t("error"), - description: t("refreshError"), - variant: "destructive" - }); - } finally { - setIsRefreshing(false); - } - }; - const exportData = async () => { try { // Prepare query params for export diff --git a/src/components/resource-policy/ResourcePolicySubForms.tsx b/src/components/resource-policy/ResourcePolicySubForms.tsx index 1b46c79f4..b9e825b7c 100644 --- a/src/components/resource-policy/ResourcePolicySubForms.tsx +++ b/src/components/resource-policy/ResourcePolicySubForms.tsx @@ -123,7 +123,7 @@ type LocalRule = { // ─── PolicyNameSection ────────────────────────────────────────────────── type PolicyNameSectionProps = { - form: UseFormReturn; + form: UseFormReturn; isEditing?: boolean; }; @@ -178,7 +178,7 @@ export function PolicyNameSection({ form }: PolicyNameSectionProps) { // ─── PolicyUsersRolesSection ────────────────────────────────────────────────── type PolicyUsersRolesSectionProps = { - form: UseFormReturn; + form: UseFormReturn; allRoles: { id: string; text: string }[]; allUsers: { id: string; text: string }[]; allIdps: { id: number; text: string }[]; @@ -384,7 +384,7 @@ const setHeaderAuthSchema = z.object({ }); type PolicyAuthMethodsSectionProps = { - form: UseFormReturn; + form: UseFormReturn; }; export function PolicyAuthMethodsSection({ @@ -808,7 +808,7 @@ export function PolicyAuthMethodsSection({ // ─── PolicyOtpEmailSection ──────────────────────────────────────────────────── type PolicyOtpEmailSectionProps = { - form: UseFormReturn; + form: UseFormReturn; emailEnabled: boolean; }; @@ -950,7 +950,7 @@ export function PolicyOtpEmailSection({ // ─── PolicyRulesSection ─────────────────────────────────────────────────────── type PolicyRulesSectionProps = { - form: UseFormReturn; + form: UseFormReturn; isMaxmindAvailable: boolean; isMaxmindAsnAvailable: boolean; };