From 360da5aa3967efa90ca7866c23795f37cf9c4941 Mon Sep 17 00:00:00 2001
From: Iukou Siarhei <45054016+BlazarQSO@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:48:17 +0300
Subject: [PATCH] =?UTF-8?q?EPMRPP-98477=20||=20No=20results=20found=20is?=
 =?UTF-8?q?=20displayed=20instead=20of=20No=20assignmen=E2=80=A6=20(#4155)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* EPMRPP-98477 || No results found is displayed instead of No assignments in the popover

* EPMRPP-98477 || Code Review fix - 1
---
 app/localization/translated/be.json                    |  1 +
 app/localization/translated/es.json                    |  1 +
 app/localization/translated/ru.json                    |  1 +
 app/localization/translated/uk.json                    |  1 +
 app/localization/translated/zh.json                    |  1 +
 .../organizationsPopover/organizationsPopover.jsx      | 10 ++++++++--
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
index f79a35cb8d..792919dddc 100644
--- 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
index 8a3397b1db..97b038586e 100644
--- 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
index 4cd32f3eee..150d366075 100644
--- 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
index 2398384b98..0438e95710 100644
--- 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
index 65109004e7..4333680987 100644
--- 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
index d60441ab90..8b7e97398f 100644
--- 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>