From 593a627627a59a0f82131aebdd38b6919939798c Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:03:15 +0100 Subject: [PATCH 1/7] wc: fix actions column to be always visible in rearrangement grid #TASK-5575 --- .../interpretation/variant-interpreter-rearrangement-grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js index 4b15bc83de..5081717898 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js @@ -596,8 +596,8 @@ export default class VariantInterpreterRearrangementGrid extends LitElement { events: { "click a": this.onActionClick.bind(this) }, - visible: this._config.showActions && !this._config?.columns?.hidden?.includes("actions"), excludeFromExport: true, + excludeFromSettings: true, } ], [ From d2e5bca01ddb40d5f70b0c150195b63a86a82cbd Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:04:35 +0100 Subject: [PATCH 2/7] wc: prevent changing disabled attribute in edit button of actions dropdown when actions column is not visible #TASK-5575 --- .../variant-interpreter-rearrangement-grid.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js index 5081717898..dd1c227f70 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js @@ -846,10 +846,12 @@ export default class VariantInterpreterRearrangementGrid extends LitElement { // Set 'Edit' button as enabled/disabled document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewButton`).disabled = !event.currentTarget.checked; const reviewActionButton = document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewActionButton`); - if (event.currentTarget.checked) { - reviewActionButton.removeAttribute("disabled"); - } else { - reviewActionButton.setAttribute("disabled", "true"); + if (reviewActionButton) { + if (event.currentTarget.checked) { + reviewActionButton.removeAttribute("disabled"); + } else { + reviewActionButton.setAttribute("disabled", "true"); + } } // Dispatch row check event From 0c7f7fbd3a7b81995945a71061663a5df3310590 Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:07:04 +0100 Subject: [PATCH 3/7] wc: apply the same fix in variant-interpreter-grid #TASK-5575 --- .../interpretation/variant-interpreter-grid.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js index 2f30235a51..75662f9b45 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js @@ -1307,13 +1307,18 @@ export default class VariantInterpreterGrid extends LitElement { this.checkedVariants.delete(variantId); } - // Set 'Edit' button as enabled/disabled - document.getElementById(`${this._prefix}${variantId}VariantReviewButton`).disabled = !e.currentTarget.checked; + // Set 'Edit' button as enabled/disabled in column and actions dropdown + const reviewButton = document.getElementById(`${this._prefix}${variantId}VariantReviewButton`); + if (reviewButton) { + reviewButton.disabled = !e.currentTarget.checked; + } const reviewActionButton = document.getElementById(`${this._prefix}${variantId}VariantReviewActionButton`); - if (e.currentTarget.checked) { - reviewActionButton.removeAttribute("disabled"); - } else { - reviewActionButton.setAttribute("disabled", "true"); + if (reviewActionButton) { + if (e.currentTarget.checked) { + reviewActionButton.removeAttribute("disabled"); + } else { + reviewActionButton.setAttribute("disabled", "true"); + } } // Enable or disable evidences select From d3252fbe5dd0942e556ebb63c4213599b17d068b Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:12:54 +0100 Subject: [PATCH 4/7] wc: added note in variant-interpreter-grid #TAKS-5575 --- .../variant/interpretation/variant-interpreter-grid.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js index 75662f9b45..fa9366757e 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js @@ -1308,10 +1308,10 @@ export default class VariantInterpreterGrid extends LitElement { } // Set 'Edit' button as enabled/disabled in column and actions dropdown - const reviewButton = document.getElementById(`${this._prefix}${variantId}VariantReviewButton`); - if (reviewButton) { - reviewButton.disabled = !e.currentTarget.checked; - } + document.getElementById(`${this._prefix}${variantId}VariantReviewButton`).disabled = !e.currentTarget.checked; + + // Josemi NOTE 20240205 - Edit buton in actions dropdown is not rendered when when actions column is hidden + // We have added a condition to ensure that the button exists before set/remove the disabled attribute const reviewActionButton = document.getElementById(`${this._prefix}${variantId}VariantReviewActionButton`); if (reviewActionButton) { if (e.currentTarget.checked) { From 576becbcbc83ccf8c0786f81db925ad3e559ac5a Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:13:10 +0100 Subject: [PATCH 5/7] wc: added note about last change in rearrangement grid #TAKS-5575 --- .../interpretation/variant-interpreter-rearrangement-grid.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js index dd1c227f70..4fa0c021a6 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js @@ -845,6 +845,9 @@ export default class VariantInterpreterRearrangementGrid extends LitElement { // Set 'Edit' button as enabled/disabled document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewButton`).disabled = !event.currentTarget.checked; + + // Josemi NOTE 20240205 - Edit buton in actions dropdown is not rendered when when actions column is hidden + // We have added a condition to ensure that the button exists before set/remove the disabled attribute const reviewActionButton = document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewActionButton`); if (reviewActionButton) { if (event.currentTarget.checked) { From 215ff07b2df60a461275abcd974780a08432f438 Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:17:12 +0100 Subject: [PATCH 6/7] wc: fix note and add check also to edit button in review column #TASK-5575 --- .../variant/interpretation/variant-interpreter-grid.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js index fa9366757e..867216c757 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js @@ -1307,11 +1307,15 @@ export default class VariantInterpreterGrid extends LitElement { this.checkedVariants.delete(variantId); } - // Set 'Edit' button as enabled/disabled in column and actions dropdown - document.getElementById(`${this._prefix}${variantId}VariantReviewButton`).disabled = !e.currentTarget.checked; + // Set 'Edit' button as enabled/disabled in 'Review' column + // Josemi NOTE 20240205 - Edit buton in column is not rendered when 'Review' column is hidden + const reviewButton = document.getElementById(`${this._prefix}${variantId}VariantReviewButton`); + if (reviewButton) { + reviewButton.disabled = !e.currentTarget.checked; + } + // Set 'Edit' button as enabled/disabled in 'Actions' dropdown // Josemi NOTE 20240205 - Edit buton in actions dropdown is not rendered when when actions column is hidden - // We have added a condition to ensure that the button exists before set/remove the disabled attribute const reviewActionButton = document.getElementById(`${this._prefix}${variantId}VariantReviewActionButton`); if (reviewActionButton) { if (e.currentTarget.checked) { From 6945577e29e38e05e31173970bc08fe0badb0315 Mon Sep 17 00:00:00 2001 From: Josemi Date: Mon, 5 Feb 2024 16:17:38 +0100 Subject: [PATCH 7/7] wc: fix note and add check also in edit button of Review column of rearrangement grid #TASK-5575 --- .../variant-interpreter-rearrangement-grid.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js index 4fa0c021a6..038dfd5568 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js @@ -843,11 +843,15 @@ export default class VariantInterpreterRearrangementGrid extends LitElement { } }); - // Set 'Edit' button as enabled/disabled - document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewButton`).disabled = !event.currentTarget.checked; + // Set 'Edit' button as enabled/disabled in 'Review' column + // Josemi NOTE 20240205 - Edit buton in column is not rendered when 'Review' column is hidden + const reviewButton = document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewButton`); + if (reviewButton) { + reviewButton.disabled = !event.currentTarget.checked; + } + // Set 'Edit' button as enabled/disabled in 'Actions' dropdown // Josemi NOTE 20240205 - Edit buton in actions dropdown is not rendered when when actions column is hidden - // We have added a condition to ensure that the button exists before set/remove the disabled attribute const reviewActionButton = document.getElementById(`${this._prefix}${this._rows[index][0].id}VariantReviewActionButton`); if (reviewActionButton) { if (event.currentTarget.checked) {