fix(vwb): SKFP-1084 manage loading state (#4007)

kids-first · May 24, 2024 · 5de0b61 · 5de0b61
1 parent 7187cd3
commit 5de0b61
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/src/store/notebook/index.ts b/src/store/notebook/index.ts
@@ -1,4 +1,5 @@
 import { useSelector } from 'react-redux';
+
 import { notebookSelector } from './selector';
 
 export type { initialState as NotebookInitialState } from './types';

diff --git a/src/store/notebook/selector.ts b/src/store/notebook/selector.ts
@@ -1,4 +1,5 @@
 import { RootState } from 'store/types';
+
 import { initialState } from './types';
 
 export type NotebookProps = initialState;

diff --git a/src/store/notebook/slice.ts b/src/store/notebook/slice.ts
@@ -1,14 +1,10 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { NotebookApiStatus } from 'services/api/notebook/model';
-
 import { getNotebookClusterManifest } from './thunks';
 import { initialState } from './types';
 
 export const NotebookState: initialState = {
   isLoading: false,
-  url: '',
-  status: NotebookApiStatus.unverified,
 };
 
 const notebookSlice = createSlice({
@@ -32,7 +28,6 @@ const notebookSlice = createSlice({
     builder.addCase(getNotebookClusterManifest.pending, (state) => ({
       ...state,
       isLoading: true,
-      status: NotebookApiStatus.createInProgress,
       error: null,
     }));
     builder.addCase(getNotebookClusterManifest.fulfilled, (state) => ({
@@ -42,7 +37,6 @@ const notebookSlice = createSlice({
     builder.addCase(getNotebookClusterManifest.rejected, (state, action) => ({
       ...state,
       error: action.payload,
-      status: NotebookApiStatus.unverified,
       isLoading: false,
     }));
   },

diff --git a/src/store/notebook/types.ts b/src/store/notebook/types.ts
@@ -1,8 +1,4 @@
-import { NotebookApiStatus } from 'services/api/notebook/model';
-
 export type initialState = {
-  url: string;
-  status: NotebookApiStatus;
   error?: any;
   isLoading: boolean;
 };
diff --git a/src/views/Dashboard/components/DashboardCards/Notebook/index.tsx b/src/views/Dashboard/components/DashboardCards/Notebook/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import intl from 'react-intl-universal';
 import { useDispatch } from 'react-redux';
 import { ApiOutlined, RocketOutlined } from '@ant-design/icons';
@@ -8,15 +8,13 @@ import { IFenceService } from '@ferlab/ui/core/components/Widgets/AuthorizedStud
 import FencesAuthentificationModal from '@ferlab/ui/core/components/Widgets/AuthorizedStudies/FencesAuthentificationModal';
 import GridCard from '@ferlab/ui/core/view/v2/GridCard';
 import { Alert, Button, Space, Typography } from 'antd';
-import { isNotebookStatusInProgress, isNotebookStatusLaunched } from 'helpers/notebook';
 import CardHeader from 'views/Dashboard/components/CardHeader';
 import { DashboardCardProps } from 'views/Dashboard/components/DashboardCards';
 
 import { FENCE_NAMES } from 'common/fenceTypes';
 import logo from 'components/assets/jupyterLab.png';
 import KidsFirstLoginIcon from 'components/Icons/KidsFirstLoginIcon';
 import NciIcon from 'components/Icons/NciIcon';
-import OpenInNewIcon from 'components/Icons/OpenInIcon';
 import { TUserGroups } from 'services/api/user/models';
 import { useAtLeastOneFenceConnected, useFenceAuthentification } from 'store/fences';
 import { fenceDisconnection, fenceOpenAuhentificationTab } from 'store/fences/thunks';
@@ -57,7 +55,7 @@ const Notebook = ({ id, key, className = '' }: DashboardCardProps) => {
   ];
   const [isFenceModalAuthentificationOpen, setIsFenceModalAuthentificationOpen] =
     useState<boolean>(false);
-  const { url, isLoading, error, status } = useNotebook();
+  const { isLoading, error } = useNotebook();
   const { groups } = useUser();
   const onCloseFenceAuthentificationModal = () => {
     setIsFenceModalAuthentificationOpen(false);
@@ -69,7 +67,7 @@ const Notebook = ({ id, key, className = '' }: DashboardCardProps) => {
   const hasAtLeastOneAuthentificatedFence = useAtLeastOneFenceConnected();
 
   const isAllowed = groups.includes(TUserGroups.BETA);
-  const isProcessing = (isLoading || isNotebookStatusInProgress(status)) && !error;
+  const isProcessing = isLoading && !error;
 
   const handleGetManifest = () => {
     dispatch(getNotebookClusterManifest());
@@ -153,7 +151,7 @@ const Notebook = ({ id, key, className = '' }: DashboardCardProps) => {
                 </Button>
               )}
 
-              {hasAtLeastOneAuthentificatedFence && !url && (
+              {hasAtLeastOneAuthentificatedFence && (
                 <Button
                   loading={isProcessing}
                   disabled={!isAllowed}
@@ -165,13 +163,6 @@ const Notebook = ({ id, key, className = '' }: DashboardCardProps) => {
                   {intl.get('screen.dashboard.cards.notebook.launch')}
                 </Button>
               )}
-
-              {hasAtLeastOneAuthentificatedFence && url && isNotebookStatusLaunched(status) && (
-                <Button type="primary" size="small" href={url} target="_blank">
-                  <span>{intl.get('screen.dashboard.cards.notebook.open')}</span>
-                  <OpenInNewIcon width={12.5} height={12.5} />
-                </Button>
-              )}
             </Space>
 
             <Space className={styles.message} size={8} direction="vertical">