wc - Fixed bug disorder as array

opencb · Oct 27, 2023 · d0c7538 · d0c7538
1 parent 379b1b7
commit d0c7538
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 13 deletions.
diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -633,7 +633,7 @@ export default class ClinicalAnalysisGrid extends LitElement {
                 formatter: (value, row) => {
                     const panelHtml = row.panels?.length > 0 ? CatalogGridFormatter.panelFormatter(row.panels) : "-";
                     return `
-                        <div>${CatalogGridFormatter.disorderFormatter(value, row)}</div>
+                        <div>${CatalogGridFormatter.disorderFormatter([value], row)}</div>
                         <div style="margin: 5px 0">${panelHtml}</div>
                     `;
                 },

diff --git a/src/webcomponents/clinical/clinical-analysis-summary.js b/src/webcomponents/clinical/clinical-analysis-summary.js
@@ -137,7 +137,7 @@ export default class ClinicalAnalysisSummary extends LitElement {
                             field: "disorder",
                             type: "custom",
                             display: {
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                             }
                         },
                         {

diff --git a/src/webcomponents/clinical/clinical-analysis-update.js b/src/webcomponents/clinical/clinical-analysis-update.js
@@ -213,7 +213,7 @@ export default class ClinicalAnalysisUpdate extends LitElement {
                             field: "disorder",
                             type: "custom",
                             display: {
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                             }
                         },
                         {

diff --git a/src/webcomponents/clinical/clinical-analysis-view.js b/src/webcomponents/clinical/clinical-analysis-view.js
@@ -239,7 +239,7 @@ export default class ClinicalAnalysisView extends LitElement {
                             id: "type",
                             type: "custom",
                             display: {
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                             },
                         },
                         {

diff --git a/src/webcomponents/clinical/interpretation/clinical-interpretation-editor.js b/src/webcomponents/clinical/interpretation/clinical-interpretation-editor.js
@@ -221,7 +221,7 @@ class ClinicalInterpretationEditor extends LitElement {
                             field: "disorder",
                             type: "custom",
                             display: {
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder))
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder]))
                             }
                         },
                         {
@@ -322,7 +322,13 @@ class ClinicalInterpretationEditor extends LitElement {
 
     _updateOrDeleteComments(notify) {
         if (this.commentsUpdate?.updated?.length > 0) {
-            this.opencgaSession.opencgaClient.clinical().updateInterpretation(this.clinicalAnalysis.id, this.clinicalAnalysis.interpretation.id, {comments: this.commentsUpdate.updated}, {commentsAction: "REPLACE", study: this.opencgaSession.study.fqn})
+            this.opencgaSession.opencgaClient.clinical()
+                .updateInterpretation(
+                    this.clinicalAnalysis.id,
+                    this.clinicalAnalysis.interpretation.id,
+                    {comments: this.commentsUpdate.updated},
+                    {commentsAction: "REPLACE", study: this.opencgaSession.study.fqn}
+                )
                 .then(response => {
                     if (notify && this.commentsUpdate?.deleted?.length === 0) {
                         this._postUpdate(response);
@@ -333,7 +339,13 @@ class ClinicalInterpretationEditor extends LitElement {
                 });
         }
         if (this.commentsUpdate?.deleted?.length > 0) {
-            this.opencgaSession.opencgaClient.clinical().updateInterpretation(this.clinicalAnalysis.id, this.clinicalAnalysis.interpretation.id, {comments: this.commentsUpdate.deleted}, {commentsAction: "REMOVE", study: this.opencgaSession.study.fqn})
+            this.opencgaSession.opencgaClient.clinical()
+                .updateInterpretation(
+                    this.clinicalAnalysis.id,
+                    this.clinicalAnalysis.interpretation.id,
+                    {comments: this.commentsUpdate.deleted},
+                    {commentsAction: "REMOVE", study: this.opencgaSession.study.fqn}
+                )
                 .then(response => {
                     if (notify) {
                         this._postUpdate(response);

diff --git a/src/webcomponents/commons/catalog-grid-formatter.js b/src/webcomponents/commons/catalog-grid-formatter.js
@@ -200,7 +200,8 @@ export default class CatalogGridFormatter {
                     html += `
                         <div style="white-space: nowrap">
                             <span style="margin: 2px 0; font-weight: bold">${variable}:</span> ${annotationSet.annotations[variable]}
-                        </div>`;
+                        </div>
+                    `;
                 }
             } else {
                 // This entity has not this variableSetId annotated
@@ -215,7 +216,8 @@ export default class CatalogGridFormatter {
                         html += `
                             <div style="white-space: nowrap">
                                 <span style="margin: 2px 0; font-weight: bold">${variable}:</span> ${annotationSet.annotations[variable]}
-                            </div>`;
+                            </div>
+                        `;
                     }
                 }
             } else {

diff --git a/src/webcomponents/family/family-view.js b/src/webcomponents/family/family-view.js
@@ -247,7 +247,7 @@ export default class FamilyView extends LitElement {
                             type: "list",
                             display: {
                                 contentLayout: "vertical",
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                                 defaultValue: "N/A"
                             }
                         },

diff --git a/src/webcomponents/individual/individual-view.js b/src/webcomponents/individual/individual-view.js
@@ -249,7 +249,7 @@ export default class IndividualView extends LitElement {
                             type: "list",
                             display: {
                                 contentLayout: "vertical",
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                                 defaultValue: "N/A",
                             },
                         },

diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-qc-summary.js b/src/webcomponents/variant/interpretation/variant-interpreter-qc-summary.js
@@ -182,7 +182,7 @@ class VariantInterpreterQcSummary extends LitElement {
                             field: "disorder",
                             type: "custom",
                             display: {
-                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter(disorder)),
+                                render: disorder => UtilsNew.renderHTML(CatalogGridFormatter.disorderFormatter([disorder])),
                             },
                         },
                         {

diff --git a/src/webcomponents/variant/variant-samples.js b/src/webcomponents/variant/variant-samples.js
@@ -330,7 +330,7 @@ export default class VariantSamples extends LitElement {
                     colspan: 1,
                     rowspan: 1,
                     formatter: disorders => {
-                        const result = disorders?.map(disorder => CatalogGridFormatter.disorderFormatter(disorder)).join("<br>");
+                        const result = disorders?.map(disorder => CatalogGridFormatter.disorderFormatter([disorder])).join("<br>");
                         return result ? result : "-";
                     },
                     halign: "center"