[NCL-8452] Consolidate action buttons

project-ncl · Apr 23, 2024 · 2ceb437 · 2ceb437
1 parent f5ad600
commit 2ceb437
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/src/components/ArtifactEditQualityModal/ArtifactEditQualityModalButton.tsx b/src/components/ArtifactEditQualityModal/ArtifactEditQualityModalButton.tsx
@@ -1,19 +1,18 @@
-import { Button } from '@patternfly/react-core';
+import { Button, ButtonProps } from '@patternfly/react-core';
 
 import { ButtonTitles } from 'common/constants';
 
-import { IArtifactEditQualityModalProps } from 'components/ArtifactEditQualityModal/ArtifactEditQualityModal';
 import { ProtectedComponent } from 'components/ProtectedContent/ProtectedComponent';
 import { TooltipWrapper } from 'components/TooltipWrapper/TooltipWrapper';
 
 type IArtifactEditQualityModalButtonProps = {
   toggleModal: () => void;
-  variant: IArtifactEditQualityModalProps['variant'];
+  variant?: ButtonProps['variant'];
 } & ({ isBuildVariant?: false } | { isBuildVariant: true; buildArtifactsCount: number | undefined });
 
 export const ArtifactEditQualityModalButton = ({
   toggleModal,
-  variant,
+  variant = 'secondary',
   isBuildVariant,
   ...props
 }: IArtifactEditQualityModalButtonProps) => {
@@ -24,8 +23,8 @@ export const ArtifactEditQualityModalButton = ({
   return (
     <ProtectedComponent>
       <TooltipWrapper tooltip={disabledButtonReason}>
-        <Button variant={variant === 'list' ? 'secondary' : 'tertiary'} onClick={toggleModal} isSmall isAriaDisabled={isDisabled}>
-          {ButtonTitles.edit} Quality
+        <Button variant={variant} onClick={toggleModal} isSmall isAriaDisabled={isDisabled}>
+          {ButtonTitles.update} quality
         </Button>
       </TooltipWrapper>
     </ProtectedComponent>

diff --git a/src/components/ArtifactPages/ArtifactPages.tsx b/src/components/ArtifactPages/ArtifactPages.tsx
@@ -93,7 +93,7 @@ export const ArtifactPages = () => {
       <PageLayout
         title={serviceContainerArtifact.data?.identifier}
         breadcrumbs={[{ entity: breadcrumbData.artifact.id, title: serviceContainerArtifact.data?.identifier }]}
-        actions={<ArtifactEditQualityModalButton toggleModal={toggleEditQualityModal} variant="detail" />}
+        actions={<ArtifactEditQualityModalButton toggleModal={toggleEditQualityModal} />}
         tabs={pageTabs}
       >
         <Outlet context={{ serviceContainerArtifact }} />

diff --git a/src/components/BrewPushModal/BrewPushModalButton.tsx b/src/components/BrewPushModal/BrewPushModalButton.tsx
@@ -16,7 +16,7 @@ export const BrewPushModalButton = ({ toggleModal, build }: IBrewPushModalButton
   return (
     <ProtectedComponent>
       <TooltipWrapper tooltip={disabledButtonReason}>
-        <Button variant="tertiary" onClick={toggleModal} isAriaDisabled={!!disabledButtonReason} isBlock isSmall>
+        <Button variant="primary" onClick={toggleModal} isAriaDisabled={!!disabledButtonReason} isBlock isSmall>
           Push to Brew
         </Button>
       </TooltipWrapper>

diff --git a/src/components/BuildArtifactsPage/BuildArtifactsPage.tsx b/src/components/BuildArtifactsPage/BuildArtifactsPage.tsx
@@ -45,7 +45,6 @@ export const BuildArtifactsPage = ({ componentId = 'a1' }: IBuildArtifactsPagePr
         <ToolbarItem>
           <ArtifactEditQualityModalButton
             toggleModal={toggleEditQualitiesModal}
-            variant="detail"
             isBuildVariant
             buildArtifactsCount={serviceContainerArtifacts.data?.content?.length}
           />

diff --git a/src/components/BuildConfigRestoreModal/BuildConfigRestoreModalButton.tsx b/src/components/BuildConfigRestoreModal/BuildConfigRestoreModalButton.tsx
@@ -8,7 +8,7 @@ interface IBuildConfigRestoreModalButtonProps {
 
 export const BuildConfigRestoreModalButton = ({ toggleModal }: IBuildConfigRestoreModalButtonProps) => (
   <ProtectedComponent>
-    <Button variant="tertiary" onClick={toggleModal} isSmall>
+    <Button variant="primary" onClick={toggleModal} isSmall>
       Restore
     </Button>
   </ProtectedComponent>

diff --git a/src/components/CancelBuildModal/CancelBuildModalButton.tsx b/src/components/CancelBuildModal/CancelBuildModalButton.tsx
@@ -20,7 +20,7 @@ export const CancelBuildModalButton = ({ toggleModal, build, variant }: ICancelB
   return (
     <ProtectedComponent>
       <TooltipWrapper tooltip={disabledButtonReason}>
-        <Button variant="tertiary" onClick={toggleModal} isAriaDisabled={!!disabledButtonReason} isBlock isSmall>
+        <Button variant="primary" onClick={toggleModal} isAriaDisabled={!!disabledButtonReason} isBlock isSmall>
           Abort
         </Button>
       </TooltipWrapper>

diff --git a/src/components/GroupConfigDetailPage/GroupConfigDetailPage.tsx b/src/components/GroupConfigDetailPage/GroupConfigDetailPage.tsx
@@ -126,7 +126,9 @@ export const GroupConfigDetailPage = ({
             <BuildStartButton groupConfig={serviceContainerGroupConfig.data!} />
           </ProtectedComponent>,
           <ProtectedComponent key="edit-group-config-button">
-            <ActionButton link="edit">Edit Group Config</ActionButton>
+            <ActionButton variant="tertiary" link="edit">
+              Edit Group Config
+            </ActionButton>
           </ProtectedComponent>,
         ]}
         sidebar={{

diff --git a/src/components/ProductMilestoneMarkModal/ProductMilestoneMarkModalButton.tsx b/src/components/ProductMilestoneMarkModal/ProductMilestoneMarkModalButton.tsx
@@ -47,6 +47,7 @@ export const ProductMilestoneMarkModalButton = ({
               variant === 'list' && !isDisabled && 'black-color',
               variant === 'list' && isDisabled && 'disabled-color',
               variant === 'list' && 'dropdown-item-font-size',
+              'dropdown-item-font-size',
               'text-align-left'
             )}
             isBlock