From 7b02270523c0e98a8312da86e7b9e4a08aec1d58 Mon Sep 17 00:00:00 2001
From: jayacryl <159848059+jayacryl@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:37:08 -0800
Subject: [PATCH 1/2] fix(web) move form entity sidebar to right to align with
 saas

---
 .../src/app/entity/shared/entityForm/FormByEntity.tsx          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
index 61a70c145bd11..109e3b2fdb895 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
@@ -63,13 +63,12 @@ export default function FormByEntity({ formUrn }: Props) {
             <ContentWrapper>
                 <ProgressBar formUrn={formUrn} />
                 <FlexWrapper>
+                    <Form formUrn={formUrn} />
                     <ProfileSidebar
                         sidebarSections={loading ? [] : sections}
                         topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
                         backgroundColor="white"
-                        alignLeft
                     />
-                    <Form formUrn={formUrn} />
                 </FlexWrapper>
             </ContentWrapper>
         </EntityContext.Provider>

From 35e5a3127df575e82b07a3ce61ba92e967071f26 Mon Sep 17 00:00:00 2001
From: jayacryl <159848059+jayacryl@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:38:40 -0800
Subject: [PATCH 2/2] saas

---
 .../app/entity/shared/entityForm/FormByEntity.tsx    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
index 109e3b2fdb895..a6c3fdae71b2e 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
@@ -64,11 +64,13 @@ export default function FormByEntity({ formUrn }: Props) {
                 <ProgressBar formUrn={formUrn} />
                 <FlexWrapper>
                     <Form formUrn={formUrn} />
-                    <ProfileSidebar
-                        sidebarSections={loading ? [] : sections}
-                        topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
-                        backgroundColor="white"
-                    />
+                    {selectedEntityData && (
+                        <ProfileSidebar
+                            sidebarSections={loading ? [] : sections}
+                            topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
+                            backgroundColor="white"
+                        />
+                    )}
                 </FlexWrapper>
             </ContentWrapper>
         </EntityContext.Provider>