Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-binoculars.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions src/Common/BreadCrumb/BreadCrumb.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import React, { useMemo, useEffect } from 'react'
import { Link, useRouteMatch, useParams } from 'react-router-dom'
import { useBreadcrumbContext } from './BreadcrumbStore'
import { getBreadCrumbSeparator, useBreadcrumbContext } from './BreadcrumbStore'
import { ConditionalWrap } from '../Helper'
import { Breadcrumb, Breadcrumbs, UseBreadcrumbOptionalProps, UseBreadcrumbState } from './Types'

Expand Down Expand Up @@ -90,7 +90,7 @@ export function useBreadcrumb(props?: UseBreadcrumbOptionalProps, deps?: any[]):
export const BreadCrumb: React.FC<Breadcrumbs> = ({
breadcrumbs,
sep = '/',
className = 'dc__devtron-breadcrumb__item',
className = 'dc__devtron-breadcrumb__item fs-16 fw-4 lh-1-5 dc__ellipsis-right dc__mxw-155',
}) => {
const { url } = useRouteMatch()
const filteredCrumbs = breadcrumbs.filter((crumb) => !!crumb.name)
Expand All @@ -114,9 +114,7 @@ export const BreadCrumb: React.FC<Breadcrumbs> = ({
{breadcrumb.name}
</ConditionalWrap>

{idx + 1 !== filteredCrumbs.length && breadcrumb.name && (
<span className={`${className}__separator cn-5`}>{sep}</span>
)}
{idx + 1 !== filteredCrumbs.length && breadcrumb.name && getBreadCrumbSeparator()}
</React.Fragment>
))}
</>
Expand Down
7 changes: 6 additions & 1 deletion src/Common/BreadCrumb/BreadcrumbStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ const initialState = {
}

export const BreadcrumbText = ({ heading, isActive, shouldTruncate = false }: BreadcrumbTextProps) => (
<h2 className={`m-0 fs-16 fw-6 lh-32 ${shouldTruncate ? 'dc__truncate' : ''} ${isActive ? 'cn-9' : 'cb-5'}`}>{heading}</h2>
<span className={`dc__breadcrumb-text cb-5 fs-16 lh-1-5 ${shouldTruncate ? 'dc__truncate' : ''} ${isActive ? 'cn-9 fw-6' : 'cb-5 fw-4 dc__mxw-155 dc__ellipsis-right'}`}>{heading}</span>
)

export const getBreadCrumbSeparator = (sep: string = '/') => (
<span className="dc__devtron-breadcrumb__item__separator">{sep}</span>
)


const Store = ({ children }) => {
const [state, setState] = useState(initialState)
return <BreadcrumbContext.Provider value={{ state, setState }}>{children}</BreadcrumbContext.Provider>
Expand Down
5 changes: 5 additions & 0 deletions src/Common/Constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const PATTERNS = {
}

const GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP = '/global-config/templates/devtron-apps'
const OBSERVABILITY_ROOT = '/observability'

export const URLS = {
LOGIN: '/login',
Expand Down Expand Up @@ -88,6 +89,10 @@ export const URLS = {
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_DETAIL: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/detail/:appId`,
LICENSE_AUTH: '/license-auth',
GLOBAL_CONFIG_EDIT_CLUSTER: '/global-config/cluster-env/edit/:clusterId',
// OBSERVABILITY
OBSERVABILITY: OBSERVABILITY_ROOT,
OBSERVABILITY_OVERVIEW: `${OBSERVABILITY_ROOT}/overview`,
OBSERVABILITY_CUSTOMER_LIST: `${OBSERVABILITY_ROOT}/tenants`,
} as const

export const ROUTES = {
Expand Down
2 changes: 2 additions & 0 deletions src/Shared/Components/Icon/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ReactComponent as ICAzureAks } from '@IconsV2/ic-azure-aks.svg'
import { ReactComponent as ICBgCluster } from '@IconsV2/ic-bg-cluster.svg'
import { ReactComponent as ICBgEnvironment } from '@IconsV2/ic-bg-environment.svg'
import { ReactComponent as ICBharatpe } from '@IconsV2/ic-bharatpe.svg'
import { ReactComponent as ICBinoculars } from '@IconsV2/ic-binoculars.svg'
import { ReactComponent as ICBitbucket } from '@IconsV2/ic-bitbucket.svg'
import { ReactComponent as ICBookOpen } from '@IconsV2/ic-book-open.svg'
import { ReactComponent as ICBrain } from '@IconsV2/ic-brain.svg'
Expand Down Expand Up @@ -262,6 +263,7 @@ export const iconMap = {
'ic-bg-cluster': ICBgCluster,
'ic-bg-environment': ICBgEnvironment,
'ic-bharatpe': ICBharatpe,
'ic-binoculars': ICBinoculars,
'ic-bitbucket': ICBitbucket,
'ic-book-open': ICBookOpen,
'ic-brain': ICBrain,
Expand Down