From be32e653df830d26af677e146d1b211c4ef40db1 Mon Sep 17 00:00:00 2001
From: Andrea Cordoba <dandrea.cordoba@gmail.com>
Date: Thu, 17 Oct 2024 14:48:01 +0200
Subject: [PATCH] add code suggestions

- use named functions
- refactor working and mount directory handling with optional chaining and fallback to undefined
- remove forced URL generation in ensureHTTPS function when the input is not a valid URL.
- ensure session data is fetched when loading ShowSessionPage
---
 client/src/components/Logs.tsx                | 47 ++++++++--------
 client/src/components/LogsV2.tsx              | 47 ++--------------
 .../admin/AddSessionEnvironmentButton.tsx     | 12 ++---
 .../admin/UpdateSessionEnvironmentButton.tsx  |  8 +--
 .../src/features/admin/adminSessions.utils.ts |  8 +--
 .../dashboardV2/DashboardV2Sessions.tsx       | 54 +++++++++++--------
 .../components/StartSessionProgressBar.tsx    |  2 +-
 .../sessionsV2/PauseOrDeleteSessionModal.tsx  | 32 +++++------
 .../SessionShowPage/ShowSessionPage.tsx       | 16 +++---
 .../features/sessionsV2/SessionStartPage.tsx  | 21 ++++----
 .../SessionButton/ActiveSessionButton.tsx     |  5 +-
 .../src/features/sessionsV2/session.utils.ts  | 11 ++--
 .../sessionsV2/useSessionLaunchState.hook.ts  |  1 -
 13 files changed, 108 insertions(+), 156 deletions(-)

diff --git a/client/src/components/Logs.tsx b/client/src/components/Logs.tsx
index 9d4992186..d7f6d66c9 100644
--- a/client/src/components/Logs.tsx
+++ b/client/src/components/Logs.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import React, { useEffect } from "react";
+import React, { ReactNode, useEffect } from "react";
 import {
   Button,
   Modal,
@@ -335,13 +335,27 @@ const EnvironmentLogs = ({ name, annotations }: EnvironmentLogsProps) => {
     );
   };
 
+  const cleanAnnotations = NotebooksHelper.cleanAnnotations(
+    annotations
+  ) as NotebookAnnotations;
+
+  const modalTitle = !cleanAnnotations.renkuVersion && (
+    <div className="fs-5 fw-normal">
+      <small>
+        {cleanAnnotations["namespace"]}/{cleanAnnotations["projectName"]} [
+        {cleanAnnotations["branch"]}@
+        {cleanAnnotations["commit-sha"].substring(0, 8)}]
+      </small>
+    </div>
+  );
+
   return (
     <EnvironmentLogsPresent
       fetchLogs={fetchLogs}
       toggleLogs={toggleLogs}
       logs={logs}
       name={name}
-      annotations={annotations}
+      title={modalTitle}
     />
   );
 };
@@ -353,38 +367,24 @@ const EnvironmentLogs = ({ name, annotations }: EnvironmentLogsProps) => {
  * @param {function} toggleLogs - toggle logs visibility and fetch logs on show
  * @param {object} logs - log object from redux store enhanced with `show` property
  * @param {string} name - server name
- * @param {object} annotations - list of annotations
+ * @param {ReactNode | string} title - modal title
  */
 interface EnvironmentLogsPresentProps {
-  annotations: Record<string, unknown>;
+  title: ReactNode | string;
   fetchLogs: IFetchableLogs["fetchLogs"];
   logs?: ILogs;
   name: string;
   toggleLogs: (name: string) => unknown;
 }
-const EnvironmentLogsPresent = ({
+function EnvironmentLogsPresent({
   logs,
   name,
   toggleLogs,
   fetchLogs,
-  annotations,
-}: EnvironmentLogsPresentProps) => {
+  title,
+}: EnvironmentLogsPresentProps) {
   if (!logs?.show || logs?.show !== name || !logs) return null;
 
-  const cleanAnnotations = NotebooksHelper.cleanAnnotations(
-    annotations
-  ) as NotebookAnnotations;
-
-  const modalTitle = !cleanAnnotations.renkuVersion && (
-    <div className="fs-5 fw-normal">
-      <small>
-        {cleanAnnotations["namespace"]}/{cleanAnnotations["projectName"]} [
-        {cleanAnnotations["branch"]}@
-        {cleanAnnotations["commit-sha"].substring(0, 8)}]
-      </small>
-    </div>
-  );
-
   return (
     <Modal
       isOpen={!!logs.show}
@@ -400,8 +400,7 @@ const EnvironmentLogsPresent = ({
           toggleLogs(name);
         }}
       >
-        <div>Logs</div>
-        {modalTitle}
+        {title}
       </ModalHeader>
       <ModalBody>
         <div className="mx-2">
@@ -410,6 +409,6 @@ const EnvironmentLogsPresent = ({
       </ModalBody>
     </Modal>
   );
-};
+}
 
 export { EnvironmentLogs, EnvironmentLogsPresent, SessionLogs };
diff --git a/client/src/components/LogsV2.tsx b/client/src/components/LogsV2.tsx
index cb4f0600b..8a1e5a8cf 100644
--- a/client/src/components/LogsV2.tsx
+++ b/client/src/components/LogsV2.tsx
@@ -16,12 +16,11 @@
  * limitations under the License.
  */
 
-import { Modal, ModalBody, ModalHeader } from "reactstrap";
 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 { IFetchableLogs, ILogs, SessionLogs } from "./Logs";
+import { EnvironmentLogsPresent } from "./Logs";
 
 /**
  * Sessions logs container integrating state and actions V2
@@ -31,7 +30,7 @@ import { IFetchableLogs, ILogs, SessionLogs } from "./Logs";
 interface EnvironmentLogsPropsV2 {
   name: string;
 }
-export const EnvironmentLogsV2 = ({ name }: EnvironmentLogsPropsV2) => {
+export default function EnvironmentLogsV2({ name }: EnvironmentLogsPropsV2) {
   const displayModal = useAppSelector(
     ({ display }) => display.modals.sessionLogs
   );
@@ -47,50 +46,12 @@ export const EnvironmentLogsV2 = ({ name }: EnvironmentLogsPropsV2) => {
   };
 
   return (
-    <EnvironmentLogsPresentV2
+    <EnvironmentLogsPresent
       fetchLogs={fetchLogs}
       toggleLogs={toggleLogs}
       logs={logs}
       name={name}
+      title="Logs"
     />
   );
-};
-interface EnvironmentLogsPresentV2Props {
-  fetchLogs: IFetchableLogs["fetchLogs"];
-  logs?: ILogs;
-  name: string;
-  toggleLogs: (name: string) => unknown;
 }
-const EnvironmentLogsPresentV2 = ({
-  logs,
-  name,
-  toggleLogs,
-  fetchLogs,
-}: EnvironmentLogsPresentV2Props) => {
-  if (!logs?.show || logs?.show !== name || !logs) return null;
-
-  return (
-    <Modal
-      isOpen={!!logs.show}
-      className="modal-xl"
-      scrollable={true}
-      toggle={() => {
-        toggleLogs(name);
-      }}
-    >
-      <ModalHeader
-        className="header-multiline"
-        toggle={() => {
-          toggleLogs(name);
-        }}
-      >
-        <div>Logs</div>
-      </ModalHeader>
-      <ModalBody>
-        <div className="mx-2">
-          <SessionLogs fetchLogs={fetchLogs} logs={logs} name={name} />
-        </div>
-      </ModalBody>
-    </Modal>
-  );
-};
diff --git a/client/src/features/admin/AddSessionEnvironmentButton.tsx b/client/src/features/admin/AddSessionEnvironmentButton.tsx
index 37d8fd941..484f26cfa 100644
--- a/client/src/features/admin/AddSessionEnvironmentButton.tsx
+++ b/client/src/features/admin/AddSessionEnvironmentButton.tsx
@@ -86,15 +86,11 @@ function AddSessionEnvironmentModal({
         addSessionEnvironment({
           container_image: data.container_image,
           name: data.name,
-          default_url: data.default_url?.trim() ? data.default_url : undefined,
-          description: data.description?.trim() ? data.description : undefined,
+          default_url: data.default_url?.trim() || undefined,
+          description: data.description?.trim() || undefined,
           port: data.port ?? undefined,
-          working_directory: data.working_directory?.trim()
-            ? data.working_directory
-            : undefined,
-          mount_directory: data.mount_directory?.trim()
-            ? data.mount_directory
-            : undefined,
+          working_directory: data.working_directory?.trim() || undefined,
+          mount_directory: data.mount_directory?.trim() || undefined,
           uid: data.uid ?? undefined,
           gid: data.gid ?? undefined,
           command: commandParsed.data,
diff --git a/client/src/features/admin/UpdateSessionEnvironmentButton.tsx b/client/src/features/admin/UpdateSessionEnvironmentButton.tsx
index f5c181fff..685af6bbc 100644
--- a/client/src/features/admin/UpdateSessionEnvironmentButton.tsx
+++ b/client/src/features/admin/UpdateSessionEnvironmentButton.tsx
@@ -108,12 +108,8 @@ function UpdateSessionEnvironmentModal({
           default_url: data.default_url?.trim() ? data.default_url : "",
           description: data.description?.trim() ? data.description : "",
           port: data.port ?? undefined,
-          working_directory: data.working_directory?.trim()
-            ? data.working_directory
-            : undefined,
-          mount_directory: data.mount_directory?.trim()
-            ? data.mount_directory
-            : undefined,
+          working_directory: data.working_directory?.trim() || undefined,
+          mount_directory: data.mount_directory?.trim() || undefined,
           uid: data.uid ?? undefined,
           gid: data.gid ?? undefined,
           command: commandParsed.data,
diff --git a/client/src/features/admin/adminSessions.utils.ts b/client/src/features/admin/adminSessions.utils.ts
index e0e8a2c5b..c1d136ecc 100644
--- a/client/src/features/admin/adminSessions.utils.ts
+++ b/client/src/features/admin/adminSessions.utils.ts
@@ -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()
-      ? environment.working_directory
-      : undefined,
-    mount_directory: environment.mount_directory?.trim()
-      ? environment.mount_directory
-      : 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),
diff --git a/client/src/features/dashboardV2/DashboardV2Sessions.tsx b/client/src/features/dashboardV2/DashboardV2Sessions.tsx
index 0e220929f..bf145228e 100644
--- a/client/src/features/dashboardV2/DashboardV2Sessions.tsx
+++ b/client/src/features/dashboardV2/DashboardV2Sessions.tsx
@@ -4,7 +4,7 @@ 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 EnvironmentLogsV2 from "../../components/LogsV2";
 import { RtkErrorAlert } from "../../components/errors/RtkErrorAlert";
 import { useGetSessionsQuery as useGetSessionsQueryV2 } from "../../features/sessionsV2/sessionsV2.api";
 import "../../notebooks/Notebooks.css";
@@ -36,37 +36,45 @@ export default function DashboardV2Sessions() {
   return <SessionDashboardList sessions={sessions} />;
 }
 
-const LoadingState = () => (
-  <div className={cx("d-flex", "flex-column", "mx-auto")}>
-    <Loader />
-    <p className={cx("mx-auto", "my-3")}>Retrieving sessions...</p>
-  </div>
-);
+function LoadingState() {
+  return (
+    <div className={cx("d-flex", "flex-column", "mx-auto")}>
+      <Loader />
+      <p className={cx("mx-auto", "my-3")}>Retrieving sessions...</p>
+    </div>
+  );
+}
 
-const ErrorState = ({
+function ErrorState({
   error,
 }: {
   error: FetchBaseQueryError | SerializedError | undefined;
-}) => (
-  <div>
-    <p>Cannot show sessions.</p>
-    <RtkErrorAlert error={error} />
-  </div>
-);
+}) {
+  return (
+    <div>
+      <p>Cannot show sessions.</p>
+      <RtkErrorAlert error={error} />
+    </div>
+  );
+}
 
-const NoSessionsState = () => <div>No running sessions.</div>;
+function NoSessionsState() {
+  return <div>No running sessions.</div>;
+}
 
-const SessionDashboardList = ({
+function SessionDashboardList({
   sessions,
 }: {
   sessions: SessionList | undefined;
-}) => (
-  <ListGroup flush data-cy="dashboard-session-list">
-    {sessions?.map((session) => (
-      <DashboardSession key={session.name} session={session} />
-    ))}
-  </ListGroup>
-);
+}) {
+  return (
+    <ListGroup flush data-cy="dashboard-session-list">
+      {sessions?.map((session) => (
+        <DashboardSession key={session.name} session={session} />
+      ))}
+    </ListGroup>
+  );
+}
 
 interface DashboardSessionProps {
   session: SessionV2;
diff --git a/client/src/features/session/components/StartSessionProgressBar.tsx b/client/src/features/session/components/StartSessionProgressBar.tsx
index 8498c54bd..89af35a1a 100644
--- a/client/src/features/session/components/StartSessionProgressBar.tsx
+++ b/client/src/features/session/components/StartSessionProgressBar.tsx
@@ -72,7 +72,7 @@ export function StartSessionProgressBarV2({
   const statusData = session?.status;
   const description =
     statusData?.ready_containers && statusData?.total_containers
-      ? `${statusData?.ready_containers} of ${statusData?.total_containers} containers ready`
+      ? `${statusData.ready_containers} of ${statusData.total_containers} containers ready`
       : "Loading containers status";
 
   return (
diff --git a/client/src/features/sessionsV2/PauseOrDeleteSessionModal.tsx b/client/src/features/sessionsV2/PauseOrDeleteSessionModal.tsx
index 6f0554880..debd472ab 100644
--- a/client/src/features/sessionsV2/PauseOrDeleteSessionModal.tsx
+++ b/client/src/features/sessionsV2/PauseOrDeleteSessionModal.tsx
@@ -19,7 +19,6 @@
 import { SerializedError } from "@reduxjs/toolkit";
 import { FetchBaseQueryError } from "@reduxjs/toolkit/query";
 import cx from "classnames";
-import { DateTime } from "luxon";
 import { useCallback, useContext, useEffect, useState } from "react";
 import {
   generatePath,
@@ -27,24 +26,20 @@ import {
   useParams,
 } from "react-router-dom-v5-compat";
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from "reactstrap";
-
-import { InfoAlert } from "../../components/Alert";
-import { Loader } from "../../components/Loader";
 import { User } from "../../model/renkuModels.types";
 import { NOTIFICATION_TOPICS } from "../../notifications/Notifications.constants";
 import { NotificationsManager } from "../../notifications/notifications.types";
 import { ABSOLUTE_ROUTES } from "../../routing/routes.constants";
 import AppContext from "../../utils/context/appContext";
 import useLegacySelector from "../../utils/customHooks/useLegacySelector.hook";
-import { toHumanRelativeDuration } from "../../utils/helpers/DurationUtils";
+import styles from "../session/components/SessionModals.module.scss";
 import { useWaitForSessionStatusV2 } from "../session/useWaitForSessionStatus.hook";
 import {
   usePatchSessionMutation,
   useStopSessionMutation,
 } from "../sessionsV2/sessionsV2.api";
-
-import styles from "../session/components/SessionModals.module.scss";
 import { SessionV2 } from "./sessionsV2.types";
+import { Loader } from "../../components/Loader";
 
 interface PauseOrDeleteSessionModalProps {
   action?: "pause" | "delete";
@@ -258,13 +253,14 @@ function PauseSessionModalContent({
     }
   }, [backUrl, isSuccess, isWaiting, navigate]);
 
-  const now = DateTime.utc();
-  const hibernationThreshold = session?.status?.will_hibernate_at
-    ? toHumanRelativeDuration({
-        datetime: session?.status?.will_hibernate_at,
-        now,
-      })
-    : 0;
+  // TODO: Uncomment when hibernatedSecondsThreshold is available
+  // const now = DateTime.utc();
+  // const hibernationThreshold = session?.status?.hibernatedSecondsThreshold
+  //   ? toHumanRelativeDuration({
+  //       datetime: session?.status?.hibernatedSecondsThreshold,
+  //       now,
+  //     })
+  //   : 0;
   return (
     <>
       <ModalBody>
@@ -273,13 +269,13 @@ function PauseSessionModalContent({
           session (new and edited files) will be preserved while the session is
           paused.
         </p>
-        {session?.status?.will_hibernate_at &&
-          session?.status?.will_hibernate_at?.length > 0 && (
+        {/* TODO: Uncomment when hibernatedSecondsThreshold is available
+          { hibernationThreshold > 0 && (
             <InfoAlert dismissible={false} timeout={0}>
-              Please note that paused session are deleted after{" "}
+              Please note that paused sessions are deleted after{" "}
               {hibernationThreshold} of inactivity.
             </InfoAlert>
-          )}
+          )} */}
         <div className="my-2">
           <Button
             className={cx("float-right", "p-0")}
diff --git a/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx b/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
index 79cf908d3..db8971c04 100644
--- a/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
+++ b/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
@@ -44,7 +44,7 @@ import {
   UncontrolledTooltip,
 } from "reactstrap";
 import { Loader } from "../../../components/Loader";
-import { EnvironmentLogsV2 } from "../../../components/LogsV2";
+import EnvironmentLogsV2 from "../../../components/LogsV2";
 import { TimeCaption } from "../../../components/TimeCaption";
 import { CommandCopy } from "../../../components/commandCopy/CommandCopy";
 import RenkuFrogIcon from "../../../components/icons/RenkuIcon";
@@ -85,9 +85,11 @@ export default function ShowSessionPage() {
     slug: slug ?? "",
   });
 
-  const { data: sessions, isLoading } = useGetSessionsQuery(undefined, {
-    skip: false,
-  });
+  const {
+    data: sessions,
+    isLoading,
+    isFetching,
+  } = useGetSessionsQuery(undefined, { refetchOnMountOrArgChange: true });
 
   const thisSession = useMemo(() => {
     if (sessions == null) {
@@ -99,14 +101,14 @@ export default function ShowSessionPage() {
   useEffect(() => {
     const faviconByStatus = getSessionFavicon(
       thisSession?.status?.state,
-      isLoading
+      isLoading || isFetching
     );
     dispatch(setFavicon(faviconByStatus));
     return () => {
       // cleanup and set favicon to default
       dispatch(resetFavicon());
     };
-  }, [thisSession?.status?.state, isLoading, dispatch]);
+  }, [thisSession?.status?.state, isLoading, isFetching, dispatch]);
 
   const [isTheSessionReady, setIsTheSessionReady] = useState(false);
 
@@ -173,7 +175,7 @@ export default function ShowSessionPage() {
   );
   const logs = thisSession && <EnvironmentLogsV2 name={sessionName} />;
   const content =
-    !isLoading && thisSession == null ? (
+    !isLoading && !isFetching && !thisSession ? (
       <SessionUnavailable />
     ) : thisSession?.status.state === "hibernated" ? (
       <SessionHibernated sessionName={thisSession.name} />
diff --git a/client/src/features/sessionsV2/SessionStartPage.tsx b/client/src/features/sessionsV2/SessionStartPage.tsx
index 3c1cc87a6..8fa9a8f53 100644
--- a/client/src/features/sessionsV2/SessionStartPage.tsx
+++ b/client/src/features/sessionsV2/SessionStartPage.tsx
@@ -40,18 +40,17 @@ import useAppSelector from "../../utils/customHooks/useAppSelector.hook";
 import { resetFavicon, setFavicon } from "../display";
 import type { DataConnectorConfiguration } from "../dataConnectorsV2/components/useDataConnectorConfiguration.hook";
 import { usePatchDataConnectorsByDataConnectorIdSecretsMutation } from "../dataConnectorsV2/api/data-connectors.enhanced-api";
-import {
-  storageDefinitionAfterSavingCredentialsFromConfig,
-  storageDefinitionFromConfig,
-} from "../project/utils/projectCloudStorage.utils";
+import { storageDefinitionAfterSavingCredentialsFromConfig } from "../project/utils/projectCloudStorage.utils";
 import type { Project } from "../projectsV2/api/projectV2.api";
 import { useGetProjectsByNamespaceAndSlugQuery } from "../projectsV2/api/projectV2.enhanced-api";
 import { storageSecretNameToFieldName } from "../secrets/secrets.utils";
-import { useStartRenku2SessionMutation } from "../session/sessions.api";
 
 import DataConnectorSecretsModal from "./DataConnectorSecretsModal";
 import { SelectResourceClassModal } from "./components/SessionModals/SelectResourceClass";
-import { useGetProjectSessionLaunchersQuery } from "./sessionsV2.api";
+import {
+  useGetProjectSessionLaunchersQuery,
+  useLaunchSessionMutation,
+} from "./sessionsV2.api";
 import { SessionLauncher } from "./sessionsV2.types";
 import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
 import {
@@ -59,6 +58,7 @@ import {
   StartSessionOptionsV2,
 } from "./startSessionOptionsV2.types";
 import useSessionLaunchState from "./useSessionLaunchState.hook";
+import { storageDefinitionFromConfigV2 } from "./session.utils";
 
 interface SaveCloudStorageProps
   extends Omit<StartSessionFromLauncherProps, "containerImage" | "project"> {
@@ -202,8 +202,8 @@ function SessionStarting({
       launcher_id: launcher.id,
       disk_storage: startSessionOptionsV2.storage,
       resource_class_id: startSessionOptionsV2.sessionClass,
-      cloudStorage: startSessionOptionsV2.cloudStorage.map((cs) =>
-        storageDefinitionFromConfig(cs, project.id)
+      cloudstorage: startSessionOptionsV2.cloudStorage.map((cs) =>
+        storageDefinitionFromConfigV2(cs)
       ),
     });
     dispatch(setFavicon("waiting"));
@@ -213,8 +213,11 @@ function SessionStarting({
     launcher.id,
     project.id,
     startSessionV2,
-    startSessionOptionsV2,
+    startSessionOptionsV2.storage,
+    startSessionOptionsV2.sessionClass,
+    startSessionOptionsV2.cloudStorage,
     dispatch,
+    session,
   ]);
 
   // Navigate to the session page when it is ready
diff --git a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
index 3b250c134..b76e3ed1a 100644
--- a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
+++ b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
@@ -46,7 +46,7 @@ import {
 
 import { WarnAlert } from "../../../../components/Alert";
 import { Loader } from "../../../../components/Loader";
-import { EnvironmentLogsV2 } from "../../../../components/LogsV2";
+import EnvironmentLogsV2 from "../../../../components/LogsV2";
 import { ButtonWithMenuV2 } from "../../../../components/buttons/Button";
 import { User } from "../../../../model/renkuModels.types";
 import { NOTIFICATION_TOPICS } from "../../../../notifications/Notifications.constants";
@@ -612,8 +612,7 @@ function ModifySessionModalContent({
               resourcePools.length == 0 ||
               isError ||
               currentSessionClass == null ||
-              (resource_class_id != null &&
-                resource_class_id === `${currentSessionClass?.id}`)
+              resource_class_id === `${currentSessionClass?.id}`
             }
             onClick={onClick({ resumeSession: true })}
             type="submit"
diff --git a/client/src/features/sessionsV2/session.utils.ts b/client/src/features/sessionsV2/session.utils.ts
index 75bedee9c..1fe765d7e 100644
--- a/client/src/features/sessionsV2/session.utils.ts
+++ b/client/src/features/sessionsV2/session.utils.ts
@@ -26,7 +26,7 @@ import {
   SessionLauncherEnvironmentParams,
   SessionLauncherForm,
 } from "./sessionsV2.types";
-import { SessionStartCloudStorageConfiguration } from "./startSessionOptionsV2.types";
+import { SessionStartDataConnectorConfiguration } from "./startSessionOptionsV2.types";
 
 export function getSessionFavicon(
   sessionState?: SessionStatusState,
@@ -226,9 +226,9 @@ export function isValidJSONStringArray(
 }
 
 export function storageDefinitionFromConfigV2(
-  config: SessionStartCloudStorageConfiguration
+  config: SessionStartDataConnectorConfiguration
 ): SessionCloudStorageV2 {
-  const { storage: storageDefinition } = config.cloudStorage;
+  const storageDefinition = config.dataConnector.storage;
   const { sensitiveFieldValues } = config;
 
   // Merge configuration with sensitive field values, excluding empty ones
@@ -245,7 +245,7 @@ export function storageDefinitionFromConfigV2(
     readonly: !!storageDefinition.readonly,
     source_path: storageDefinition.source_path,
     target_path: storageDefinition.target_path,
-    storage_id: storageDefinition.storage_id,
+    storage_id: config.dataConnector.id,
     configuration,
   };
 }
@@ -273,9 +273,6 @@ export function ensureHTTPS(url: string): string {
 
     throw new Error("Unsupported protocol");
   } catch (error) {
-    if (url && !url.includes("://")) {
-      return `https://${url}`;
-    }
     throw new Error(`Invalid URL: ${url}`);
   }
 }
diff --git a/client/src/features/sessionsV2/useSessionLaunchState.hook.ts b/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
index f0fa8d705..86bd43da2 100644
--- a/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
+++ b/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
@@ -31,7 +31,6 @@ import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
 import useSessionResourceClass from "./useSessionResourceClass.hook";
 import { skipToken } from "@reduxjs/toolkit/query";
 import { useGetDockerImageQuery } from "./sessionsV2.api";
-import { useGetStoragesV2Query } from "../projectsV2/api/storagesV2.api";
 import { DEFAULT_URL } from "./session.constants";
 
 interface StartSessionFromLauncherProps {