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.

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

Feat: add accordion #93

Merged
merged 3 commits into from
Jul 16, 2024
Merged
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
1 change: 1 addition & 0 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@emotion/styled": "^11.11.5",
"@mui/material": "^5.15.20",
"@mui/x-charts": "^7.7.1",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-navigation-menu": "^1.2.0",
Expand Down
32 changes: 32 additions & 0 deletions dashboard/pnpm-lock.yaml

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

98 changes: 98 additions & 0 deletions dashboard/src/components/Accordion/Accordion.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import type { Meta, StoryObj } from '@storybook/react';

import Accordion, { IAccordionItems } from './Accordion';

const meta = {
title: 'Accordion',
component: Accordion,
parameters: {
layout: 'centered',
},
tags: ['autodocs'],
} satisfies Meta<typeof Accordion>;

export default meta;
type Story = StoryObj<typeof meta>;

const itemsBuild: IAccordionItems[] = [
{
trigger: {
config: 'config',
compiler: 'compiler',
date: 'dd/mm/yyyy',
buildErrors: 5,
buildTime: '500 seconds',
status: 'valid',
},
content: <span>AAAAa</span>,
},
{
trigger: {
config: 'config',
compiler: 'compiler',
date: 'dd/mm/yyyy',
buildErrors: 5,
buildTime: '500 seconds',
status: 'valid',
},
content: <span>AAAAa</span>,
},
{
trigger: {
config: 'config',
compiler: 'compiler',
date: 'dd/mm/yyyy',
buildErrors: 5,
buildTime: '500 seconds',
status: 'valid',
},
content: <span>AAAAa</span>,
},
];

const headersBuild = [
'config',
'compiler',
'date',
'build errors',
'build time',
'status',
];

const itemsTest: IAccordionItems[] = [
{
trigger: {
testPlans: 'aaaaaaa',
testErrors: 5,
testSuccessfull: 12,
status: 'invalid',
},
content: <span>AAAAa</span>,
},
{
trigger: {
testPlans: 'aaaaaaasdkjmla',
testErrors: 5,
testSuccessfull: 12,
status: 'valid',
},
content: <span>BBB</span>,
},
];
const headersTest = ['test plan', 'test results', 'status'];

export const Builds: Story = {
args: {
items: itemsBuild,
headers: headersBuild,
type: 'build',
},
};

export const Tests: Story = {
args: {
items: itemsTest,
headers: headersTest,
type: 'test',
},
};
141 changes: 141 additions & 0 deletions dashboard/src/components/Accordion/Accordion.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
import { ReactNode, useMemo } from 'react';

import { MdCheck, MdClose } from 'react-icons/md';

import { TableBody, TableCell, TableRow } from '../ui/table';
import BaseTable from '../Table/BaseTable';
import {
Collapsible,
CollapsibleContent,
CollapsibleTrigger,
} from '../ui/collapsible';
import ColoredCircle from '../ColoredCircle/ColoredCircle';
import { ComponentType } from '../ListingComponentItem/ListingComponentItem';

export interface IAccordion {
headers: string[];
items: IAccordionItems[];
type: 'build' | 'test';
}

export interface IAccordionItems {
trigger: AccordionItemBuildsTrigger | AccordionItemTestsTrigger;
content?: ReactNode;
}

interface ICustomAccordionTableBody {
items: IAccordionItems[];
type: 'build' | 'test';
}

export type AccordionItemBuildsTrigger = {
config?: string;
compiler?: string;
date?: string;
buildErrors?: number;
buildTime?: string;
status?: 'valid' | 'invalid';
};

export type AccordionItemTestsTrigger = {
testPlans?: string;
testSuccessfull?: number;
testErrors?: number;
status?: 'valid' | 'invalid';
};

const Accordion = ({ headers, items, type }: IAccordion): JSX.Element => {
const accordionTableHeader = useMemo(
() => headers.map(header => <span key={header}>{header}</span>),
[headers],
);

return (
<BaseTable
headers={accordionTableHeader}
body={<AccordionTableBody items={items} type={type} />}
/>
);
};

const AccordionTableBody = ({
items,
type,
}: ICustomAccordionTableBody): JSX.Element => {
const accordionItems = useMemo(
() =>
items.map((item, index) => (
<Collapsible key={index} asChild>
<>
<CollapsibleTrigger asChild>
<TableRow>
{type === 'build' ? (
<AccordionBuildsTrigger trigger={item.trigger} />
) : (
<AccordionTestsTrigger trigger={item.trigger} />
)}
</TableRow>
</CollapsibleTrigger>
<CollapsibleContent>{item.content}</CollapsibleContent>
</>
</Collapsible>
)),
[items, type],
);

return <TableBody>{accordionItems}</TableBody>;
};

const AccordionBuildsTrigger = ({ trigger }: IAccordionItems): JSX.Element => {
const triggerInfo = trigger as AccordionItemBuildsTrigger;
return (
<>
<TableCell>{triggerInfo.config}</TableCell>
<TableCell>{triggerInfo.compiler}</TableCell>
<TableCell>{triggerInfo.date}</TableCell>
<TableCell>
<ColoredCircle
className="max-w-6"
quantity={triggerInfo.buildErrors ?? 0}
type={ComponentType.Error}
/>
</TableCell>
<TableCell>{triggerInfo.buildTime}</TableCell>
<TableCell>
{triggerInfo.status === 'valid' ? (
<MdCheck className="text-green" />
) : (
<MdClose className="text-red" />
)}
</TableCell>
</>
);
};

const AccordionTestsTrigger = ({ trigger }: IAccordionItems): JSX.Element => {
const triggerInfo = trigger as AccordionItemTestsTrigger;
return (
<>
<TableCell>{triggerInfo.testPlans}</TableCell>
<TableCell className="flex flex-row gap-1">
<ColoredCircle
quantity={triggerInfo.testErrors ?? 0}
type={ComponentType.Error}
/>
<ColoredCircle
quantity={triggerInfo.testSuccessfull ?? 0}
type={ComponentType.Warning}
/>
</TableCell>
<TableCell>
{triggerInfo.status === 'valid' ? (
<MdCheck className="text-green" />
) : (
<MdClose className="text-red" />
)}
</TableCell>
</>
);
};

export default Accordion;
10 changes: 8 additions & 2 deletions dashboard/src/components/ColoredCircle/ColoredCircle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,22 @@ import { ComponentType } from '../ListingComponentItem/ListingComponentItem';
interface IColoredCircle {
quantity: number;
type: ComponentType;
className?: string;
}

const ColoredCircle = ({ quantity, type }: IColoredCircle): JSX.Element => {
const ColoredCircle = ({
quantity,
type,
className,
}: IColoredCircle): JSX.Element => {
const backgroundColor =
type === ComponentType.Error ? 'bg-lightRed' : 'bg-yellow';
type === ComponentType.Error ? 'bg-lightRed' : 'bg-lightGreen';
return (
<div
className={classNames(
backgroundColor,
'rounded-full text-black h-6 min-w-6 flex justify-center px-1',
className,
)}
>
<span className="text-sm">{quantity}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface IListingComponentItem {
export enum ComponentType {
Warning,
Error,
Success,
}

const ListingComponentItem = ({
Expand Down
9 changes: 9 additions & 0 deletions dashboard/src/components/ui/collapsible.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"

const Collapsible = CollapsiblePrimitive.Root

const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger

const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent

export { Collapsible, CollapsibleTrigger, CollapsibleContent }
3 changes: 3 additions & 0 deletions dashboard/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ module.exports = {
"black": '#000000',
"lightRed": '#FFBBBB',
"yellow": '#FFD27C',
"lightGreen": '#C9FADA',
"green": '#1DDF5D',
"red": '#E15739'
}
},
},
Expand Down
Loading