Skip to content

Commit 1551a76

Browse files
Merge branch 'main' into feat/argo-timeline
2 parents 7e9a935 + e77fdf1 commit 1551a76

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
| CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL | 7000 | Interval for checking connection with cluster terminal. |
2828
| LOGIN_PAGE_IMAGE | "" | Login page image url |
2929
| LOGIN_PAGE_IMAGE_BG | "" | Login page image background color code |
30+
| DEFAULT_CI_TRIGGER_TYPE_MANUAL | "false" | Change default trigger behaviour of newly created ci-pipeline to manual |
3031

3132
# DASHBOARD CONFIG SECRET

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ const WorkerStatus = React.memo(
133133
// check if finishedOn time is timed out or not
134134
const isTimedOut = moment(finishedOn).isBefore(moment().subtract(TIMEOUT_VALUE, 'hours'))
135135
// finishedOn is 0001-01-01T00:00:00Z when the worker is still running
136-
const showLink = finishedOn === ZERO_TIME_STRING || !isTimedOut
136+
const showLink = workerPodName && (finishedOn === ZERO_TIME_STRING || !isTimedOut)
137137

138138
return (
139139
<>
@@ -143,8 +143,8 @@ const WorkerStatus = React.memo(
143143
{stage === 'DEPLOY' ? (
144144
<div className="mr-10">Message</div>
145145
) : showLink ? (
146-
<NavLink to={`${WORKER_POD_BASE_URL}/${workerPodName}/logs`} className="anchor">
147-
<div className="mr-10">Worker</div>
146+
<NavLink to={`${WORKER_POD_BASE_URL}/${workerPodName}/logs`} target="_blank" className="anchor">
147+
<div className="mr-10">View worker pod</div>
148148
</NavLink>
149149
) : (
150150
<div className="mr-10">Worker</div>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export interface History {
1313
name: string
1414
status: string
1515
podStatus: string
16+
podName: string
1617
message: string
1718
startedOn: string
1819
finishedOn: string

src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export function WebhookDetailsModal({ close }: WebhookDetailType) {
379379
return (
380380
<div>
381381
<div className="cn-7 mt-16 mb-8 fs-13">{titlePrefix} API token</div>
382-
<div className="fs-13 font-roboto flexbox dc__word-break">
382+
<div className="fs-13 font-roboto flexbox dc__word-break pl-8-imp">
383383
{token}
384384
<Tippy
385385
className="default-tt"

0 commit comments

Comments
 (0)