Fix visual isses on Enabled/Explore tiles

opendatahub-io · Dec 19, 2024 · 9875201 · 9875201
1 parent 065da14
commit 9875201
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 54 deletions.
diff --git a/frontend/src/components/OdhAppCard.tsx b/frontend/src/components/OdhAppCard.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 import {
   AlertVariant,
@@ -15,6 +14,7 @@ import {
   DropdownList,
   Label,
 } from '@patternfly/react-core';
+import { css } from '@patternfly/react-styles';
 import { EllipsisVIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { OdhApplication } from '~/types';
 import { getLaunchStatus, launchQuickStart } from '~/utilities/quickStartUtils';
@@ -104,10 +104,11 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
     );
   }
 
-  const launchClasses = classNames('odh-card__footer__link', {
-    'm-hidden': !odhApp.spec.link,
-    'm-disabled': disabled || !workbenchEnabled,
-  });
+  const launchClasses = css(
+    'odh-card__footer__link',
+    !odhApp.spec.link && 'm-hidden',
+    (disabled || !workbenchEnabled) && 'm-disabled',
+  );
 
   const cardFooter = (
     <CardFooter className="odh-card__footer">
@@ -116,9 +117,7 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
           <Link
             data-testid="jupyter-app-link"
             to="/notebookController"
-            className={classNames('odh-card__footer__link', {
-              'm-disabled': !workbenchEnabled,
-            })}
+            className={css('odh-card__footer__link', !workbenchEnabled && 'm-disabled')}
           >
             Launch application
           </Link>
@@ -137,11 +136,7 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
     </CardFooter>
   );
 
-  const cardClasses = classNames('odh-card', {
-    // Using PF native class to prevent needing custom styling; RHOAI feel free to delete this comment
-    'pf-m-disabled': disabled,
-    'pf-m-current': selected,
-  });
+  const cardClasses = css('odh-card', selected && 'pf-m-current');
 
   const popoverBodyContent = (hide: () => void) => (
     <div>
@@ -177,8 +172,9 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
       bodyContent={popoverBodyContent}
       position="bottom"
     >
-      {/* Note from PatternFly: this implementation is not accessible and should use a button/interactive element instead of a plain span */}
-      <span className="odh-card__disabled-text">Disabled</span>
+      <Button variant="plain" className="odh-card__disabled-text">
+        Disabled
+      </Button>
     </Popover>
   );
 
@@ -189,6 +185,7 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
       id={odhApp.metadata.name}
       role="listitem"
       className={cardClasses}
+      isDisabled={disabled || !workbenchEnabled}
     >
       <CardHeader
         actions={{
@@ -228,10 +225,11 @@ const OdhAppCard: React.FC<OdhAppCardProps> = ({ odhApp }) => {
         odhApp.spec.category &&
         odhApp.spec.support !== ODH_PRODUCT_NAME ? (
           <div className="odh-card__partner-badge-container">
-            <span className="odh-card__partner-badge" data-testid="partner-badge">
-              <Label className={disabled ? 'pf-m-disabled' : undefined} variant="outline">
-                {odhApp.spec.category}
-              </Label>
+            <span
+              className={css('odh-card__partner-badge', disabled && 'pf-m-disabled')}
+              data-testid="partner-badge"
+            >
+              <Label variant="outline">{odhApp.spec.category}</Label>
             </span>
           </div>
         ) : null}

diff --git a/frontend/src/components/OdhCard.scss b/frontend/src/components/OdhCard.scss
@@ -1,8 +1,4 @@
 .odh-card {
-  // Removed the custom disabled styling and replaced the existing disabled class in component code with pf-m-disabled
-  // Updating the custom overrides would have involved adding more overrides for font colors
-  // Removed the custom odh-card.pf-m-current styling as PF cards with the pf-m-current have styling
-  // RHOAI feel free to delete above comments
   & .odh-brand > img {
     background-color: var(--pf-t--color--white);
     padding: var(--pf-t--global--spacer--xs);
@@ -15,8 +11,12 @@
   }
 
   &__partner-badge {
-    padding: 0 var(--pf-t--global--spacer--sm);
-
+    // Override the label outline for disabled cards so it shows in dark theme
+    &.pf-m-disabled {
+      .pf-v6-c-label.pf-m-outline {
+        --pf-v6-c-label--m-outline--BorderColor: var(--pf-t--global--text--color--regular);
+      }
+    }
     &.m-hidden {
       visibility: hidden;
     }
@@ -40,7 +40,6 @@
   }
 
   &__disabled-text {
-    color: var(--pf-t--global--text--color--disabled);
     font-size: var(--pf-t--global--font--size--body--sm);
   }
 

diff --git a/frontend/src/components/OdhExploreCard.tsx b/frontend/src/components/OdhExploreCard.tsx
@@ -53,36 +53,11 @@ const OdhExploreCard: React.FC<OdhExploreCardProps> = ({
       className={cardClasses}
     >
       <CardHeader
+        className="pf-m-no-offset"
         {...(!dashboardConfig.spec.dashboardConfig.disableISVBadges && {
           actions: {
-            actions: (
-              <Flex
-                spaceItems={{ default: 'spaceItemsSm' }}
-                alignItems={{ default: 'alignItemsCenter' }}
-                direction={{ default: 'column' }}
-              >
-                {odhApp.spec.comingSoon && (
-                  <FlexItem className="odh-card__coming-soon">Coming soon</FlexItem>
-                )}
-                {!odhApp.spec.comingSoon && odhApp.spec.category && (
-                  <FlexItem className={badgeClasses} onClick={disabled ? undefined : onSelect}>
-                    <OdhExploreCardTypeBadge
-                      isDisabled={disabled}
-                      category={odhApp.spec.category}
-                    />
-                  </FlexItem>
-                )}
-                {odhApp.spec.beta && (
-                  <FlexItem className="odh-card__partner-badge odh-m-beta">
-                    <Label className={disabled ? 'pf-m-disabled' : undefined} color="yellow">
-                      Beta
-                    </Label>
-                  </FlexItem>
-                )}
-              </Flex>
-            ),
             hasNoOffset: true,
-            className: undefined,
+            actions: null,
           },
           selectableActions: {
             selectableActionId: `${odhApp.metadata.name}-selectable-card-id`,
@@ -94,7 +69,35 @@ const OdhExploreCard: React.FC<OdhExploreCardProps> = ({
           },
         })}
       >
-        <BrandImage src={odhApp.spec.img} alt="" data-testid="brand-image" />
+        <Flex
+          alignItems={{ default: 'alignItemsCenter' }}
+          gap={{ default: 'gapMd' }}
+          direction={{ default: 'row' }}
+          flexWrap={{ default: 'nowrap' }}
+        >
+          <BrandImage src={odhApp.spec.img} alt="" data-testid="brand-image" />
+          <Flex
+            spaceItems={{ default: 'spaceItemsSm' }}
+            alignItems={{ default: 'alignItemsCenter' }}
+            direction={{ default: 'column' }}
+          >
+            {odhApp.spec.comingSoon && (
+              <FlexItem className="odh-card__coming-soon">Coming soon</FlexItem>
+            )}
+            {!odhApp.spec.comingSoon && odhApp.spec.category && (
+              <FlexItem className={badgeClasses} onClick={disabled ? undefined : onSelect}>
+                <OdhExploreCardTypeBadge isDisabled={disabled} category={odhApp.spec.category} />
+              </FlexItem>
+            )}
+            {odhApp.spec.beta && (
+              <FlexItem className="odh-card__partner-badge odh-m-beta">
+                <Label className={disabled ? 'pf-m-disabled' : undefined} color="yellow">
+                  Beta
+                </Label>
+              </FlexItem>
+            )}
+          </Flex>
+        </Flex>
       </CardHeader>
       <SupportedAppTitle odhApp={odhApp} showProvider />
       <CardBody data-testid="cardbody">{odhApp.spec.description}</CardBody>