Merge remote-tracking branch 'origin/develop' into az/fix_templates
Andrey Zhavoronkov
5 years ago
commit
6833ab05fc
@ -1,36 +0,0 @@
|
|||||||
// Copyright (C) 2020 Intel Corporation
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
|
|
||||||
import getCore from 'cvat-core-wrapper';
|
|
||||||
|
|
||||||
const core = getCore();
|
|
||||||
|
|
||||||
export enum UsersActionTypes {
|
|
||||||
GET_USERS = 'GET_USERS',
|
|
||||||
GET_USERS_SUCCESS = 'GET_USERS_SUCCESS',
|
|
||||||
GET_USERS_FAILED = 'GET_USERS_FAILED',
|
|
||||||
}
|
|
||||||
|
|
||||||
const usersActions = {
|
|
||||||
getUsers: () => createAction(UsersActionTypes.GET_USERS),
|
|
||||||
getUsersSuccess: (users: any[]) => createAction(UsersActionTypes.GET_USERS_SUCCESS, { users }),
|
|
||||||
getUsersFailed: (error: any) => createAction(UsersActionTypes.GET_USERS_FAILED, { error }),
|
|
||||||
};
|
|
||||||
|
|
||||||
export type UsersActions = ActionUnion<typeof usersActions>;
|
|
||||||
|
|
||||||
export function getUsersAsync(): ThunkAction {
|
|
||||||
return async (dispatch): Promise<void> => {
|
|
||||||
dispatch(usersActions.getUsers());
|
|
||||||
|
|
||||||
try {
|
|
||||||
const users = await core.users.get();
|
|
||||||
const wrappedUsers = users.map((userData: any): any => new core.classes.User(userData));
|
|
||||||
dispatch(usersActions.getUsersSuccess(wrappedUsers));
|
|
||||||
} catch (error) {
|
|
||||||
dispatch(usersActions.getUsersFailed(error));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
// Copyright (C) 2020 Intel Corporation
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
import { BoundariesActionTypes, BoundariesActions } from 'actions/boundaries-actions';
|
|
||||||
import { AuthActionTypes, AuthActions } from 'actions/auth-actions';
|
|
||||||
import { UsersActionTypes, UsersActions } from 'actions/users-actions';
|
|
||||||
import { UsersState } from './interfaces';
|
|
||||||
|
|
||||||
const defaultState: UsersState = {
|
|
||||||
users: [],
|
|
||||||
fetching: false,
|
|
||||||
initialized: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function (
|
|
||||||
state: UsersState = defaultState,
|
|
||||||
action: UsersActions | AuthActions | BoundariesActions,
|
|
||||||
): UsersState {
|
|
||||||
switch (action.type) {
|
|
||||||
case UsersActionTypes.GET_USERS: {
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
fetching: true,
|
|
||||||
initialized: false,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
case UsersActionTypes.GET_USERS_SUCCESS:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
fetching: false,
|
|
||||||
initialized: true,
|
|
||||||
users: action.payload.users,
|
|
||||||
};
|
|
||||||
case UsersActionTypes.GET_USERS_FAILED:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
fetching: false,
|
|
||||||
initialized: true,
|
|
||||||
};
|
|
||||||
case BoundariesActionTypes.RESET_AFTER_ERROR:
|
|
||||||
case AuthActionTypes.LOGOUT_SUCCESS: {
|
|
||||||
return { ...defaultState };
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,126 @@
|
|||||||
|
// Copyright (C) 2020 Intel Corporation
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
|
||||||
|
import { taskName } from '../../support/const';
|
||||||
|
|
||||||
|
context('Group features', () => {
|
||||||
|
const caseId = '15';
|
||||||
|
const createRectangleShape2Points = {
|
||||||
|
points: 'By 2 Points',
|
||||||
|
type: 'Shape',
|
||||||
|
switchLabel: false,
|
||||||
|
firstX: 250,
|
||||||
|
firstY: 350,
|
||||||
|
secondX: 350,
|
||||||
|
secondY: 450,
|
||||||
|
};
|
||||||
|
const createRectangleShape2PointsSecond = {
|
||||||
|
points: 'By 2 Points',
|
||||||
|
type: 'Shape',
|
||||||
|
switchLabel: false,
|
||||||
|
firstX: createRectangleShape2Points.firstX + 300,
|
||||||
|
firstY: createRectangleShape2Points.firstY,
|
||||||
|
secondX: createRectangleShape2Points.secondX + 300,
|
||||||
|
secondY: createRectangleShape2Points.secondY,
|
||||||
|
};
|
||||||
|
const createRectangleTrack2Points = {
|
||||||
|
points: 'By 2 Points',
|
||||||
|
type: 'Track',
|
||||||
|
switchLabel: false,
|
||||||
|
firstX: 250,
|
||||||
|
firstY: 600,
|
||||||
|
secondX: 350,
|
||||||
|
secondY: 700,
|
||||||
|
};
|
||||||
|
const createRectangleTrack2PointsSecond = {
|
||||||
|
points: 'By 2 Points',
|
||||||
|
type: 'Track',
|
||||||
|
switchLabel: false,
|
||||||
|
firstX: createRectangleTrack2Points.firstX + 300,
|
||||||
|
firstY: createRectangleTrack2Points.firstY,
|
||||||
|
secondX: createRectangleTrack2Points.secondX + 300,
|
||||||
|
secondY: createRectangleTrack2Points.secondY,
|
||||||
|
};
|
||||||
|
|
||||||
|
let defaultGroupColor = '';
|
||||||
|
let shapesGroupColor = '';
|
||||||
|
let tracksGroupColor = '';
|
||||||
|
|
||||||
|
before(() => {
|
||||||
|
cy.openTaskJob(taskName);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe(`Testing case "${caseId}"`, () => {
|
||||||
|
it('Create two shapes and two tracks.', () => {
|
||||||
|
cy.createRectangle(createRectangleShape2Points);
|
||||||
|
cy.createRectangle(createRectangleShape2PointsSecond);
|
||||||
|
cy.createRectangle(createRectangleTrack2Points);
|
||||||
|
cy.createRectangle(createRectangleTrack2PointsSecond);
|
||||||
|
});
|
||||||
|
it('Set option "Color by" to "Group".', () => {
|
||||||
|
cy.changeAppearance('Group');
|
||||||
|
cy.get('.cvat_canvas_shape').then($listCanvasShapes => {
|
||||||
|
for (let i=0; i<$listCanvasShapes.length; i++) {
|
||||||
|
cy.get($listCanvasShapes[i]).should('have.css', 'fill').then($fill => {
|
||||||
|
defaultGroupColor = $fill;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cy.get('.cvat-objects-sidebar-state-item').then($listObjectsSidebarStateItem => {
|
||||||
|
for (let i=0; i<$listObjectsSidebarStateItem.length; i++) {
|
||||||
|
cy.get($listObjectsSidebarStateItem[i]).should('have.css', 'background-color').then($bColorObjectsSidebarStateItem => {
|
||||||
|
// expected rgba(224, 224, 224, 0.533) to include [ 224, 224, 224, index: 4, input: 'rgb(224, 224, 224)', groups: undefined ]
|
||||||
|
expect($bColorObjectsSidebarStateItem).contain(defaultGroupColor.match(/\d+, \d+, \d+/));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
it('With group button unite two shapes. They have corresponding colors.', () => {
|
||||||
|
cy.get('.cvat-group-control').click();
|
||||||
|
for (const shapeToGroup of ['#cvat_canvas_shape_1', '#cvat_canvas_shape_2']) {
|
||||||
|
cy.get(shapeToGroup).click();
|
||||||
|
}
|
||||||
|
cy.get('.cvat-group-control').click();
|
||||||
|
for (const groupedShape of ['#cvat_canvas_shape_1', '#cvat_canvas_shape_2']) {
|
||||||
|
cy.get(groupedShape).should('have.css', 'fill').then($shapesGroupColor => {
|
||||||
|
// expected rgb(250, 50, 83) to not equal rgb(224, 224, 224)
|
||||||
|
expect($shapesGroupColor).to.not.equal(defaultGroupColor);
|
||||||
|
shapesGroupColor = $shapesGroupColor;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const objectSideBarShape of ['#cvat-objects-sidebar-state-item-1', '#cvat-objects-sidebar-state-item-2']) {
|
||||||
|
cy.get(objectSideBarShape).should('have.css', 'background-color').then($bColorobjectSideBarShape => {
|
||||||
|
// expected rgba(250, 50, 83, 0.533) to not include [ 224, 224, 224, index: 4, input: 'rgb(224, 224, 224)', groups: undefined ]
|
||||||
|
expect($bColorobjectSideBarShape).to.not.contain(defaultGroupColor.match(/\d+, \d+, \d+/));
|
||||||
|
// expected rgba(250, 50, 83, 0.533) to include [ 250, 50, 83, index: 4, input: 'rgb(250, 50, 83)', groups: undefined ]
|
||||||
|
expect($bColorobjectSideBarShape).to.be.contain(shapesGroupColor.match(/\d+, \d+, \d+/));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
it('With group button unite two track. They have corresponding colors.', () => {
|
||||||
|
cy.get('.cvat-group-control').click();
|
||||||
|
for (const trackToGroup of ['#cvat_canvas_shape_3', '#cvat_canvas_shape_4']) {
|
||||||
|
cy.get(trackToGroup).click();
|
||||||
|
}
|
||||||
|
cy.get('.cvat-group-control').click();
|
||||||
|
for (const groupedTrack of ['#cvat_canvas_shape_3', '#cvat_canvas_shape_4']) {
|
||||||
|
cy.get(groupedTrack).should('have.css', 'fill').then($tracksGroupColor => {
|
||||||
|
// expected rgb(250, 50, 83) to not equal rgb(224, 224, 224)
|
||||||
|
expect($tracksGroupColor).to.not.equal(defaultGroupColor);
|
||||||
|
tracksGroupColor = $tracksGroupColor;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const objectSideBarTrack of ['#cvat-objects-sidebar-state-item-3', '#cvat-objects-sidebar-state-item-4']) {
|
||||||
|
cy.get(objectSideBarTrack).should('have.css', 'background-color').then($bColorobjectSideBarTrack => {
|
||||||
|
// expected rgba(52, 209, 183, 0.533) to not include [ 224, 224, 224, index: 4, input: 'rgb(224, 224, 224)', groups: undefined ]
|
||||||
|
expect($bColorobjectSideBarTrack).to.not.contain(defaultGroupColor.match(/\d+, \d+, \d+/));
|
||||||
|
// expected rgba(52, 209, 183, 0.533) to include [ 52, 209, 183, index: 4, input: 'rgb(52, 209, 183)', groups: undefined ]
|
||||||
|
expect($bColorobjectSideBarTrack).to.be.contain(tracksGroupColor.match(/\d+, \d+, \d+/));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
Loading…
Reference in New Issue