From d5bdafc0d9569bd66b881a9e6111818661113c66 Mon Sep 17 00:00:00 2001
From: Nathan Curtis <nathan.curtis@gmail.com>
Date: Tue, 24 Dec 2024 11:10:21 -0800
Subject: [PATCH] [TM-1590] Wait to mount the entity form until the entity has
 finished loading.

---
 src/pages/entity/[entityName]/edit/[uuid]/index.page.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/entity/[entityName]/edit/[uuid]/index.page.tsx b/src/pages/entity/[entityName]/edit/[uuid]/index.page.tsx
index 78e711409..b2a7e6523 100644
--- a/src/pages/entity/[entityName]/edit/[uuid]/index.page.tsx
+++ b/src/pages/entity/[entityName]/edit/[uuid]/index.page.tsx
@@ -18,7 +18,7 @@ const EditEntityPage = () => {
   const entityName = router.query.entityName as EntityName;
   const entityUUID = router.query.uuid as string;
 
-  const { data: entityData } = useGetV2ENTITYUUID({
+  const { data: entityData, isLoading: getEntityLoading } = useGetV2ENTITYUUID({
     pathParams: { entity: entityName, uuid: entityUUID }
   });
   const entity = entityData?.data ?? {}; //Do not abuse this since forms should stay entity agnostic!
@@ -37,7 +37,7 @@ const EditEntityPage = () => {
   return (
     <BackgroundLayout>
       <FrameworkProvider frameworkKey={entity.framework_key}>
-        <LoadingContainer loading={isLoading}>
+        <LoadingContainer loading={isLoading || getEntityLoading}>
           <EditEntityForm {...{ entityName, entityUUID, entity, formData }} />
         </LoadingContainer>
         <br />