Skip to content

[Bug]: Empty spaces on User Details page #2815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olgenn merged 1 commit into from
Jun 19, 2025
Merged

[Bug]: Empty spaces on User Details page #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions frontend/src/pages/User/Details/Billing/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useParams, useSearchParams } from 'react-router-dom';

import { Box, Button, Container, Header, Hotspot, Loader, Modal, SpaceBetween } from 'components';
import { Box, Button, Header, Hotspot, Loader, Modal, SpaceBetween } from 'components';
import { PermissionGuard } from 'components/PermissionGuard';
import { HotspotIds } from 'layouts/AppLayout/TutorialPanel/constants';

Expand Down Expand Up @@ -102,7 +102,9 @@ export const Billing: React.FC = () => {

return (
<SpaceBetween size="l">
<Container header={<Header variant="h2">{t('billing.balance')}</Header>}>
<div>
<Header variant="h2">{t('billing.balance')}</Header>

{isLoading && <Loader />}

{data && (
Expand All @@ -126,7 +128,7 @@ export const Billing: React.FC = () => {
</SpaceBetween>
</SpaceBetween>
)}
</Container>
</div>

<Payments
payments={data?.billing_history ?? []}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/User/Details/Payments/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const Payments: React.FC<IProps> = ({ payments, emptyMessageContent, isLo
<Table
{...collectionProps}
columnDefinitions={columns}
variant="borderless"
items={items}
loading={isLoading}
loadingText={t('common.loading')}
Expand Down
18 changes: 14 additions & 4 deletions frontend/src/pages/User/Details/Projects/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';

import { ListEmptyMessage, NavigateLink, Pagination, Table } from 'components';
import {
ListEmptyMessage,
NavigateLink,
// Pagination,
Table,
} from 'components';

import { useBreadcrumbs, useCollection } from 'hooks';
import { ROUTES } from 'routes';
Expand Down Expand Up @@ -45,11 +50,15 @@ export const UserProjectList: React.FC = () => {
.sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
}, [data]);

const { items, collectionProps, paginationProps } = useCollection(filteredData, {
const {
items,
collectionProps,
// paginationProps
} = useCollection(filteredData, {
filtering: {
empty: renderEmptyMessage(),
},
pagination: { pageSize: 20 },
// pagination: { pageSize: 20 },
selection: {},
});

Expand All @@ -66,11 +75,12 @@ export const UserProjectList: React.FC = () => {
return (
<Table
{...collectionProps}
variant="borderless"
columnDefinitions={columns}
items={items}
loading={isLoading || isFetching}
loadingText={t('common.loading')}
pagination={<Pagination {...paginationProps} disabled={isLoading} />}
// pagination={<Pagination {...paginationProps} disabled={isLoading} />}
/>
);
};
96 changes: 46 additions & 50 deletions frontend/src/pages/User/Details/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate, useParams } from 'react-router-dom';

import { Box, Button, ColumnLayout, Container, Header, Link, Loader, Popover, SpaceBetween, StatusIndicator } from 'components';
import { Box, Button, ColumnLayout, Header, Link, Loader, Popover, SpaceBetween, StatusIndicator } from 'components';
import { PermissionGuard } from 'components/PermissionGuard';

import { useAppSelector, useBreadcrumbs, usePermissionGuard } from 'hooks';
Expand Down Expand Up @@ -52,63 +52,59 @@ export const Settings: React.FC = () => {

return (
<div>
<Container
header={
<Header
variant="h2"
actions={
<Button onClick={editUserHandler} disabled={isDisabledUserEditing()}>
{t('common.edit')}
</Button>
}
>
{t('users.account_settings')}
</Header>
<Header
variant="h2"
actions={
<Button onClick={editUserHandler} disabled={isDisabledUserEditing()}>
{t('common.edit')}
</Button>
}
>
{isLoading && <Loader />}
{t('users.account_settings')}
</Header>

{data && (
<ColumnLayout columns={2} variant="text-grid">
<SpaceBetween size="l">
{/*<div>*/}
{/* <Box variant="awsui-key-label">{t('users.user_name')}</Box>*/}
{/* <div>{data.user_name}</div>*/}
{/*</div>*/}
{isLoading && <Loader />}

<div>
<Box variant="awsui-key-label">{t('users.email')}</Box>
<div>{data.email ? <Link href={`mailto:${data.email}`}>{data.email}</Link> : '-'}</div>
</div>
{data && (
<ColumnLayout columns={2} variant="text-grid">
<SpaceBetween size="l">
{/*<div>*/}
{/* <Box variant="awsui-key-label">{t('users.user_name')}</Box>*/}
{/* <div>{data.user_name}</div>*/}
{/*</div>*/}

<PermissionGuard allowedGlobalRoles={[GlobalUserRole.ADMIN]}>
<div>
<Box variant="awsui-key-label">{t('users.global_role')}</Box>
<div>{t(`roles.${data.global_role}`)}</div>
</div>
</PermissionGuard>
<div>
<Box variant="awsui-key-label">{t('users.email')}</Box>
<div>{data.email ? <Link href={`mailto:${data.email}`}>{data.email}</Link> : '-'}</div>
</div>

<PermissionGuard allowedGlobalRoles={[GlobalUserRole.ADMIN]}>
<div>
<Box variant="awsui-key-label">{t('users.token')}</Box>

<div className={styles.token}>
<Popover
dismissButton={false}
position="top"
size="small"
triggerType="custom"
content={<StatusIndicator type="success">{t('users.token_copied')}</StatusIndicator>}
>
<Button formAction="none" iconName="copy" variant="link" onClick={onCopyToken} />
</Popover>

<div>{data.creds.token}</div>
</div>
<Box variant="awsui-key-label">{t('users.global_role')}</Box>
<div>{t(`roles.${data.global_role}`)}</div>
</div>
</PermissionGuard>

<div>
<Box variant="awsui-key-label">{t('users.token')}</Box>

<div className={styles.token}>
<Popover
dismissButton={false}
position="top"
size="small"
triggerType="custom"
content={<StatusIndicator type="success">{t('users.token_copied')}</StatusIndicator>}
>
<Button formAction="none" iconName="copy" variant="link" onClick={onCopyToken} />
</Popover>

<div>{data.creds.token}</div>
</div>
</SpaceBetween>
</ColumnLayout>
)}
</Container>
</div>
</SpaceBetween>
</ColumnLayout>
)}
</div>
);
};
8 changes: 4 additions & 4 deletions frontend/src/pages/User/Details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,19 @@ export const UserDetails: React.FC = () => {
label: t('users.settings'),
id: UserDetailsTabTypeEnum.SETTINGS,
href: ROUTES.USER.DETAILS.FORMAT(paramUserName),
content: <Outlet />,
},
{
label: t('users.projects'),
id: UserDetailsTabTypeEnum.PROJECTS,
href: ROUTES.USER.PROJECTS.FORMAT(paramUserName),
content: <Outlet />,
},
process.env.UI_VERSION === 'sky' && {
label: t('billing.title'),
id: UserDetailsTabTypeEnum.BILLING,
href: ROUTES.USER.BILLING.LIST.FORMAT(paramUserName),
content: <Outlet />,
},
].filter(Boolean);

Expand All @@ -88,10 +91,7 @@ export const UserDetails: React.FC = () => {
}
>
<SpaceBetween size="l">
<div />
<div />
<Tabs withNavigation tabs={tabs} />
<Outlet />
<Tabs variant="container" withNavigation tabs={tabs} />
</SpaceBetween>
</ContentLayout>

Expand Down
Loading