Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Divider disappears after create pipeline #1720

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Divider disappears after create pipeline #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions frontend/src/pages/projects/screens/detail/ProjectDetailsComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import * as React from 'react';
import { Divider, PageSection, Stack, StackItem } from '@patternfly/react-core';
import { PageSection, Stack, StackItem } from '@patternfly/react-core';
import GenericSidebar from '~/components/GenericSidebar';
import { useAppContext } from '~/app/AppContext';
import ServingRuntimeList from '~/pages/modelServing/screens/projects/ServingRuntimeList';
import { ProjectDetailsContext } from '~/pages/projects/ProjectDetailsContext';
import { featureFlagEnabled } from '~/utilities/utils';
import PipelinesSection from '~/pages/projects/screens/detail/pipelines/PipelinesSection';
import { usePipelinesAPI } from '~/concepts/pipelines/context';
import NotebooksList from './notebooks/NotebookList';
import { ProjectSectionID } from './types';
import StorageList from './storage/StorageList';
Expand All @@ -17,19 +15,10 @@ import useCheckLogoutParams from './useCheckLogoutParams';
type SectionType = {
id: ProjectSectionID;
component: React.ReactNode;
isEmpty: boolean;
};

const ProjectDetailsComponents: React.FC = () => {
const { dashboardConfig } = useAppContext();
const {
notebooks: { data: notebookStates, loaded: notebookStatesLoaded },
pvcs: { data: pvcs, loaded: pvcsLoaded },
dataConnections: { data: connections, loaded: connectionsLoaded },
servingRuntimes: { data: modelServers, loaded: modelServersLoaded },
} = React.useContext(ProjectDetailsContext);
const { pipelinesServer } = usePipelinesAPI();

const modelServingEnabled = featureFlagEnabled(
dashboardConfig.spec.dashboardConfig.disableModelServing,
);
Expand All @@ -42,24 +31,20 @@ const ProjectDetailsComponents: React.FC = () => {
{
id: ProjectSectionID.WORKBENCHES,
component: <NotebooksList />,
isEmpty: notebookStatesLoaded && notebookStates.length === 0,
},
{
id: ProjectSectionID.CLUSTER_STORAGES,
component: <StorageList />,
isEmpty: pvcsLoaded && pvcs.length === 0,
},
{
id: ProjectSectionID.DATA_CONNECTIONS,
component: <DataConnectionsList />,
isEmpty: connectionsLoaded && connections.length === 0,
},
...(pipelinesEnabled
? [
{
id: ProjectSectionID.PIPELINES,
component: <PipelinesSection />,
isEmpty: !pipelinesServer.installed,
},
]
: []),
Expand All @@ -68,7 +53,6 @@ const ProjectDetailsComponents: React.FC = () => {
{
id: ProjectSectionID.MODEL_SERVER,
component: <ServingRuntimeList />,
isEmpty: modelServersLoaded && modelServers.length === 0,
},
]
: []),
Expand All @@ -82,7 +66,7 @@ const ProjectDetailsComponents: React.FC = () => {
maxWidth={175}
>
<Stack hasGutter>
{sections.map(({ id, component, isEmpty }, index) => (
{sections.map(({ id, component }) => (
<React.Fragment key={id}>
<StackItem
id={id}
Expand All @@ -91,9 +75,6 @@ const ProjectDetailsComponents: React.FC = () => {
>
{component}
</StackItem>
{index !== sections.length - 1 && isEmpty && (
<Divider data-id="details-page-section-divider" />
)}
</React.Fragment>
))}
</Stack>
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/pages/projects/screens/detail/data-connections/DataConnectionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Button } from '@patternfly/react-core';
import { Button, Divider } from '@patternfly/react-core';
import EmptyDetailsList from '~/pages/projects/screens/detail/EmptyDetailsList';
import { ProjectSectionID } from '~/pages/projects/screens/detail/types';
import DetailsSection from '~/pages/projects/screens/detail/DetailsSection';
Expand All @@ -15,6 +15,8 @@ const DataConnectionsList: React.FC = () => {
} = React.useContext(ProjectDetailsContext);
const [open, setOpen] = React.useState(false);

const isDataConnectionsEmpty = connections.length === 0;

return (
<>
<DetailsSection
Expand All @@ -30,7 +32,7 @@ const DataConnectionsList: React.FC = () => {
</Button>,
]}
isLoading={!loaded}
isEmpty={connections.length === 0}
isEmpty={isDataConnectionsEmpty}
loadError={error}
emptyState={
<EmptyDetailsList
Expand All @@ -41,6 +43,7 @@ const DataConnectionsList: React.FC = () => {
>
<DataConnectionsTable connections={connections} refreshData={refreshAllProjectData} />
</DetailsSection>
{isDataConnectionsEmpty && <Divider data-id="details-page-section-divider" />}
<ManageDataConnectionModal
isOpen={open}
onClose={(submitted) => {
Expand Down
54 changes: 29 additions & 25 deletions frontend/src/pages/projects/screens/detail/notebooks/NotebookList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Button } from '@patternfly/react-core';
import { Button, Divider } from '@patternfly/react-core';
import { useNavigate } from 'react-router-dom';
import EmptyDetailsList from '~/pages/projects/screens/detail/EmptyDetailsList';
import { ProjectSectionID } from '~/pages/projects/screens/detail/types';
Expand All @@ -17,6 +17,7 @@ const NotebookList: React.FC = () => {
} = React.useContext(ProjectDetailsContext);
const navigate = useNavigate();
const projectName = currentProject.metadata.name;
const isNotebooksEmpty = notebookStates.length === 0;

React.useEffect(() => {
let interval: ReturnType<typeof setInterval>;
Expand All @@ -27,30 +28,33 @@ const NotebookList: React.FC = () => {
}, [notebookStates, refreshNotebooks]);

return (
<DetailsSection
id={ProjectSectionID.WORKBENCHES}
title={ProjectSectionTitles[ProjectSectionID.WORKBENCHES] || ''}
actions={[
<Button
key={`action-${ProjectSectionID.WORKBENCHES}`}
onClick={() => navigate(`/projects/${projectName}/spawner`)}
variant="secondary"
>
Create workbench
</Button>,
]}
isLoading={!loaded}
loadError={loadError}
isEmpty={notebookStates.length === 0}
emptyState={
<EmptyDetailsList
title="No workbenches"
description="To get started, create a workbench."
/>
}
>
<NotebookTable notebookStates={notebookStates} refresh={refresh} />
</DetailsSection>
<>
<DetailsSection
id={ProjectSectionID.WORKBENCHES}
title={ProjectSectionTitles[ProjectSectionID.WORKBENCHES] || ''}
actions={[
<Button
key={`action-${ProjectSectionID.WORKBENCHES}`}
onClick={() => navigate(`/projects/${projectName}/spawner`)}
variant="secondary"
>
Create workbench
</Button>,
]}
isLoading={!loaded}
loadError={loadError}
isEmpty={isNotebooksEmpty}
emptyState={
<EmptyDetailsList
title="No workbenches"
description="To get started, create a workbench."
/>
}
>
<NotebookTable notebookStates={notebookStates} refresh={refresh} />
</DetailsSection>
{isNotebooksEmpty && <Divider data-id="details-page-section-divider" />}
</>
);
};

Expand Down
12 changes: 11 additions & 1 deletion frontend/src/pages/projects/screens/detail/pipelines/PipelinesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,21 @@ import { usePipelinesAPI } from '~/concepts/pipelines/context';
import EmptyStateErrorMessage from '~/components/EmptyStateErrorMessage';
import { TABLE_CONTENT_LIMIT, LIMIT_MAX_ITEM_COUNT } from '~/concepts/pipelines/const';

const PipelinesList: React.FC = () => {
type PipelinesListProps = {
setIsPipelinesEmpty: (isEmpty: boolean) => void;
};

const PipelinesList: React.FC<PipelinesListProps> = ({ setIsPipelinesEmpty }) => {
const { namespace } = usePipelinesAPI();
const [pipelines, loaded, loadError, refresh] = usePipelines(LIMIT_MAX_ITEM_COUNT);
const navigate = useNavigate();

const isPipelinesEmpty = pipelines.length === 0;

React.useEffect(() => {
setIsPipelinesEmpty(isPipelinesEmpty);
}, [isPipelinesEmpty, setIsPipelinesEmpty]);

if (loadError) {
return (
<EmptyStateErrorMessage title="Error displaying pipelines" bodyText={loadError.message} />
Expand Down
50 changes: 28 additions & 22 deletions frontend/src/pages/projects/screens/detail/pipelines/PipelinesSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { Divider } from '@patternfly/react-core';
import { ProjectSectionID } from '~/pages/projects/screens/detail/types';
import { ProjectSectionTitles } from '~/pages/projects/screens/detail/const';
import DetailsSection from '~/pages/projects/screens/detail/DetailsSection';
Expand All @@ -13,29 +14,34 @@ const PipelinesSection: React.FC = () => {
pipelinesServer: { initializing, installed, timedOut },
} = usePipelinesAPI();

const [isPipelinesEmpty, setIsPipelinesEmpty] = React.useState(false);

return (
<DetailsSection
id={ProjectSectionID.PIPELINES}
title={ProjectSectionTitles[ProjectSectionID.PIPELINES]}
actions={[
<ImportPipelineButton
isDisabled={!installed}
key={`action-${ProjectSectionID.PIPELINES}`}
variant="secondary"
/>,
]}
isLoading={initializing}
isEmpty={!installed}
emptyState={<NoPipelineServer variant="secondary" />}
>
{timedOut ? (
<PipelineServerTimedOut />
) : (
<EnsureAPIAvailability>
<PipelinesList />
</EnsureAPIAvailability>
)}
</DetailsSection>
<>
<DetailsSection
id={ProjectSectionID.PIPELINES}
title={ProjectSectionTitles[ProjectSectionID.PIPELINES]}
actions={[
<ImportPipelineButton
isDisabled={!installed}
key={`action-${ProjectSectionID.PIPELINES}`}
variant="secondary"
/>,
]}
isLoading={initializing}
isEmpty={!installed}
emptyState={<NoPipelineServer variant="secondary" />}
>
{timedOut ? (
<PipelineServerTimedOut />
) : (
<EnsureAPIAvailability>
<PipelinesList setIsPipelinesEmpty={setIsPipelinesEmpty} />
</EnsureAPIAvailability>
)}
</DetailsSection>
{(isPipelinesEmpty || !installed) && <Divider data-id="details-page-section-divider" />}
</>
);
};

Expand Down
7 changes: 5 additions & 2 deletions frontend/src/pages/projects/screens/detail/storage/StorageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Button } from '@patternfly/react-core';
import { Button, Divider } from '@patternfly/react-core';
import EmptyDetailsList from '~/pages/projects/screens/detail/EmptyDetailsList';
import DetailsSection from '~/pages/projects/screens/detail/DetailsSection';
import { ProjectSectionID } from '~/pages/projects/screens/detail/types';
Expand All @@ -15,6 +15,8 @@ const StorageList: React.FC = () => {
refreshAllProjectData: refresh,
} = React.useContext(ProjectDetailsContext);

const isPvcsEmpty = pvcs.length === 0;

return (
<>
<DetailsSection
Expand All @@ -30,7 +32,7 @@ const StorageList: React.FC = () => {
</Button>,
]}
isLoading={!loaded}
isEmpty={pvcs.length === 0}
isEmpty={isPvcsEmpty}
loadError={loadError}
emptyState={
<EmptyDetailsList
Expand All @@ -41,6 +43,7 @@ const StorageList: React.FC = () => {
>
<StorageTable pvcs={pvcs} refresh={refresh} onAddPVC={() => setOpen(true)} />
</DetailsSection>
{isPvcsEmpty && <Divider data-id="details-page-section-divider" />}
<ManageStorageModal
isOpen={isOpen}
onClose={(submit: boolean) => {
Expand Down