Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 114

Hide some host details cards for Android hosts (#26763)

Browse source
This commit is contained in:
Sarah Gillespie 2025-03-04 11:38:50 -06:00 committed by GitHub
parent 488efd144e
commit 239a7a3994
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
View file

@ -854,9 +854,11 @@ const HostDetailsPage = ({
const isDarwinHost = host.platform === "darwin";
const isIosOrIpadosHost = isIPadOrIPhone(host.platform);
const isAndroidHost = isAndroid(host.platform);
const detailsPanelClass = classNames(`${baseClass}__details-panel`, {
[`${baseClass}__details-panel--ios-grid`]: isIosOrIpadosHost,
[`${baseClass}__details-panel--android-grid`]: isAndroidHost,
[`${baseClass}__details-panel--macos-grid`]: isDarwinHost,
});
@ -919,31 +921,33 @@ const HostDetailsPage = ({
munki={macadmins?.munki}
mdm={mdm}
/>
<ActivityCard
activeTab={activeActivityTab}
activities={
activeActivityTab === "past"
? pastActivities
: upcomingActivities
}
isLoading={
activeActivityTab === "past"
? pastActivitiesIsFetching
: upcomingActivitiesIsFetching
}
isError={
activeActivityTab === "past"
? pastActivitiesIsError
: upcomingActivitiesIsError
}
upcomingCount={upcomingActivities?.count || 0}
onChangeTab={onChangeActivityTab}
onNextPage={() => setActivityPage(activityPage + 1)}
onPreviousPage={() => setActivityPage(activityPage - 1)}
onShowDetails={onShowActivityDetails}
onCancel={onCancelActivity}
/>
{!isIosOrIpadosHost && (
{!isAndroidHost && (
<ActivityCard
activeTab={activeActivityTab}
activities={
activeActivityTab === "past"
? pastActivities
: upcomingActivities
}
isLoading={
activeActivityTab === "past"
? pastActivitiesIsFetching
: upcomingActivitiesIsFetching
}
isError={
activeActivityTab === "past"
? pastActivitiesIsError
: upcomingActivitiesIsError
}
upcomingCount={upcomingActivities?.count || 0}
onChangeTab={onChangeActivityTab}
onNextPage={() => setActivityPage(activityPage + 1)}
onPreviousPage={() => setActivityPage(activityPage - 1)}
onShowDetails={onShowActivityDetails}
onCancel={onCancelActivity}
/>
)}
{!isIosOrIpadosHost && !isAndroidHost && (
<AgentOptionsCard
osqueryData={osqueryData}
wrapFleetHelper={wrapFleetHelper}
@ -954,7 +958,7 @@ const HostDetailsPage = ({
labels={host?.labels || []}
onLabelClick={onLabelClick}
/>
{!isIosOrIpadosHost && (
{!isIosOrIpadosHost && !isAndroidHost && (
<UsersCard
users={host?.users || []}
usersState={usersState}

19
frontend/pages/hosts/details/HostDetailsPage/_styles.scss
View file

@ -26,18 +26,23 @@
"certs certs";
}
// No agent options card for Android, so extend Labels card vertically.
&__details-panel--android-grid.react-tabs__tab-panel--selected {
grid-template-areas:
"about about"
"labels labels";
}
// We add the certs card to the grid layout on mac hosts
&__details-panel--macos-grid.react-tabs__tab-panel--selected {
grid-template-areas:
"about about"
"activity agent-options"
"activity labels"
"users users"
"certs certs";
grid-template-areas:
"about about"
"activity agent-options"
"activity labels"
"users users"
"certs certs";
}
.about-card {
grid-area: about;
}