EPMRPP-93205 || Wrong behaviour when clicking on All organizations bu… (

#3939) * EPMRPP-93205 || Wrong behaviour when clicking on All organizations button in the sidebar * EPMRPP-93205 || Code Review fix - 1 * EPMRPP-93205 || Code Review fix - 2
reportportal · Jul 31, 2024 · 05c27a1 · 05c27a1
1 parent ed09c37
commit 05c27a1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/app/src/layouts/instanceLayout/instanceSidebar/instanceSidebar.jsx b/app/src/layouts/instanceLayout/instanceSidebar/instanceSidebar.jsx
@@ -133,7 +133,6 @@ export const InstanceSidebar = ({ onClickNavBtn }) => {
       }}
       link={link}
       titles={titles}
-      isExtendedNav
     />
   );
 

diff --git a/app/src/layouts/organizationLayout/organizationSidebar/organizationSidebar.jsx b/app/src/layouts/organizationLayout/organizationSidebar/organizationSidebar.jsx
@@ -124,6 +124,7 @@ export const OrganizationSidebar = ({ onClickNavBtn }) => {
       }}
       link={link}
       titles={titles}
+      isExtendedNav
     />
   );
 

diff --git a/app/src/layouts/organizationsControl/organizationsControl.jsx b/app/src/layouts/organizationsControl/organizationsControl.jsx
@@ -42,15 +42,21 @@ export const OrganizationsControl = ({
       <div>
         <div
           className={cx('organization-btn-wrapper', {
-            'instance-level': isExtendedNav,
+            'not-extended': !isExtendedNav,
           })}
         >
-          {!isExtendedNav ? <i className={cx('arrow-icon')}>{Parser(ArrowLeftIcon)}</i> : null}
-          <Link to={link} className={cx('organization-btn')} onClick={closeSidebar}>
-            <div className={cx('top-title')}>{titles.topTitle}</div>
-          </Link>
+          {isExtendedNav ? (
+            <>
+              <i className={cx('arrow-icon')}>{Parser(ArrowLeftIcon)}</i>
+              <Link to={link} className={cx('organization-btn')} onClick={closeSidebar}>
+                <div className={cx('top-title')}>{titles.topTitle}</div>
+              </Link>
+            </>
+          ) : (
+            <div className={cx('extended-top-title')}>{titles.topTitle}</div>
+          )}
         </div>
-        {!isExtendedNav ? <div className={cx('bottom-title')}>{titles.bottomTitle}</div> : null}
+        {isExtendedNav ? <div className={cx('bottom-title')}>{titles.bottomTitle}</div> : null}
       </div>
       <i
         className={cx('open-popover', {

diff --git a/app/src/layouts/organizationsControl/organizationsControl.scss b/app/src/layouts/organizationsControl/organizationsControl.scss
@@ -108,6 +108,13 @@
   text-align: start;
 }
 
+.extended-top-title {
+  color: $COLOR--darkmode-gray-100;
+  line-height: 20px;
+  font-size: 13px;
+  font-family: $FONT-ROBOTO-MEDIUM;
+}
+
 .bottom-title {
   @include truncate(220px);
   color: $COLOR--darkmode-gray-100;
@@ -169,7 +176,7 @@
   }
 }
 
-.instance-level {
+.not-extended {
   height: 20px;
 
   .top-title {

diff --git a/app/src/layouts/projectLayout/projectSidebar/projectSidebar.jsx b/app/src/layouts/projectLayout/projectSidebar/projectSidebar.jsx
@@ -165,6 +165,7 @@ export const ProjectSidebar = ({ onClickNavBtn }) => {
       }}
       link={link}
       titles={titles}
+      isExtendedNav
     />
   );
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,6 @@ export const InstanceSidebar = ({ onClickNavBtn }) => { @@
           }}
           link={link}
           titles={titles}
-          isExtendedNav
         />
       );
@@ Expand Down @@