diff --git a/frontend/src/pages/notebookController/screens/admin/NotebookAdminControl.tsx b/frontend/src/pages/notebookController/screens/admin/NotebookAdminControl.tsx
index 643fb44b11..f3c66eca05 100644
--- a/frontend/src/pages/notebookController/screens/admin/NotebookAdminControl.tsx
+++ b/frontend/src/pages/notebookController/screens/admin/NotebookAdminControl.tsx
@@ -1,5 +1,14 @@
import * as React from 'react';
-import { Alert, Stack, StackItem, Title } from '@patternfly/react-core';
+import {
+ Alert,
+ EmptyState,
+ EmptyStateHeader,
+ EmptyStateVariant,
+ Spinner,
+ Stack,
+ StackItem,
+ Title,
+} from '@patternfly/react-core';
import { Td, Tr } from '@patternfly/react-table';
import { Table } from '~/components/table';
import ExternalLink from '~/components/ExternalLink';
@@ -38,61 +47,65 @@ const NotebookAdminControl: React.FC = () => {
);
return (
-
-
}
- >
-
-
-
- Create, delete, and manage permissions for {ODH_PRODUCT_NAME} users in OpenShift.{' '}
-
-
-
-
- Users
-
-
- (
-
- {columns.map((column) => (
-
-
- |
- ))}
-
- )}
+
+
+
+
+ }
+ loadError={loadError}
+ empty={false}
+ headerAction={}
+ >
+
+
+
+ Create, delete, and manage permissions for {ODH_PRODUCT_NAME} users in OpenShift.{' '}
+
-
-
-
-
-
+
+
+
+ Users
+
+
+ (
+
+ {columns.map((column) => (
+
+
+ |
+ ))}
+
+ )}
+ />
+
+
+
+
);
};
diff --git a/frontend/src/pages/notebookController/screens/server/SpawnerPage.tsx b/frontend/src/pages/notebookController/screens/server/SpawnerPage.tsx
index b88b1d43ef..3fdf0800a4 100644
--- a/frontend/src/pages/notebookController/screens/server/SpawnerPage.tsx
+++ b/frontend/src/pages/notebookController/screens/server/SpawnerPage.tsx
@@ -3,11 +3,15 @@ import {
ActionGroup,
Alert,
Button,
+ EmptyState,
+ EmptyStateHeader,
+ EmptyStateVariant,
Form,
FormGroup,
FormSection,
Grid,
GridItem,
+ Spinner,
} from '@patternfly/react-core';
import { PlusCircleIcon } from '@patternfly/react-icons';
import { useNavigate } from 'react-router-dom';
@@ -305,6 +309,12 @@ const SpawnerPage: React.FC = () => {
description="Select options for your notebook server."
provideChildrenPadding
loaded={loaded}
+ loadingContent={
+
+
+
+
+ }
loadError={loadError}
empty={images.length === 0}
>