[GSoC2024] Enhancement of empty list components (cvat-ai#7659)

### Motivation and context Fixes cvat-ai#7657 Made all of the empty-list components ui consistent. ### Checklist - [x] I have created a changelog fragment  - [x] I submit my changes into the `develop` branch - [x] I have linked related issues (see [GitHub docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) ### License - [x] I submit _my code changes_ under the same [MIT License]( https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern. --------- Co-authored-by: syedbarimanjan <[email protected]> Co-authored-by: Boris Sekachev <[email protected]> Co-authored-by: Kirill Lakhov <[email protected]>
summeroff · Apr 5, 2024 · f1db0fd · f1db0fd
1 parent 6c57c03
commit f1db0fd
Show file tree

Hide file tree

Showing 22 changed files with 226 additions and 163 deletions.
diff --git a/changelog.d/20240403_153414_syedbarimnajan_empty_list_components.md b/changelog.d/20240403_153414_syedbarimnajan_empty_list_components.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Standardize the alignment of empty-list components
+  (<https://github.com/opencv/cvat/pull/7659>)
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.63.5",
+  "version": "1.63.6",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/cvat-ui/src/components/cloud-storages-page/cloud-storages-list.tsx b/cvat-ui/src/components/cloud-storages-page/cloud-storages-list.tsx
@@ -1,4 +1,5 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -7,6 +8,7 @@ import Pagination from 'antd/lib/pagination';
 import { Row, Col } from 'antd/lib/grid';
 
 import { CloudStorage } from 'reducers';
+import dimensions from 'utils/dimensions';
 import CloudStorageItemComponent from './cloud-storage-item';
 
 interface Props {
@@ -36,7 +38,7 @@ export default function StoragesList(props: Props): JSX.Element {
     return (
         <>
             <Row justify='center' align='middle'>
-                <Col span={24} className='cvat-cloud-storages-list'>
+                <Col {...dimensions} className='cvat-cloud-storages-list'>
                     {groupedStorages.map(
                         (instances: CloudStorage[]): JSX.Element => (
                             <Row key={instances[0].id} gutter={[8, 8]}>

diff --git a/cvat-ui/src/components/cloud-storages-page/cloud-storages-page.tsx b/cvat-ui/src/components/cloud-storages-page/cloud-storages-page.tsx
@@ -1,19 +1,21 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import './styles.scss';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router';
 import { useDispatch, useSelector } from 'react-redux';
-import { Row, Col } from 'antd/lib/grid';
+import { Row } from 'antd/lib/grid';
 import Spin from 'antd/lib/spin';
 
-import { CombinedState, Indexable } from 'reducers';
+import { CloudStoragesQuery, CombinedState, Indexable } from 'reducers';
 import { getCloudStoragesAsync } from 'actions/cloud-storage-actions';
 import { updateHistoryFromQuery } from 'components/resource-sorting-filtering';
+import { anySearch } from 'utils/any-search';
 import CloudStoragesListComponent from './cloud-storages-list';
-import EmptyCloudStorageListComponent from './empty-cloud-storages-list';
+import EmptyListComponent from './empty-list';
 import TopBarComponent from './top-bar';
 
 export default function StoragesPageComponent(): JSX.Element {
@@ -57,15 +59,8 @@ export default function StoragesPageComponent(): JSX.Element {
         [query],
     );
 
-    const dimensions = {
-        md: 22,
-        lg: 18,
-        xl: 16,
-        xxl: 16,
-    };
+    const isAnySearch = anySearch<CloudStoragesQuery>(query);
 
-    const anySearch = Object.keys(query)
-        .some((value: string) => value !== 'page' && (query as any)[value] !== null);
     const content = current.length ? (
         <CloudStoragesListComponent
             totalCount={totalCount}
@@ -74,48 +69,46 @@ export default function StoragesPageComponent(): JSX.Element {
             onChangePage={onChangePage}
         />
     ) : (
-        <EmptyCloudStorageListComponent notFound={anySearch} />
+        <EmptyListComponent notFound={isAnySearch} />
     );
 
     return (
-        <Row className='cvat-cloud-storages-page' justify='center' align='top'>
-            <Col {...dimensions}>
-                <TopBarComponent
-                    onApplySearch={(_search: string | null) => {
-                        dispatch(
-                            getCloudStoragesAsync({
-                                ...query,
-                                search: _search,
-                                page: 1,
-                            }),
-                        );
-                    }}
-                    onApplyFilter={(filter: string | null) => {
-                        dispatch(
-                            getCloudStoragesAsync({
-                                ...query,
-                                filter,
-                                page: 1,
-                            }),
-                        );
-                    }}
-                    onApplySorting={(sorting: string | null) => {
-                        dispatch(
-                            getCloudStoragesAsync({
-                                ...query,
-                                sort: sorting,
-                                page: 1,
-                            }),
-                        );
-                    }}
-                    query={updatedQuery}
-                />
-                { fetching ? (
-                    <Row className='cvat-cloud-storages-page' justify='center' align='middle'>
-                        <Spin size='large' />
-                    </Row>
-                ) : content }
-            </Col>
-        </Row>
+        <div className='cvat-cloud-storages-page'>
+            <TopBarComponent
+                onApplySearch={(_search: string | null) => {
+                    dispatch(
+                        getCloudStoragesAsync({
+                            ...query,
+                            search: _search,
+                            page: 1,
+                        }),
+                    );
+                }}
+                onApplyFilter={(filter: string | null) => {
+                    dispatch(
+                        getCloudStoragesAsync({
+                            ...query,
+                            filter,
+                            page: 1,
+                        }),
+                    );
+                }}
+                onApplySorting={(sorting: string | null) => {
+                    dispatch(
+                        getCloudStoragesAsync({
+                            ...query,
+                            sort: sorting,
+                            page: 1,
+                        }),
+                    );
+                }}
+                query={updatedQuery}
+            />
+            { fetching ? (
+                <Row className='cvat-cloud-storages-page' justify='center' align='middle'>
+                    <Spin size='large' />
+                </Row>
+            ) : content }
+        </div>
     );
 }
diff --git a/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx b/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx
diff --git a/cvat-ui/src/components/cloud-storages-page/empty-list.tsx b/cvat-ui/src/components/cloud-storages-page/empty-list.tsx
@@ -0,0 +1,49 @@
+// Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import React from 'react';
+
+import Empty from 'antd/lib/empty';
+import { Row, Col } from 'antd/lib/grid';
+import Text from 'antd/lib/typography/Text';
+import { CloudOutlined } from '@ant-design/icons';
+import { Link } from 'react-router-dom';
+
+interface Props {
+    notFound: boolean;
+}
+
+export default function EmptyListComponent(props: Props): JSX.Element {
+    const { notFound } = props;
+
+    return (
+        <div className='cvat-empty-cloud-storages-list'>
+            <Empty
+                description={notFound ? (
+                    <Text strong>No results matched your search...</Text>
+                ) : (
+                    <>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Text strong>No cloud storages attached yet...</Text>
+                            </Col>
+                        </Row>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Text type='secondary'>To get started with your cloud storage</Text>
+                            </Col>
+                        </Row>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Link to='/cloudstorages/create'>attach a new one</Link>
+                            </Col>
+                        </Row>
+                    </>
+                )}
+                image={notFound ? Empty.PRESENTED_IMAGE_DEFAULT : <CloudOutlined className='cvat-empty-cloud-storages-list-icon' />}
+            />
+        </div>
+    );
+}
diff --git a/cvat-ui/src/components/cloud-storages-page/styles.scss b/cvat-ui/src/components/cloud-storages-page/styles.scss
@@ -1,13 +1,15 @@
 // Copyright (C) 2021-2022 Intel Corporation
-// Copyright (C) 2022 CVAT.ai Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
-@import '../../base.scss';
+@import '../../base';
 
 .cvat-cloud-storages-page {
-    padding: $grid-unit-size * 2;
+    padding-top: $grid-unit-size * 2;
+    padding-bottom: $grid-unit-size;
     height: 100%;
+    width: 100%;
     overflow: auto;
 
     .ant-spin {
@@ -56,7 +58,14 @@
 
 .cvat-cloud-storages-list,
 .cvat-empty-cloud-storages-list {
-    margin-top: $grid-unit-size * 2;
+    margin-top: $grid-unit-size;
+
+    .ant-empty {
+        top: 50%;
+        left: 50%;
+        position: absolute;
+        transform: translate(-50%, -50%);
+    }
 }
 
 .cvat-cloud-storage-item {

diff --git a/cvat-ui/src/components/cloud-storages-page/top-bar.tsx b/cvat-ui/src/components/cloud-storages-page/top-bar.tsx
@@ -1,4 +1,5 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -12,6 +13,8 @@ import { CloudStoragesQuery } from 'reducers';
 import Input from 'antd/lib/input';
 import { SortingComponent, ResourceFilterHOC, defaultVisibility } from 'components/resource-sorting-filtering';
 
+import dimensions from 'utils/dimensions';
+
 import {
     localStorageRecentKeyword, localStorageRecentCapacity,
     predefinedFilterValues, config,
@@ -36,8 +39,8 @@ export default function StoragesTopBar(props: Props): JSX.Element {
     const [visibility, setVisibility] = useState(defaultVisibility);
 
     return (
-        <Row justify='space-between' align='middle' className='cvat-cloud-storages-list-top-bar'>
-            <Col span={24}>
+        <Row justify='center' align='middle' className='cvat-cloud-storages-list-top-bar'>
+            <Col {...dimensions}>
                 <div className='cvat-cloudstorages-page-filters-wrapper'>
                     <Input.Search
                         enterButton

diff --git a/cvat-ui/src/components/invitations-page/invitations-list.tsx b/cvat-ui/src/components/invitations-page/invitations-list.tsx
@@ -10,10 +10,9 @@ import Pagination from 'antd/lib/pagination';
 import { CombinedState, InvitationsQuery } from 'reducers';
 import { Invitation } from 'cvat-core/src/organization';
 import { acceptInvitationAsync, getInvitationsAsync, declineInvitationAsync } from 'actions/invitations-actions';
+import dimensions from 'utils/dimensions';
 import InvitationItem from './invitation-item';
 
-import dimensions from '../projects-page/dimensions';
-
 interface Props {
     query: InvitationsQuery;
 }

diff --git a/cvat-ui/src/components/jobs-page/empty-list.tsx b/cvat-ui/src/components/jobs-page/empty-list.tsx
@@ -0,0 +1,49 @@
+// Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import React from 'react';
+import { Link } from 'react-router-dom';
+import Text from 'antd/lib/typography/Text';
+import { Row, Col } from 'antd/lib/grid';
+
+import Empty from 'antd/lib/empty';
+
+interface Props {
+    notFound: boolean;
+}
+
+function EmptyListComponent(props: Props): JSX.Element {
+    const { notFound } = props;
+
+    return (
+        <div className='cvat-empty-jobs-list'>
+            <Empty description={notFound ?
+                (<Text strong>No results matched your search...</Text>) : (
+                    <>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Text strong>No jobs created yet...</Text>
+                            </Col>
+                        </Row>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Text type='secondary'>To get started with your annotation project</Text>
+                            </Col>
+                        </Row>
+                        <Row justify='center' align='middle'>
+                            <Col>
+                                <Link to='/tasks/create'>create a new task</Link>
+                                <Text type='secondary'> or try to </Text>
+                                <Link to='/projects/create'>create a new project</Link>
+                            </Col>
+                        </Row>
+                    </>
+                )}
+            />
+        </div>
+    );
+}
+
+export default React.memo(EmptyListComponent);