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

Upgrade Antd to v4.24 #6865

Merged
merged 19 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Added support for remote Zarr datasets with a `datasource-properties.json` as created by the WEBKNOSSOS Python library. [#6879](https://github.com/scalableminds/webknossos/pull/6879)

### Changed
- Upgraded antd UI library to v4.24.8 [#6865](https://github.com/scalableminds/webknossos/pull/6865)

### Fixed
- Fixed a bug where N5 datasets reading with end-chunks that have a chunk size differing from the metadata-supplied chunk size would fail for some areas. [#6890](https://github.com/scalableminds/webknossos/pull/6890)
Expand Down
39 changes: 18 additions & 21 deletions frontend/javascripts/dashboard/dataset_view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ import {
import { PricingEnforcedButton } from "components/pricing_enforcers";
import { PricingPlanEnum } from "admin/organization/pricing_plan_utils";

const { Group: InputGroup } = Input;

type Props = {
user: APIUser;
context: DatasetCollectionContextValue;
Expand Down Expand Up @@ -181,22 +179,20 @@ function DatasetView(props: Props) {
</Radio>
);

const filterMenu = (
<Menu
onClick={() => {}}
items={[
{ label: createFilteringModeRadio("showAllDatasets", "Show all datasets"), key: "all" },
{
label: createFilteringModeRadio("onlyShowReported", "Only show available datasets"),
key: "available",
},
{
label: createFilteringModeRadio("onlyShowUnreported", "Only show missing datasets"),
key: "missing",
},
]}
/>
);
const filterMenu = {
items: [
{ label: createFilteringModeRadio("showAllDatasets", "Show all datasets"), key: "all" },
{
label: createFilteringModeRadio("onlyShowReported", "Only show available datasets"),
key: "available",
},
{
label: createFilteringModeRadio("onlyShowUnreported", "Only show missing datasets"),
key: "missing",
},
],
};

const searchBox = (
<Input
prefix={<SearchOutlined />}
Expand All @@ -214,16 +210,17 @@ function DatasetView(props: Props) {
const isUserAdminOrDatasetManagerOrTeamManager =
isUserAdminOrDatasetManager || Utils.isUserTeamManager(user);
const search = isUserAdminOrDatasetManager ? (
<InputGroup compact>
<Input.Group compact style={{ display: "flex" }}>
{searchBox}
<Dropdown overlay={filterMenu} trigger={["click"]}>

<Dropdown menu={filterMenu} trigger={["click"]}>
<Button>
<Badge dot={datasetFilteringMode !== "showAllDatasets"}>
<SettingOutlined />
</Badge>
</Button>
</Dropdown>
</InputGroup>
</Input.Group>
) : (
searchBox
);
Expand Down
5 changes: 2 additions & 3 deletions frontend/javascripts/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,12 @@ function LoggedInAvatar({
theme="dark"
subMenuCloseDelay={subMenuCloseDelay}
triggerSubMenuAction="click"
className="right-navbar"
items={[
{
key: "loggedMenu",
label: <UserInitials activeUser={activeUser} isMultiMember={isMultiMember} />,
style: {
padding: 0,
},
style: { padding: 0 },
children: [
{
key: "userName",
Expand Down
3 changes: 2 additions & 1 deletion frontend/stylesheets/antd_overwrites.less
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ label.ant-checkbox-wrapper {
border-bottom: none;
}

.collapsed-nav-header {
.collapsed-nav-header .ant-menu:not(.right-navbar) {

.ant-menu-item,
.ant-menu-submenu-title,
li.ant-menu-submenu {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"@types/three": "^0.142.0",
"@use-it/interval": "^1.0.0",
"ansi-to-react": "^6.1.6",
"antd": "^4.23.6",
"antd": "^4.24.8",
"backbone-events-standalone": "^0.2.7",
"ball-morphology": "^0.1.0",
"base64-js": "^1.2.1",
Expand Down
Loading