Skip to content

Scripts: Back from a directly opened execution resolves the script; ↗ opens in a new tab. CU-17tkuw5ty38 #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-blip merged 1 commit into from
Oct 2, 2026
+11 −12
Merged

Scripts: Back from a directly opened execution resolves the script; ↗ opens in a new tab. CU-17tkuw5ty38 #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/app/(app)/scripts/schedule/components/schedule-runs-columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -166,7 +165,6 @@ export function useScheduleRunColumns(
statusOptions: RunStatusOption[],
dateFilter: TableDateFilter,
): ColumnDef<UiRun>[] {
const router = useRouter();
const { toast } = useToast();

const renderRowActions = useCallback(
Expand Down Expand Up @@ -272,11 +270,11 @@ export function useScheduleRunColumns(
cell: ({ row }: { row: Row<UiRun> }) => (
<div data-no-row-click className="pointer-events-auto flex items-center justify-end">
<Button
onClick={() => router.push(runDetailsHref(row.original))}
onClick={openInNewTab(runDetailsHref(row.original))}
variant="outline"
size="icon"
leftIcon={<ArrowRightUpIcon className="h-5 w-5" />}
aria-label="Open run details"
aria-label="Open run details in new tab"
className="bg-ods-card"
/>
</div>
Expand All @@ -285,7 +283,7 @@ export function useScheduleRunColumns(
meta: liveColumnMeta(RUN_COLUMNS.open),
},
],
[renderRowActions, router, statusOptions, dateFilter],
[renderRowActions, statusOptions, dateFilter],
);
}

Expand Down
7 changes: 5 additions & 2 deletions src/app/(app)/scripts/script/components/script-execution-details-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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<PageActionButton[]>(() => {
Expand Down
8 changes: 3 additions & 5 deletions src/app/(app)/scripts/shared/components/executions-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -300,7 +299,6 @@ export function ExecutionsTable({
onMobileFilterClose,
onEmptyChange,
}: ExecutionsTableProps) {
const router = useRouter();
const { toast } = useToast();
const { statusOptions, machineOptions, initiatorOptions } = facetOptions;

Expand Down Expand Up @@ -491,11 +489,11 @@ export function ExecutionsTable({
cell: ({ row }: { row: Row<UiExecution> }) => (
<div data-no-row-click className="pointer-events-auto flex items-center justify-end">
<Button
onClick={() => router.push(executionHref(row.original))}
onClick={openInNewTab(executionHref(row.original))}
variant="outline"
size="icon"
leftIcon={<ArrowRightUpIcon className="h-5 w-5" />}
aria-label="Open execution details"
aria-label="Open execution details in new tab"
className="bg-ods-card"
/>
</div>
Expand All @@ -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(
Expand Down
Loading