Added error handling if organizations request is failed

changelog.d/20231026_141231_sekachev.bs_additional_org_receive_check.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- There is no switcher to personal workspace if an organization request failed
+  (<https://github.com/opencv/cvat/pull/7063>)

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

@@ -28,6 +28,7 @@ import Menu from 'antd/lib/menu';
 import Dropdown from 'antd/lib/dropdown';
 import Modal from 'antd/lib/modal';
 import Text from 'antd/lib/typography/Text';
+import notification from 'antd/lib/notification';
 
 import config from 'config';
 
@@ -169,6 +170,12 @@ function HeaderComponent(props: Props): JSX.Element {
             if (isMounted()) {
                 setOrganizationList(organizations);
             }
+        }).catch((error: unknown) => {
+            setOrganizationList([]);
+            notification.error({
+                message: 'Could not receive a list of organizations',
+                description: error instanceof Error ? error.message : '',
+            });
         });
     }, []);
 

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

@@ -6,6 +6,7 @@ import './styles.scss';
 import _ from 'lodash';
 import React, { useEffect, useState } from 'react';
 import AutoComplete from 'antd/lib/auto-complete';
+import notification from 'antd/lib/notification';
 
 import { Organization } from 'cvat-core-wrapper';
 
@@ -25,6 +26,12 @@ function OrganizationsSearch(props: {
         if (searchPhrase) {
             searchOrganizations(searchPhrase).then((organizations) => {
                 setSearchResults(organizations);
+            }).catch((error: unknown) => {
+                setSearchResults([]);
+                notification.error({
+                    message: 'Could not receive a list of organizations',
+                    description: error instanceof Error ? error.message : '',
+                });
             });
         }
     }, [searchPhrase]);

cvat/apps/organizations/views.py

@@ -67,9 +67,9 @@ class OrganizationViewSet(viewsets.GenericViewSet,
                    PartialUpdateModelMixin,
     ):
     queryset = Organization.objects.select_related('owner').all()
-    search_fields = ('name', 'owner')
-    filter_fields = list(search_fields) + ['id', 'slug']
-    simple_filters = list(search_fields) + ['slug']
+    search_fields = ('name', 'owner', 'slug')
+    filter_fields = list(search_fields) + ['id']
+    simple_filters = list(search_fields)
     lookup_fields = {'owner': 'owner__username'}
     ordering_fields = list(filter_fields)
     ordering = '-id'

cvat/schema.yml

@@ -3113,7 +3113,7 @@ paths:
 
           Details about the syntax used can be found at the link: https://jsonlogic.com/
 
-           Available filter_fields: ['name', 'owner', 'id', 'slug'].
+           Available filter_fields: ['name', 'owner', 'slug', 'id'].
         schema:
           type: string
       - name: name
@@ -3141,7 +3141,8 @@ paths:
       - name: search
         required: false
         in: query
-        description: 'A search term. Available search_fields: (''name'', ''owner'')'
+        description: 'A search term. Available search_fields: (''name'', ''owner'',
+          ''slug'')'
         schema:
           type: string
       - name: slug
@@ -3153,7 +3154,7 @@ paths:
         required: false
         in: query
         description: 'Which field to use when ordering the results. Available ordering_fields:
-          [''name'', ''owner'', ''id'', ''slug'']'
+          [''name'', ''owner'', ''slug'', ''id'']'
         schema:
           type: string
       tags: