feat: use data-service sessions endpoint #3296
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /*! | ||
| * Copyright 2024 - Swiss Data Science Center (SDSC) | ||
| * A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and | ||
| * Eidgenössische Technische Hochschule Zürich (ETHZ). | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { displaySlice } from "../features/display"; | ||
| import useAppDispatch from "../utils/customHooks/useAppDispatch.hook"; | ||
| import useAppSelector from "../utils/customHooks/useAppSelector.hook"; | ||
| import { useGetSessionLogsV2 } from "../utils/customHooks/UseGetSessionLogs"; | ||
| import { EnvironmentLogsPresent } from "./Logs"; | ||
|
|
||
| /** | ||
| * Sessions logs container integrating state and actions V2 | ||
| * | ||
| * @param {string} name - server name | ||
| */ | ||
| interface EnvironmentLogsPropsV2 { | ||
| name: string; | ||
| } | ||
| export default function EnvironmentLogsV2({ name }: EnvironmentLogsPropsV2) { | ||
| const displayModal = useAppSelector( | ||
| ({ display }) => display.modals.sessionLogs | ||
| ); | ||
| const { logs, fetchLogs } = useGetSessionLogsV2( | ||
| displayModal.targetServer, | ||
| displayModal.show | ||
| ); | ||
| const dispatch = useAppDispatch(); | ||
| const toggleLogs = function (target: string) { | ||
| dispatch( | ||
| displaySlice.actions.toggleSessionLogsModal({ targetServer: target }) | ||
| ); | ||
| }; | ||
|
|
||
| return ( | ||
| <EnvironmentLogsPresent | ||
| fetchLogs={fetchLogs} | ||
| toggleLogs={toggleLogs} | ||
| logs={logs} | ||
| name={name} | ||
| title="Logs" | ||
| /> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,12 +26,8 @@ export function getSessionEnvironmentValues(environment: SessionEnvironment) { | |
| description: environment.description, | ||
| name: environment.name, | ||
| port: environment.port ?? undefined, | ||
| working_directory: environment.working_directory?.trim() || undefined, | ||
| mount_directory: environment.mount_directory?.trim() || undefined, | ||
| uid: environment.uid ?? undefined, | ||
| gid: environment.gid ?? undefined, | ||
| command: getJSONStringArray(environment.command), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,91 @@ | ||
| import { SerializedError } from "@reduxjs/toolkit"; | ||
| import { FetchBaseQueryError, skipToken } from "@reduxjs/toolkit/query"; | ||
| import cx from "classnames"; | ||
| import { Link, generatePath } from "react-router-dom-v5-compat"; | ||
| import { Col, ListGroup, Row } from "reactstrap"; | ||
| import { Loader } from "../../components/Loader"; | ||
| import EnvironmentLogsV2 from "../../components/LogsV2"; | ||
| import { RtkErrorAlert } from "../../components/errors/RtkErrorAlert"; | ||
| import { useGetSessionsQuery as useGetSessionsQueryV2 } from "../../features/sessionsV2/sessionsV2.api"; | ||
| import "../../notebooks/Notebooks.css"; | ||
| import { ABSOLUTE_ROUTES } from "../../routing/routes.constants"; | ||
|
There was a problem hiding this comment. Can you keep the CSS imports as the last ones? They semantically different from the other ones, so we should make them stand out. Also keep the associated comment. |
||
| import useAppSelector from "../../utils/customHooks/useAppSelector.hook"; | ||
| import { useGetProjectsByProjectIdQuery } from "../projectsV2/api/projectV2.enhanced-api"; | ||
| import ActiveSessionButton from "../sessionsV2/components/SessionButton/ActiveSessionButton"; | ||
| import { | ||
| SessionStatusV2Description, | ||
| SessionStatusV2Label, | ||
| } from "../sessionsV2/components/SessionStatus/SessionStatus"; | ||
|
There was a problem hiding this comment. Can you keep this comment here? Otherwise there is no indication that removing the |
||
| import { SessionList, SessionV2 } from "../sessionsV2/sessionsV2.types"; | ||
|
|
||
| export default function DashboardV2Sessions() { | ||
| const { data: sessions, error, isLoading } = useGetSessionsQueryV2(); | ||
|
|
||
| if (isLoading) { | ||
| return <LoadingState />; | ||
| } | ||
|
|
||
| if (error) { | ||
| return <ErrorState error={error} />; | ||
| } | ||
|
|
||
| if (!sessions || sessions.length === 0) { | ||
| return <NoSessionsState />; | ||
| } | ||
|
|
||
| return <SessionDashboardList sessions={sessions} />; | ||
| } | ||
|
|
||
| function LoadingState() { | ||
| return ( | ||
| <div className={cx("d-flex", "flex-column", "mx-auto")}> | ||
| <Loader /> | ||
| <p className={cx("mx-auto", "my-3")}>Retrieving sessions...</p> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function ErrorState({ | ||
| error, | ||
| }: { | ||
| error: FetchBaseQueryError | SerializedError | undefined; | ||
| }) { | ||
| return ( | ||
| <div> | ||
| <p>Cannot show sessions.</p> | ||
| <RtkErrorAlert error={error} /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function NoSessionsState() { | ||
| return <div>No running sessions.</div>; | ||
| } | ||
|
|
||
| function SessionDashboardList({ | ||
| sessions, | ||
| }: { | ||
| sessions: SessionList | undefined; | ||
| }) { | ||
| return ( | ||
| <ListGroup flush data-cy="dashboard-session-list"> | ||
| {sessions?.map((session) => ( | ||
| <DashboardSession key={session.name} session={session} /> | ||
| ))} | ||
| </ListGroup> | ||
| ); | ||
| } | ||
|
|
||
| interface DashboardSessionProps { | ||
| session: SessionV2; | ||
| } | ||
| function DashboardSession({ session }: DashboardSessionProps) { | ||
| const displayModal = useAppSelector( | ||
| ({ display }) => display.modals.sessionLogs | ||
| ); | ||
| const { image, project_id: projectId } = session; | ||
| const { data: project } = useGetProjectsByProjectIdQuery( | ||
| projectId ? { projectId } : skipToken | ||
| ); | ||
|
|
||
| const projectUrl = project | ||
|
|
@@ -147,10 +154,7 @@ function DashboardSession({ session }: DashboardSessionProps) { | |
| </Row> | ||
| </Col> | ||
| </Row> | ||
| <EnvironmentLogsV2 name={displayModal.targetServer} /> | ||
| </Link> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -755,7 +755,7 @@ function ModifySessionModalContent({ | |
| <Col> | ||
| {message} | ||
| <p> | ||
| <span className={cx("fw-bold", "me-3")}>Current resources:</span> | ||
| <span> | ||
| <SessionRowResourceRequests | ||
| resourceRequests={resources.requests} | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar to the comment on
AddSessionEnvironmentButton: