Skip to content
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

AWS Integration: Account setup basic UI and functionality #6806

Open
wants to merge 1 commit into
base: aws-integration-skeleton
Choose a base branch
from
Open

AWS Integration: Account setup basic UI and functionality #6806

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
79 changes: 79 additions & 0 deletions frontend/src/container/CloudIntegrationPage/HeroSection/AccountActions.style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
.hero-section__actions {
margin-top: 12px;

&-with-account {
display: flex;
flex-direction: column;
gap: 10px;
}
}
.hero-section__action-buttons {
display: flex;
align-items: center;
gap: 8px;
}

.hero-section__action-button {
font-family: 'Inter';
border-radius: 2px;
cursor: pointer;
font-size: 12px;
font-weight: 500;
line-height: 16px;
padding: 8px 17px;

&.primary {
background: var(--bg-robin-500);
border: none;
color: var(--bg-vanilla-100);
}

&.secondary {
display: flex;
align-items: center;
border: 1px solid var(--bg-ink-300);
color: var(--bg-vanilla-100);
border-radius: 2px;
background: var(--bg-slate-400);
box-shadow: none;
}
}

.cloud-account-selector {
border-radius: 2px;
border: 1px solid var(--bg-ink-300);
background: linear-gradient(
139deg,
rgba(18, 19, 23, 0.8) 0%,
rgba(18, 19, 23, 0.9) 98.68%
);
box-shadow: 4px 10px 16px 2px rgba(0, 0, 0, 0.2);
-webkit-backdrop-filter: blur(20px);
backdrop-filter: blur(20px);
.ant-select-selector {
border-color: var(--bg-slate-400) !important;
background: var(--bg-ink-300) !important;
padding: 6px 8px !important;
}
.ant-select-selection-item {
color: var(--bg-vanilla-400);
font-size: 12px;
font-weight: 400;
line-height: 16px;
}

.account-option-item {
display: flex;
align-items: center;
justify-content: space-between;
&__selected {
display: flex;
align-items: center;
justify-content: center;
height: 14px;
width: 14px;
background-color: rgba(192, 193, 195, 0.2); /* #C0C1C3 with 0.2 opacity */
ahmadshaheer marked this conversation as resolved.
Show resolved Hide resolved
border-radius: 2px;
}
}
}
99 changes: 99 additions & 0 deletions frontend/src/container/CloudIntegrationPage/HeroSection/AccountActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import './AccountActions.style.scss';

import { Color } from '@signozhq/design-tokens';
import { Button, Select } from 'antd';
import { SelectProps } from 'antd/lib';
import useUrlQuery from 'hooks/useUrlQuery';
import { Check, ChevronDown } from 'lucide-react';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom-v5-compat';

import { CloudAccount } from '../ServicesSection/types';

interface AccountActionsProps {
accounts: CloudAccount[];
}

interface AccountOptionItemProps {
label: React.ReactNode;
isSelected: boolean;
}

function AccountOptionItem({
label,
isSelected,
}: AccountOptionItemProps): JSX.Element {
return (
<div className="account-option-item">
{label}
{isSelected && (
<div className="account-option-item__selected">
<Check size={12} color={Color.BG_VANILLA_100} />
</div>
)}
</div>
);
}

function renderOption(
option: any,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid using any type for option. Consider defining a specific type for the options used in the Select component to ensure type safety.

ahmadshaheer marked this conversation as resolved.
Show resolved Hide resolved
activeAccountId: string | null,
): JSX.Element {
return (
<AccountOptionItem
label={option.label}
isSelected={option.value === activeAccountId}
/>
);
}

function AccountActions({ accounts }: AccountActionsProps): JSX.Element {
const urlQuery = useUrlQuery();
const navigate = useNavigate();
const [activeAccountId, setActiveAccountId] = useState<string | null>(
urlQuery.get('accountId') ?? accounts[0]?.cloud_account_id ?? null,
);

const selectOptions: SelectProps['options'] = accounts.map((account) => ({
value: account.cloud_account_id,
label: account.cloud_account_id,
}));

return (
<div className="hero-section__actions">
{accounts.length ? (
<div className="hero-section__actions-with-account">
<Select
value={`Account: ${activeAccountId}`}
options={selectOptions}
rootClassName="cloud-account-selector"
placeholder="Select AWS Account"
suffixIcon={<ChevronDown size={16} color={Color.BG_VANILLA_400} />}
optionRender={(option): JSX.Element =>
renderOption(option, activeAccountId)
}
onChange={(value): void => {
setActiveAccountId(value);
urlQuery.set('accountId', value);
navigate({ search: urlQuery.toString() });
}}
/>
<div className="hero-section__action-buttons">
<Button type="primary" className="hero-section__action-button primary">
Add New AWS Account
</Button>
<Button type="default" className="hero-section__action-button secondary">
Account Settings
</Button>
</div>
</div>
) : (
<Button type="primary" className="hero-section__action-button primary">
Integrate Now
</Button>
)}
</div>
);
}

export default AccountActions;
21 changes: 2 additions & 19 deletions frontend/src/container/CloudIntegrationPage/HeroSection/HeroSection.style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,15 @@
color: var(--bg-vanilla-100);
font-size: 24px;
font-weight: 500;
line-height: 20px; /* 83.333% */
line-height: 20px;
letter-spacing: -0.12px;
}

.description {
color: var(--bg-vanilla-400);
font-size: 12px;
font-weight: 400;
line-height: 18px; /* 150% */
}

.hero-section__buttons {
margin-top: 12px;
}

.hero-section__button {
font-family: 'Inter';
background: var(--bg-robin-500);
border: none;
padding: 8px 17px;
color: var(--bg-vanilla-100);
border-radius: 2px;
cursor: pointer;
font-size: 12px;
font-weight: 500;
line-height: 16px;
line-height: 18px;
}
}
}
9 changes: 4 additions & 5 deletions frontend/src/container/CloudIntegrationPage/HeroSection/HeroSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import './HeroSection.style.scss';

import { cloudAccountsData } from '../ServicesSection/data';
import AccountActions from './AccountActions';

function HeroSection(): JSX.Element {
return (
<div
Expand All @@ -15,11 +18,7 @@ function HeroSection(): JSX.Element {
Monitor your AWS infrastructure with SigNoz. Get metrics and logs from your
AWS services.
</div>
<div className="hero-section__buttons">
<button className="hero-section__button" type="button">
Integrate Now
</button>
</div>
<AccountActions accounts={cloudAccountsData.accounts} />
</div>
</div>
);
Expand Down
45 changes: 43 additions & 2 deletions frontend/src/container/CloudIntegrationPage/ServicesSection/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Service, ServiceData } from './types';
import { CloudAccountsData, Service, ServiceData } from './types';

const services: Service[] = [
{
Expand Down Expand Up @@ -135,4 +135,45 @@ const serviceDetails: ServiceData[] = [
},
];

export { serviceDetails, services };
const cloudAccountsData: CloudAccountsData = {
accounts: [
{
id: '3e585f2d-fd1e-43bf-8a3b-ee9d449cc626',
cloud_account_id: '443370682259',
config: {
regions: ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2'],
},
status: {
integration: {
last_heartbeat_ts_ms: 1709825467000,
},
},
},
{
id: '7a9b2c3d-4e5f-6g7h-8i9j-0k1l2m3n4o5p',
cloud_account_id: '123456789012',
config: {
regions: ['all'],
},
status: {
integration: {
last_heartbeat_ts_ms: 1709825467000,
},
},
},
{
id: '9p8o7n6m-5l4k-3j2i-1h0g-f4e3d2c1b0a',
cloud_account_id: '098765432109',
config: {
regions: ['eu-west-1', 'eu-central-1', 'ap-southeast-1'],
},
status: {
integration: {
last_heartbeat_ts_ms: 1709825467000,
},
},
},
],
};

export { cloudAccountsData, serviceDetails, services };
25 changes: 24 additions & 1 deletion frontend/src/container/CloudIntegrationPage/ServicesSection/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,27 @@ interface ServiceData {
status?: ServiceStatus; // Optional - included only with account_id
}

export type { Service, ServiceData };
interface CloudAccountConfig {
regions: string[];
}

interface IntegrationStatus {
last_heartbeat_ts_ms: number;
}

interface AccountStatus {
integration: IntegrationStatus;
}

interface CloudAccount {
id: string;
cloud_account_id: string;
config: CloudAccountConfig;
status: AccountStatus;
}

interface CloudAccountsData {
accounts: CloudAccount[];
}

export type { CloudAccount, CloudAccountsData, Service, ServiceData };
Loading