Skip to content

Commit b09b8af

Browse files
authored
Merge branch 'master' into ci/support-node-22-drop-16
2 parents 77d4336 + 70e0133 commit b09b8af

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ This repository and site are available as open source under the terms of the [Ap
145145

146146
**Community First**
147147

148-
<p>The <a href="https://layer5.io">Layer5</a> community represents the largest collection of service mesh projects and their maintainers in the world.</p>
148+
<p>The <a href="https://layer5.io/community">Layer5 community</a> represents the largest collection of service mesh projects and their maintainers in the world.</p>
149149

150150
**Open Source First**
151-
152-
<p>Our projects establish industry standards and enable service developers, owners, and operators with repeatable patterns and best practices for managing all aspects of distributed services. Our shared commitment to the open source spirit push the Layer5 community and its projects forward.</p>
151+
<p>At Layer5, we champion developer-defined infrastructure, giving engineers the power to reshape application delivery. We empower operators in reimagining how they manage modern infrastructure: collaboratively.</p>

src/custom/Markdown/index.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ export const RenderMarkdown: React.FC<RenderMarkdownProps> = ({ content }) => {
6565
};
6666

6767
export const RenderMarkdownTooltip: React.FC<RenderMarkdownProps> = ({ content }) => {
68+
const processDescription = (desc: string | undefined): string | undefined => {
69+
if (!desc) return desc;
70+
try {
71+
// -> json.parse will handle esacpe characters
72+
return JSON.parse(`"${desc}"`);
73+
} catch {
74+
return desc;
75+
}
76+
};
6877
return (
6978
<ReactMarkdown
7079
remarkPlugins={[remarkGfm]}
@@ -96,7 +105,7 @@ export const RenderMarkdownTooltip: React.FC<RenderMarkdownProps> = ({ content }
96105
td: ({ ...props }) => <StyledMarkdownTd>{props.children}</StyledMarkdownTd>
97106
}}
98107
>
99-
{content}
108+
{processDescription(content) as string}
100109
</ReactMarkdown>
101110
);
102111
};

src/custom/NavigationNavbar/navigationNavbar.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,17 @@ const NavigationNavbar: React.FC<NavigationNavbarProps> = ({
5252

5353
return (
5454
<React.Fragment key={item.id}>
55-
<MenuItem disabled={!permission} onClick={item.onClick}>
55+
<MenuItem
56+
disabled={!permission}
57+
onClick={item.onClick}
58+
data-testid={`nav-item-${item.id}`}
59+
>
5660
<MenuItemList>
5761
{item.icon && <IconWrapper>{item.icon}</IconWrapper>}
5862
<ListItemText primary={item.title} {...ListItemTextProps} />
5963
</MenuItemList>
6064
{item.subItems && (
61-
<ListItemText>
65+
<ListItemText data-testid={`nav-toggle-${item.id}`}>
6266
{isOpen ? (
6367
<ExpandLessIcon onClick={(e) => toggleSectionOpen(item.id, e)} />
6468
) : (
@@ -74,6 +78,7 @@ const NavigationNavbar: React.FC<NavigationNavbarProps> = ({
7478
key={subItem.id}
7579
disabled={!subItem.permission}
7680
onClick={subItem.onClick}
81+
data-testid={`nav-subitem-${subItem.id}`}
7782
>
7883
<MenuItemSubList>
7984
{subItem.icon && <SubIconWrapper>{subItem.icon}</SubIconWrapper>}

0 commit comments

Comments
 (0)