Merge branch 'develop' into quality-formulas

cvat-ai · Mar 21, 2024 · 387b720 · 387b720
2 parents c6a6228 + 1749002
commit 387b720
Show file tree

Hide file tree

Showing 6 changed files with 303 additions and 279 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "REST API tests: Attach to server",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -26,7 +26,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ annotation worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -46,7 +46,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ export worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -66,7 +66,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ import worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -86,7 +86,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ quality reports worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -106,7 +106,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ analytics reports worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -158,7 +158,7 @@
         },
         {
             "name": "server: django",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -196,7 +196,7 @@
         },
         {
             "name": "server: RQ - import",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -218,7 +218,7 @@
         },
         {
             "name": "server: RQ - export",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -240,7 +240,7 @@
         },
         {
             "name": "server: RQ - quality reports",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -262,7 +262,7 @@
         },
         {
             "name": "server: RQ - analytics reports",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -284,7 +284,7 @@
         },
         {
             "name": "server: RQ - scheduler",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -303,7 +303,7 @@
         },
         {
             "name": "server: RQ - annotation",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -322,7 +322,7 @@
         },
         {
             "name": "server: RQ - webhooks",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -341,7 +341,7 @@
         },
         {
             "name": "server: RQ - cleaning",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -363,7 +363,7 @@
         },
         {
             "name": "server: migrate",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -379,7 +379,7 @@
         },
         {
             "name": "server: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -399,7 +399,7 @@
         },
         {
             "name": "server: REST API tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -413,7 +413,7 @@
         },
         {
             "name": "sdk: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -427,7 +427,7 @@
         },
         {
             "name": "cli: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -441,7 +441,7 @@
         },
         {
             "name": "api client: Postprocess generator output",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -456,7 +456,7 @@
         },
         {
             "name": "docs: Postprocess SDK docs",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -471,7 +471,7 @@
         },
         {
             "name": "docs: Build docs",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -482,7 +482,7 @@
         },
         {
             "name": "server: Generate REST API Schema",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,

diff --git a/changelog.d/20240318_203856_kavikumarceo.md b/changelog.d/20240318_203856_kavikumarceo.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Incorrect alignment of empty job list component
+  (<https://github.com/opencv/cvat/pull/7621>)
diff --git a/cvat-ui/src/components/jobs-page/jobs-page.tsx b/cvat-ui/src/components/jobs-page/jobs-page.tsx
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 Intel Corporation
-// Copyright (C) 2023 CVAT.ai Corporation
+// Copyright (C) 2023-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -76,7 +76,18 @@ function JobsPageComponent(): JSX.Element {
                 </Col>
             </Row>
         </>
-    ) : <Empty description={<Text>No results matched your search...</Text>} />;
+    ) : (
+        <div className='cvat-empty-jobs-list'>
+            <Empty description={(
+                <Row justify='center' align='middle'>
+                    <Col>
+                        <Text>No results matched your search...</Text>
+                    </Col>
+                </Row>
+            )}
+            />
+        </div>
+    );
 
     return (
         <div className='cvat-jobs-page'>
@@ -110,9 +121,7 @@ function JobsPageComponent(): JSX.Element {
                     );
                 }}
             />
-            { fetching ? (
-                <Spin size='large' className='cvat-spinner' />
-            ) : content }
+            {fetching ? <Spin size='large' className='cvat-spinner' /> : content}
         </div>
     );
 }

diff --git a/cvat-ui/src/components/jobs-page/styles.scss b/cvat-ui/src/components/jobs-page/styles.scss
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 Intel Corporation
-// Copyright (C) 2022 CVAT.ai Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -12,23 +12,40 @@
     width: 100%;
     overflow: auto;
 
-    > div:nth-child(1) {
-        div > {
-            .cvat-title {
-                color: $text-color;
+    .cvat-jobs-page-top-bar {
+        > div {
+            display: flex;
+            justify-content: space-between;
+
+            > div {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%;
+
+                .cvat-jobs-page-search-bar {
+                    width: $grid-unit-size * 32;
+                    padding-left: $grid-unit-size * 0.5;
+                }
+
+                > div {
+                    > *:not(:last-child) {
+                        margin-right: $grid-unit-size;
+                    }
+
+                    display: flex;
+                }
             }
         }
     }
 
-    > div:nth-child(2) {
-        &.ant-empty {
+    .cvat-empty-jobs-list {
+        .ant-empty {
             position: absolute;
-            top: 40%;
+            top: 50%;
             left: 50%;
+            transform: translate(-50%, -50%);
         }
-
-        padding-bottom: $grid-unit-size;
-        padding-top: $grid-unit-size;
     }
 
     .cvat-job-page-list-item {
@@ -129,6 +146,8 @@
     .cvat-jobs-page-list {
         display: flex;
         flex-wrap: wrap;
+        padding-top: $grid-unit-size;
+        padding-bottom: $grid-unit-size;
     }
 
     .cvat-job-card-more-button {
@@ -138,30 +157,3 @@
         font-size: 16px;
     }
 }
-
-.cvat-jobs-page-top-bar {
-    > div {
-        display: flex;
-        justify-content: space-between;
-
-        > div {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            width: 100%;
-
-            .cvat-jobs-page-search-bar {
-                width: $grid-unit-size * 32;
-                padding-left: $grid-unit-size * 0.5;
-            }
-
-            > div {
-                > *:not(:last-child) {
-                    margin-right: $grid-unit-size;
-                }
-
-                display: flex;
-            }
-        }
-    }
-}