Merge branch 'release-3.x.x' into TASK-6635

opencb · Oct 4, 2024 · 014f6cb · 014f6cb
2 parents 2ede06b + 274a1c1
commit 014f6cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/webcomponents/sample/sample-grid.js b/src/webcomponents/sample/sample-grid.js
@@ -149,11 +149,11 @@ export default class SampleGrid extends LitElement {
         this.permissionID = WebUtils.getPermissionID(this.toolbarConfig.resource, "WRITE");
     }
 
-    fetchClinicalAnalysis(rows, casesLimit) {
+    fetchClinicalAnalysis(rows, individuals, casesLimit) {
         if (rows && rows.length > 0) {
             return this.opencgaSession.opencgaClient.clinical()
                 .search({
-                    individual: rows.map(sample => sample.individualId).join(","),
+                    individual: individuals,
                     study: this.opencgaSession.study.fqn,
                     include: "id,proband.id,family.members",
                     limit: casesLimit * 10,
@@ -233,7 +233,14 @@ export default class SampleGrid extends LitElement {
                         .then(response => {
                             sampleResponse = response;
                             // Fetch clinical analysis to display the Case ID
-                            return this.fetchClinicalAnalysis(sampleResponse?.responses?.[0]?.results || [], casesLimit);
+                            const samples = sampleResponse?.responses?.[0]?.results;
+                            const individuals = (samples || [])
+                                .map(sample => sample.individualId)
+                                .filter(individualId => !!individualId)
+                                .join(",");
+                            if (individuals) {
+                                return this.fetchClinicalAnalysis(samples || [], individuals, casesLimit);
+                            }
                         })
                         .then(() => {
                             // Prepare data for columns extensions

diff --git a/src/webcomponents/sample/sample-view.js b/src/webcomponents/sample/sample-view.js
@@ -194,7 +194,10 @@ export default class SampleView extends LitElement {
                         },
                         {
                             title: "Individual ID",
-                            field: "individualId"
+                            field: "individualId",
+                            display: {
+                                defaultValue: "No individuals or no clinical analyses",
+                            }
                         },
                         {
                             title: "Files",