Merge branch 'main' into release/scoped-variables

Author: shivani170

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/ClusterNodes/NodeDetails.tsx

@@ -642,7 +642,7 @@ export default function NodeDetails({
       const _url = `${URLS.RESOURCE_BROWSER}/${clusterId}/${namespace}/pod/${_group}/${name}${
           tab ? `/${tab.toLowerCase()}` : ''
       }`
-      const isAdded = addTab(_group, 'pod', name, _url)
+      const isAdded = addTab(`${_group}_${namespace}`, 'pod', name, _url)
       if (isAdded) {
           updateNodeSelectionData(_nodeSelectionData, _group)
           push(_url)

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

@@ -40,13 +40,13 @@
         &.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;
+              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) 16px 32px 1fr auto;
+                    grid-template-rows: repeat(6, 32px) 54px 1fr auto;
                 }
             }
         }
@@ -205,4 +205,4 @@
     .repo-configured-icon {
         width: 96px;
     }
-}
+}