Skip to content
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.

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

Fixes #38013 - Add Image mode card on host details tab #11219

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import React from 'react';
import PropTypes from 'prop-types';
import { translate as __ } from 'foremanReact/common/I18n';
import {
DescriptionList,
DescriptionListGroup,
DescriptionListDescription as Dd,
DescriptionListTerm as Dt,
} from '@patternfly/react-core';
import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
import FontAwesomeImageModeIcon from '../../../../components/extensions/Hosts/FontAwesomeImageModeIcon';

const cardHeader = (
<>
<span style={{ marginRight: '0.5rem' }}>{__('Image mode details')}</span>
<FontAwesomeImageModeIcon />
</>
);

const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
const imageMode = hostDetails?.content_facet_attributes?.bootc_booted_image;
if (!imageMode) return null;
const getValueOrDash = value => (value || '—');
return (
<CardTemplate
header={cardHeader}
expandable
masonryLayout
isExpandedGlobal={isExpandedGlobal}
>
<DescriptionList isHorizontal>
<DescriptionListGroup>
<Dt>{__('Running image')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_booted_image)}</Dd>
<Dt>{__('Running image digest')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_booted_digest)}</Dd>

<Dt>{__('Staged image')}</Dt>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For any field that is empty, should we display a dash - like in the mock image?

image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to work well:

diff --git a/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js b/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
index 7ec258bf77..ce281d6274 100644
--- a/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
+++ b/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
@@ -19,6 +19,8 @@ const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
     </>
   );
   if (!imageMode) return null;
+  const getValueOrDash = value => (value || '-');
+
   return (
     <CardTemplate
       header={header}
@@ -29,24 +31,24 @@ const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
       <DescriptionList isHorizontal>
         <DescriptionListGroup>
           <Dt>{__('Running image')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_booted_image}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_booted_image)}</Dd>
           <Dt>{__('Running image digest')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_booted_digest}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_booted_digest)}</Dd>
 
           <Dt>{__('Staged image')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_staged_image}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_staged_image)}</Dd>
           <Dt>{__('Staged image digest')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_staged_digest}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_staged_digest)}</Dd>
 
           <Dt>{__('Available image')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_available_image}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_available_image)}</Dd>
           <Dt>{__('Available image digest')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_available_digest}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_available_digest)}</Dd>
 
           <Dt>{__('Rollback image')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_rollback_image}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_rollback_image)}</Dd>
           <Dt>{__('Rollback image digest')}</Dt>
-          <Dd>{hostDetails.content_facet_attributes.bootc_rollback_digest}</Dd>
+          <Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_rollback_digest)}</Dd>
         </DescriptionListGroup>
       </DescriptionList>
     </CardTemplate>

<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_staged_image)}</Dd>
<Dt>{__('Staged image digest')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_staged_digest)}</Dd>

<Dt>{__('Available image')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_available_image)}</Dd>
<Dt>{__('Available image digest')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_available_digest)}</Dd>

<Dt>{__('Rollback image')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_rollback_image)}</Dd>
<Dt>{__('Rollback image digest')}</Dt>
<Dd>{getValueOrDash(hostDetails.content_facet_attributes.bootc_rollback_digest)}</Dd>
</DescriptionListGroup>
</DescriptionList>
</CardTemplate>
);
};

ImageModeCard.propTypes = {
isExpandedGlobal: PropTypes.bool,
hostDetails: PropTypes.shape({
content_facet_attributes: PropTypes.shape({
bootc_booted_image: PropTypes.string,
bootc_booted_digest: PropTypes.string,
bootc_staged_image: PropTypes.string,
bootc_staged_digest: PropTypes.string,
bootc_available_image: PropTypes.string,
bootc_available_digest: PropTypes.string,
bootc_rollback_image: PropTypes.string,
bootc_rollback_digest: PropTypes.string,
}),
}),
};

ImageModeCard.defaultProps = {
isExpandedGlobal: false,
hostDetails: {},
};

export default ImageModeCard;
4 changes: 3 additions & 1 deletion webpack/global_index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import ErrataOverviewCard from './components/extensions/HostDetails/Cards/Errata
import InstalledProductsCard from './components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard';
import RegistrationCard from './components/extensions/HostDetails/DetailsTabCards/RegistrationCard';
import HwPropertiesCard from './components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard';
import ImageModeCard from './components/extensions/HostDetails/DetailsTabCards/ImageModeCard';

import TracesTab from './components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js';
import extendReducer from './components/extensions/reducers';
Expand Down Expand Up @@ -71,6 +72,8 @@ addGlobalFill('recent-communication-card-item', 'Recent communication', <RecentC
// Details tab cards & card extensions
addGlobalFill('host-tab-details-cards', 'Installed products', <InstalledProductsCard key="installed-products" />, 100);
addGlobalFill('host-tab-details-cards', 'Registration details', <RegistrationCard key="registration-details" />, 200);
addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="hw-properties" />, 200);
addGlobalFill('host-tab-details-cards', 'Image mode details', <ImageModeCard key="image-mode-details" />, 3000);
addGlobalFill('host-details-tab-properties-1', 'Subscription UUID', <SystemPropertiesCardSubscription key="subscription-uuid" />);
addGlobalFill('host-details-tab-properties-2', 'Tracer', <SystemPropertiesCardTracer key="tracer-status" />);
addGlobalFill('host-details-tab-properties-3', 'Virtualization', <SystemPropertiesCardVirtualization key="virtualization" />);
Expand All @@ -89,7 +92,6 @@ addGlobalFill(
100,
);

addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="hw-properties" />, 200);

// Hosts Index page extensions
addGlobalFill('_all-hosts-modals', 'BulkChangeHostCVModal', <BulkChangeHostCVModal key="bulk-change-host-cv-modal" />, 100);
Expand Down
Loading