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

Jump to bottom

style(import): fix import table overflowing horizontally #11

Merged
merged 1 commit into from
Jan 17, 2024
Merged

style(import): fix import table overflowing horizontally #11

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
4 changes: 2 additions & 2 deletions apps/bublik/src/pages/import-page/import-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export const ImportPage = () => {
useDocumentTitle('Import - Bublik');

return (
<div className="p-2">
<div className="flex flex-col h-full gap-1">
<div className="p-2 overflow-hidden h-full">
<div className="flex flex-col gap-1 h-full">
<ImportEventsTableContainer>
<ImportRunFormContainer />
</ImportEventsTableContainer>
Expand Down
2 changes: 1 addition & 1 deletion ...port/src/lib/import-events-table/__snapshots__/import-event-table.component.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ exports[`ImportEventTableComponent > should render successfully 1`] = `
class="border-separate border-spacing-y-1 w-full"
>
<thead
class="bg-white"
class="bg-white sticky top-0 z-10"
>
<tr
class="h-8.5"
Expand Down
10 changes: 5 additions & 5 deletions libs/bublik/features/run-import/src/lib/import-events-table/import-event-table.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/* SPDX-License-Identifier: Apache-2.0 */
/* SPDX-FileCopyrightText: 2021-2023 OKTET Labs Ltd. */
import {
useReactTable,
getCoreRowModel,
flexRender,
getCoreRowModel,
getFilteredRowModel,
getPaginationRowModel,
getFilteredRowModel
useReactTable
} from '@tanstack/react-table';

import { LogEvent } from '@/shared/types';
import { getErrorMessage } from '@/services/bublik-api';
import { Icon, Pagination, Skeleton, cn } from '@/shared/tailwind-ui';
import { cn, Icon, Pagination, Skeleton } from '@/shared/tailwind-ui';

import { columns } from './import-event-table.columns';

Expand Down Expand Up @@ -90,7 +90,7 @@ export const ImportEventTable = (props: ImportEventTableProps) => {
return (
<div>
<table className="border-separate border-spacing-y-1 w-full">
<thead className={cn('bg-white')}>
<thead className={cn('bg-white sticky top-0 z-10')}>
{table.getHeaderGroups().map((headerGroup) => (
<tr key={headerGroup.id} className="h-8.5">
{headerGroup.headers.map((header) => (
Expand Down
5 changes: 4 additions & 1 deletion libs/bublik/features/run-import/src/lib/import-events-table/import-event-table.container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ export const ImportEventsTableContainer = (props: PropsWithChildren) => {
</div>
</div>
<div
className={cn('flex flex-col', isFetching && 'opacity-40 select-none')}
className={cn(
'flex flex-col overflow-auto flex-grow',
isFetching && 'opacity-40 select-none'
)}
>
{isLoading ? (
<ImportEventTableLoading />
Expand Down
Loading