Skip to content

Updated resource page and subpages #18

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
dwolosz merged 1 commit into from
Dec 2, 2024
Merged

Updated resource page and subpages #18

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
12 changes: 8 additions & 4 deletions ngui/ui/src/components/ActionBar/ActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,13 @@ const ActionBar = ({ data, isPage = true }) => {
return title || !isEmptyActions ? (
<AppBar position="static" className={mapBarClass}>
<Toolbar disableGutters ref={wrapperRef}>
<Box pt={2} pb={2} display={"flex"} sx={{ alignItems: "center" }}>
{showBreadcrumbs ? <Breadcrumbs withSlashAtTheEnd>{breadcrumbs}</Breadcrumbs> : null}
<Box display="flex">
<Box pt={2} pb={2} width={"100%"} display={"flex"} alignItems={"center"}>
{showBreadcrumbs ? (
<Box>
<Breadcrumbs withSlashAtTheEnd>{breadcrumbs}</Breadcrumbs>
</Box>
) : null}
<Box display="flex" width="100%">
{title ? (
<Box display="flex" flexGrow="1" alignItems="center">
{renderTitle(title, titleRef)}
Expand All @@ -252,7 +256,7 @@ const ActionBar = ({ data, isPage = true }) => {
{!isEmptyActions ? (
<Box className={classes.itemsWrapper} ref={buttonsRef}>
{!isEmpty(hidden) && (
<Box component="div" className={actionsClasses}>
<Box component="div" width={"100%"} sx={{ display: "flex" }} className={actionsClasses}>
<Popover
renderMenu={({ closeHandler }) => <DropDownMenu items={hidden} onClose={closeHandler} />}
label={<IconButton isLoading={hidden.some((item) => item.isLoading)} icon={<MoreVertOutlinedIcon />} />}
Expand Down
1 change: 1 addition & 0 deletions ngui/ui/src/components/Breadcrumbs/Breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const Breadcrumbs = ({ children, withSlashAtTheEnd = false }) => {
classes={{
separator: classes.separator
}}
sx={{ "& ol": { flexWrap: "nowrap" } }}
separator={
<HorizontalRuleIcon
sx={{
Expand Down
17 changes: 10 additions & 7 deletions ngui/ui/src/components/ClusterTypes/ClusterTypes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import Grid from "@mui/material/Grid";
import Link from "@mui/material/Link";
import { Box } from "@mui/system";
import { FormattedMessage } from "react-intl";
import { Link as RouterLink } from "react-router-dom";
import ActionBar from "components/ActionBar";
import ClusterTypesTable from "components/ClusterTypesTable";
import InlineSeverityAlert from "components/InlineSeverityAlert";
import PageContentWrapper from "components/PageContentWrapper";
import { DOCS_HYSTAX_CLUSTERS, RESOURCES } from "urls";
import { SPACING_2 } from "utils/layouts";
import { KU_SPACING_2 } from "../../utils/layouts";

const actionBarDefinition = {
breadcrumbs: [
Expand Down Expand Up @@ -39,12 +40,14 @@ const ClusterTypes = ({ clusterTypes, onUpdatePriority, isLoading = false }) =>
<>
<ActionBar data={actionBarDefinition} />
<PageContentWrapper>
<Grid container spacing={SPACING_2}>
<Grid item xs={12}>
<ClusterTypesTable clusterTypes={clusterTypes} onUpdatePriority={onUpdatePriority} isLoading={isLoading} />
</Grid>
<Grid item xs={12}>
<ExplanationMessage />
<Grid direction="row" container spacing={3}>
<Grid item xs={12} className={"KuBoxShadowRoot"}>
<Box>
<Box marginBottom={KU_SPACING_2}>
<ExplanationMessage />
</Box>
<ClusterTypesTable clusterTypes={clusterTypes} onUpdatePriority={onUpdatePriority} isLoading={isLoading} />
</Box>
</Grid>
</Grid>
</PageContentWrapper>
Expand Down