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

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

@@ -37,9 +37,11 @@ export enum AnalysisStatus {
 const Analysis = ({
   analysisElement,
   results,
+  isCancelled,
 }: {
-  analysisElement: Pick<AnalysisElement, 'analysis_name_lab'>;
-  results?: AnalysisResultForDisplay;
+  analysisElement: AnalysisElement;
+  results?: UserAnalysisElement;
+  isCancelled?: boolean;
 }) => {
   const name = analysisElement.analysis_name_lab || '';
   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="font-semibold">
-              <Trans i18nKey="analysis-results:waitingForResults" />
-            </div>
+            {!isCancelled && (
+              <div className="font-semibold">
+                <Trans i18nKey="analysis-results:waitingForResults" />
+              </div>
+            )}
           </div>
           <div className="mx-8 w-[60px]"></div>
           <AnalysisLevelBarSkeleton />

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

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