diff --git a/src/app/(app)/scripts/schedule/components/schedule-runs-columns.tsx b/src/app/(app)/scripts/schedule/components/schedule-runs-columns.tsx index 2d40e789..bd0c6748 100644 --- a/src/app/(app)/scripts/schedule/components/schedule-runs-columns.tsx +++ b/src/app/(app)/scripts/schedule/components/schedule-runs-columns.tsx @@ -15,7 +15,6 @@ import { } from '@flamingo-stack/openframe-frontend-core/components/ui'; import { useToast } from '@flamingo-stack/openframe-frontend-core/hooks'; import { cn } from '@flamingo-stack/openframe-frontend-core/utils'; -import { useRouter } from 'next/navigation'; import { useCallback, useMemo } from 'react'; import { employeeDetailHref } from '@/app/(app)/settings/employees/routes'; import { DateColumnHeader, type TableDateFilter } from '@/app/components/shared/date-column-header'; @@ -166,7 +165,6 @@ export function useScheduleRunColumns( statusOptions: RunStatusOption[], dateFilter: TableDateFilter, ): ColumnDef[] { - const router = useRouter(); const { toast } = useToast(); const renderRowActions = useCallback( @@ -272,11 +270,11 @@ export function useScheduleRunColumns( cell: ({ row }: { row: Row }) => (
@@ -285,7 +283,7 @@ export function useScheduleRunColumns( meta: liveColumnMeta(RUN_COLUMNS.open), }, ], - [renderRowActions, router, statusOptions, dateFilter], + [renderRowActions, statusOptions, dateFilter], ); } diff --git a/src/app/(app)/scripts/script/components/script-execution-details-view.tsx b/src/app/(app)/scripts/script/components/script-execution-details-view.tsx index dddbf00c..1415e7df 100644 --- a/src/app/(app)/scripts/script/components/script-execution-details-view.tsx +++ b/src/app/(app)/scripts/script/components/script-execution-details-view.tsx @@ -18,7 +18,7 @@ import { displayValue, EMPTY_VALUE } from '@/lib/empty-value'; import { formatDateTime } from '@/lib/format-date'; import { formatCount } from '@/lib/format-number'; import { getFullImageUrl } from '@/lib/image-url'; -import { decodeGlobalId } from '@/lib/relay-id'; +import { decodeGlobalId, ensureGlobalIdForType } from '@/lib/relay-id'; import { routes } from '@/lib/routes'; import { ExecutionSourceBadge } from '../../shared/components/execution-source-badge'; import { @@ -85,8 +85,11 @@ function ScriptExecutionDetailsContent({ executionId }: ScriptExecutionDetailsVi return () => clearInterval(interval); }, [isInFlight, environment, executionId]); + // `scriptId` is the raw DB id, but Script Details resolves its `?id=` through `node(id:)`. const handleBack = useSafeBack( - execution?.scriptId ? routes.scripts.details(execution.scriptId, { tab: 'executions' }) : routes.scripts.list, + execution?.scriptId + ? routes.scripts.details(ensureGlobalIdForType('Script', execution.scriptId), { tab: 'executions' }) + : routes.scripts.list, ); const actions = useMemo(() => { diff --git a/src/app/(app)/scripts/shared/components/executions-table.tsx b/src/app/(app)/scripts/shared/components/executions-table.tsx index 05559368..46132187 100644 --- a/src/app/(app)/scripts/shared/components/executions-table.tsx +++ b/src/app/(app)/scripts/shared/components/executions-table.tsx @@ -26,7 +26,6 @@ import { } from '@flamingo-stack/openframe-frontend-core/components/ui'; import { useApiParams, useToast } from '@flamingo-stack/openframe-frontend-core/hooks'; import { cn } from '@flamingo-stack/openframe-frontend-core/utils'; -import { useRouter } from 'next/navigation'; import { type ReactNode, Suspense, useCallback, useEffect, useMemo, useState } from 'react'; import { readInlineData } from 'relay-runtime'; import type { executionFacets_filters$key as ExecutionFacetsKey } from '@/__generated__/executionFacets_filters.graphql'; @@ -300,7 +299,6 @@ export function ExecutionsTable({ onMobileFilterClose, onEmptyChange, }: ExecutionsTableProps) { - const router = useRouter(); const { toast } = useToast(); const { statusOptions, machineOptions, initiatorOptions } = facetOptions; @@ -491,11 +489,11 @@ export function ExecutionsTable({ cell: ({ row }: { row: Row }) => (
@@ -504,7 +502,7 @@ export function ExecutionsTable({ meta: liveColumnMeta(EXECUTION_COLUMNS.open), }, ], - [renderRowActions, router, executionHref, statusOptions, initiatorOptions, machineOptions, dateFilter], + [renderRowActions, executionHref, statusOptions, initiatorOptions, machineOptions, dateFilter], ); const filterGroups = useMemo(