Skip to content

🪟 🎨 New stream details panel #19219

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

Merged
merged 67 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
44be48c
move all stream details table related components to separate folder;
dizel852 Nov 9, 2022
2857f77
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 10, 2022
a1e130f
init a copy of existing <Table /> component - <NextTable />
dizel852 Nov 10, 2022
2683c52
fixed calc error
dizel852 Nov 11, 2022
4762ec6
first implementation of NextTable:
dizel852 Nov 11, 2022
e10558c
remove StreamDetailsHeader
dizel852 Nov 11, 2022
bab038c
updated StreamFieldsTable
dizel852 Nov 11, 2022
0c51fea
fix typings error
dizel852 Nov 14, 2022
26bdcfa
update NextTable cells classnames
dizel852 Nov 14, 2022
9b3d3f5
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 14, 2022
55c503e
remove last styled component from NextTable
dizel852 Nov 14, 2022
79da2d7
add base tests for NextTable component
dizel852 Nov 14, 2022
adbfa7a
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 14, 2022
ff7d723
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 18, 2022
f809457
remove comments
dizel852 Nov 21, 2022
c86d71f
replace "any" type with "unknown" where possible
dizel852 Nov 21, 2022
bd1323e
add react-table v8 package
dizel852 Nov 22, 2022
977bb14
update NextTable component
dizel852 Nov 22, 2022
6822e57
update NextTable component
dizel852 Nov 22, 2022
9ebca26
extend react-table ColumnMeta interface
dizel852 Nov 22, 2022
259825d
update StreamFieldsTable component
dizel852 Nov 22, 2022
ae43af1
update NextTable tests
dizel852 Nov 22, 2022
0bb9d7a
update NextTable storybook
dizel852 Nov 22, 2022
79d1daf
fixed crashed StreamConnectionHeader during connection creation
dizel852 Nov 23, 2022
d47e61f
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 23, 2022
f308517
replace useConnectionEditService with useConnectionFormService hook
dizel852 Nov 23, 2022
5e1db97
remove getIcon wrap function and combine all parts in separate component
dizel852 Nov 23, 2022
9d352ae
update styles
dizel852 Nov 23, 2022
bfbf327
extract common logic to separate function
dizel852 Nov 23, 2022
ff096a2
fix performance
dizel852 Nov 23, 2022
7441bd3
fix not capitalized table header cell
dizel852 Nov 23, 2022
e537f40
fix checkbox style issue
dizel852 Nov 23, 2022
24b9113
make thead sticky by default
dizel852 Nov 23, 2022
d2e3257
fix not scrollable table
dizel852 Nov 23, 2022
8844c22
fixed top bar overflow during scrolling table
dizel852 Nov 29, 2022
5c31048
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Nov 29, 2022
671a77a
fix top bar overflow during scrolling table - second try
dizel852 Nov 29, 2022
637668a
fix hidden cursor and pk columns
dizel852 Nov 29, 2022
a3be3cb
fix hidden cursor and pk columns
dizel852 Nov 29, 2022
55c9eab
fix PR comments: replace css values with variables
dizel852 Nov 30, 2022
c5f2349
remove unnecessary hook dependencies
dizel852 Nov 30, 2022
e404747
fix relative import component path
dizel852 Nov 30, 2022
a0b0566
add space around panel;
dizel852 Dec 1, 2022
ce62b2a
fix arrow color
dizel852 Dec 2, 2022
2a8fb82
align table padding with toggle
dizel852 Dec 2, 2022
73c328e
add ArrowRight icon from design
dizel852 Dec 3, 2022
9fbd654
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Dec 3, 2022
d7fedc2
move NextTable component to ui folder
dizel852 Dec 5, 2022
03f432c
move StreamDetailsPanel component to separate folder
dizel852 Dec 5, 2022
7c47f66
move StreamPanelHeader component to separate folder
dizel852 Dec 5, 2022
e9a3eed
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Dec 5, 2022
fcf34cc
remove obsolete DetailsPanel components
dizel852 Dec 5, 2022
1ca986e
move all DetailsPanel related components to separate folder
dizel852 Dec 5, 2022
6156c03
fix when no namespace
dizel852 Dec 5, 2022
1d5b6b1
fixed details panel header sync mode label
dizel852 Dec 5, 2022
3436402
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Dec 5, 2022
0c19aa8
fix relative import path
dizel852 Dec 7, 2022
80b1006
move react-table.d.ts to src/types
dizel852 Dec 7, 2022
4b98045
remove fake destination data type column
dizel852 Dec 7, 2022
6afc3db
add FormattedMessage to ConnectorHeaderGroupIcon
dizel852 Dec 7, 2022
decdf8c
fix StreamPanelHeader style to match Figma
dizel852 Dec 7, 2022
0106fe8
change td color from grey-100 to grey-50
dizel852 Dec 7, 2022
9ab40af
temporary remove @tanstack/react-table package
dizel852 Dec 7, 2022
cb6c52b
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Dec 7, 2022
567fa06
add @tanstack/react-table back to package.json
dizel852 Dec 7, 2022
ebae26e
fix cross icon color
dizel852 Dec 7, 2022
62c13e2
Merge branch 'master' into vlad/18242-new-streams-details-panel
dizel852 Dec 8, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@use "scss/colors";

// ------- <table/> --------
.table {
border-spacing: 0;
width: 100%;
max-width: 100%;
border-radius: 10px;
}

// --------- <th/> ---------
.th {
background: colors.$grey-50;
color: colors.$grey;
text-transform: uppercase;
border-bottom: none;
text-align: left;
font-size: 10px;
line-height: 12px;
font-weight: 600;

&:first-child {
padding-left: 45px;
border-radius: 10px 0 0;
}

&:last-child {
padding-left: 15px;
border-radius: 0 10px 0 0;
}
}

// --------- <tr/> ---------
.tr {
background: colors.$white;
cursor: auto;

&:hover {
background-color: colors.$grey-50;
}
}

// --------- <td/> ---------

.td {
padding: 16px 13px;
font-size: 12px;
line-height: 15px;
font-weight: normal;
color: colors.$dark-blue;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid colors.$grey-100;
width: auto;

tr:last-child > & {
border-bottom: none;

&:first-child {
border-radius: 0 0 0 10px;
}

&:last-child {
border-radius: 0 0 10px;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { render } from "@testing-library/react";
import { CellProps } from "react-table";

import { NextTable } from "./NextTable";

interface Item {
name: string;
value: number;
}

describe("<NextTable>", () => {
it("should should render the table with passed data", () => {
const data: Item[] = [
{ name: "2017", value: 100 },
{ name: "2018", value: 300 },
{ name: "2019", value: 500 },
{ name: "2020", value: 400 },
{ name: "2021", value: 200 },
];

const columns = [
{
Header: "Name",
accessor: "name",
Cell: ({ cell }: CellProps<Item>) => <strong>{cell.value}</strong>,
},
{
Header: "Value",
accessor: "value",
Cell: ({ cell }: CellProps<Item>) => <>{cell.value}</>,
},
];

const { getByText, container } = render(<NextTable columns={columns} data={data} />);
expect(getByText(/2019/)).toBeInTheDocument();
expect(getByText(/500/)).toBeInTheDocument();

expect(container.querySelectorAll("thead tr")).toHaveLength(1);
expect(container.querySelectorAll("tbody tr")).toHaveLength(data.length);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import classNames from "classnames";
import React, { memo, useMemo } from "react";
import { Column, SortingRule, useSortBy, useTable } from "react-table";

import styles from "./NextTable.module.scss";

interface TableProps {
columns: ReadonlyArray<Column<Record<string, unknown>>>;
erroredRows?: boolean;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
data: any[];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onClickRow?: (data: any) => void;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
sortBy?: Array<SortingRule<any>>;
}

export const NextTable: React.FC<TableProps> = memo(({ columns, data, onClickRow, sortBy }) => {
const [plugins, config] = useMemo(() => {
const pl = [];
const plConfig: Record<string, unknown> = {};

if (sortBy) {
pl.push(useSortBy);
plConfig.initialState = { sortBy };
}
return [pl, plConfig];
}, [sortBy]);
const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow } = useTable(
{
...config,
columns,
data,
},
...plugins
);

return (
<table className={styles.table} {...getTableProps()}>
<thead>
{headerGroups.map((headerGroup, key) => (
<tr {...headerGroup.getHeaderGroupProps()} key={`table-header-${key}`}>
{headerGroup.headers.map((column, columnKey) => (
<th
{...column.getHeaderProps([
{
className: classNames(
styles.th,
// @ts-expect-error will be fixed when with typings
column.thClassName
),
},
])}
key={`table-column-${key}-${columnKey}`}
>
{column.render("Header")}
</th>
))}
</tr>
))}
</thead>
<tbody {...getTableBodyProps()}>
{rows.map((row) => {
prepareRow(row);
return (
<tr
{...row.getRowProps()}
className={styles.tr}
key={`table-row-${row.id}`}
onClick={() => onClickRow?.(row.original)}
>
{row.cells.map((cell, key) => {
return (
<td
{...cell.getCellProps([
{
className: classNames(
styles.td,
// @ts-expect-error will be fixed when with typings
cell.column.tdClassName
),
},
])}
key={`table-cell-${row.id}-${key}`}
>
{cell.render("Cell")}
</td>
);
})}
</tr>
);
})}
</tbody>
</table>
);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { ComponentStory, ComponentMeta } from "@storybook/react";
import { CellProps } from "react-table";

import { NextTable } from "./NextTable";

export default {
title: "UI/NextTable",
component: NextTable,
argTypes: {},
} as ComponentMeta<typeof NextTable>;

const Template: ComponentStory<typeof NextTable> = (args) => <NextTable {...args} />;

interface Item {
name: string;
value: number;
}

const data: Item[] = [
{ name: "2017", value: 100 },
{ name: "2018", value: 300 },
{ name: "2019", value: 500 },
{ name: "2020", value: 400 },
{ name: "2021", value: 200 },
];

const columns = [
{
Header: "Name",
accessor: "name",
Cell: ({ cell }: CellProps<Item>) => <strong>{cell.value}</strong>,
},
{
Header: "Value",
accessor: "value",
Cell: ({ cell }: CellProps<Item>) => <>{cell.value}</>,
},
];

export const Primary = Template.bind({});
Primary.args = {
data,
columns,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./NextTable";
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $icon-size: 15px;
display: flex;
flex-direction: row;
justify-content: space-between;
padding: variables.$spacing-lg calc(variables.$spacing-lg * 2);
padding: variables.$spacing-lg calc(#{variables.$spacing-lg} * 2);
}

.connector {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Dialog } from "@headlessui/react";
import React from "react";

import { Overlay } from "components/ui/Overlay";

import { AirbyteStream } from "core/request/AirbyteClient";

import { StreamConnectionHeader } from "./StreamConnectionHeader";
import styles from "./StreamDetailsPanel.module.scss";
import { StreamFieldsTable, StreamFieldsTableProps } from "./StreamFieldsTable";
import { StreamFieldsTable, StreamFieldsTableProps } from "./StreamFieldsTable/StreamFieldsTable";
import { StreamPanelHeader } from "./StreamPanelHeader";

interface StreamDetailsPanelProps extends StreamFieldsTableProps {
Expand Down Expand Up @@ -39,7 +39,6 @@ export const StreamDetailsPanel: React.FC<StreamDetailsPanelProps> = ({
onClose={onClose}
onSelectedChange={onSelectedChange}
/>
<StreamConnectionHeader />
<StreamFieldsTable
config={config}
syncSchemaFields={syncSchemaFields}
Expand Down

This file was deleted.

Loading