EPMRPP-96148 || Long organization name is not cut by ellipsis (#4054)

* EPMRPP-96148 || Long organization name is not cut by ellipsis * EPMRPP-96148 || Code Review fix - 1
reportportal · Oct 18, 2024 · 3cdc21b · 3cdc21b
1 parent 5716fdf
commit 3cdc21b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 9 deletions.
diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
@@ -1566,9 +1566,10 @@
   "OrganizationsPage.searchPlaceholder": "Пошук па назве",
   "OrganizationsPage.synchedOrganization": "Сінхранізаваная арганізацыя",
   "OrganizationsPage.lastLaunch": "Апошні запуск быў ажыццёўлены больш 3 месяцаў таму",
+  "OrganizationsPage.latestLaunch": "Апошняе выкананне запуску",
   "OrganizationsPage.organizationUsers": "Карыстальнікі арганізацыі",
   "OrganizationsPage.organizationProjects": "Арганізацыйныя праекты",
-  "OrganizationsPage.latestLaunch": "Апошняе выкананне запуску",
+  "OrganizationsPage.personalOrganization": "Асабістая арганізацыя",
   "OrganizationsPopover.allOrganizations": "Усе арганізацыі",
   "OrganizationsControl.assignmentsList": "Прызначаны спіс",
   "OverallStatisticsControls.ContentFieldsValidationError": "Абярыце па меншай меры адзін элемент",

diff --git a/app/localization/translated/es.json b/app/localization/translated/es.json
@@ -1557,9 +1557,10 @@
   "OrganizationsPage.searchPlaceholder": "Buscar por nombre",
   "OrganizationsPage.synchedOrganization": "Synched organization",
   "OrganizationsPage.lastLaunch": "The last launch was executed more than 3 months ago",
+  "OrganizationsPage.latestLaunch": "The latest launch execution",
   "OrganizationsPage.organizationUsers": "Organization users",
   "OrganizationsPage.organizationProjects": "Organization projects",
-  "OrganizationsPage.latestLaunch": "The latest launch execution",
+  "OrganizationsPage.personalOrganization": "Personal organization",
   "OrganizationsPopover.allOrganizations": "All organizatoins",
   "OrganizationsControl.assignmentsList": "Assignments list",
   "OverallStatisticsControls.ContentFieldsValidationError": "Seleccione al menos un elemento",

diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json
@@ -1566,9 +1566,10 @@
   "OrganizationsPage.searchPlaceholder": "Поиск по названию",
   "OrganizationsPage.synchedOrganization": "Синхронизированная организация",
   "OrganizationsPage.lastLaunch": "Последний запуск был осуществлен более 3 месяцев назад",
+  "OrganizationsPage.latestLaunch": "Последнее выполнение запуска",
   "OrganizationsPage.organizationUsers": "Пользователи организации",
   "OrganizationsPage.organizationProjects": "Организационные проекты",
-  "OrganizationsPage.latestLaunch": "Последнее выполнение запуска",
+  "OrganizationsPage.personalOrganization": "Персональная организация",
   "OrganizationsPopover.allOrganizations": "Все организации",
   "OrganizationsControl.assignmentsList": "Назначенный список",
   "OverallStatisticsControls.ContentFieldsValidationError": "Выберите не меньше одного элемента",

diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json
@@ -1566,9 +1566,10 @@
   "OrganizationsPage.searchPlaceholder": "Пошук по назві",
   "OrganizationsPage.synchedOrganization": "Синхронізована організація",
   "OrganizationsPage.lastLaunch": "Останній запуск був здійснений більше 3 місяців тому",
+  "OrganizationsPage.latestLaunch": "Останнє виконання запуску",
   "OrganizationsPage.organizationUsers": "Користувачі організації",
   "OrganizationsPage.organizationProjects": "Організаційні проекти",
-  "OrganizationsPage.latestLaunch": "Останнє виконання запуску",
+  "OrganizationsPage.personalOrganization": "Особиста організація",
   "OrganizationsPopover.allOrganizations": "Всі організації",
   "OrganizationsControl.assignmentsList": "Призначений список",
   "OverallStatisticsControls.ContentFieldsValidationError": "Виберіть не менше одного елемента",

diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json
@@ -1566,9 +1566,10 @@
   "OrganizationsPage.searchPlaceholder": "按名称搜索",
   "OrganizationsPage.synchedOrganization": "Synched organization",
   "OrganizationsPage.lastLaunch": "The last launch was executed more than 3 months ago",
+  "OrganizationsPage.latestLaunch": "The latest launch execution",
   "OrganizationsPage.organizationUsers": "Organization users",
   "OrganizationsPage.organizationProjects": "Organization projects",
-  "OrganizationsPage.latestLaunch": "The latest launch execution",
+  "OrganizationsPage.personalOrganization": "Personal organization",
   "OrganizationsPopover.allOrganizations": "All organizations",
   "OrganizationsControl.assignmentsList": "Assignments list",
   "OverallStatisticsControls.ContentFieldsValidationError": "您必须选中至少一个测试项",

diff --git a/app/src/common/constants/organizationTypes.js b/app/src/common/constants/organizationTypes.js
@@ -15,3 +15,4 @@
  */
 
 export const ORGANIZATION_EXTERNAL_TYPE = 'EXTERNAL';
+export const ORGANIZATION_INTERNAL_TYPE = 'INTERNAL';
diff --git a/app/src/pages/instance/organizationsPage/messages.js b/app/src/pages/instance/organizationsPage/messages.js
@@ -70,4 +70,8 @@ export const messages = defineMessages({
     id: 'OrganizationsPage.searchPlaceholder',
     defaultMessage: 'Type to search by name',
   },
+  personalOrganization: {
+    id: 'OrganizationsPage.personalOrganization',
+    defaultMessage: 'Personal organization',
+  },
 });
diff --git a/...s/instance/organizationsPage/organizationsPanelView/organizationCard/organizationCard.jsx b/...s/instance/organizationsPage/organizationsPanelView/organizationCard/organizationCard.jsx
@@ -26,7 +26,11 @@ import { userRolesSelector } from 'controllers/pages';
 import { MANAGER } from 'common/constants/projectRoles';
 import { ADMINISTRATOR } from 'common/constants/accountRoles';
 import { getRelativeUnits } from 'common/utils/timeDateUtils';
-import { ORGANIZATION_EXTERNAL_TYPE } from 'common/constants/organizationTypes';
+import {
+  ORGANIZATION_EXTERNAL_TYPE,
+  ORGANIZATION_INTERNAL_TYPE,
+} from 'common/constants/organizationTypes';
+import { assignedOrganizationsSelector } from 'controllers/user';
 import UserIcon from './img/user-inline.svg';
 import ProjectsIcon from './img/projects-inline.svg';
 import LastUpdateIcon from './img/last-update-inline.svg';
@@ -41,8 +45,12 @@ const THREE_MONTHS = 3600 * 24 * 30 * 1000;
 
 export const OrganizationCard = ({ organization }) => {
   const { formatMessage } = useIntl();
-  const { userRole, organizationRole } = useSelector(userRolesSelector);
-  const hasPermission = userRole === ADMINISTRATOR || organizationRole === MANAGER;
+  const { userRole } = useSelector(userRolesSelector);
+  const assignedOrganizations = useSelector(assignedOrganizationsSelector);
+  const hasPermission =
+    userRole === ADMINISTRATOR ||
+    assignedOrganizations[organization.slug]?.organizationRole === MANAGER;
+
   const usersCount = organization.relationships.users.meta.count;
   const projectsCount = organization.relationships.projects.meta.count;
   const lastLaunch = organization.relationships.launches.meta.last_occurred_at;
@@ -92,7 +100,15 @@ export const OrganizationCard = ({ organization }) => {
               <i className={cx('icon')}>{Parser(SynchedIcon)}</i>
             </Tooltip>
           ) : (
-            <i className={cx('icon')}>{Parser(PersonalIcon)}</i>
+            organization.type !== ORGANIZATION_INTERNAL_TYPE && (
+              <Tooltip
+                content={formatMessage(messages.personalOrganization)}
+                placement={'top'}
+                wrapperClassName={cx('tooltip-wrapper')}
+              >
+                <i className={cx('icon')}>{Parser(PersonalIcon)}</i>
+              </Tooltip>
+            )
           ))}
         {hasPermission && isOutdated && (
           <Tooltip

diff --git a/.../instance/organizationsPage/organizationsPanelView/organizationCard/organizationCard.scss b/.../instance/organizationsPage/organizationsPanelView/organizationCard/organizationCard.scss
@@ -88,4 +88,7 @@
   color: $COLOR--almost-black;
   font-size: 13px;
   line-height: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }