Skip to content

fix(web): small UI adjustments in network page #1389

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
dgdavid merged 2 commits into from
Jun 26, 2024
Merged

fix(web): small UI adjustments in network page #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fd57e4
fix(web): small network page UI adjustments
dgdavid Jun 26, 2024
ebf5b22
web: add a changelog entry
dgdavid Jun 26, 2024
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
6 changes: 6 additions & 0 deletions web/package/agama-web-ui.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 14:17:30 UTC 2024 - David Diaz <dgonzalez@suse.com>

- Use similar look&feel for sections at network page
(gh#openSUSE/agama#1389).

-------------------------------------------------------------------
Wed Jun 26 14:04:53 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
42 changes: 21 additions & 21 deletions web/src/components/network/NetworkPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// @ts-check

import React, { useCallback, useEffect, useState } from "react";
import { Button, CardBody, Grid, GridItem, Split, Skeleton, Stack } from "@patternfly/react-core";
import { CardBody, Grid, GridItem, Skeleton, Split, Stack } from "@patternfly/react-core";
import { useLoaderData } from "react-router-dom";
import { ButtonLink, CardField, EmptyState, Page } from "~/components/core";
import { ConnectionsTable } from "~/components/network";
Expand All @@ -31,17 +31,6 @@ import { useInstallerClient } from "~/context/installer";
import { _ } from "~/i18n";
import { formatIp } from "~/client/network/utils";
import { sprintf } from "sprintf-js";
import { DeviceState } from "~/client/network/model";

/**
* Internal component for displaying info when none wire connection is found
* @component
*/
const NoWiredConnections = () => {
return (
<div>{_("No wired connections found.")}</div>
);
};

/**
* Page component holding Network settings
Expand Down Expand Up @@ -93,7 +82,7 @@ export default function NetworkPage() {
return (
<CardField>
<CardField.Content>
<EmptyState title={_("Not supported")} icon="error">
<EmptyState title={_("No Wi-Fi supported")} icon="error">
{_("The system does not support Wi-Fi connections, probably because of missing or disabled hardware.")}
</EmptyState>
</CardField.Content>
Expand Down Expand Up @@ -131,12 +120,27 @@ export default function NetworkPage() {
);
};

const SectionSkeleton = () => (
<Stack hasGutter>
<Skeleton width="45%" />
<Split hasGutter><Skeleton width="30%" height="10px" /><Skeleton width="30%" height="10px" /><Skeleton width="30%" height="10px" /></Split>
<Split hasGutter><Skeleton width="30%" height="10px" /><Skeleton width="30%" height="10px" /><Skeleton width="30%" height="10px" /></Split>
</Stack>
);

const WiredConnections = () => {
const wiredConnections = connections.filter(c => !c.wireless);
const total = wiredConnections.length;

if (wiredConnections.length === 0) return <NoWiredConnections />;

return <ConnectionsTable connections={wiredConnections} devices={devices} />;
return (
<CardField label={total > 0 && _("Wired")}>
<CardBody>
{!ready && <SectionSkeleton />}
{ready && total === 0 && <EmptyState title={_("No wired connections found")} icon="warning" />}
{ready && total !== 0 && <ConnectionsTable connections={wiredConnections} devices={devices} />}
</CardBody>
</CardField>
);
};

return (
Expand All @@ -148,11 +152,7 @@ export default function NetworkPage() {
<Page.MainContent>
<Grid hasGutter>
<GridItem sm={12} xl={6}>
<CardField label={_("Wired")}>
<CardBody>
{ready ? <WiredConnections /> : <Skeleton />}
</CardBody>
</CardField>
<WiredConnections />
</GridItem>
<GridItem sm={12} xl={6}>
<WifiConnections />
Expand Down