From 37f233e36308800a96f92fc1011ecab1fe54fac3 Mon Sep 17 00:00:00 2001 From: k4rli Date: Mon, 11 Aug 2025 09:21:27 +0300 Subject: [PATCH] feat(MED-105): show empty text on no ordered analyses --- .../(dashboard)/analysis-results/page.tsx | 21 ++++++++++++------- public/locales/en/analysis-results.json | 1 + public/locales/et/analysis-results.json | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/home/(user)/(dashboard)/analysis-results/page.tsx b/app/home/(user)/(dashboard)/analysis-results/page.tsx index efd68e1..d5b5293 100644 --- a/app/home/(user)/(dashboard)/analysis-results/page.tsx +++ b/app/home/(user)/(dashboard)/analysis-results/page.tsx @@ -60,10 +60,12 @@ async function AnalysisResultsPage() { return { results, } - }); + }) ?? []; const analysisElementsWithoutResults = analysisElements .filter((element) => !analysisElementsWithResults?.some(({ results }) => results.analysis_element_original_id === element.analysis_id_original)); + const hasNoAnalysisElements = analysisElementsWithResults.length === 0 && analysisElementsWithoutResults.length === 0; + return (
@@ -80,13 +82,13 @@ async function AnalysisResultsPage() {

- {analysisElementsWithResults?.map(({ results }) => { + {analysisElementsWithResults.map(({ results }) => { const analysisElement = analysisElements.find((element) => element.analysis_id_original === results.analysis_element_original_id); if (!analysisElement) { return null; @@ -95,11 +97,14 @@ async function AnalysisResultsPage() { ); })} - {analysisElementsWithoutResults?.map((element) => { - return ( - - ); - })} + {analysisElementsWithoutResults.map((element) => ( + + ))} + {hasNoAnalysisElements && ( +
+ +
+ )}
); diff --git a/public/locales/en/analysis-results.json b/public/locales/en/analysis-results.json index 3d53e6b..8dd0a09 100644 --- a/public/locales/en/analysis-results.json +++ b/public/locales/en/analysis-results.json @@ -4,6 +4,7 @@ "descriptionEmpty": "If you've already done your analysis, your results will appear here soon.", "orderNewAnalysis": "Order new analyses", "waitingForResults": "Waiting for results", + "noAnalysisElements": "No analysis orders found", "results": { "range": { "normal": "Normal range" diff --git a/public/locales/et/analysis-results.json b/public/locales/et/analysis-results.json index 59cfcaa..f8a7c2d 100644 --- a/public/locales/et/analysis-results.json +++ b/public/locales/et/analysis-results.json @@ -4,6 +4,7 @@ "descriptionEmpty": "Kui oled juba käinud analüüse andmas, siis varsti jõuavad siia sinu analüüside vastused.", "orderNewAnalysis": "Telli uued analüüsid", "waitingForResults": "Tulemuse ootel", + "noAnalysisElements": "Veel ei ole tellitud analüüse", "results": { "range": { "normal": "Normaalne vahemik"