Skip to content

Commit 342af82

Browse files
Merge branch 'main' into feat/adding-git-repository
2 parents 8bb25e4 + 7b1800b commit 342af82

File tree

18 files changed

+173
-187
lines changed

18 files changed

+173
-187
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"i18next": "25.6.1",
6060
"javascript-time-ago": "2.5.12",
6161
"js-yaml": "4.1.1",
62-
"monaco-editor": "0.54.0",
62+
"monaco-editor": "0.55.1",
6363
"monaco-yaml": "5.4.0",
6464
"react": "19.2.0",
6565
"react-dom": "19.2.0",
@@ -95,7 +95,7 @@
9595
"eslint-plugin-jsx-a11y": "6.10.2",
9696
"eslint-plugin-prettier": "5.5.4",
9797
"eslint-plugin-react": "7.37.5",
98-
"eslint-plugin-react-hooks": "5.2.0",
98+
"eslint-plugin-react-hooks": "7.0.1",
9999
"fastify-tsconfig": "3.0.0",
100100
"globals": "16.5.0",
101101
"jsdom": "27.1.0",

server/plugins/http-proxy.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,12 @@ function proxyPlugin(fastify) {
111111
? req.encryptedSession.get('onboarding_accessToken')
112112
: `${req.encryptedSession.get('onboarding_accessToken')},${req.encryptedSession.get('mcp_accessToken')}`;
113113

114+
// Remove accept-encoding to prevent backend from compressing
115+
// This avoids double-compression or encoding issues
116+
const { 'accept-encoding': _, ...restHeaders } = headers;
117+
114118
return {
115-
...headers,
119+
...restHeaders,
116120
authorization: accessToken,
117121
};
118122
},

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';
22

3-
import { Dispatch, FC, SetStateAction, useRef, useState } from 'react';
3+
import { Dispatch, FC, SetStateAction, useId, useState } from 'react';
44
import '@ui5/webcomponents-icons/dist/copy';
55
import '@ui5/webcomponents-icons/dist/accept';
66

@@ -17,7 +17,7 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
1717
isDeleteMcpButtonDisabled,
1818
setIsEditManagedControlPlaneWizardOpen,
1919
}) => {
20-
const buttonRef = useRef(null);
20+
const openerId = useId();
2121
const [menuIsOpen, setMenuIsOpen] = useState(false);
2222
const { t } = useTranslation();
2323

@@ -28,15 +28,15 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
2828
return (
2929
<>
3030
<Button
31-
ref={buttonRef}
31+
id={openerId}
3232
icon="overflow"
3333
icon-end
3434
data-testid="ControlPlaneCardMenu-opener"
3535
onClick={handleOpenerClick}
3636
/>
3737
<Menu
3838
open={menuIsOpen}
39-
opener={buttonRef.current}
39+
opener={openerId}
4040
onItemClick={(event) => {
4141
const action = (event.detail.item as HTMLElement).dataset.action;
4242
if (action === 'editMcp') {

src/components/ControlPlanes/ControlPlanePageMenu.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Dispatch, FC, SetStateAction, useRef, useState } from 'react';
1+
import { Dispatch, FC, SetStateAction, useId, useState } from 'react';
22
import { useTranslation } from 'react-i18next';
33
import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';
44

@@ -7,7 +7,7 @@ type ControlPlanesListMenuProps = {
77
};
88

99
export const ControlPlanePageMenu: FC<ControlPlanesListMenuProps> = ({ setIsEditManagedControlPlaneWizardOpen }) => {
10-
const buttonRef = useRef(null);
10+
const openerId = useId();
1111
const [menuIsOpen, setMenuIsOpen] = useState(false);
1212
const { t } = useTranslation();
1313

@@ -17,10 +17,10 @@ export const ControlPlanePageMenu: FC<ControlPlanesListMenuProps> = ({ setIsEdit
1717

1818
return (
1919
<>
20-
<Button ref={buttonRef} icon="overflow" icon-end onClick={handleOpenerClick} />
20+
<Button id={openerId} icon="overflow" icon-end onClick={handleOpenerClick} />
2121
<Menu
2222
open={menuIsOpen}
23-
opener={buttonRef.current}
23+
opener={openerId}
2424
onItemClick={(event) => {
2525
const action = (event.detail.item as HTMLElement).dataset.action;
2626
if (action === 'editMcp') {

src/components/ControlPlanes/List/MembersAvatarView.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Avatar, AvatarGroup, Popover } from '@ui5/webcomponents-react';
22
import AvatarGroupType from '@ui5/webcomponents/dist/types/AvatarGroupType.js';
33
import PopoverPlacement from '@ui5/webcomponents/dist/types/PopoverPlacement.js';
4-
import { useRef, useState } from 'react';
4+
import { useId, useState } from 'react';
55
import { MemberTable } from '../../Members/MemberTable.tsx';
66
import { Member } from '../../../lib/api/types/shared/members';
77
import { generateInitialsForEmail } from '../../Helper/generateInitialsForEmail.ts';
@@ -13,7 +13,7 @@ interface Props {
1313
}
1414

1515
export function MembersAvatarView({ members, project, workspace }: Props) {
16-
const openerRef = useRef(null);
16+
const openerId = useId();
1717
const [popoverIsOpen, setPopoverIsOpen] = useState(false);
1818
const avatars = [];
1919

@@ -33,11 +33,11 @@ export function MembersAvatarView({ members, project, workspace }: Props) {
3333

3434
return (
3535
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
36-
<AvatarGroup ref={openerRef} style={{ maxWidth: '200px' }} type={AvatarGroupType.Group} onClick={handleOnClick}>
36+
<AvatarGroup id={openerId} style={{ maxWidth: '200px' }} type={AvatarGroupType.Group} onClick={handleOnClick}>
3737
{avatars}
3838
</AvatarGroup>
3939
<Popover
40-
opener={openerRef.current!}
40+
opener={openerId}
4141
placement={PopoverPlacement.Bottom}
4242
open={popoverIsOpen}
4343
onClose={() => {

0 commit comments

Comments
 (0)