fix: review comments

Author: Elessar1802

src/components/ResourceBrowser/Constants.ts

@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import { NO_MATCHING_RESULT, Nodes, RESOURCE_BROWSER_ROUTES } from '@devtron-labs/devtron-fe-common-lib'
+import {
+    K8S_EMPTY_GROUP as K8S_EMPTY_GROUP_FROM_COMMON,
+    NO_MATCHING_RESULT,
+    Nodes,
+    RESOURCE_BROWSER_ROUTES,
+} from '@devtron-labs/devtron-fe-common-lib'
 
 import ICArrowUpCircle from '@Icons/ic-arrow-up-circle.svg'
 
@@ -113,7 +118,7 @@ export const RESOURCE_ACTION_MENU = {
 /**
  * @deprecated Use from common-lib instead
  */
-export const K8S_EMPTY_GROUP = 'k8sEmptyGroup'
+export const K8S_EMPTY_GROUP = K8S_EMPTY_GROUP_FROM_COMMON
 export const NAMESPACE_NOT_APPLICABLE_OPTION = {
     label: 'Namespace: Not applicable',
     value: 'not-applicable',

src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx

@@ -31,6 +31,7 @@ import {
     Table,
     TableColumnType,
     TableProps,
+    URLS,
     useAsync,
     useUrlFilters,
 } from '@devtron-labs/devtron-fe-common-lib'
@@ -236,8 +237,16 @@ export const K8SResourceList = ({
         return columns.some(({ field }) => field === 'namespace') ? 'namespace' : 'name'
     }
 
-    if (resourceListError) {
-        return <ErrorScreenManager code={(resourceListError as ServerErrors).code} />
+    if (resourceListError && !isResourceListLoading) {
+        return (
+            <div className="flexbox-col flex-grow-1 border__primary--left">
+                <ErrorScreenManager
+                    code={(resourceListError as ServerErrors).code}
+                    reload={reloadResourceList}
+                    redirectURL={URLS.RESOURCE_BROWSER}
+                />
+            </div>
+        )
     }
 
     return (

src/components/ResourceBrowser/ResourceList/Sidebar.tsx

@@ -106,7 +106,6 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
     const selectNode = (
         e: React.MouseEvent<HTMLButtonElement> | { currentTarget: Pick<K8sObjectOptionType, 'dataset'> },
         groupName?: string,
-        shouldPushUrl = true,
     ): void => {
         const _selectedKind = e.currentTarget.dataset.kind.toLowerCase()
         const _selectedGroup = e.currentTarget.dataset.group.toLowerCase()
@@ -118,19 +117,23 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
         if (_selectedKind !== Nodes.Event.toLowerCase()) {
             params.delete('eventType')
         }
-        const _url = `${generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_LIST, {
+        const path = generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_LIST, {
             clusterId,
             kind: _selectedKind,
             group: _selectedGroup || K8S_EMPTY_GROUP,
             version: DUMMY_RESOURCE_GVK_VERSION,
-        })}?${params.toString()}`
+        })
+
+        if (path === location.pathname) {
+            return
+        }
+
+        const _url = `${path}?${params.toString()}`
 
         updateK8sResourceTab({ url: _url, dynamicTitle: e.currentTarget.dataset.kind, retainSearchParams: true })
         updateTabLastSyncMoment(ResourceBrowserTabsId.k8s_Resources)
 
-        if (shouldPushUrl) {
-            push(_url)
-        }
+        push(_url)
 
         /**
          * If groupName present then kind selection is from search dropdown,
@@ -168,8 +171,6 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
                 },
             },
             match.groupName,
-            /* NOTE: if we push here the history will be lost */
-            !selectedResource,
         )
     }, [kind, k8sObjectOptionsList])
 

src/components/ResourceBrowser/Utils.tsx

@@ -319,7 +319,6 @@ export const getTabsBasedOnRole = ({
                       generatePath(RESOURCE_BROWSER_ROUTES.MONITORING_DASHBOARD, {
                           clusterId,
                       }),
-                      false,
                       MONITORING_DASHBOARD_TAB_ID,
                   ),
               ]