Skip to content

Commit ef775bd

Browse files
committed
feat: add DEFAULT_NAMESPACE constant and update related functions for improved namespace handling
1 parent 9404e61 commit ef775bd

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

src/Shared/Components/CICDHistory/constants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export const POD_STATUS = {
7272
export const TIMEOUT_VALUE = '1' // in hours
7373

7474
export const DEFAULT_CLUSTER_ID = 1
75+
export const DEFAULT_NAMESPACE = 'devtron-ci'
7576

7677
export const DEFAULT_ENV = 'devtron-ci'
7778

src/Shared/Components/CICDHistory/utils.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ import { ReactComponent as ICHelpFilled } from '@Icons/ic-help-filled.svg'
3131
import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
3232
import { isTimeStringAvailable } from '@Shared/Helpers'
3333
import { DATE_TIME_FORMATS } from '@Common/Constants'
34-
import { DEFAULT_CLUSTER_ID, FAILED_WORKFLOW_STAGE_STATUS_MAP, TERMINAL_STATUS_MAP } from './constants'
34+
import {
35+
DEFAULT_CLUSTER_ID,
36+
DEFAULT_NAMESPACE,
37+
FAILED_WORKFLOW_STAGE_STATUS_MAP,
38+
TERMINAL_STATUS_MAP,
39+
} from './constants'
3540
import { ResourceKindType, WorkflowStatusEnum } from '../../types'
3641
import {
3742
TriggerHistoryFilterCriteriaProps,
@@ -154,14 +159,14 @@ export const getStageStatusIcon = (status: StageStatusType): JSX.Element => {
154159
}
155160

156161
const renderAbortedTriggerIcon = (): JSX.Element => <ICAborted className="icon-dim-20 dc__no-shrink" />
157-
const renderFailedTriggerIcon = (): JSX.Element => (
158-
<ICErrorCross className="icon-dim-20 dc__no-shrink ic-error-cross-red" />
162+
const renderFailedTriggerIcon = (baseClass: string = 'icon-dim-20'): JSX.Element => (
163+
<ICErrorCross className={`${baseClass} dc__no-shrink ic-error-cross-red`} />
159164
)
160-
const renderProgressingTriggerIcon = (): JSX.Element => (
161-
<ICInProgress className="dc__no-shrink icon-dim-20 ic-in-progress-orange" />
165+
const renderProgressingTriggerIcon = (baseClass: string = 'icon-dim-20'): JSX.Element => (
166+
<ICInProgress className={`${baseClass} dc__no-shrink ic-in-progress-orange`} />
162167
)
163-
const renderSuccessTriggerIcon = (): JSX.Element => (
164-
<div className="dc__app-summary__icon dc__no-shrink icon-dim-20 succeeded" />
168+
const renderSuccessTriggerIcon = (baseClass: string = 'icon-dim-20'): JSX.Element => (
169+
<div className={`${baseClass} dc__app-summary__icon dc__no-shrink succeeded`} />
165170
)
166171

167172
export const getTriggerStatusIcon = (triggerDetailStatus: string): JSX.Element => {
@@ -221,15 +226,10 @@ const getWorkerInfoFromExecutionStages = (
221226
workflowExecutionStages: WorkflowExecutionStagesMapDTO['workflowExecutionStages'],
222227
): ExecutionInfoType['workerDetails'] => {
223228
const workerInfo: PodExecutionStageDTO = workflowExecutionStages?.[WorkflowExecutionStageType.POD]?.[0]
224-
225-
if (!workerInfo) {
226-
return null
227-
}
228-
229-
const { status, message, endTime, metadata } = workerInfo
229+
const { status, message, endTime, metadata } = workerInfo || {}
230230

231231
return {
232-
status,
232+
status: status || WorkflowStageStatusType.UNKNOWN,
233233
message: message || '',
234234
clusterId: metadata?.clusterId || DEFAULT_CLUSTER_ID,
235235
endTime: isTimeStringAvailable(endTime) ? endTime : '',
@@ -253,7 +253,7 @@ export const sanitizeWorkflowExecutionStages = (
253253
)
254254

255255
const isOldData = !preparationStage
256-
const computedTriggedOn = isOldData ? executionStage?.startTime : preparationStage?.startTime
256+
const computedTriggeredOn = isOldData ? executionStage?.startTime : preparationStage?.startTime
257257

258258
let lastStatus: WorkflowStageStatusType = WorkflowStageStatusType.UNKNOWN
259259
workflowExecutionSteps.forEach(({ status }) => {
@@ -272,7 +272,7 @@ export const sanitizeWorkflowExecutionStages = (
272272
})
273273

274274
return {
275-
triggeredOn: isTimeStringAvailable(computedTriggedOn) ? computedTriggedOn : '',
275+
triggeredOn: isTimeStringAvailable(computedTriggeredOn) ? computedTriggeredOn : '',
276276
executionStartedOn: isOldData ? null : executionStage?.startTime,
277277
finishedOn: isTimeStringAvailable(finishedOn) ? finishedOn : '',
278278
currentStatus: lastStatus,
@@ -292,15 +292,15 @@ export const getIconFromWorkflowStageStatusType = (
292292
return <ICAborted className={baseClass} />
293293

294294
case WorkflowStageStatusType.FAILED:
295-
return renderFailedTriggerIcon()
295+
return renderFailedTriggerIcon(baseClass)
296296

297297
case WorkflowStageStatusType.SUCCEEDED:
298-
return renderSuccessTriggerIcon()
298+
return renderSuccessTriggerIcon(baseClass)
299299

300300
// NOT_STARTED case is not expected
301301
case WorkflowStageStatusType.NOT_STARTED:
302302
case WorkflowStageStatusType.RUNNING:
303-
return renderProgressingTriggerIcon()
303+
return renderProgressingTriggerIcon(baseClass)
304304

305305
default:
306306
return <ICHelpFilled className={baseClass} />
@@ -318,7 +318,7 @@ export const getHistoryItemStatusIconFromWorkflowStages = (
318318
}
319319

320320
if (!executionInfo.finishedOn) {
321-
return renderProgressingTriggerIcon()
321+
return renderProgressingTriggerIcon(baseClass)
322322
}
323323

324324
if (FAILED_WORKFLOW_STAGE_STATUS_MAP[executionInfo.workerDetails?.status]) {
@@ -328,7 +328,7 @@ export const getHistoryItemStatusIconFromWorkflowStages = (
328328
return getIconFromWorkflowStageStatusType(executionInfo.currentStatus, baseClass)
329329
}
330330

331-
export const getWorkerPodBaseUrl = (clusterId: number = DEFAULT_CLUSTER_ID, podNamespace: string = 'devtron-ci') =>
331+
export const getWorkerPodBaseUrl = (clusterId: number = DEFAULT_CLUSTER_ID, podNamespace: string = DEFAULT_NAMESPACE) =>
332332
`/resource-browser/${clusterId}/${podNamespace}/pod/k8sEmptyGroup`
333333

334334
export const getWorkflowNodeStatusTitle = (status: string) => {

0 commit comments

Comments
 (0)