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
48 changes: 43 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.5.4",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"eslint-plugin-react-hooks": "7.0.1",
"fastify-tsconfig": "3.0.0",
"globals": "16.5.0",
"jsdom": "27.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';

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

Expand All @@ -17,7 +17,7 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
isDeleteMcpButtonDisabled,
setIsEditManagedControlPlaneWizardOpen,
}) => {
const buttonRef = useRef(null);
const openerId = useId();
const [menuIsOpen, setMenuIsOpen] = useState(false);
const { t } = useTranslation();

Expand All @@ -28,15 +28,15 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
return (
<>
<Button
ref={buttonRef}
id={openerId}
icon="overflow"
icon-end
data-testid="ControlPlaneCardMenu-opener"
onClick={handleOpenerClick}
/>
<Menu
open={menuIsOpen}
opener={buttonRef.current}
opener={openerId}
onItemClick={(event) => {
const action = (event.detail.item as HTMLElement).dataset.action;
if (action === 'editMcp') {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ControlPlanes/ControlPlanePageMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Dispatch, FC, SetStateAction, useRef, useState } from 'react';
import { Dispatch, FC, SetStateAction, useId, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';

Expand All @@ -7,7 +7,7 @@ type ControlPlanesListMenuProps = {
};

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

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

return (
<>
<Button ref={buttonRef} icon="overflow" icon-end onClick={handleOpenerClick} />
<Button id={openerId} icon="overflow" icon-end onClick={handleOpenerClick} />
<Menu
open={menuIsOpen}
opener={buttonRef.current}
opener={openerId}
onItemClick={(event) => {
const action = (event.detail.item as HTMLElement).dataset.action;
if (action === 'editMcp') {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ControlPlanes/List/MembersAvatarView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Avatar, AvatarGroup, Popover } from '@ui5/webcomponents-react';
import AvatarGroupType from '@ui5/webcomponents/dist/types/AvatarGroupType.js';
import PopoverPlacement from '@ui5/webcomponents/dist/types/PopoverPlacement.js';
import { useRef, useState } from 'react';
import { useId, useState } from 'react';
import { MemberTable } from '../../Members/MemberTable.tsx';
import { Member } from '../../../lib/api/types/shared/members';
import { generateInitialsForEmail } from '../../Helper/generateInitialsForEmail.ts';
Expand All @@ -13,7 +13,7 @@ interface Props {
}

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

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

return (
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<AvatarGroup ref={openerRef} style={{ maxWidth: '200px' }} type={AvatarGroupType.Group} onClick={handleOnClick}>
<AvatarGroup id={openerId} style={{ maxWidth: '200px' }} type={AvatarGroupType.Group} onClick={handleOnClick}>
{avatars}
</AvatarGroup>
<Popover
opener={openerRef.current!}
opener={openerId}
placement={PopoverPlacement.Bottom}
open={popoverIsOpen}
onClose={() => {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Core/BreadcrumbFeedbackHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Button, FlexBox, FlexBoxAlignItems, Menu, MenuItem } from '@ui5/webcomp
import { useTranslation } from 'react-i18next';
import { FeedbackButton } from './FeedbackButton.tsx';
import { BetaButton } from './BetaButton.tsx';
import { useRef, useState } from 'react';
import { useId, useState } from 'react';
import { useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding.tsx';
import { SearchParamToggleVisibility } from '../Helper/FeatureToggleExistance.tsx';
import { PathAwareBreadcrumbs } from './PathAwareBreadcrumbs/PathAwareBreadcrumbs.tsx';
Expand All @@ -30,20 +30,20 @@ export function BreadcrumbFeedbackHeader() {
function LogoutMenu() {
const auth = useAuthOnboarding();
const { t } = useTranslation();
const openerId = useId();

const buttonRef = useRef(null);
const [menuIsOpen, setMenuIsOpen] = useState(false);
return (
<>
<Button
ref={buttonRef}
id={openerId}
icon="menu2"
onClick={() => {
setMenuIsOpen(true);
}}
/>
<Menu
opener={buttonRef.current}
opener={openerId}
open={menuIsOpen}
onClose={() => {
setMenuIsOpen(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { KubectlBaseDialog, FormField, CustomCommand } from './KubectlBaseDialog';
import { useTranslation } from 'react-i18next';
import { useState } from 'react';

interface KubectlCreateProjectDialogProps {
onClose: () => void;
Expand All @@ -8,7 +9,7 @@ interface KubectlCreateProjectDialogProps {

export const KubectlCreateProjectDialog = ({ onClose, isOpen }: KubectlCreateProjectDialogProps) => {
const { t } = useTranslation();
const randomProjectName = Math.random().toString(36).substring(2, 8);
const [randomProjectName] = useState(() => Math.random().toString(36).substring(2, 8));

const formFields: FormField[] = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { KubectlBaseDialog, FormField, CustomCommand } from './KubectlBaseDialog';
import { useTranslation } from 'react-i18next';
import { useState } from 'react';

interface KubectlCreateWorkspaceDialogProps {
onClose: () => void;
Expand All @@ -9,7 +10,7 @@ interface KubectlCreateWorkspaceDialogProps {

export const KubectlCreateWorkspaceDialog = ({ onClose, isOpen, project }: KubectlCreateWorkspaceDialogProps) => {
const { t } = useTranslation();
const randomWorkspaceName = Math.random().toString(36).substring(2, 8);
const [randomWorkspaceName] = useState(() => Math.random().toString(36).substring(2, 8));
const projectName = project || '<Project Namespace>';
const projectNamespace = `project-${projectName}`;

Expand Down
30 changes: 13 additions & 17 deletions src/components/Dialogs/ManagedResourceDeleteDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FC, useState, useEffect } from 'react';
import { FC, useState } from 'react';
import {
Button,
CheckBox,
Expand All @@ -20,22 +20,19 @@ type Props = {
onClose: () => void;
item: ManagedResourceItem | null;
onDeletionConfirmed?: (item: ManagedResourceItem, force: boolean) => void;
onCanceled?: () => void;
};

export const ManagedResourceDeleteDialog: FC<Props> = ({ open, onClose, item, onDeletionConfirmed, onCanceled }) => {
export const ManagedResourceDeleteDialog: FC<Props> = ({ open, onClose, item, onDeletionConfirmed }) => {
const { t } = useTranslation();
const [forceDeletion, setForceDeletion] = useState(false);
const [advancedCollapsed, setAdvancedCollapsed] = useState(true);
const [confirmationText, setConfirmationText] = useState('');

useEffect(() => {
if (!open) {
setForceDeletion(false);
setAdvancedCollapsed(true);
setConfirmationText('');
}
}, [open]);
const resetForm = () => {
setForceDeletion(false);
setAdvancedCollapsed(true);
setConfirmationText('');
};

const resourceName = item?.metadata?.name ?? '';

Expand All @@ -54,22 +51,21 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ open, onClose, item, on
if (item && onDeletionConfirmed) {
onDeletionConfirmed(item, forceDeletion);
}
onClose();
handleClose();
};

const handleCancel = () => {
const handleClose = () => {
resetForm();
onClose();
if (onCanceled) {
onCanceled();
}
};

return (
<Dialog
open={open}
headerText={t('ManagedResources.deleteDialogTitle')}
className={styles.dialog}
onClose={handleCancel}
onOpen={resetForm}
onClose={handleClose}
>
<FlexBox direction="Column" className={styles.content}>
<DeleteConfirmationForm
Expand Down Expand Up @@ -99,7 +95,7 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ open, onClose, item, on
</Panel>

<FlexBox justifyContent="End" className={styles.actions}>
<Button design="Transparent" onClick={handleCancel}>
<Button design="Transparent" onClick={handleClose}>
{t('buttons.cancel')}
</Button>
<Button design={ButtonDesign.Negative} disabled={!isConfirmed} onClick={handleDelete}>
Expand Down
1 change: 1 addition & 0 deletions src/components/Graphs/useGraph.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export function useGraph(colorBy: ColorBy, onYamlClick: (item: ManagedResourceIt

useEffect(() => {
if (!treeData.length) {
// eslint-disable-next-line react-hooks/set-state-in-effect
setNodes([]);
setEdges([]);
return;
Expand Down
12 changes: 8 additions & 4 deletions src/components/Helper/AnimatedHoverTextButton.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import { Button, ButtonDomRef, FlexBox, FlexBoxAlignItems, Text } from '@ui5/webcomponents-react';
import '@ui5/webcomponents-icons/dist/copy';
import { JSX, RefObject, useState } from 'react';
import { JSX, useId, useState } from 'react';
import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
import type { Ui5CustomEvent } from '@ui5/webcomponents-react-base';
import type { ButtonClickEventDetail } from '@ui5/webcomponents/dist/Button.js';

type HoverTextButtonProps = {
id?: string;
text: string;
icon: JSX.Element;
ref?: RefObject<ButtonDomRef | null>;
onClick: (event: Ui5CustomEvent<ButtonDomRef, ButtonClickEventDetail>) => void;
};
export const AnimatedHoverTextButton = ({ text, icon, onClick, ref }: HoverTextButtonProps) => {
export const AnimatedHoverTextButton = ({ id, text, icon, onClick }: HoverTextButtonProps) => {
const [hover, setHover] = useState(false);

const generatedId = useId();
id ??= generatedId;

return (
<Button
ref={ref}
id={id}
design={ButtonDesign.Transparent}
onClick={onClick}
onMouseOver={() => setHover(true)}
Expand Down
Loading
Loading