@openshift-assisted/ui-lib 2.16.5-cim → 2.17.0-cim

package/lib/common/components/hosts/status.tsx

@@ -8,10 +8,9 @@ import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/e
 import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
 import { LinkIcon } from '@patternfly/react-icons/dist/js/icons/link-icon';
 import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
-import { PlusIcon } from '@patternfly/react-icons/dist/js/icons/plus-icon';
-import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
-import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
-import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
+import { t_global_icon_color_status_danger_default as dangerColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_danger_default';
+import { t_global_icon_color_status_warning_default as warningColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_warning_default';
+import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
 import { chart_color_blue_300 as blueColor } from '@patternfly/react-tokens/dist/js/chart_color_blue_300';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { HostStatus } from './types';
@@ -95,7 +94,7 @@ export const hostStatus = (t: TFunction): HostStatus<Host['status'] | 'finalizin
       key: 'known-unbound',
       title: t('ai:Available'),
       category: 'Discovery related',
-      icon: <PlusIcon color={blueColor.value} />,
+      icon: <ConnectedIcon color={blueColor.value} />,
       details: t(
         'ai:This host meets the minimum hardware and networking requirements and can be included in the cluster.',
       ),

package/lib/common/components/hosts/tableUtils.tsx

@@ -67,7 +67,6 @@ export const hostnameColumn = (
       title: t('ai:Hostname'),
       props: {
         id: 'col-header-hostname', // ACM jest tests require id over testId
-        modifier: 'breakWord',
       },
       sort: true,
     },
@@ -394,15 +393,18 @@ export const labelsColumn = (t: TFunction): TableRow<Host> => ({
   cell: (host) => {
     const labels = getHostLabels(host);
     return {
-      title: (
-        <LabelGroup>
-          {Object.entries(labels).map(([key, value], index) => (
-            <Label key={`${host.id}-host-label-${index}`} isCompact>
-              {key} = {value}
-            </Label>
-          ))}
-        </LabelGroup>
-      ),
+      title:
+        Object.entries(labels).length > 0 ? (
+          <LabelGroup>
+            {Object.entries(labels).map(([key, value], index) => (
+              <Label key={`${host.id}-host-label-${index}`} isCompact>
+                {key} = {value}
+              </Label>
+            ))}
+          </LabelGroup>
+        ) : (
+          '--'
+        ),
       props: { 'data-testid': 'host-labels' },
     };
   },

package/lib/common/components/operators/operatorDescriptions.tsx

@@ -60,6 +60,12 @@ export const DESCRIPTION_LVM =
 export const DESCRIPTION_CLUSTER_OBSERVABILITY =
   'Provides observability and monitoring capabilities for your OpenShift cluster.';
 
+export const DESCRIPTION_LOKI =
+  'Provides a log aggregation system designed to store and query logs from all applications and infrastructure components.';
+
+export const DESCRIPTION_OPENSHIFT_LOGGING =
+  'Collects, stores, and visualizes logs from OpenShift Container Platform components and applications.';
+
 export const DESCRIPTION_NUMA_RESOURCES =
   'Provides NUMA-aware scheduling to improve workload performance on NUMA systems.';
 

package/lib/common/components/operators/operatorSpecs.tsx

@@ -24,6 +24,8 @@ import {
   OPERATOR_NAME_NODE_MAINTENANCE,
   OPERATOR_NAME_KUBE_DESCHEDULER,
   OPERATOR_NAME_CLUSTER_OBSERVABILITY,
+  OPERATOR_NAME_LOKI,
+  OPERATOR_NAME_OPENSHIFT_LOGGING,
   OPERATOR_NAME_NUMA_RESOURCES,
   OPERATOR_NAME_OADP,
   OPERATOR_NAME_METALLB,
@@ -36,6 +38,7 @@ import {
   getClusterObservabilityLink,
   getKmmDocsLink,
   getKubeDeschedulerLink,
+  getLokiLink,
   getLsoLink,
   getLvmsDocsLink,
   getMceDocsLink,
@@ -45,6 +48,7 @@ import {
   getNumaResourcesLink,
   getNvidiaGpuLink,
   getOadpLink,
+  getOpenShiftLoggingLink,
   MTV_LINK,
   NODE_HEALTHCHECK_LINK,
   NODE_MAINTENANCE_LINK,
@@ -83,6 +87,8 @@ import {
   DESCRIPTION_SERVICEMESH,
   DESCRIPTION_LVM,
   DESCRIPTION_CLUSTER_OBSERVABILITY,
+  DESCRIPTION_LOKI,
+  DESCRIPTION_OPENSHIFT_LOGGING,
   DESCRIPTION_NUMA_RESOURCES,
   DESCRIPTION_OADP,
   DESCRIPTION_METALLB,
@@ -473,9 +479,36 @@ export const getOperatorSpecs = (
             </ExternalLink>
           </>
         ),
-        notStandalone: true,
         supportLevel: getFeatureSupportLevel('CLUSTER_OBSERVABILITY'),
       },
+      {
+        operatorKey: OPERATOR_NAME_LOKI,
+        title: 'Loki Operator',
+        featureId: 'CLUSTER_OBSERVABILITY',
+        descriptionText: DESCRIPTION_LOKI,
+        Description: ({ openshiftVersion, searchTerm }) => (
+          <>
+            <HighlightedText text={DESCRIPTION_LOKI} searchTerm={searchTerm} />{' '}
+            <ExternalLink href={getLokiLink(openshiftVersion)}>Learn more</ExternalLink>
+          </>
+        ),
+        notStandalone: true,
+        supportLevel: getFeatureSupportLevel('LOKI'),
+      },
+      {
+        operatorKey: OPERATOR_NAME_OPENSHIFT_LOGGING,
+        title: 'OpenShift Logging',
+        featureId: 'CLUSTER_OBSERVABILITY',
+        descriptionText: DESCRIPTION_OPENSHIFT_LOGGING,
+        Description: ({ openshiftVersion, searchTerm }) => (
+          <>
+            <HighlightedText text={DESCRIPTION_OPENSHIFT_LOGGING} searchTerm={searchTerm} />{' '}
+            <ExternalLink href={getOpenShiftLoggingLink(openshiftVersion)}>Learn more</ExternalLink>
+          </>
+        ),
+        notStandalone: true,
+        supportLevel: getFeatureSupportLevel('OPENSHIFT_LOGGING'),
+      },
     ],
     [categories[Category.SCHEDULING]]: [
       {

package/lib/common/components/storage/DisksTable.tsx

@@ -1,12 +1,5 @@
 import React from 'react';
-import {
-  TextContent,
-  Text,
-  TextVariants,
-  Popover,
-  Alert,
-  AlertVariant,
-} from '@patternfly/react-core';
+import { Content, ContentVariants, Popover, Alert, AlertVariant } from '@patternfly/react-core';
 import { TableVariant, Thead, Tbody, Table, Th, Tr, Td } from '@patternfly/react-table';
 import type { Disk, Host } from '@openshift-assisted/types/assisted-installer-service';
 import type { WithTestID } from '../../types/index';
@@ -53,9 +46,7 @@ const diskColumns = (t: TFunction, showFormat: boolean) =>
   ].filter(Boolean) as { title: string | React.ReactNode }[];
 
 const SkipFormattingDisk = () => (
-  <TextContent>
-    <Text component={TextVariants.p}>This bootable disk will skip formatting</Text>
-  </TextContent>
+  <Content component={ContentVariants.p}>This bootable disk will skip formatting</Content>
 );
 
 const getDiskLimitation = (

package/lib/common/components/storage/StorageUtils.tsx

@@ -2,14 +2,12 @@ import * as React from 'react';
 import { TFunction } from 'i18next';
 import { getHostRole, getInventory, RoleCell, UiIcon } from '../../index';
 import { TableRow } from '../hosts/AITable';
-import { Popover, Text, TextContent, TextVariants } from '@patternfly/react-core';
+import { Popover, Content, ContentVariants } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 
 const SkipFormattingDisks = () => (
-  <TextContent>
-    <Text component={TextVariants.p}>Some bootable disks will skip formatting</Text>
-  </TextContent>
+  <Content component={ContentVariants.p}>Some bootable disks will skip formatting</Content>
 );
 
 export const roleColumn = (t: TFunction, schedulableMasters: boolean): TableRow<Host> => {
@@ -76,7 +74,13 @@ export const odfUsageColumn = (excludeMasters: boolean): TableRow<Host> => {
       const isExcluded = excludeMasters && isMaster;
       return {
         title: isExcluded ? (
-          <div style={{ color: 'var(--pf-v5-global--disabled-color--100)' }}>Excluded for ODF</div>
+          <div
+            style={{
+              color: 'var(--pf-t--global--icon--color--disabled)',
+            }}
+          >
+            Excluded for ODF
+          </div>
         ) : (
           'Use ODF'
         ),

package/lib/common/components/ui/ClusterEventsToolbar.tsx

@@ -5,7 +5,7 @@ import {
   ToolbarItem,
   ToolbarContent,
   ToolbarFilter,
-  ToolbarChip,
+  ToolbarLabel,
   Button,
   ButtonVariant,
   InputGroup,
@@ -83,19 +83,19 @@ export const getInitialClusterEventsFilters = (
   deletedHosts: false,
 });
 
-const mapHostsChips = (
+const mapHostsLabels = (
   t: TFunction,
   filters: ClusterEventsFiltersType,
   hosts: { id: string; hostname?: string }[],
-): ToolbarChip[] => {
-  const chips = [
+): ToolbarLabel[] => {
+  const labels = [
     filters.deletedHosts && { key: DELETED_HOSTS, node: t('ai:Deleted hosts') },
     filters.clusterLevel && { key: CLUSTER_LEVEL, node: t('ai:Cluster-level events') },
     ...(hosts || [])
       .filter((host) => filters.hostIds?.includes(host.id))
-      .map((host): ToolbarChip => ({ key: host.id, node: host.hostname })),
+      .map((host): ToolbarLabel => ({ key: host.id, node: host.hostname })),
   ];
-  return chips.filter(Boolean) as ToolbarChip[];
+  return labels.filter(Boolean) as ToolbarLabel[];
 };
 
 const ClusterEventsToolbar = ({
@@ -178,7 +178,7 @@ const ClusterEventsToolbar = ({
     setTimer(newTimer);
   };
 
-  const onDeleteChipGroup: ToolbarFilterProps['deleteChipGroup'] = (type) => {
+  const onDeleteLabelGroup: ToolbarFilterProps['deleteLabelGroup'] = (type) => {
     if (type === 'Severity') {
       setFilters({
         ...filters,
@@ -209,7 +209,7 @@ const ClusterEventsToolbar = ({
     a.hostname && b.hostname && a.hostname < b.hostname ? -1 : 1,
   );
 
-  const hostChips = mapHostsChips(t, filters, sortedHosts);
+  const hostLabels = mapHostsLabels(t, filters, sortedHosts);
 
   return (
     <Toolbar
@@ -225,11 +225,11 @@ const ClusterEventsToolbar = ({
         {entityKind === 'cluster' && (
           <CustomToolbarFilter
             categoryName="Hosts"
-            chips={hostChips}
-            deleteChip={(_, chip) =>
-              onHostSelect(typeof chip === 'string' ? chip : chip.key, false)
+            labels={hostLabels}
+            deleteLabel={(_, label) =>
+              onHostSelect(typeof label === 'string' ? label : label.key, false)
             }
-            deleteChipGroup={onDeleteChipGroup}
+            deleteLabelGroup={onDeleteLabelGroup}
           >
             <Dropdown
               isOpen={isHostExpanded}
@@ -243,8 +243,8 @@ const ClusterEventsToolbar = ({
                   isFullWidth
                   onClick={onHostToggle}
                   isExpanded={isHostExpanded}
-                  badge={hostChips.length && <Badge isRead>{hostChips.length}</Badge>}
-                  data-testid="cluster-events-hosts-dropdown-button"
+                  badge={hostLabels.length && <Badge isRead>{hostLabels.length}</Badge>}
+                  data-testid="hosts-dropdown-toggle"
                 >
                   <Placeholder text="Hosts" />
                 </MenuToggle>
@@ -290,16 +290,16 @@ const ClusterEventsToolbar = ({
         )}
 
         <ToolbarFilter
-          chips={filters.severities?.map(
-            (severity): ToolbarChip => ({
+          labels={filters.severities?.map(
+            (severity): ToolbarLabel => ({
               key: severity,
               node: capitalize(severity),
             }),
           )}
-          deleteChip={(_, chip) =>
-            onSeveritySelect(typeof chip === 'string' ? chip : chip.key, false)
+          deleteLabel={(_, label) =>
+            onSeveritySelect(typeof label === 'string' ? label : label.key, false)
           }
-          deleteChipGroup={onDeleteChipGroup}
+          deleteLabelGroup={onDeleteLabelGroup}
           categoryName="Severity"
         >
           <Dropdown
@@ -318,7 +318,7 @@ const ClusterEventsToolbar = ({
                 badge={
                   filters.severities?.length && <Badge isRead>{filters.severities.length}</Badge>
                 }
-                data-testid="cluster-events-severity-dropdown-button"
+                data-testid="severity-dropdown-toggle"
               >
                 <Placeholder text="Severity" />
               </MenuToggle>
@@ -355,9 +355,11 @@ const ClusterEventsToolbar = ({
               />
             </InputGroupItem>
             <InputGroupItem>
-              <Button variant={ButtonVariant.control} aria-label="search text button">
-                <SearchIcon />
-              </Button>
+              <Button
+                icon={<SearchIcon />}
+                variant={ButtonVariant.control}
+                aria-label="search text button"
+              />
             </InputGroupItem>
           </InputGroup>
         </ToolbarItem>

package/lib/common/components/ui/ConfirmationModal.tsx

@@ -1,10 +1,19 @@
 import * as React from 'react';
-import { Modal, Button, ModalVariant, ButtonProps, ModalProps } from '@patternfly/react-core';
+import {
+  Button,
+  ButtonProps,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  ModalHeaderProps,
+  ModalVariant,
+} from '@patternfly/react-core';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
 type ConfirmationModalProps = {
   title: string;
-  titleIconVariant?: ModalProps['titleIconVariant'];
+  titleIconVariant?: ModalHeaderProps['titleIconVariant'];
   content: React.ReactNode;
   confirmationButtonVariant?: ButtonProps['variant'];
   confirmationButtonText?: string;
@@ -23,13 +32,10 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
 }) => {
   const { t } = useTranslation();
   return (
-    <Modal
-      title={title}
-      titleIconVariant={titleIconVariant}
-      isOpen={true}
-      onClose={onClose}
-      variant={ModalVariant.small}
-      actions={[
+    <Modal isOpen={true} onClose={onClose} variant={ModalVariant.small}>
+      <ModalHeader title={title} titleIconVariant={titleIconVariant} />
+      <ModalBody>{content}</ModalBody>
+      <ModalFooter>
         <Button
           data-testid="confirm-modal-submit"
           key="confirm"
@@ -37,13 +43,11 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
           onClick={onConfirm}
         >
           {confirmationButtonText}
-        </Button>,
+        </Button>
         <Button key="cancel" variant="link" onClick={onClose}>
           {t('ai:Cancel')}
-        </Button>,
-      ]}
-    >
-      {content}
+        </Button>
+      </ModalFooter>
     </Modal>
   );
 };

package/lib/common/components/ui/CustomToolbarFilter.tsx

@@ -2,15 +2,16 @@
 // Once this issues is addressed in PatternFly, this component should be removed.
 
 import {
-  Chip,
-  ChipGroup,
+  Label,
+  LabelGroup,
   PickOptional,
-  ToolbarChip,
+  ToolbarLabel,
   ToolbarContentContext,
   ToolbarContext,
   ToolbarFilterProps,
   ToolbarItem,
 } from '@patternfly/react-core';
+
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
@@ -23,7 +24,7 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
   static contextType = ToolbarContext;
   context!: React.ContextType<typeof ToolbarContext>;
   static defaultProps: PickOptional<ToolbarFilterProps> = {
-    chips: [] as (string | ToolbarChip)[],
+    labels: [] as (string | ToolbarLabel)[],
     showToolbarItem: true,
   };
 
@@ -35,70 +36,78 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
   }
 
   componentDidMount() {
-    const { categoryName, chips } = this.props;
+    const { categoryName, labels } = this.props;
     this.context.updateNumberFilters(
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString(),
-      chips ? chips.length : 0,
+      labels ? labels.length : 0,
     );
     this.setState({ isMounted: true });
   }
 
   componentDidUpdate() {
-    const { categoryName, chips } = this.props;
+    const { categoryName, labels } = this.props;
     this.context.updateNumberFilters(
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString(),
-      chips ? chips.length : 0,
+      labels ? labels.length : 0,
     );
   }
 
   render() {
     const {
       children,
-      chips,
-      deleteChipGroup,
-      deleteChip,
-      chipGroupExpandedText,
-      chipGroupCollapsedText,
+      labels,
+      deleteLabelGroup,
+      deleteLabel,
+      labelGroupExpandedText,
+      labelGroupCollapsedText,
       categoryName,
       showToolbarItem,
       isExpanded,
-      expandableChipContainerRef,
+      expandableLabelContainerRef,
       ...props
     } = this.props;
-    const { isExpanded: managedIsExpanded, chipGroupContentRef } = this.context;
+    const { isExpanded: managedIsExpanded, labelGroupContentRef } = this.context;
     const _isExpanded = isExpanded !== undefined ? isExpanded : managedIsExpanded;
     const categoryKey =
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString();
 
-    const chipGroup =
-      chips !== undefined && chips.length ? (
-        <ToolbarItem variant="chip-group">
-          <ChipGroup
+    const labelGroup =
+      labels !== undefined && labels.length ? (
+        <ToolbarItem variant="label-group">
+          <LabelGroup
             key={categoryKey}
             categoryName={typeof categoryName === 'string' ? categoryName : categoryName.name}
-            isClosable={deleteChipGroup !== undefined}
-            onClick={() => deleteChipGroup && deleteChipGroup(categoryName)}
-            collapsedText={chipGroupCollapsedText}
-            expandedText={chipGroupExpandedText}
+            isClosable={deleteLabelGroup !== undefined}
+            onClick={() => deleteLabelGroup && deleteLabelGroup(categoryName)}
+            collapsedText={labelGroupCollapsedText}
+            expandedText={labelGroupExpandedText}
           >
-            {chips.map((chip) =>
-              typeof chip === 'string' ? (
-                <Chip key={chip} onClick={() => deleteChip && deleteChip(categoryKey, chip)}>
-                  {chip}
-                </Chip>
+            {labels.map((label) =>
+              typeof label === 'string' ? (
+                <Label
+                  variant="outline"
+                  key={label}
+                  onClose={() => deleteLabel && deleteLabel(categoryKey, label)}
+                >
+                  {label}
+                </Label>
               ) : (
-                <Chip key={chip.key} onClick={() => deleteChip && deleteChip(categoryKey, chip)}>
-                  {chip.node}
-                </Chip>
+                <Label
+                  variant="outline"
+                  key={label.key}
+                  onClose={() => deleteLabel && deleteLabel(categoryKey, label)}
+                >
+                  {label.node}
+                </Label>
               ),
             )}
-          </ChipGroup>
+          </LabelGroup>
         </ToolbarItem>
       ) : null;
 
@@ -106,24 +115,24 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
       return (
         <React.Fragment>
           {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
-          {chipGroupContentRef &&
-            chipGroupContentRef.current !== null &&
-            chipGroupContentRef.current.firstElementChild !== null &&
-            ReactDOM.createPortal(chipGroup, chipGroupContentRef.current.firstElementChild)}
+          {labelGroupContentRef &&
+            labelGroupContentRef.current !== null &&
+            labelGroupContentRef.current.firstElementChild !== null &&
+            ReactDOM.createPortal(labelGroup, labelGroupContentRef.current.firstElementChild)}
         </React.Fragment>
       );
     }
 
     return (
       <ToolbarContentContext.Consumer>
-        {({ chipContainerRef }) => (
+        {({ labelContainerRef }) => (
           <React.Fragment>
             {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
-            {chipContainerRef.current &&
-              ReactDOM.createPortal(chipGroup, chipContainerRef.current as Element)}
-            {expandableChipContainerRef &&
-              expandableChipContainerRef.current &&
-              ReactDOM.createPortal(chipGroup, expandableChipContainerRef.current)}
+            {labelContainerRef.current &&
+              ReactDOM.createPortal(labelGroup, labelContainerRef.current as Element)}
+            {expandableLabelContainerRef &&
+              expandableLabelContainerRef.current &&
+              ReactDOM.createPortal(labelGroup, expandableLabelContainerRef.current)}
           </React.Fragment>
         )}
       </ToolbarContentContext.Consumer>

package/lib/common/components/ui/DetailList.css

@@ -3,10 +3,10 @@
 }
 
 .detail-list dd {
-  margin-bottom: var(--pf-v5-global--spacer--sm);
+  margin-bottom: var(--pf-v6-global--spacer--sm);
 }
 
 .detail-list ul ul,
 .detail-list ul li {
-  margin-top: var(--pf-v5-c-content--dt--sm--MarginTop);
+  margin-top: var(--pf-v6-c-content--dt--sm--MarginTop);
 }

package/lib/common/components/ui/DetailList.tsx

@@ -1,13 +1,5 @@
 import React, { ReactChild, ReactNode } from 'react';
-import {
-  TextContent,
-  TextList,
-  TextListVariants,
-  TextListItem,
-  TextListItemVariants,
-  Text,
-  TextProps,
-} from '@patternfly/react-core';
+import { Content, ContentVariants, ContentProps } from '@patternfly/react-core';
 import { WithTestID } from '../../types';
 
 import './DetailList.css';
@@ -16,7 +8,7 @@ import { RenderIf } from './RenderIf';
 export type DetailListProps = {
   children: ReactChild | (ReactChild | undefined)[];
   title?: string;
-  titleComponent?: TextProps['component'];
+  titleComponent?: ContentProps['component'];
 };
 
 export type DetailItemList = {
@@ -37,12 +29,12 @@ export const DetailList: React.FC<DetailListProps> = ({
   title,
   titleComponent = 'h2',
 }) => (
-  <TextContent>
-    {title && <Text component={titleComponent}>{title}</Text>}
-    <TextList component={TextListVariants.dl} className="detail-list">
+  <Content>
+    {title && <Content component={titleComponent}>{title}</Content>}
+    <Content component={ContentVariants.dl} className="detail-list">
       {children}
-    </TextList>
-  </TextContent>
+    </Content>
+  </Content>
 );
 
 const hasDetailItemList = (data: DetailItemProps['value']): data is DetailItemList => {
@@ -60,42 +52,42 @@ export const DetailItem: React.FC<DetailItemProps & WithTestID> = ({
   isHidden ? null : (
     <>
       <RenderIf condition={title !== undefined}>
-        <TextListItem
-          component={TextListItemVariants.dt}
+        <Content
+          component={ContentVariants.dt}
           id={idPrefix ? `${idPrefix}-title` : undefined}
           data-testid={testId ? `${testId}-title` : undefined}
         >
           {title}
-        </TextListItem>
+        </Content>
       </RenderIf>
-      <TextListItem
-        component={TextListItemVariants.dd}
+      <Content
+        component={ContentVariants.dd}
         id={idPrefix ? `${idPrefix}-value` : undefined}
         data-testid={testId ? `${testId}-value` : undefined}
         className={classNameValue}
       >
         {hasDetailItemList(value) ? (
-          <TextList component={TextListVariants.dl}>
+          <Content component={ContentVariants.dl}>
             {value.map((item, idx) => [
-              <TextListItem
+              <Content
                 data-testid={testId ? `${testId}-title-${idx}` : undefined}
                 key={item.title}
-                component={TextListItemVariants.dt}
+                component={ContentVariants.dt}
               >
                 {item.title}
-              </TextListItem>,
-              <TextListItem
+              </Content>,
+              <Content
                 data-testid={testId ? `${testId}-value-${idx}` : undefined}
                 key={`dd-${item.title}`}
-                component={TextListItemVariants.dd}
+                component={ContentVariants.dd}
               >
                 {item.value}
-              </TextListItem>,
+              </Content>,
             ])}
-          </TextList>
+          </Content>
         ) : (
           value
         )}
-      </TextListItem>
+      </Content>
     </>
   );