From 721290b1e9fbdb36fda66c76dd33ca973b27a47d Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Tue, 20 Feb 2024 16:23:05 +0530
Subject: [PATCH] Fix an issue where type column in dependents/dependencies tab
 is not showing correct label. #7225

---
 docs/en_US/release_notes_8_4.rst                      |  1 +
 web/pgadmin/misc/dependents/static/js/Dependents.jsx  |  3 +++
 .../misc/properties/CollectionNodeProperties.jsx      | 11 ++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/en_US/release_notes_8_4.rst b/docs/en_US/release_notes_8_4.rst
index 0cb7fe6c3..7864ea0bf 100644
--- a/docs/en_US/release_notes_8_4.rst
+++ b/docs/en_US/release_notes_8_4.rst
@@ -34,3 +34,4 @@ Bug fixes
   | `Issue #6808 <https://github.com/pgadmin-org/pgadmin4/issues/6808>`_ -  Fix the tabbed panel backward/forward shortcut for tabs.
   | `Issue #7164 <https://github.com/pgadmin-org/pgadmin4/issues/7164>`_ -  Fix an issue where constraint check control is enabled in the edit table dialog.
   | `Issue #7165 <https://github.com/pgadmin-org/pgadmin4/issues/7165>`_ -  Fix an issue where the scripts created by generate script of Schema diff for Table with sequence was not working earlier.
+  | `Issue #7225 <https://github.com/pgadmin-org/pgadmin4/issues/7225>`_ -  Fix an issue where type column in dependents/dependencies tab is not showing correct label.
diff --git a/web/pgadmin/misc/dependents/static/js/Dependents.jsx b/web/pgadmin/misc/dependents/static/js/Dependents.jsx
index 6bdb8e003..60dc4724b 100644
--- a/web/pgadmin/misc/dependents/static/js/Dependents.jsx
+++ b/web/pgadmin/misc/dependents/static/js/Dependents.jsx
@@ -88,6 +88,9 @@ function Dependents({ nodeData, nodeItem, node, treeNodeInfo, isActive, isStale,
       sortable: true,
       resizable: true,
       disableGlobalFilter: false,
+      Cell: ({row})=>{
+        return pgAdmin.Browser.Nodes?.[row.original.type]?.label??row.original.type;
+      }
     },
     {
       Header: 'Name',
diff --git a/web/pgadmin/misc/properties/CollectionNodeProperties.jsx b/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
index ed4260dfd..d9a879de2 100644
--- a/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
+++ b/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
@@ -193,7 +193,7 @@ export default function CollectionNodeProperties({
   };
 
   React.useEffect(() => {
-    if (node){
+    if (node) {
 
       let nodeObj =
       pgAdmin.Browser.Nodes[nodeData?._type.replace('coll-', '')];
@@ -204,6 +204,10 @@ export default function CollectionNodeProperties({
 
       let tableColumns = [];
       let column = {};
+      if(!isStale || !isActive) {
+        return;
+      }
+
       setLoaderText(gettext('Loading...'));
 
       if (nodeData._type.indexOf('coll-') > -1 && !_.isUndefined(nodeObj.getSchema)) {
@@ -250,9 +254,6 @@ export default function CollectionNodeProperties({
         });
       }
 
-      if(!isStale || !isActive) {
-        return;
-      }
 
       api({
         url: url,
@@ -275,7 +276,7 @@ export default function CollectionNodeProperties({
         });
       setIsStale(false);
     }
-  }, [nodeData, node, nodeItem, isStale]);
+  }, [nodeData, node, nodeItem, isStale, isActive]);
 
   const CustomHeader = () => {
     const canDrop = evalFunc(node, node.canDrop, nodeData, nodeItem, treeNodeInfo);