From 6a8b2a9855d692a1198de821aae1c1b20e68d6c4 Mon Sep 17 00:00:00 2001
From: Brijesh Bhalala <brijeshbhalala2324@gmail.com>
Date: Fri, 17 Jul 2026 15:32:49 +0530
Subject: [PATCH 1/2] ATLAS-5347: Atlas React UI: Skeleton loader stuck
 indefinitely in Administration Audit tab when expanding Purge/Auto-Purge
 entity details

---
 dashboard/src/views/Administrator/Audits/AuditResults.tsx     | 2 +-
 .../views/DetailPage/EntityDetailTabs/AttributeProperties.tsx | 2 +-
 .../EntityDetailTabs/__tests__/AttributeProperties.test.tsx   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dashboard/src/views/Administrator/Audits/AuditResults.tsx b/dashboard/src/views/Administrator/Audits/AuditResults.tsx
index 984221b1529..acde90ff397 100644
--- a/dashboard/src/views/Administrator/Audits/AuditResults.tsx
+++ b/dashboard/src/views/Administrator/Audits/AuditResults.tsx
@@ -232,7 +232,7 @@ const AuditResults = ({ componentProps, row }: any) => {
           button2Handler={undefined}
           maxWidth="lg"
         >
-          <AuditsTab auditResultGuid={currentPurgeResultObj} />
+          <AuditsTab auditResultGuid={currentPurgeResultObj} loading={false} />
         </CustomModal>
       )}
     </>
diff --git a/dashboard/src/views/DetailPage/EntityDetailTabs/AttributeProperties.tsx b/dashboard/src/views/DetailPage/EntityDetailTabs/AttributeProperties.tsx
index 0aaeb774ef3..bdf10246d6d 100644
--- a/dashboard/src/views/DetailPage/EntityDetailTabs/AttributeProperties.tsx
+++ b/dashboard/src/views/DetailPage/EntityDetailTabs/AttributeProperties.tsx
@@ -222,7 +222,7 @@ const AttributeProperties = ({
           </Stack>
         </AccordionSummary>
         <AccordionDetails>
-          {loading == undefined || loading || isEmpty(entityData) ? (
+          {loading === true || (!auditDetails && isEmpty(entityData)) ? (
             <>
               <SkeletonLoader count={3} animation="wave" />
             </>
diff --git a/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx b/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
index 2eb488a385b..6e6aa30e6ee 100644
--- a/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
+++ b/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
@@ -325,7 +325,7 @@ describe('AttributeProperties', () => {
 			expect(screen.getByTestId('skeleton-loader')).toBeInTheDocument();
 		});
 
-		it('should render loading skeleton when loading is undefined', () => {
+		it('should render properties when loading is undefined and entityData is available', () => {
 			render(
 				<TestWrapper>
 					<AttributeProperties
@@ -337,7 +337,7 @@ describe('AttributeProperties', () => {
 				</TestWrapper>
 			);
 
-			expect(screen.getByTestId('skeleton-loader')).toBeInTheDocument();
+			expect(screen.queryByTestId('skeleton-loader')).not.toBeInTheDocument();
 		});
 
 		it('should render loading skeleton when entityData is empty', () => {

From 1b560a7a9a04f46ae0c8fe846e11f09db225e59e Mon Sep 17 00:00:00 2001
From: Brijesh Bhalala <brijeshbhalala2324@gmail.com>
Date: Mon, 27 Jul 2026 18:34:43 +0530
Subject: [PATCH 2/2] ATLAS-5347: Atlas React UI: Skeleton loader stuck
 indefinitely in Administration Audit tab when expanding Purge/Auto-Purge
 entity details

---
 .../Audits/__tests__/AuditResults.test.tsx    |  5 +--
 .../__tests__/AttributeProperties.test.tsx    | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/dashboard/src/views/Administrator/Audits/__tests__/AuditResults.test.tsx b/dashboard/src/views/Administrator/Audits/__tests__/AuditResults.test.tsx
index 0fc580d4d17..1896838f7d6 100644
--- a/dashboard/src/views/Administrator/Audits/__tests__/AuditResults.test.tsx
+++ b/dashboard/src/views/Administrator/Audits/__tests__/AuditResults.test.tsx
@@ -112,8 +112,8 @@ jest.mock('@utils/Muiutils', () => ({
 
 jest.mock('@views/DetailPage/EntityDetailTabs/AuditsTab', () => ({
   __esModule: true,
-  default: ({ auditResultGuid }: any) => (
-    <div data-testid="audits-tab">AuditsTab - {auditResultGuid}</div>
+  default: ({ auditResultGuid, loading }: any) => (
+    <div data-testid="audits-tab" data-loading={loading}>AuditsTab - {auditResultGuid}</div>
   )
 }));
 
@@ -425,6 +425,7 @@ describe('AuditResults Component', () => {
 
       expect(screen.getByTestId('modal-title')).toHaveTextContent('Purged Entity Details: guid-1');
       expect(screen.getByTestId('audits-tab')).toBeInTheDocument();
+      expect(screen.getByTestId('audits-tab')).toHaveAttribute('data-loading', 'false');
     });
 
     it('should open auto purge modal with correct title', async () => {
diff --git a/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx b/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
index 6e6aa30e6ee..158b9b66fe1 100644
--- a/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
+++ b/dashboard/src/views/DetailPage/EntityDetailTabs/__tests__/AttributeProperties.test.tsx
@@ -364,6 +364,40 @@ describe('AttributeProperties', () => {
 			expect(screen.getByTestId('skeleton-loader')).toBeInTheDocument();
 		});
 
+		it('should not render skeleton in auditDetails mode when loading is undefined', () => {
+			mockUseSelector.mockImplementation((selector: any) =>
+				selector({ entity: { entityData: {} } })
+			);
+			render(
+				<TestWrapper>
+					<AttributeProperties
+						entity={defaultMockEntity}
+						referredEntities={defaultMockReferredEntities}
+						loading={undefined}
+						auditDetails={true}
+						propertiesName="Technical"
+					/>
+				</TestWrapper>
+			);
+			expect(screen.queryByTestId('skeleton-loader')).not.toBeInTheDocument();
+			expect(screen.getByText('Technical Properties')).toBeInTheDocument();
+		});
+
+		it('should render skeleton in auditDetails mode when loading is true', () => {
+			render(
+				<TestWrapper>
+					<AttributeProperties
+						entity={defaultMockEntity}
+						referredEntities={defaultMockReferredEntities}
+						loading={true}
+						auditDetails={true}
+						propertiesName="Technical"
+					/>
+				</TestWrapper>
+			);
+			expect(screen.getByTestId('skeleton-loader')).toBeInTheDocument();
+		});
+
 		it('should render "No Record Found" when properties are empty', () => {
 			const emptyEntity = {
 				typeName: 'DataSet',