Notebook Spawner reachable when disabled

opendatahub-io · Jul 13, 2023 · ddbe1fa · ddbe1fa
1 parent 58d77f1
commit ddbe1fa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/frontend/src/pages/projects/screens/projects/EmptyProjects.tsx b/frontend/src/pages/projects/screens/projects/EmptyProjects.tsx
@@ -10,6 +10,7 @@ import {
 import { CubesIcon } from '@patternfly/react-icons';
 import { useNavigate } from 'react-router-dom';
 import { ODH_PRODUCT_NAME } from '~/utilities/const';
+import { useAppContext } from '~/app/AppContext';
 import LaunchJupyterButton from '~/pages/projects/screens/projects/LaunchJupyterButton';
 import NewProjectButton from './NewProjectButton';
 
@@ -19,7 +20,7 @@ type EmptyProjectsProps = {
 
 const EmptyProjects: React.FC<EmptyProjectsProps> = ({ allowCreate }) => {
   const navigate = useNavigate();
-
+  const { dashboardConfig } = useAppContext();
   return (
     <EmptyState>
       <EmptyStateIcon icon={CubesIcon} />
@@ -28,17 +29,27 @@ const EmptyProjects: React.FC<EmptyProjectsProps> = ({ allowCreate }) => {
       </Title>
       <EmptyStateBody>
         {allowCreate
-          ? 'To get started, create a data science project or launch a notebook with Jupyter.'
-          : `To get started, ask your ${ODH_PRODUCT_NAME} admin for a data science project or launch a notebook with Jupyter.`}
+          ? `To get started, create a data science project ${
+              dashboardConfig.spec.notebookController?.enabled
+                ? 'or launch a notebook with Jupyter.'
+                : '.'
+            } `
+          : `To get started, ask your ${ODH_PRODUCT_NAME} admin for a data science project ${
+              dashboardConfig.spec.notebookController?.enabled
+                ? 'or launch a notebook with Jupyter.'
+                : '.'
+            }`}
       </EmptyStateBody>
       {allowCreate ? (
         <>
           <NewProjectButton
             onProjectCreated={(projectName) => navigate(`/projects/${projectName}`)}
           />
-          <EmptyStateSecondaryActions>
-            <LaunchJupyterButton variant={ButtonVariant.link} />
-          </EmptyStateSecondaryActions>
+          {dashboardConfig.spec.notebookController?.enabled && (
+            <EmptyStateSecondaryActions>
+              <LaunchJupyterButton variant={ButtonVariant.link} />
+            </EmptyStateSecondaryActions>
+          )}
         </>
       ) : (
         <LaunchJupyterButton variant={ButtonVariant.primary} />

diff --git a/frontend/src/pages/projects/screens/projects/ProjectListView.tsx b/frontend/src/pages/projects/screens/projects/ProjectListView.tsx
@@ -6,6 +6,7 @@ import useTableColumnSort from '~/components/table/useTableColumnSort';
 import SearchField, { SearchType } from '~/pages/projects/components/SearchField';
 import { ProjectKind } from '~/k8sTypes';
 import { getProjectDisplayName, getProjectOwner } from '~/pages/projects/utils';
+import { useAppContext } from '~/app/AppContext';
 import LaunchJupyterButton from '~/pages/projects/screens/projects/LaunchJupyterButton';
 import { ProjectsContext } from '~/concepts/projects/ProjectsContext';
 import NewProjectButton from './NewProjectButton';
@@ -19,6 +20,7 @@ type ProjectListViewProps = {
 };
 
 const ProjectListView: React.FC<ProjectListViewProps> = ({ allowCreate }) => {
+  const { dashboardConfig } = useAppContext();
   const { projects: unfilteredProjects } = React.useContext(ProjectsContext);
   const navigate = useNavigate();
   const [searchType, setSearchType] = React.useState<SearchType>(SearchType.NAME);
@@ -87,20 +89,16 @@ const ProjectListView: React.FC<ProjectListViewProps> = ({ allowCreate }) => {
                 }}
               />
             </ToolbarItem>
-            {allowCreate ? (
-              <>
-                <ToolbarItem>
-                  <NewProjectButton
-                    onProjectCreated={(projectName) => navigate(`/projects/${projectName}`)}
-                  />
-                </ToolbarItem>
-                <ToolbarItem>
-                  <LaunchJupyterButton variant={ButtonVariant.link} />
-                </ToolbarItem>
-              </>
-            ) : (
+            {allowCreate && (
               <ToolbarItem>
-                <LaunchJupyterButton variant={ButtonVariant.primary} />
+                <NewProjectButton
+                  onProjectCreated={(projectName) => navigate(`/projects/${projectName}`)}
+                />
+              </ToolbarItem>
+            )}
+            {dashboardConfig.spec.notebookController?.enabled && (
+              <ToolbarItem>
+                <LaunchJupyterButton variant={ButtonVariant.link} />
               </ToolbarItem>
             )}
           </React.Fragment>