Skip to content

Commit 119e1c9

Browse files
authored
Merge pull request #930 from devtron-labs/feat/misc-ui-issues
feat: tippy added in all breadcrumb icon
2 parents c348662 + f24b2a4 commit 119e1c9

8 files changed

Lines changed: 22 additions & 11 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.20.6-pre-7",
3+
"version": "1.20.6-pre-11",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/BreadCrumb/NestedBreadCrumb.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ import { Link } from 'react-router-dom'
44
import { BreadcrumbText, getBreadCrumbSeparator } from './BreadcrumbStore'
55
import { NestedBreadCrumbProps } from './Types'
66

7-
export const NestedBreadCrumb = ({ redirectUrl, linkText, profileName }: NestedBreadCrumbProps) => {
7+
export const NestedBreadCrumb = ({
8+
redirectUrl,
9+
linkText,
10+
profileName,
11+
nestedBreadCrumbsText,
12+
}: NestedBreadCrumbProps) => {
813
const breadcrumbLinkClass = 'active dc__devtron-breadcrumb__item fs-16 fw-4 lh-1-5 dc__ellipsis-right dc__mxw-155'
914

1015
const breadcrumbs = [
1116
{ type: 'link', label: linkText, to: redirectUrl },
1217
...(profileName
1318
? [
14-
{ type: 'link', label: 'Profiles', to: redirectUrl },
19+
...(nestedBreadCrumbsText ? [{ type: 'link', label: nestedBreadCrumbsText, to: redirectUrl }] : []),
1520
{
1621
type: 'text',
1722
label: profileName,

src/Common/BreadCrumb/Types.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,9 @@ export interface NestedBreadCrumbProps {
6767
* If not given, would show "Create Profile"
6868
*/
6969
profileName: string
70+
/**
71+
* @default Profiles
72+
* It is the text of the nested breadcrumb
73+
*/
74+
nestedBreadCrumbsText?: string
7075
}

src/Pages-Devtron-2.0/ApplicationManagement/Shared/ApplicationManagementIcon/ApplicationManagementIcon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export const ApplicationManagementIcon = () => (
1111
linkProps={{
1212
to: URLS.APPLICATION_MANAGEMENT_APP,
1313
}}
14-
ariaLabel="Redirect to Devtron Apps"
15-
showAriaLabelInTippy={false}
14+
ariaLabel="Application Management"
15+
showAriaLabelInTippy
1616
icon={<Icon name="ic-grid-view" color={null} />}
1717
/>
1818
)

src/Pages-Devtron-2.0/InfrastructureManagement/Shared/InfrastructureManagementIcon/InfrastructureManagementIcon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export const InfrastructureManagementIcon = () => (
1111
linkProps={{
1212
to: URLS.INFRASTRUCTURE_MANAGEMENT_RESOURCE_BROWSER,
1313
}}
14-
ariaLabel="Redirect to Infrastructure Management Overview"
15-
showAriaLabelInTippy={false}
14+
ariaLabel="Infrastructure Management"
15+
showAriaLabelInTippy
1616
icon={<Icon name="ic-cloud" color={null} />}
1717
/>
1818
)

src/Pages-Devtron-2.0/InfrastructureManagement/utils.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export const getAutomationEnablementBreadcrumbConfig = () => ({
1515
to: URLS.AUTOMATION_AND_ENABLEMENT_JOB,
1616
}}
1717
icon={<Icon name="ic-bot" color={null} />}
18-
ariaLabel="Redirect to Automation & Enablement Overview"
19-
showAriaLabelInTippy={false}
18+
ariaLabel="Automation & Enablement"
19+
showAriaLabelInTippy
2020
/>
2121
),
2222
linked: true,

src/Pages/GlobalConfigurations/BuildInfra/Descriptor.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const Descriptor = ({
3737
redirectUrl={URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_BUILD_INFRA_PROFILES}
3838
linkText={BUILD_INFRA_TEXT.HEADING}
3939
profileName={profileName}
40+
nestedBreadCrumbsText="Profiles"
4041
/>
4142
<InfoIconTippy
4243
infoText={tippyInfoText ?? BUILD_INFRA_TEXT.EDIT_DEFAULT_TOOLTIP}

0 commit comments

Comments
 (0)