Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 60

Host Details Page: Same naming convention for info as device user page (#4815)

Browse source
This commit is contained in:
RachelElysia 2022-03-29 10:35:02 -04:00 committed by GitHub
parent 222d85178d
commit a402ccab25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/pages/hosts/details/cards/About/About.tsx
View file

@ -176,7 +176,7 @@ const About = ({
<p className="section__header">About</p>
<div className="info-grid">
<div className="info-grid__block">
<span className="info-grid__header">First enrolled</span>
<span className="info-grid__header">Added to Fleet</span>
<span className="info-grid__data">
{wrapFleetHelper(humanHostEnrolled, aboutData.last_enrolled_at)}
</span>

57
frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx
View file

@ -149,7 +149,7 @@ const HostSummary = ({
return <span className="info-flex__data">No data available</span>;
};
const renderDeviceUserSummary = () => {
const renderSummary = () => {
return (
<div className="info-flex">
<div className="info-flex__item info-flex__item--title">
@ -158,8 +158,12 @@ const HostSummary = ({
{titleData.status}
</span>
</div>
{!deviceUser &&
titleData.issues?.total_issues_count > 0 &&
renderIssues()}
{!deviceUser && isPremiumTier && renderHostTeam()}
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Disk Space</span>
<span className="info-flex__header">Disk space</span>
{renderDiskSpace()}
</div>
<div className="info-flex__item info-flex__item--title">
@ -174,41 +178,8 @@ const HostSummary = ({
</div>
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Operating system</span>
<span className="info-flex__data">{titleData.os_version}</span>
</div>
</div>
);
};
const renderHostDetailsSummary = () => {
return (
<div className="info-flex">
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Status</span>
<span className={`${statusClassName} info-flex__data`}>
{titleData.status}
</span>
</div>
{titleData.issues?.total_issues_count > 0 && renderIssues()}
{isPremiumTier && renderHostTeam()}
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Disk Space</span>
{renderDiskSpace()}
</div>
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">RAM</span>
<span className="info-flex__data">
{wrapFleetHelper(humanHostMemory, titleData.memory)}
</span>
</div>
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">CPU</span>
<span className="info-flex__data">{titleData.cpu_type}</span>
</div>
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">OS</span>
<span className="info-flex__data">
{isOnlyObserver ? (
{isOnlyObserver || deviceUser ? (
`${titleData.os_version}`
) : (
<Button
@ -221,10 +192,12 @@ const HostSummary = ({
)}
</span>
</div>
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Osquery</span>
<span className="info-flex__data">{titleData.osquery_version}</span>
</div>
{!deviceUser && (
<div className="info-flex__item info-flex__item--title">
<span className="info-flex__header">Osquery</span>
<span className="info-flex__data">{titleData.osquery_version}</span>
</div>
)}
</div>
);
};
@ -249,9 +222,7 @@ const HostSummary = ({
{renderActionButtons()}
</div>
<div className="section title">
<div className="title__inner">
{deviceUser ? renderDeviceUserSummary() : renderHostDetailsSummary()}
</div>
<div className="title__inner">{renderSummary()}</div>
</div>
</>
);