Cypress. New organization pipeline.

.github/workflows/main.yml

@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3', 'actions_objects', 'actions_objects2', 'actions_users', 'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2', 'issues_prs', 'issues_prs2']
+        specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3', 'actions_objects', 'actions_objects2', 'actions_users', 'actions_projects_models', 'actions_organizations', 'canvas3d_functionality', 'canvas3d_functionality_2', 'issues_prs', 'issues_prs2']
     steps:
       - uses: actions/checkout@v2
       - name: Getting SHA from the default branch
@@ -193,16 +193,16 @@ jobs:
           npm ci
           if [[ ${{ github.ref }} == 'refs/heads/develop' ]]; then
             if [ ${{ matrix.specs }} == 'canvas3d_functionality' ] || [ ${{ matrix.specs }} == 'canvas3d_functionality_2' ]; then
-              npx cypress run --headed --browser chrome --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects.js'
+              npx cypress run --headed --browser chrome --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js'
             else
-              npx cypress run --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects.js'
+              npx cypress run --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js'
             fi
             mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json
           else
             if [ ${{ matrix.specs }} == 'canvas3d_functionality' ] || [ ${{ matrix.specs }} == 'canvas3d_functionality_2' ]; then
-              npx cypress run --headed --browser chrome --env coverage=false --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects.js'
+              npx cypress run --headed --browser chrome --env coverage=false --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js'
             else
-              npx cypress run --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects.js'
+              npx cypress run --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js'
             fi
           fi
       - name: Creating a log file from "cvat" container logs

cvat-ui/src/components/header/header.tsx

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Intel Corporation
+// Copyright (C) 2020-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -266,11 +266,11 @@ function HeaderContainer(props: Props): JSX.Element {
                 icon={organizationsFetching ? <LoadingOutlined /> : <TeamOutlined />}
             >
                 {currentOrganization ? (
-                    <Menu.Item icon={<SettingOutlined />} key='open_organization' onClick={() => history.push('/organization')}>
+                    <Menu.Item icon={<SettingOutlined />} key='open_organization' onClick={() => history.push('/organization')} className='cvat-header-menu-open-organization'>
                         Settings
                     </Menu.Item>
                 ) : null}
-                <Menu.Item icon={<PlusOutlined />} key='create_organization' onClick={() => history.push('/organizations/create')}>Create</Menu.Item>
+                <Menu.Item icon={<PlusOutlined />} key='create_organization' onClick={() => history.push('/organizations/create')} className='cvat-header-menu-create-organization'>Create</Menu.Item>
                 { organizationsList.length > 5 ? (
                     <Menu.Item
                         key='switch_organization'
@@ -315,7 +315,8 @@ function HeaderContainer(props: Props): JSX.Element {
                         <Menu.Divider />
                         <Menu.ItemGroup>
                             <Menu.Item
-                                className={!currentOrganization ? 'cvat-header-menu-active-organization-item' : ''}
+                                className={!currentOrganization ?
+                                    'cvat-header-menu-active-organization-item' : 'cvat-header-menu-organization-item'}
                                 key='$personal'
                                 onClick={resetOrganization}
                             >
@@ -324,7 +325,7 @@ function HeaderContainer(props: Props): JSX.Element {
                             {organizationsList.map((organization: any): JSX.Element => (
                                 <Menu.Item
                                     className={currentOrganization?.slug === organization.slug ?
-                                        'cvat-header-menu-active-organization-item' : ''}
+                                        'cvat-header-menu-active-organization-item' : 'cvat-header-menu-organization-item'}
                                     key={organization.slug}
                                     onClick={() => setNewOrganization(organization)}
                                 >
@@ -475,13 +476,15 @@ function HeaderContainer(props: Props): JSX.Element {
                         <UserOutlined className='cvat-header-dropdown-icon' />
                         <Row>
                             <Col span={24}>
-                                <Text strong>
+                                <Text strong className='cvat-header-menu-user-dropdown-user'>
                                     {user.username.length > 14 ? `${user.username.slice(0, 10)} ...` : user.username}
                                 </Text>
                             </Col>
                             { currentOrganization ? (
                                 <Col span={24}>
-                                    <Text>{currentOrganization.slug}</Text>
+                                    <Text className='cvat-header-menu-user-dropdown-organization'>
+                                        {currentOrganization.slug}
+                                    </Text>
                                 </Col>
                             ) : null }
                         </Row>

cvat-ui/src/components/organization-page/member-item.tsx

@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2021-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -65,6 +65,7 @@ function MemberItem(props: Props): JSX.Element {
                     <CloseOutlined
                         onClick={() => {
                             Modal.confirm({
+                                className: 'cvat-modal-organization-member-remove',
                                 title: `You are removing "${username}" from this organization`,
                                 content: 'The person will not have access to the organization data anymore. Continue?',
                                 okText: 'Yes, remove',

cvat-ui/src/components/organization-page/top-bar.tsx

@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2021-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -194,6 +194,7 @@ function OrganizationTopBar(props: Props): JSX.Element {
                                         onOk: () => {
                                             dispatch(leaveOrganizationAsync(organizationInstance));
                                         },
+                                        className: 'cvat-modal-organization-leave-confirm',
                                         content: (
                                             <>
                                                 <Text>Please, confirm leaving the organization</Text>
@@ -260,6 +261,7 @@ function OrganizationTopBar(props: Props): JSX.Element {
                 </Col>
             </Row>
             <Modal
+                className='cvat-organization-invitation-modal'
                 visible={visibleInviteModal}
                 onCancel={() => {
                     setVisibleInviteModal(false);
@@ -294,6 +296,7 @@ function OrganizationTopBar(props: Props): JSX.Element {
                                     <Row className='cvat-organization-invitation-field' key={field.key}>
                                         <Col span={10}>
                                             <Form.Item
+                                                className='cvat-organization-invitation-field-email'
                                                 hasFeedback
                                                 name={[field.name, 'email']}
                                                 fieldKey={[field.fieldKey, 'email']}
@@ -307,6 +310,7 @@ function OrganizationTopBar(props: Props): JSX.Element {
                                         </Col>
                                         <Col span={10} offset={1}>
                                             <Form.Item
+                                                className='cvat-organization-invitation-field-role'
                                                 name={[field.name, 'role']}
                                                 fieldKey={[field.fieldKey, 'role']}
                                                 initialValue='worker'

tests/cypress.json

@@ -21,6 +21,7 @@
     "issues_prs2/**/*.js",
     "actions_users/**/*.js",
     "actions_projects_models/**/*.js",
-    "remove_users_tasks_projects.js"
+    "actions_organizations/**/*.js",
+    "remove_users_tasks_projects_organizations.js"
   ]
 }