Skip to content

Commit 3046d0b

Browse files
committed
fix: review comments
1 parent c70b248 commit 3046d0b

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

src/components/app/details/triggerView/BuildImageModal/BulkBuildImageModal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
WorkflowType,
2828
} from '@devtron-labs/devtron-fe-common-lib'
2929

30-
import { ReactComponent as MechanicalOperation } from '@Images/ic-mechanical-operation.svg'
3130
import { BulkCIDetailType, ResponseRowType } from '@Components/ApplicationGroup/AppGroup.types'
3231
import {
3332
BULK_CI_BUILD_STATUS,
@@ -417,7 +416,7 @@ const BulkBuildImageModal = ({
417416
? BULK_CI_BUILD_STATUS(numberOfAppsLoading)
418417
: BULK_CI_MATERIAL_STATUS(numberOfAppsLoading)
419418

420-
return <GenericEmptyState {...message} SvgImage={MechanicalOperation} contentClassName="text-center" />
419+
return <GenericEmptyState {...message} imgName="img-mechanical-operation" contentClassName="text-center" />
421420
}
422421

423422
if (isLoadingSingleAppInfoMap) {

src/components/app/details/triggerView/DeployImageModal/BulkDeployEmptyState.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const BulkDeployEmptyState = ({
2727
return <TriggerBlockEmptyState stageType={stageType} appId={appId} />
2828
}
2929

30-
if (isTriggerBlockedDueToPlugin) {
30+
if (MissingPluginBlockState && isTriggerBlockedDueToPlugin) {
3131
// It can't be CD
3232
const commonNodeAttrType: CommonNodeAttr['type'] = stageType === DeploymentNodeType.PRECD ? 'PRECD' : 'POSTCD'
3333

src/components/app/details/triggerView/DeployImageModal/BulkDeployModal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import {
2929
useMainContext,
3030
} from '@devtron-labs/devtron-fe-common-lib'
3131

32-
import { ReactComponent as MechanicalOperation } from '@Images/ic-mechanical-operation.svg'
3332
import { ResponseRowType } from '@Components/ApplicationGroup/AppGroup.types'
3433
import {
3534
BULK_CD_DEPLOYMENT_STATUS,
@@ -569,7 +568,7 @@ const BulkDeployModal = ({ handleClose, stageType, workflows, isVirtualEnvironme
569568

570569
return (
571570
<GenericEmptyState
572-
SvgImage={MechanicalOperation}
571+
imgName="img-mechanical-operation"
573572
title={message.title}
574573
subTitle={message.subTitle}
575574
contentClassName="text-center"

src/components/app/details/triggerView/DeployImageModal/ImageSelectionCTA.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const ImageSelectionCTA = ({
112112

113113
{material.filterState !== FilterStates.ALLOWED && (
114114
<div className="flex dc__gap-12 mr-12">
115-
<div className="h-12 dc__border-left" />
115+
<div className="dc__divider h12" />
116116
</div>
117117
)}
118118
</>

src/components/app/details/triggerView/DeployImageModal/MaterialListEmptyState.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
ButtonVariantType,
44
EMPTY_STATE_STATUS,
55
GenericEmptyState,
6+
GenericFilterEmptyState,
67
getIsApprovalPolicyConfigured,
78
} from '@devtron-labs/devtron-fe-common-lib'
89

@@ -49,12 +50,6 @@ const MaterialListEmptyState = ({
4950
onSearchApply('')
5051
}
5152

52-
const renderGenerateButton = () => (
53-
<button className="flex cta h-32" onClick={clearSearch} type="button">
54-
Clear filter
55-
</button>
56-
)
57-
5853
const renderFilterEmptyStateSubtitle = (): JSX.Element => (
5954
<p className="m-0 flex cn-8 fs-13 fw-4 lh-20">
6055
<button
@@ -118,12 +113,10 @@ const MaterialListEmptyState = ({
118113

119114
if (isSearchApplied) {
120115
return (
121-
<GenericEmptyState
122-
image={noArtifact}
116+
<GenericFilterEmptyState
117+
handleClearFilters={clearSearch}
123118
title="No matching image available"
124119
subTitle="We couldn't find any matching image"
125-
isButtonAvailable
126-
renderButton={renderGenerateButton}
127120
/>
128121
)
129122
}

0 commit comments

Comments
 (0)