Merge pull request #1796 from gchq/BAI-1456-fix-model-and-datacard-ta…

…b-loading Bai 1456 fix model and datacard tab loading
gchq · Feb 6, 2025 · 9ff769c · 9ff769c
2 parents f258678 + 375487c
commit 9ff769c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/frontend/pages/data-card/[dataCardId].tsx b/frontend/pages/data-card/[dataCardId].tsx
@@ -52,8 +52,9 @@ export default function DataCard() {
   return (
     <>
       <Title text={dataCard ? dataCard.name : 'Loading...'} />
-      {isDataCardLoading && <Loading />}
-      {dataCard && (
+      {!dataCard || isDataCardLoading ? (
+        <Loading />
+      ) : (
         <PageWithTabs
           title={dataCard.name}
           subheading={`ID: ${dataCard.id}`}

diff --git a/frontend/pages/model/[modelId].tsx b/frontend/pages/model/[modelId].tsx
@@ -97,8 +97,9 @@ export default function Model() {
   return (
     <>
       <Title text={model ? model.name : 'Loading...'} />
-      {(isModelLoading || isCurrentUserLoading || isUiConfigLoading) && <Loading />}
-      {model && (
+      {!model || isModelLoading || isCurrentUserLoading || isUiConfigLoading ? (
+        <Loading />
+      ) : (
         <PageWithTabs
           title={model.name}
           subheading={`ID: ${model.id}`}