EPMRPP-98477 || No results found is displayed instead of No assignmen… (

#4155) * EPMRPP-98477 || No results found is displayed instead of No assignments in the popover * EPMRPP-98477 || Code Review fix - 1
reportportal · Jan 14, 2025 · 360da5a · 360da5a
1 parent c2dafb5
commit 360da5a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
@@ -1544,6 +1544,7 @@
   "OrganizationsControl.all": "Усе",
   "OrganizationsControl.allOrganizations": "Усе арганізацыі",
   "OrganizationsControl.assignmentsList": "Прызначаны спіс",
+  "OrganizationsControl.noAssignments": "Ніякіх прызначэнняў",
   "OrganizationsControl.organization": "Арганізацыя",
   "OrganizationsFilter.lastRunDate": "Дата апошняга запуску",
   "OrganizationsFilter.lastRunDatePlaceholder": "Любая",

diff --git a/app/localization/translated/es.json b/app/localization/translated/es.json
@@ -1544,6 +1544,7 @@
   "OrganizationsControl.all": "All",
   "OrganizationsControl.allOrganizations": "All organizations",
   "OrganizationsControl.assignmentsList": "Assignments list",
+  "OrganizationsControl.noAssignments": "No assignments",
   "OrganizationsControl.organization": "Organization",
   "OrganizationsFilter.lastRunDate": "Last Run Date",
   "OrganizationsFilter.lastRunDatePlaceholder": "Any",

diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json
@@ -1544,6 +1544,7 @@
   "OrganizationsControl.all": "Все",
   "OrganizationsControl.allOrganizations": "Все организации",
   "OrganizationsControl.assignmentsList": "Назначенный список",
+  "OrganizationsControl.noAssignments": "Никаких назначений",
   "OrganizationsControl.organization": "Организация",
   "OrganizationsFilter.lastRunDate": "Дата последнего запуска",
   "OrganizationsFilter.lastRunDatePlaceholder": "Любой",

diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json
@@ -1544,6 +1544,7 @@
   "OrganizationsControl.all": "Всі",
   "OrganizationsControl.allOrganizations": "Всі організації",
   "OrganizationsControl.assignmentsList": "Призначений список",
+  "OrganizationsControl.noAssignments": "Ніяких призначень",
   "OrganizationsControl.organization": "Організація",
   "OrganizationsFilter.lastRunDate": "Last Run Date",
   "OrganizationsFilter.lastRunDatePlaceholder": "Будь-який",

diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json
@@ -1544,6 +1544,7 @@
   "OrganizationsControl.all": "All",
   "OrganizationsControl.allOrganizations": "All organizations",
   "OrganizationsControl.assignmentsList": "Assignments list",
+  "OrganizationsControl.noAssignments": "No assignments",
   "OrganizationsControl.organization": "组织",
   "OrganizationsFilter.lastRunDate": "Last Run Date",
   "OrganizationsFilter.lastRunDatePlaceholder": "Any",

diff --git a/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.jsx b/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.jsx
@@ -48,6 +48,10 @@ export const messages = defineMessages({
     id: 'OrganizationsControl.assignmentsList',
     defaultMessage: 'Assignments list',
   },
+  noAssignments: {
+    id: 'OrganizationsControl.noAssignments',
+    defaultMessage: 'No assignments',
+  },
 });
 
 export const OrganizationsPopover = ({ closePopover, closeSidebar }) => {
@@ -106,7 +110,7 @@ export const OrganizationsPopover = ({ closePopover, closeSidebar }) => {
   return (
     <div className={cx('organizations-popover')}>
       <div className={cx('organizations-search')}>
-        {filteredProjects.length > 0 && (
+        {availableProjects.length > 0 && (
           <ThemeProvider theme="dark">
             <FieldText
               startIcon={<SearchIcon />}
@@ -171,7 +175,9 @@ export const OrganizationsPopover = ({ closePopover, closeSidebar }) => {
           ))
         ) : (
           <div className={cx('organizations-empty-state')}>
-            {formatMessage(COMMON_LOCALE_KEYS.NO_RESULTS)}
+            {availableProjects.length > 0
+              ? formatMessage(COMMON_LOCALE_KEYS.NO_RESULTS)
+              : formatMessage(messages.noAssignments)}
           </div>
         )}
       </ScrollWrapper>