Skip to content

Commit c2c9b11

Browse files
chore: pr comments
1 parent e7113fd commit c2c9b11

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

src/components/app/details/appDetails/appDetails.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,12 @@ table.pod__table td:last-child {
246246
}
247247

248248
.no-pod {
249+
display: flex;
250+
align-items: center;
251+
justify-content: center;
249252
width: 100%;
250253
height: 100%;
254+
flex-direction: column;
251255

252256
.no-pod__container-icon {
253257
height: 34px;

src/components/app/details/cIDetails/CIDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ export const Details = ({
386386
artifact={triggerDetails.artifact}
387387
environmentName={triggerDetails.environmentName}
388388
isJobView={isJobView}
389-
name={triggerDetails.name}
389+
workerPodName={triggerDetails.name}
390390
/>
391391
<ul className="tab-list dc__border-bottom pl-20 pr-20">
392392
<li className="tab-list__tab">

src/components/app/details/cicdHistory/Constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ export const HISTORY_LABEL = {
2323

2424
export const WORKER_POD_BASE_URL = '/resource-browser/1/devtron-ci/pod/k8sEmptyGroup'
2525

26-
export const TIMEOUT_VALUE = '12' // in hours
26+
export const TIMEOUT_VALUE = '1' // in hours
2727

src/components/app/details/cicdHistory/TriggerDetails.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const TriggerDetails = React.memo(
6262
artifact,
6363
environmentName,
6464
isJobView,
65-
name,
65+
workerPodName,
6666
}: TriggerDetailsType): JSX.Element => {
6767
return (
6868
<div className="trigger-details">
@@ -90,7 +90,7 @@ export const TriggerDetails = React.memo(
9090
stage={stage}
9191
type={type}
9292
isJobView={isJobView}
93-
name={name}
93+
workerPodName={workerPodName}
9494
/>
9595
</div>
9696
</div>
@@ -128,7 +128,7 @@ const Finished = React.memo(({ status, finishedOn, artifact, type }: FinishedTyp
128128
})
129129

130130
const WorkerStatus = React.memo(
131-
({ message, podStatus, stage, name, finishedOn }: WorkerStatusType): JSX.Element | null => {
131+
({ message, podStatus, stage, workerPodName, finishedOn }: WorkerStatusType): JSX.Element | null => {
132132
if (!message && !podStatus) return null
133133
// check if finishedOn time is timed out or not
134134
const isTimedOut = moment(finishedOn).isBefore(moment().subtract(TIMEOUT_VALUE, 'hours'))
@@ -143,7 +143,7 @@ const WorkerStatus = React.memo(
143143
{stage === 'DEPLOY' ? (
144144
<div className="mr-10">Message</div>
145145
) : showLink ? (
146-
<NavLink to={`${WORKER_POD_BASE_URL}/${name}/logs`} className="anchor">
146+
<NavLink to={`${WORKER_POD_BASE_URL}/${workerPodName}/logs`} className="anchor">
147147
<div className="mr-10">Worker</div>
148148
</NavLink>
149149
) : (
@@ -173,7 +173,7 @@ const WorkerStatus = React.memo(
173173
})
174174

175175
const ProgressingStatus = React.memo(
176-
({ status, message, podStatus, stage, type, finishedOn, name }: ProgressingStatusType): JSX.Element => {
176+
({ status, message, podStatus, stage, type, finishedOn, workerPodName }: ProgressingStatusType): JSX.Element => {
177177
const [aborting, setAborting] = useState(false)
178178
const [abortConfirmation, setAbortConfiguration] = useState(false)
179179
const { buildId, triggerId, pipelineId } = useParams<{
@@ -223,7 +223,7 @@ const ProgressingStatus = React.memo(
223223
podStatus={podStatus}
224224
stage={stage}
225225
finishedOn={finishedOn}
226-
name={name}
226+
workerPodName={workerPodName}
227227
/>
228228
</div>
229229
{abortConfirmation && (
@@ -266,7 +266,7 @@ const CurrentStatus = React.memo(
266266
stage,
267267
type,
268268
isJobView,
269-
name,
269+
workerPodName,
270270
}: CurrentStatusType): JSX.Element => {
271271
if (PROGRESSING_STATUS[status.toLowerCase()]) {
272272
return (
@@ -277,7 +277,7 @@ const CurrentStatus = React.memo(
277277
stage={stage}
278278
type={type}
279279
finishedOn={finishedOn}
280-
name={name}
280+
workerPodName={workerPodName}
281281
/>
282282
)
283283
} else {
@@ -289,7 +289,7 @@ const CurrentStatus = React.memo(
289289
podStatus={podStatus}
290290
stage={stage}
291291
finishedOn={finishedOn}
292-
name={name}
292+
workerPodName={workerPodName}
293293
/>
294294
</div>
295295
)

src/components/app/details/cicdHistory/types.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export interface TriggerDetailsType {
206206
artifact?: string
207207
environmentName?: string
208208
isJobView?: boolean
209-
name?: string
209+
workerPodName?: string
210210
}
211211

212212
export interface TriggerDetailsStatusIconType {
@@ -224,7 +224,7 @@ export interface WorkerStatusType {
224224
podStatus: string
225225
stage: DeploymentStageType
226226
finishedOn?: string
227-
name?: string
227+
workerPodName?: string
228228
}
229229
export interface ProgressingStatusType {
230230
status: string
@@ -233,7 +233,7 @@ export interface ProgressingStatusType {
233233
stage: DeploymentStageType
234234
type: HistoryComponentType
235235
finishedOn?: string
236-
name?: string
236+
workerPodName?: string
237237
}
238238

239239
export interface CurrentStatusType {
@@ -245,7 +245,7 @@ export interface CurrentStatusType {
245245
stage: DeploymentStageType
246246
type: HistoryComponentType
247247
isJobView?: boolean
248-
name?: string
248+
workerPodName?: string
249249
}
250250

251251
export interface StartDetailsType {

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ function LogsComponent({
708708
</div>
709709
)}
710710

711-
{podContainerOptions.containerOptions.filter((_co) => _co.selected).length === 0 && (
711+
{podContainerOptions.containerOptions.filter((_co) => _co.selected).length == 0 && (
712712
<div className="no-pod no-pod--container ">
713713
<MessageUI
714714
icon={MsgUIType.MULTI_CONTAINER}
@@ -718,7 +718,6 @@ function LogsComponent({
718718
: 'No container'
719719
}`}
720720
size={32}
721-
minHeight={isResourceBrowserView ? 'calc(100vh - 155px)' : ''}
722721
/>
723722
</div>
724723
)}

0 commit comments

Comments
 (0)