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

Make tables horizontally scrollable on overflow and add wordbreak in tables #4136

Merged
merged 16 commits into from
Jul 4, 2019
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c8476ce
made antd tables scrollable and added wordbreak for them;
MichaelBuessemeyer Jun 17, 2019
bc8f8a9
Merge branch 'master' of github.com:scalableminds/webknossos into mak…
MichaelBuessemeyer Jun 20, 2019
2b55630
change color of the dataset name in the table back to black/grey
MichaelBuessemeyer Jun 20, 2019
62450f1
Updated the changelog
MichaelBuessemeyer Jun 20, 2019
dc76ec5
Merge branch 'master' of github.com:scalableminds/webknossos into mak…
MichaelBuessemeyer Jun 20, 2019
5506230
Merge branch 'master' into make-tables-scrollable
MichaelBuessemeyer Jun 21, 2019
93df5c5
Merge branch 'master' of github.com:scalableminds/webknossos into mak…
MichaelBuessemeyer Jun 27, 2019
24a3169
apllying fix only to dataset table & set min width
MichaelBuessemeyer Jun 27, 2019
94ab418
Merge branch 'make-tables-scrollable' of github.com:scalableminds/web…
MichaelBuessemeyer Jun 27, 2019
fea8478
Merge branch 'master' into make-tables-scrollable
MichaelBuessemeyer Jun 27, 2019
c00ac34
Merge branch 'master' of github.com:scalableminds/webknossos into mak…
MichaelBuessemeyer Jun 28, 2019
78c759f
also apply table scroll fix to explorative annotations table
MichaelBuessemeyer Jun 28, 2019
92a8261
Merge branch 'make-tables-scrollable' of github.com:scalableminds/web…
MichaelBuessemeyer Jun 28, 2019
2c1652d
Update CHANGELOG.md
MichaelBuessemeyer Jul 2, 2019
e275b75
Update CHANGELOG.md
MichaelBuessemeyer Jul 2, 2019
d9954ea
Merge branch 'master' into make-tables-scrollable
MichaelBuessemeyer Jul 2, 2019
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
- Added the possbility to enforce a certain magnification range for tasks (can be configured in the corresponding task type). [#4101](https://github.com/scalableminds/webknossos/pull/4101)
- Added the possibility for admins to add experience domains while creating new tasks. [#4119](https://github.com/scalableminds/webknossos/pull/4119)
- Added a histogram to the dataset settings for each layer. It simplifies adjusting the brightness and contrast of a layer and replaces the brightness and contrast slider. [#4105](https://github.com/scalableminds/webknossos/pull/4105)
- The dataset table in the dashboard is now horizontally scrollable if the window is not wide enough. Additionally, clicking on the name of a dataset in the table opens of the dataset in view mode. [#4136](https://github.com/scalableminds/webknossos/pull/4136)
MichaelBuessemeyer marked this conversation as resolved.
Show resolved Hide resolved

### Changed
-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { Table, Icon, Tag } from "antd";
import * as React from "react";
import _ from "lodash";
import { Link } from "react-router-dom";
import dice from "dice-coefficient";

import type { APITeam, APIMaybeUnimportedDataset } from "admin/api_flow_types";
Expand Down Expand Up @@ -154,7 +155,13 @@ class DatasetTable extends React.PureComponent<Props, State> {
sortOrder={sortedInfo.columnKey === "name" && sortedInfo.order}
render={(name: string, dataset: APIMaybeUnimportedDataset) => (
<div>
{dataset.name}
<Link
to={`/datasets/${dataset.owningOrganization}/${dataset.name}/view`}
title="View Dataset"
style={{ color: "rgba(0, 0, 0, 0.65)" }}
>
{dataset.name}
</Link>
<br />
<Tag color={stringToColor(dataset.dataStore.name)}>{dataset.dataStore.name}</Tag>
</div>
Expand Down
4 changes: 4 additions & 0 deletions frontend/stylesheets/antd_overwrites.less
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
.ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-tbody > tr > td {
padding: 1px 8px;
}
.ant-table {
overflow: auto;
word-break: break-word;
}

label.ant-checkbox-wrapper {
line-height: 1.5;
Expand Down