Skip to content

Commit c02b976

Browse files
committed
fix: use appStatus for debug button, rename to updateDeploymentStatusDetailsBreakdownData, minor css enhancement
1 parent 2647f68 commit c02b976

File tree

8 files changed

+27
-21
lines changed

8 files changed

+27
-21
lines changed

src/Shared/Components/AppStatusModal/AppStatusBody.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { getAIAnalyticsEvents } from '@Common/Helper'
44
import { Tooltip } from '@Common/Tooltip'
55
import { ComponentSizeType } from '@Shared/constants'
66
import { getAppDetailsURL } from '@Shared/Helpers'
7-
import { AppType } from '@Shared/types'
87

98
import { Button, ButtonComponentType, ButtonVariantType } from '../Button'
109
import { DeploymentStatusDetailBreakdown } from '../CICDHistory'
@@ -106,21 +105,18 @@ export const AppStatusBody = ({
106105
envId={appDetails.environmentId}
107106
actionItem={
108107
ExplainWithAIButton &&
109-
appDetails.appStatus?.toLowerCase() !== StatusType.HEALTHY.toLowerCase() &&
108+
appStatus?.toLowerCase() !== StatusType.HEALTHY.toLowerCase() &&
110109
(debugNode || message) ? (
111110
<ExplainWithAIButton
112111
intelligenceConfig={{
113112
clusterId: appDetails.clusterId,
114113
metadata: {
115114
...(debugNode ? { object: debugObject } : { message }),
116115
namespace: appDetails.namespace,
117-
status: debugNode?.health?.status ?? appDetails.appStatus,
116+
status: debugNode?.health?.status ?? appStatus,
118117
},
119118
prompt: `Debug ${message || 'error'} ${debugNode ? `of ${debugObject}` : ''} in ${appDetails.namespace}`,
120-
analyticsCategory: getAIAnalyticsEvents(
121-
'APP_STATUS',
122-
appDetails.appStatus as AppType,
123-
),
119+
analyticsCategory: getAIAnalyticsEvents('APP_STATUS', appDetails.appType),
124120
}}
125121
/>
126122
) : null

src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const AppStatusModal = ({
2929
type,
3030
appDetails: appDetailsProp,
3131
processVirtualEnvironmentDeploymentData,
32-
handleUpdateDeploymentStatusDetailsBreakdownData,
32+
updateDeploymentStatusDetailsBreakdownData,
3333
isConfigDriftEnabled,
3434
configDriftModal: ConfigDriftModal,
3535
appId,
@@ -95,7 +95,7 @@ const AppStatusModal = ({
9595
deploymentStatusAbortControllerRef,
9696
)
9797

98-
handleUpdateDeploymentStatusDetailsBreakdownData?.(response)
98+
updateDeploymentStatusDetailsBreakdownData?.(response)
9999

100100
return response
101101
}

src/Shared/Components/AppStatusModal/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ export type AppStatusModalProps = {
3030
envId: number
3131
appDetails?: never
3232
initialTab?: never
33-
handleUpdateDeploymentStatusDetailsBreakdownData?: never
33+
updateDeploymentStatusDetailsBreakdownData?: never
3434
}
3535
| {
3636
type: 'devtron-app' | 'other-apps' | 'stack-manager'
3737
appDetails: AppDetails
3838
initialTab: AppStatusModalTabType
39-
handleUpdateDeploymentStatusDetailsBreakdownData: (data: DeploymentStatusDetailsBreakdownDataType) => void
39+
updateDeploymentStatusDetailsBreakdownData: (data: DeploymentStatusDetailsBreakdownDataType) => void
4040
appId?: never
4141
envId?: never
4242
}

src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,12 @@ const DeploymentDetailSteps = ({
163163
{renderDeploymentApprovalInfo &&
164164
getIsApprovalPolicyConfigured(userApprovalMetadata?.approvalConfigData) &&
165165
renderDeploymentApprovalInfo(userApprovalMetadata)}
166-
<div className="p-20 w-100">
167-
<DeploymentStatusDetailBreakdown
168-
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
169-
isVirtualEnvironment={isVirtualEnv.current}
170-
appDetails={appDetails}
171-
/>
172-
</div>
166+
<DeploymentStatusDetailBreakdown
167+
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
168+
isVirtualEnvironment={isVirtualEnv.current}
169+
appDetails={appDetails}
170+
rootClassName="p-20"
171+
/>
173172
</div>
174173
)
175174

src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,8 @@
5656
border-radius: 0 0 4px 4px;
5757
border-top: 0;
5858
}
59-
}
59+
}
60+
61+
.deployment-approval-container + .deployment-status-breakdown-container {
62+
padding-top: 0px;
63+
}

src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const DeploymentStatusDetailBreakdown = ({
2525
deploymentStatusDetailsBreakdownData,
2626
isVirtualEnvironment,
2727
appDetails,
28+
rootClassName = '',
2829
}: DeploymentStatusDetailBreakdownType) => {
2930
const isHelmManifestPushed =
3031
deploymentStatusDetailsBreakdownData.deploymentStatusBreakdown[
@@ -38,7 +39,10 @@ const DeploymentStatusDetailBreakdown = ({
3839
}
3940

4041
return (
41-
<div className="deployment-status-breakdown-container" data-testid="deployment-history-steps-status">
42+
<div
43+
className={`deployment-status-breakdown-container ${rootClassName}`}
44+
data-testid="deployment-history-steps-status"
45+
>
4246
<DeploymentStatusDetailRow
4347
type={TIMELINE_STATUS.DEPLOYMENT_INITIATED}
4448
{...deploymentStatusDetailRowProps}

src/Shared/Components/CICDHistory/DeploymentStatusDetailRow.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ export const DeploymentStatusDetailRow = ({
186186
{statusBreakDownType.displayText}
187187
</span>
188188
{statusBreakDownType.displaySubText && (
189-
<span className={`app-summary__status-name f-${statusBreakDownType.icon || 'waiting'}`}>
189+
<span
190+
className={`app-summary__status-name dc__first-letter-capitalize--imp f-${statusBreakDownType.icon || 'waiting'}`}
191+
>
190192
{statusBreakDownType.displaySubText}
191193
</span>
192194
)}

src/Shared/Components/CICDHistory/types.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ export interface DeploymentStatusDetailBreakdownType {
519519
* Won't be available if coming directly to deployment history from url
520520
*/
521521
appDetails: AppDetails | null
522+
rootClassName?: string
522523
}
523524

524525
export interface DeploymentStatusDetailRowType extends Pick<DeploymentStatusDetailBreakdownType, 'appDetails'> {

0 commit comments

Comments
 (0)