From 41e9a23e2933c83df01007184bb4efc643a89bb1 Mon Sep 17 00:00:00 2001
From: Dhruv Parmar <83108871+dhruvjsx@users.noreply.github.com>
Date: Tue, 5 Aug 2025 10:15:59 +0530
Subject: [PATCH] Fix(UI): Incorrect Data model count (#22726)

* fixed data model tab count

* moved types to interface file
---
 .../DataModel/DataModels/DataModelDetails.interface.tsx  | 5 +++++
 .../Dashboard/DataModel/DataModels/DataModelsTable.tsx   | 9 ++++++---
 .../src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx  | 9 +++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx
index 3770940b2d2..aee03042cef 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx
@@ -33,3 +33,8 @@ export interface DataModelDetailsProps {
   ) => Promise<void>;
   handleToggleDelete: (version?: number) => void;
 }
+
+export interface DataModelTableProps {
+  showDeleted: boolean;
+  handleShowDeleted: (checked: boolean) => void;
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
index 843f92d61fd..75207d173ee 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
@@ -50,12 +50,15 @@ import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHol
 import { NextPreviousProps } from '../../../common/NextPrevious/NextPrevious.interface';
 import RichTextEditorPreviewerNew from '../../../common/RichTextEditor/RichTextEditorPreviewNew';
 import Table from '../../../common/Table/Table';
+import { DataModelTableProps } from './DataModelDetails.interface';
 
-const DataModelTable = () => {
+const DataModelTable = ({
+  showDeleted,
+  handleShowDeleted,
+}: DataModelTableProps) => {
   const { t } = useTranslation();
   const { fqn } = useFqn();
   const [dataModels, setDataModels] = useState<Array<ServicePageData>>();
-  const [showDeleted, setShowDeleted] = useState(false);
   const {
     currentPage,
     pageSize,
@@ -157,7 +160,7 @@ const DataModelTable = () => {
   };
 
   const handleShowDeletedChange = (checked: boolean) => {
-    setShowDeleted(checked);
+    handleShowDeleted(checked);
     handlePageChange(INITIAL_PAGING_VALUE);
     handlePageSizeChange(PAGE_SIZE_BASE);
   };
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
index a2951e2185c..0efb0d901cf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
@@ -1162,7 +1162,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
     if (serviceCategory === ServiceCategory.DASHBOARD_SERVICES) {
       fetchDashboardsDataModel({ limit: 0 });
     }
-  }, []);
+  }, [showDeleted]);
 
   useEffect(() => {
     if (servicePermission.ViewAll || servicePermission.ViewBasic) {
@@ -1419,7 +1419,12 @@ const ServiceDetailsPage: FunctionComponent = () => {
         name: t('label.data-model'),
         key: EntityTabs.DATA_Model,
         count: dataModelPaging.total,
-        children: <DataModelTable />,
+        children: (
+          <DataModelTable
+            handleShowDeleted={handleShowDeleted}
+            showDeleted={showDeleted}
+          />
+        ),
       });
     }