@openmrs/esm-patient-tests-app 11.3.1-pre.9437 → 11.3.1-pre.9442

package/src/test-results/grouped-timeline/grouped-timeline.component.tsx

@@ -21,29 +21,27 @@ export const GroupedTimeline: React.FC<{ patientUuid: string }> = ({ patientUuid
 
   if (activeTests && timelineData && loaded && tableData) {
     return (
-      <div>
-        <div className={styles.timelineDataContainer}>
-          {tableData.map((panel, index) => {
-            // Filter rowData to only include tests that belong to this panel
-            const panelTestNames = panel.entries.map((entry) => entry.flatName);
-            const subRows = rowData?.filter((row: { flatName: string }) => panelTestNames.includes(row.flatName));
+      <div className={styles.timelineDataContainer}>
+        {tableData.map((panel, index) => {
+          // Filter rowData to only include tests that belong to this panel
+          const panelTestNames = panel.entries.map((entry) => entry.flatName);
+          const subRows = rowData?.filter((row: { flatName: string }) => panelTestNames.includes(row.flatName));
 
-            return (
-              subRows?.length > 0 && (
-                <div key={index}>
-                  <TimelineDataGroup
-                    groupNumber={index + 1}
-                    parent={{ display: panel.key, flatName: panel.key }}
-                    patientUuid={patientUuid}
-                    setXScroll={setXScroll}
-                    subRows={subRows}
-                    xScroll={xScroll}
-                  />
-                </div>
-              )
-            );
-          })}
-        </div>
+          return (
+            subRows?.length > 0 && (
+              <div key={index}>
+                <TimelineDataGroup
+                  groupNumber={index + 1}
+                  parent={{ display: panel.key, flatName: panel.key }}
+                  patientUuid={patientUuid}
+                  setXScroll={setXScroll}
+                  subRows={subRows}
+                  xScroll={xScroll}
+                />
+              </div>
+            )
+          );
+        })}
       </div>
     );
   }

package/src/test-results/tree-view/tree-view.component.tsx

@@ -170,13 +170,21 @@ const TreeView: React.FC<TreeViewProps> = ({ patientUuid, expanded, view }) => {
         {isLoading ? (
           <DataTableSkeleton />
         ) : view === 'individual-test' ? (
-          <div className={styles.panelViewTimeline}>
+          tableData && tableData.length > 0 ? (
+            <div className={styles.panelViewTimeline}>
+              <GroupedPanelsTables
+                patientUuid={patientUuid}
+                className={styles.groupPanelsTables}
+                loadingPanelData={isLoading}
+              />
+            </div>
+          ) : (
             <GroupedPanelsTables
               patientUuid={patientUuid}
               className={styles.groupPanelsTables}
               loadingPanelData={isLoading}
             />
-          </div>
+          )
         ) : view === 'over-time' ? (
           <GroupedTimeline patientUuid={patientUuid} />
         ) : null}

package/translations/am.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/ar.json

@@ -100,7 +100,7 @@
   "testName": "اسم الاختبار",
   "testResults": "نتائج الاختبار",
   "testResults_title": "نتائج الاختبار",
-  "testResultsData": "بيانات نتائج الاختبار",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "نوع الاختبار",
   "testTypeRequired": "Test type is required",

package/translations/ar_SY.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/bn.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/cs.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/de.json

@@ -100,7 +100,7 @@
   "testName": "Testname",
   "testResults": "Testergebnisse",
   "testResults_title": "Testergebnisse",
-  "testResultsData": "Daten der Testergebnisse",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Testart",
   "testTypeRequired": "Test type is required",

package/translations/en_US.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/es.json

@@ -100,7 +100,7 @@
   "testName": "Nombre de la prueba",
   "testResults": "resultados de la prueba",
   "testResults_title": "Resultados de la Prueba",
-  "testResultsData": "Datos de los resultados de la prueba",
+  "testResultsData": "test results data",
   "tests": "Pruebas",
   "testType": "Tipo de prueba",
   "testTypeRequired": "Se requiere un tipo de prueba",

package/translations/es_MX.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/fr.json

@@ -100,7 +100,7 @@
   "testName": "Nom Examen",
   "testResults": "Résultats d'examens",
   "testResults_title": "Résultats d'examens",
-  "testResultsData": "Résultats d'examens",
+  "testResultsData": "test results data",
   "tests": "Examens",
   "testType": "Analyse",
   "testTypeRequired": "Le type d'examen est requis",

package/translations/he.json

@@ -100,7 +100,7 @@
   "testName": "שם הבדיקה",
   "testResults": "תוצאות הבדיקה",
   "testResults_title": "תוצאות הבדיקה",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "סוג הבדיקה",
   "testTypeRequired": "Test type is required",

package/translations/hi.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/hi_IN.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/id.json

@@ -100,7 +100,7 @@
   "testName": "Nama tes",
   "testResults": "hasil tes",
   "testResults_title": "Hasil Tes",
-  "testResultsData": "Data hasil tes",
+  "testResultsData": "test results data",
   "tests": "Tes",
   "testType": "Jenis tes",
   "testTypeRequired": "Jenis tes diperlukan",

package/translations/it.json

@@ -100,7 +100,7 @@
   "testName": "Nome del test",
   "testResults": "Risultati test",
   "testResults_title": "Risultati test",
-  "testResultsData": "Dati risultati test",
+  "testResultsData": "test results data",
   "tests": "Test",
   "testType": "Tipo di test",
   "testTypeRequired": "Il tipo di test è obbligatorio",

package/translations/ka.json

@@ -100,7 +100,7 @@
   "testName": "ტესტის სახელი",
   "testResults": "ტესტის შედეგი",
   "testResults_title": "ტესტის შედეგები",
-  "testResultsData": "ტესტის შედეგის მონაცემები",
+  "testResultsData": "test results data",
   "tests": "ტესტები",
   "testType": "ტესტის ტიპი",
   "testTypeRequired": "ტესტის ტიპი აუცილებელია",

package/translations/km.json

@@ -100,7 +100,7 @@
   "testName": "ធ្វើតេស្តលើឈ្មោះ",
   "testResults": "លទ្ធផលតេស្ត",
   "testResults_title": "លទ្ធផលតេស្ត",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "ប្រភេទតេស្ត",
   "testTypeRequired": "Test type is required",

package/translations/ku.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/ky.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/lg.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/ne.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/pl.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/pt.json

@@ -100,7 +100,7 @@
   "testName": "Nome do teste",
   "testResults": "resultados do teste",
   "testResults_title": "Resultados do Teste",
-  "testResultsData": "Dados dos resultados de teste",
+  "testResultsData": "test results data",
   "tests": "Testes",
   "testType": "Tipo de teste",
   "testTypeRequired": "Test type is required",

package/translations/pt_BR.json

@@ -100,7 +100,7 @@
   "testName": "Nome do teste",
   "testResults": "resultados do teste",
   "testResults_title": "Resultados do teste",
-  "testResultsData": "Dados dos resultados do teste",
+  "testResultsData": "test results data",
   "tests": "Testes",
   "testType": "Tipo de teste",
   "testTypeRequired": "Test type is required",

package/translations/qu.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/ro_RO.json

@@ -100,7 +100,7 @@
   "testName": "Nume test",
   "testResults": "rezultate test",
   "testResults_title": "Rezultate test",
-  "testResultsData": "Date rezultate test",
+  "testResultsData": "test results data",
   "tests": "Teste",
   "testType": "Tip test",
   "testTypeRequired": "Tipul testului este obligatoriu",

package/translations/ru_RU.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/si.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/sq.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/sw.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/sw_KE.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/tr.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/tr_TR.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/uk.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/uz.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/uz@Latn.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/uz_UZ.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",

package/translations/vi.json

@@ -100,7 +100,7 @@
   "testName": "Tên bài kiểm tra",
   "testResults": "kết quả kiểm tra",
   "testResults_title": "Kết quả kiểm tra",
-  "testResultsData": "Dữ liệu kết quả kiểm tra",
+  "testResultsData": "test results data",
   "tests": "Kiểm tra",
   "testType": "Loại kiểm tra",
   "testTypeRequired": "Test type is required",

package/translations/zh.json

@@ -100,7 +100,7 @@
   "testName": "检验名称",
   "testResults": "检验结果",
   "testResults_title": "检验结果",
-  "testResultsData": "检验结果数据",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "检验类型",
   "testTypeRequired": "Test type is required",

package/translations/zh_CN.json

@@ -100,7 +100,7 @@
   "testName": "检验名称",
   "testResults": "检验结果",
   "testResults_title": "检验结果",
-  "testResultsData": "检验结果数据",
+  "testResultsData": "test results data",
   "tests": "检验",
   "testType": "检验类型",
   "testTypeRequired": "检验检查类型是必填项",

package/translations/zh_TW.json

@@ -100,7 +100,7 @@
   "testName": "Test name",
   "testResults": "test results",
   "testResults_title": "Test Results",
-  "testResultsData": "Test results data",
+  "testResultsData": "test results data",
   "tests": "Tests",
   "testType": "Test type",
   "testTypeRequired": "Test type is required",