Skip to content

Commit

Permalink
Fixed copy job list feature (#3749)
Browse files Browse the repository at this point in the history
* Fixed copy job list feature

* Updated version & changelog
  • Loading branch information
Boris Sekachev committed Sep 30, 2021
1 parent 54ac8c0 commit 51ee7cb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Display a more user-friendly exception message (<https://github.com/openvinotoolkit/cvat/pull/3721>)
- Exception `DataCloneError: The object could not be cloned` (<https://github.com/openvinotoolkit/cvat/pull/3733>)
- Fixed extension comparison in task frames CLI (<https://github.com/openvinotoolkit/cvat/pull/3674>)
- Incorrect work when copy job list with "Copy" button (<https://github.com/openvinotoolkit/cvat/pull/3749>)

### Security

Expand Down
2 changes: 1 addition & 1 deletion cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.24.0",
"version": "1.24.1",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
9 changes: 2 additions & 7 deletions cvat-ui/src/components/task-page/job-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,8 @@ import moment from 'moment';
import copy from 'copy-to-clipboard';

import CVATTooltip from 'components/common/cvat-tooltip';

import getCore from 'cvat-core-wrapper';
import UserSelector, { User } from './user-selector';

const core = getCore();

const baseURL = core.config.backendAPI.slice(0, -7);

interface Props {
taskInstance: any;
onJobUpdate(jobInstance: any): void;
Expand Down Expand Up @@ -292,8 +286,9 @@ function JobListComponent(props: Props & RouteComponentProps): JSX.Element {
let serialized = '';
const [latestJob] = [...taskInstance.jobs].reverse();
for (const job of taskInstance.jobs) {
const baseURL = window.location.origin;
serialized += `Job #${job.id}`.padEnd(`${latestJob.id}`.length + 6, ' ');
serialized += `: ${baseURL}/?id=${job.id}`.padEnd(
serialized += `: ${baseURL}/tasks/${taskInstance.id}/jobs/${job.id}`.padEnd(
`${latestJob.id}`.length + baseURL.length + 8,
' ',
);
Expand Down

0 comments on commit 51ee7cb

Please sign in to comment.