EPMRPP-77768 || Code Review fix - 3

reportportal · Jul 23, 2024 · 3876189 · 3876189
1 parent 6bdfda9
commit 3876189
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/app/src/controllers/pages/constants.js b/app/src/controllers/pages/constants.js
@@ -23,6 +23,7 @@ export const CLEAR_PAGE_STATE = 'clearPageStateAction';
 export const NO_PAGE = undefined;
 // admin
 export const ORGANIZATIONS_PAGE = 'ORGANIZATIONS_PAGE';
+export const ALL_ORGANIZATIONS_PAGE = 'ALL_ORGANIZATIONS_PAGE';
 export const PROJECTS_PAGE = 'PROJECTS_PAGE';
 export const PROJECT_DETAILS_PAGE = 'PROJECT_DETAILS_PAGE';
 export const ALL_USERS_PAGE = 'ALL_USERS_PAGE';

diff --git a/app/src/controllers/pages/index.js b/app/src/controllers/pages/index.js
@@ -50,6 +50,7 @@ export { updatePagePropertiesAction, clearPageStateAction } from './actionCreato
 
 export {
   NO_PAGE,
+  ALL_ORGANIZATIONS_PAGE,
   ORGANIZATIONS_PAGE,
   PROJECTS_PAGE,
   PROJECT_DETAILS_PAGE,

diff --git a/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.jsx b/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.jsx
@@ -21,8 +21,8 @@ import { useSelector } from 'react-redux';
 import { availableProjectsSelector } from 'controllers/user';
 import { urlProjectSlugSelector, urlOrganizationSlugSelector } from 'controllers/pages';
 import { ScrollWrapper } from 'components/main/scrollWrapper';
-import Link from 'redux-first-router-link';
-import { ORGANIZATIONS_PAGE } from 'controllers/pages/constants';
+import { ALL_ORGANIZATIONS_PAGE } from 'controllers/pages/constants';
+import { NavLink } from 'components/main/navLink';
 import { OrganizationsItem } from './organizationsItem';
 import { messages } from '../../messages';
 import styles from './organizationsPopover.scss';
@@ -47,14 +47,14 @@ export const OrganizationsPopover = ({ closePopover, closeSidebar }) => {
       {availableProjects.length > 0 && (
         <>
           <div className={cx('all-organizations')}>
-            <Link
-              to={{ type: ORGANIZATIONS_PAGE }}
-              // TODO: Instead of an additional class, use the active class
-              className={cx('all-organizations-link', { 'instance-level': !currentOrganization })}
+            <NavLink
+              to={{ type: ALL_ORGANIZATIONS_PAGE }}
+              className={cx('all-organizations-link')}
               onClick={onClose}
+              activeClassName={cx('active')}
             >
               {formatMessage(messages.allOrganizations)}
-            </Link>
+            </NavLink>
           </div>
           <div className={cx('divider')} />
         </>

diff --git a/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.scss b/app/src/layouts/organizationsControl/organizationsPopover/organizationsPopover.scss
@@ -66,6 +66,6 @@
   margin: 0 16px 8px 16px;
 }
 
-.instance-level {
+.active {
   color: $COLOR--darkmode-topaz-text;
 }
diff --git a/app/src/routes/routesMap.js b/app/src/routes/routesMap.js
@@ -98,6 +98,7 @@ import {
   ORGANIZATION_PROJECTS_PAGE,
   ORGANIZATION_MEMBERS_PAGE,
   ORGANIZATION_SETTINGS_PAGE,
+  ORGANIZATIONS_PAGE,
 } from 'controllers/pages/constants';
 import {
   fetchOrganizationBySlugAction,
@@ -124,6 +125,7 @@ const routesMap = {
   [OAUTH_SUCCESS]: '/authSuccess',
   [NOT_FOUND]: '/notfound',
 
+  ALL_ORGANIZATIONS_PAGE: redirectRoute('/', () => ({ type: ORGANIZATIONS_PAGE })),
   ORGANIZATIONS_PAGE: redirectRoute('/organizations', () => ({ type: PROJECTS_PAGE })),
   USER_PROFILE_PAGE: redirectRoute('/userProfile', () => ({
     type: USER_PROFILE_SUB_PAGE,