Skip to content

Commit

Permalink
Merge branch 'develop' into bs/immediate_feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
bsekachev committed Jun 21, 2024
2 parents 7ab275f + 933fbb3 commit 4469d4d
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 20 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- scriv-insert-here -->

<a id='changelog-2.14.4'></a>
## \[2.14.4\] - 2024-06-20

### Added

- Polyline editing may be finished using corresponding shortcut
(<https://github.com/cvat-ai/cvat/pull/7922>)

### Changed

- Single shape annotation mode allows to modify/delete objects
(<https://github.com/cvat-ai/cvat/pull/8017>)

### Fixed

- Invalid server cache cleanup for backups and events (after #7864)
(<https://github.com/cvat-ai/cvat/pull/8040>)

- Filters by created date, updated date do not work on different pages (e.g. list of tasks or jobs)
(<https://github.com/cvat-ai/cvat/pull/8055>)

<a id='changelog-2.14.3'></a>
## \[2.14.3\] - 2024-06-13

Expand Down
4 changes: 0 additions & 4 deletions changelog.d/20240521_132410_krishavrajsingh_endPolyline.md

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/20240619_113143_boris_allow_editing_ssm.md

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/20240619_202033_sekachev.bs_fixed_issue_8054.md

This file was deleted.

6 changes: 3 additions & 3 deletions cvat-ui/src/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,11 @@ function HeaderComponent(props: Props): JSX.Element {
.map(({ component, weight }): typeof menuItems[0] => [component({ targetProps: props }), weight]),
);

const getButtonClassName = (value: string): string => {
const getButtonClassName = (value: string, highlightable = true): string => {
// eslint-disable-next-line security/detect-non-literal-regexp
const regex = new RegExp(`${value}$`);
const baseClass = `cvat-header-${value}-button cvat-header-button`;
return location.pathname.match(regex) ?
return highlightable && location.pathname.match(regex) ?
`${baseClass} cvat-active-header-button` : baseClass;
};

Expand Down Expand Up @@ -489,7 +489,7 @@ function HeaderComponent(props: Props): JSX.Element {
) : null}
{isAnalyticsPluginActive && user.isSuperuser ? (
<Button
className={getButtonClassName('analytics')}
className={getButtonClassName('analytics', false)}
type='link'
href='/analytics'
onClick={(event: React.MouseEvent): void => {
Expand Down

0 comments on commit 4469d4d

Please sign in to comment.