Skip to content

fix: make adhoc table fit width #1591

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
merged 8 commits into from
Oct 9, 2022
Merged

fix: make adhoc table fit width #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eecb3c6
fix: make adhoc table fit width
dogfrogfog Oct 4, 2022
e81a251
change date format
dogfrogfog Oct 5, 2022
5cbda24
feat: add suffix column
dogfrogfog Oct 5, 2022
66189a6
add todo comments
dogfrogfog Oct 5, 2022
12ea126
fix: minutes format
dogfrogfog Oct 5, 2022
de68547
fix: remove suffix column
dogfrogfog Oct 5, 2022
c3d0207
fix: change time format to 12h
dogfrogfog Oct 5, 2022
d009f6d
fix: increase time column width
dogfrogfog Oct 5, 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
20 changes: 16 additions & 4 deletions webapp/javascript/components/FileList.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,25 @@ $tdHeight: 25px;
}

&:last-child {
width: 400px;
min-width: 400px;
max-width: 400px;
text-align: right;
width: 250px;
min-width: 250px;
max-width: 250px;
padding: 0px 10px;
}
}

.profileName {
display: flex;
align-items: center;

span {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
width: calc(100% - 30px);
margin-right: 10px;
}
}
}
}

Expand Down
15 changes: 11 additions & 4 deletions webapp/javascript/components/FileList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useMemo } from 'react';
import { format, parseISO } from 'date-fns';

import { Maybe } from '@webapp/util/fp';
import { AllProfiles } from '@webapp/models/adhoc';
Expand Down Expand Up @@ -29,17 +30,23 @@ const getBodyRows = (
(profId) => profId === profile.id
);

const date = parseISO(profile.updatedAt);
const timeString = `${format(date, 'MMM d, yyyy')} at ${format(
date,
'h:mm a'
)}`;

acc.push({
cells: [
{
value: (
<>
{profile.name}
<div className={styles.profileName}>
<span title={profile.name}>{profile.name}</span>
{isRowSelected && <CheckIcon className={styles.checkIcon} />}
</>
</div>
),
},
{ value: profile.updatedAt },
{ value: timeString },
],
onClick: () => {
// Optimize to not reload the same one
Expand Down
1 change: 1 addition & 0 deletions webapp/javascript/ui/Table.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.table {
width: 100%;
table-layout: fixed;

thead th {
&.sortable {
Expand Down