Merge branch 'main' into release/use-scoped-variables

Author: AbhishekA1509

src/components/ClusterNodes/ClusterSelectionList.tsx

@@ -145,7 +145,7 @@ export default function ClusterSelectionList({
                     />
                 </div>
                 <div>
-                    {errorCount > 0 ? (
+                    {clusterData.errorInNodeListing ? (
                         <Tippy className="default-tt w-200" arrow={false} content={clusterData.errorInNodeListing}>
                             <div className="flexbox">
                                 <Error className="mt-2 mb-2 mr-8 icon-dim-18" />

src/components/app/details/appConfig/appConfig.scss

@@ -39,15 +39,17 @@
 
         &.config-protection__side-nav {
             grid-template-rows: 110px repeat(6, 32px) 54px 32px 1fr auto;
-            &.hide-external-links {
-              grid-template-rows: 110px repeat(6, 32px) 16px 32px 1fr auto;
-            }
-            &.hide-app-config-help {
-                grid-template-rows: repeat(6, 32px) 54px 32px 1fr auto;
-
+            
                 &.hide-external-links {
-                    grid-template-rows: repeat(6, 32px) 16px 32px 1fr auto;
+                    grid-template-rows: 110px repeat(6, 32px) 54px 1fr auto;
                 }
+            
+                &.hide-app-config-help {
+                    grid-template-rows: repeat(6, 32px) 54px 32px 1fr auto;
+            
+                    &.hide-external-links {
+                        grid-template-rows: repeat(6, 32px) 54px 1fr auto;
+                    }
             }
         }
 

src/components/app/list-new/HelmAppList.tsx

@@ -403,7 +403,7 @@ export default function HelmAppList({
                     <span className="app-list__cell-header flex cursor" onClick={sortByLastDeployed}>
                         {APP_LIST_HEADERS.LastDeployedAt}
                         {sortBy == SortBy.LAST_DEPLOYED ? (
-                            <span className={`sort ${sortOrder == OrderBy.DESC ? 'sort-up' : ''} ml-4`}></span>
+                            <span className={`sort ${sortOrder == OrderBy.ASC ? 'sort-up' : ''} ml-4`}></span>
                         ) : (
                             <span className="sort-col dc__opacity-0_5 ml-4"></span>
                         )}