Skip to content

Commit feef545

Browse files
authored
Merge pull request #3107 from devtron-labs/fix/linked-ci-linked
feat: update CI details link and add APP_TRIGGER route
2 parents 81f2a0c + 9bd6a72 commit feef545

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ export default function EnvCIDetails({ filteredAppIds }: AppGroupDetailDefaultTy
271271
<EmptyView
272272
title={APP_GROUP_CI_DETAILS.linkedCI.title}
273273
subTitle={APP_GROUP_CI_DETAILS.linkedCI.title}
274-
link={`${generatePath(ROUTER_URLS.DEVTRON_APP_DETAILS.CI_DETAILS, { appId: pipeline.parentAppId })}/${pipeline.parentCiPipeline}/logs`}
274+
link={`${generatePath(ROUTER_URLS.DEVTRON_APP_DETAILS.CI_DETAILS, { appId: pipeline.parentAppId })}/${pipeline.parentCiPipeline}`}
275275
linkText={APP_GROUP_CI_DETAILS.linkedCI.linkText}
276276
/>
277277
)

src/components/app/details/triggerView/workflow/nodes/TriggerLinkedCINode.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
import { Component } from 'react'
18-
import { generatePath, Link } from 'react-router-dom'
18+
import { Link } from 'react-router-dom'
1919
import Tippy from '@tippyjs/react'
2020
import { getWorkflowNodeStatusTitle, RouterV5Props, ROUTER_URLS } from '@devtron-labs/devtron-fe-common-lib'
2121
import link from '@Icons/ic-link.svg'
2222
import ICLinkedCINode from '@Icons/ic-node-build-linked.svg?react'
2323
import { TriggerStatus } from '../../../../config'
24-
import { DEFAULT_STATUS } from '../../../../../../config'
24+
import { DEFAULT_STATUS, URLS } from '../../../../../../config'
2525

2626
export interface CINodeProps extends RouterV5Props<{ appId: string }> {
2727
x: number
@@ -47,9 +47,7 @@ export interface CINodeProps extends RouterV5Props<{ appId: string }> {
4747

4848
export class TriggerLinkedCINode extends Component<CINodeProps> {
4949
getCIDetailsURL(): string {
50-
return `${generatePath(ROUTER_URLS.DEVTRON_APP_DETAILS.CI_DETAILS, {
51-
appId: this.props.params.appId,
52-
})}/${this.props.id}`
50+
return `${this.props.location.pathname.replace(URLS.APP_TRIGGER, URLS.APP_CI_DETAILS)}/${this.props.id}`
5351
}
5452

5553
redirectToCIDetails() {

src/config/routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export const URLS = {
2727
APP_DETAILS_K8: 'k8s-resources', // for V2
2828
APP_DETAILS_LOG: 'log-analyzer', // for V2
2929
APP_DIFF_VIEW: 'diff-view',
30+
APP_TRIGGER: 'trigger',
3031
APP_OVERVIEW: 'overview',
3132
MANAGE_TRAFFIC: 'manage-traffic',
3233
APP_CI_DETAILS: 'ci-details',

0 commit comments

Comments
 (0)