k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(MED-87): don't show 'waiting for results' text if order is cancelled

Browse Source
This commit is contained in:
Karli
2025-08-25 11:50:22 +03:00
parent 38d73e27ad
commit b6a0940506
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/home/(user)/(dashboard)/analysis-results/_components/analysis.tsx
View File

@@ -37,9 +37,11 @@ export enum AnalysisStatus {
const Analysis = ({ const Analysis = ({
analysisElement, analysisElement,
results, results,
isCancelled,
}: { }: {
analysisElement: Pick<AnalysisElement, 'analysis_name_lab'>; analysisElement: AnalysisElement;
results?: AnalysisResultForDisplay; results?: UserAnalysisElement;
isCancelled?: boolean;
}) => { }) => {
const name = analysisElement.analysis_name_lab || ''; const name = analysisElement.analysis_name_lab || '';
const status = results?.norm_status || AnalysisStatus.NORMAL; const status = results?.norm_status || AnalysisStatus.NORMAL;
@@ -121,9 +123,11 @@ const Analysis = ({
) : ( ) : (
<> <>
<div className="flex items-center gap-3 sm:ml-auto"> <div className="flex items-center gap-3 sm:ml-auto">
<div className="font-semibold"> {!isCancelled && (
<Trans i18nKey="analysis-results:waitingForResults" /> <div className="font-semibold">
</div> <Trans i18nKey="analysis-results:waitingForResults" />
</div>
)}
</div> </div>
<div className="mx-8 w-[60px]"></div> <div className="mx-8 w-[60px]"></div>
<AnalysisLevelBarSkeleton /> <AnalysisLevelBarSkeleton />

2
app/home/(user)/(dashboard)/analysis-results/page.tsx
View File

@@ -104,7 +104,7 @@ async function AnalysisResultsPage() {
&& analysisResponseElements?.find((element) => element.analysis_element_original_id === analysisElement.analysis_id_original); && analysisResponseElements?.find((element) => element.analysis_element_original_id === analysisElement.analysis_id_original);
if (!results) { if (!results) {
return ( return (
<Analysis key={`${analysisOrder.id}-${analysisElement.id}`} analysisElement={analysisElement} /> <Analysis key={`${analysisOrder.id}-${analysisElement.id}`} analysisElement={analysisElement} isCancelled={analysisOrder.status === 'CANCELLED'}/>
); );
} }
return ( return (