Skip to content

feat(ws): Notebooks 2.0 // Frontend // Workspace details // Applies MUI Theming #185

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

Merged
merged 1 commit into from
Jan 24, 2025
Merged

feat(ws): Notebooks 2.0 // Frontend // Workspace details // Applies MUI Theming #185

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
22 changes: 17 additions & 5 deletions workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import {
Tab,
TabTitleText,
Title,
TabContentBody,
TabContent,
} from '@patternfly/react-core';
import { Workspace } from '~/shared/types';
import { WorkspaceDetailsOverview } from '~/app/pages/Workspaces/Details/WorkspaceDetailsOverview';
Expand Down Expand Up @@ -37,7 +39,7 @@ export const WorkspaceDetails: React.FunctionComponent<WorkspaceDetailsProps> =
};

return (
<DrawerPanelContent isResizable defaultSize="50%">
<DrawerPanelContent>
<DrawerHead>
<Title headingLevel="h6">{workspace.name}</Title>
<WorkspaceDetailsActions onEditClick={onEditClick} onDeleteClick={onDeleteClick} />
Expand All @@ -48,20 +50,30 @@ export const WorkspaceDetails: React.FunctionComponent<WorkspaceDetailsProps> =
<DrawerPanelBody>
<Tabs activeKey={activeTabKey} onSelect={handleTabClick}>
<Tab eventKey={0} title={<TabTitleText>Overview</TabTitleText>} aria-label="Overview">
<WorkspaceDetailsOverview workspace={workspace} />
<TabContent id="overviewSectionBodyPadding">
<TabContentBody hasPadding>
<WorkspaceDetailsOverview workspace={workspace} />
</TabContentBody>
</TabContent>
</Tab>
<Tab eventKey={1} title={<TabTitleText>Activity</TabTitleText>} aria-label="Activity">
Activity
<TabContent id="activitySectionBodyPadding">
<TabContentBody hasPadding>Activity</TabContentBody>
</TabContent>
</Tab>
<Tab eventKey={2} title={<TabTitleText>Logs</TabTitleText>} aria-label="Logs">
Logs
<TabContent id="logsSectionBodyPadding">
<TabContentBody hasPadding>Logs</TabContentBody>
</TabContent>
</Tab>
<Tab
eventKey={3}
title={<TabTitleText>Pod template</TabTitleText>}
aria-label="Pod template"
>
Pod template
<TabContent id="podTemplateBodyPadding">
<TabContentBody hasPadding>Pod template</TabContentBody>
</TabContent>
</Tab>
</Tabs>
</DrawerPanelBody>
Expand Down
7 changes: 6 additions & 1 deletion workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
DescriptionListTerm,
DescriptionListGroup,
DescriptionListDescription,
Divider,
} from '@patternfly/react-core';
import { Workspace } from '~/shared/types';

Expand All @@ -14,24 +15,28 @@ type WorkspaceDetailsOverviewProps = {
export const WorkspaceDetailsOverview: React.FunctionComponent<WorkspaceDetailsOverviewProps> = ({
workspace,
}) => (
<DescriptionList>
<DescriptionList isHorizontal>
<DescriptionListGroup>
<DescriptionListTerm>Name</DescriptionListTerm>
<DescriptionListDescription>{workspace.name}</DescriptionListDescription>
</DescriptionListGroup>
<Divider />
<DescriptionListGroup>
<DescriptionListTerm>Kind</DescriptionListTerm>
<DescriptionListDescription>{workspace.kind}</DescriptionListDescription>
</DescriptionListGroup>
<Divider />
<DescriptionListGroup>
<DescriptionListTerm>Labels</DescriptionListTerm>
<DescriptionListDescription>
{workspace.podTemplate.podMetadata.labels.join(', ')}
</DescriptionListDescription>
</DescriptionListGroup>
<Divider />
<DescriptionListGroup>
<DescriptionListTerm>Pod config</DescriptionListTerm>
<DescriptionListDescription>{workspace.options.podConfig}</DescriptionListDescription>
</DescriptionListGroup>
<Divider />
</DescriptionList>
);
2 changes: 1 addition & 1 deletion workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ export const Workspaces: React.FunctionComponent = () => {
);

return (
<Drawer isExpanded={selectedWorkspace != null}>
<Drawer isInline isExpanded={selectedWorkspace != null}>
<DrawerContent panelContent={workspaceDetailsContent}>
<DrawerContentBody>
<PageSection isFilled>
Expand Down
25 changes: 25 additions & 0 deletions workspaces/frontend/src/shared/style/MUI-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
--mui-button--LineHeight: 1.75;
--mui-link-underlineColor: rgba(33, 150, 243, 0.4);

// Drawer
--mui-drawer-BorderLeft: var(--mui-palette-grey-300);

// Menu item
--mui-menu__item--PaddingBlockStart: 6px;
--mui-menu__item--PaddingBlockEnd: 6px;
Expand Down Expand Up @@ -175,10 +178,24 @@
--pf-v6-c-button--BackgroundColor: rgba(33, 150, 243, 0.04);
}

.mui-theme .pf-v6-c-description-list {
--pf-v6-c-description-list--RowGap: var(--pf-t--global--spacer--gap--group-to-group--horizontal--compact);
}

.mui-theme .pf-v6-c-description-list__term {
font: var(--mui-font-subtitle2);
}

.mui-theme .pf-v6-c-description-list__text .pf-v6-l-split__item.pf-m-fill {
align-content: center;
}



.mui-theme .pf-v6-c-drawer {
--pf-v6-c-drawer--m-inline--m-expanded__panel--after--BackgroundColor: var(--mui-drawer-BorderLeft);
}

.mui-theme .pf-v6-c-form__group {
position: relative;
}
Expand Down Expand Up @@ -669,6 +686,13 @@
--pf-v6-c-tab-content__body--m-padding--PaddingInlineStart: var(--pf-t--global--spacer--lg);
}

.pf-v6-c-tab-content__body.pf-m-padding {
--pf-v6-c-tab-content__body--PaddingInlineStart: 0px;
--pf-v6-c-tab-content__body--PaddingInlineEnd: 0px;
--pf-v6-c-tab-content__body--PaddingBlockStart: var(--mui-spacing-8px);
--pf-v6-c-tab-content__body--PaddingBlockEnd: var(--mui-spacing-8px);
}

.mui-theme .pf-v6-c-tabs {
--pf-v6-c-tabs__link--hover--BackgroundColor: var(--mui-tabs__link--hover--BackgroundColor);
--pf-v6-c-tabs__item--PaddingBlockStart: var(--mui-tabs__item--PaddingBlockStart);
Expand Down Expand Up @@ -760,6 +784,7 @@
}

.mui-theme .pf-v6-c-page__main-container {
--pf-v6-c-page__main-container--BorderWidth: 0px;
--pf-v6-c-page__main-container--BorderRadius: var(--mui-shape-borderRadius);
box-shadow: var(--mui-shadows-1);
}
Expand Down
Loading