Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@mui/material": "^7.3.10",
"@tanstack/react-query": "^5.100.9",
"@tanstack/react-query-devtools": "^5.100.9",
"@tanstack/react-virtual": "^3.14.6",
"dayjs": "^1.11.20",
"immer": "^11.1.11",
"next": "^15.5.15",
Expand Down
38 changes: 33 additions & 5 deletions src/app/api/sessions/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,26 @@ export const GET = withErrorHandling(async (request: NextRequest) => {
};
console.log('📨 Session GET route - final headers:', finalHeaders);

// `view=interactive` excludes headless batch jobs. Skaha source:
// skaha/src/main/java/org/opencadc/skaha/session/GetAction.java —
// SESSION_VIEW_INTERACTIVE branch.
const sessionType = request.nextUrl.searchParams.get('type');
const isHeadlessList = sessionType === 'headless';
const statusFilter = request.nextUrl.searchParams.get('status');

// Interactive: `view=interactive` excludes headless batch jobs (Skaha
// SESSION_VIEW_INTERACTIVE). Headless: `type=headless` on the typed list
// path — keep Failed/Succeeded/Completed for the batch-jobs widget.
// Optional `status` narrows to one Skaha status (Pending, Running, …).
let skahaUrl: string;
if (isHeadlessList) {
skahaUrl = `${serverApiConfig.skaha.baseUrl}/v1/session?type=headless`;
if (statusFilter) {
skahaUrl += `&status=${encodeURIComponent(statusFilter)}`;
}
} else {
skahaUrl = `${serverApiConfig.skaha.baseUrl}/v1/session?view=interactive`;
}

const response = await fetchExternalApi(
`${serverApiConfig.skaha.baseUrl}/v1/session?view=interactive`,
skahaUrl,
{
method: 'GET',
headers: finalHeaders,
Expand All @@ -68,11 +83,24 @@ export const GET = withErrorHandling(async (request: NextRequest) => {
return errorResponse('Failed to fetch sessions', response.status, errorText);
}

const all: SkahaSessionResponse[] = await response.json();

if (isHeadlessList) {
logger.info(
`Retrieved ${all.length} headless session(s)${statusFilter ? ` status=${statusFilter}` : ''}`,
);
logger.logSuccess(HTTP_STATUS.OK, {
count: all.length,
type: 'headless',
...(statusFilter ? { status: statusFilter } : {}),
});
return successResponse(all);
}

// Skaha marks a session `Failed` once its lifetime elapses (an expired
// session). These linger in the list for some time after they stop being
// useful; drop them so the active-sessions widget only shows sessions
// the user can actually interact with.
const all: SkahaSessionResponse[] = await response.json();
const sessions = all.filter((s) => s.status !== 'Failed');
logger.info(
`Retrieved ${all.length} interactive session(s), ${sessions.length} after dropping expired`,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { HeadlessSessionsWidgetProps } from '@/app/types/HeadlessSessionsWidgetProps';
import { HeadlessSessionsWidgetImpl } from '@/app/implementation/headlessSessionsWidget';

export function HeadlessSessionsWidget(props: HeadlessSessionsWidgetProps) {
return <HeadlessSessionsWidgetImpl {...props} />;
}
Loading
Loading