From 439725f01beb6db6b7080ffc5ea09ec5fa8a5731 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:14:12 +0100 Subject: [PATCH 01/13] wc: Remove icon in tool header of variant browser #TASK-7216 #TASK-7100 --- src/webcomponents/variant/variant-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/webcomponents/variant/variant-browser.js b/src/webcomponents/variant/variant-browser.js index 9ae7fcc99..25c442192 100644 --- a/src/webcomponents/variant/variant-browser.js +++ b/src/webcomponents/variant/variant-browser.js @@ -452,9 +452,6 @@ export default class VariantBrowser extends LitElement { // return BrowserConf.config; return { title: "Variant Browser", - // icon: "img/tools/icons/variant_browser.svg", - icon: "fa-dna", - active: false, searchButtonText: "Search", filter: { title: "Filter", From 01da36d05cb1f0b8c6f8d0367ad41c1e49be55b3 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:47:15 +0100 Subject: [PATCH 02/13] wc: Remove tool icon and minor code fixes in cohort browser #TASK-7216 #TASK-7100 --- src/webcomponents/cohort/cohort-browser.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/webcomponents/cohort/cohort-browser.js b/src/webcomponents/cohort/cohort-browser.js index 26a27449b..06e31a00b 100644 --- a/src/webcomponents/cohort/cohort-browser.js +++ b/src/webcomponents/cohort/cohort-browser.js @@ -25,9 +25,7 @@ export default class CohortBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -48,7 +46,7 @@ export default class CohortBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "cohort-browser"; this._config = this.getDefaultConfig(); } @@ -57,6 +55,7 @@ export default class CohortBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -83,33 +82,37 @@ export default class CohortBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onCohortUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { - return this.opencgaSession && this._config ? html` + if (!this.opencgaSession) { + return nothing; + } + + return html` - ` : ""; + + `; } getDefaultConfig() { return { title: "Cohort Browser", - icon: "fab fa-searchengin", views: [ { id: "table-tab", From 7baddc0a60a350146f23259446a277149f6d3381 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:48:13 +0100 Subject: [PATCH 03/13] wc: Remove tool icon and minor code fixes in clinical analysis browser #TASK-7216 #TASK-7100 --- .../clinical/clinical-analysis-browser.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/webcomponents/clinical/clinical-analysis-browser.js b/src/webcomponents/clinical/clinical-analysis-browser.js index 1919fa6e4..3597e24b1 100644 --- a/src/webcomponents/clinical/clinical-analysis-browser.js +++ b/src/webcomponents/clinical/clinical-analysis-browser.js @@ -93,21 +93,21 @@ export default class ClinicalAnalysisBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid, }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onClinicalAnalysisUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { - if (!this._config) { - return null; + if (!this.opencgaSession) { + return nothing; } return html` @@ -124,8 +124,6 @@ export default class ClinicalAnalysisBrowser extends LitElement { getDefaultConfig() { return { title: "Clinical Analysis Browser", - icon: "fab fa-searchengin", - // searchButtonText: "Search", views: [ { id: "table-tab", From b93374dd913ca3e9bff53856172eb209ded56fc4 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:49:34 +0100 Subject: [PATCH 04/13] wc: Remove tool icon and minor code fixes in disease panel browser #TASK-7216 #TASK-7100 --- .../disease-panel/disease-panel-browser.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/webcomponents/disease-panel/disease-panel-browser.js b/src/webcomponents/disease-panel/disease-panel-browser.js index f9f729765..47a032c97 100644 --- a/src/webcomponents/disease-panel/disease-panel-browser.js +++ b/src/webcomponents/disease-panel/disease-panel-browser.js @@ -28,7 +28,7 @@ export default class DiseasePanelBrowser extends LitElement { constructor() { super(); - this._init(); + this.#init(); } createRenderRoot() { @@ -55,7 +55,7 @@ export default class DiseasePanelBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "disease-panel-browser"; this._config = this.getDefaultConfig(); } @@ -64,6 +64,7 @@ export default class DiseasePanelBrowser extends LitElement { if (changedProperties.has("settings") || changedProperties.has("config")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -93,19 +94,20 @@ export default class DiseasePanelBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } + onDiseasePanelUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { - return html ` + return html` Date: Fri, 20 Dec 2024 12:50:29 +0100 Subject: [PATCH 05/13] wc: Remove tool icon and minor code fixes in family browser #TASK-7216 #TASK-7100 --- src/webcomponents/family/family-browser.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/webcomponents/family/family-browser.js b/src/webcomponents/family/family-browser.js index f91faf47c..45a04fc51 100644 --- a/src/webcomponents/family/family-browser.js +++ b/src/webcomponents/family/family-browser.js @@ -25,9 +25,7 @@ export default class FamilyBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -48,7 +46,7 @@ export default class FamilyBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "family-browser"; this._config = this.getDefaultConfig(); } @@ -57,6 +55,7 @@ export default class FamilyBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -83,21 +82,21 @@ export default class FamilyBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onFamilyUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { if (!this.opencgaSession) { - return html`
Not valid session
`; + return nothing; } return html` @@ -114,7 +113,6 @@ export default class FamilyBrowser extends LitElement { getDefaultConfig() { return { title: "Family Browser", - icon: "fa-users", views: [ { id: "table-tab", From 10064d9469caedf09907870fa23967a193e4e5ce Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:54:59 +0100 Subject: [PATCH 06/13] wc: Remove tool icon and minor code fixes in file browser #TASK-7216 #TASK-7100 --- src/webcomponents/file/file-browser.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/webcomponents/file/file-browser.js b/src/webcomponents/file/file-browser.js index 0f1ffab3b..a3ede7b1f 100644 --- a/src/webcomponents/file/file-browser.js +++ b/src/webcomponents/file/file-browser.js @@ -29,9 +29,7 @@ export default class FileBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -52,7 +50,7 @@ export default class FileBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "file-browser"; this._config = this.getDefaultConfig(); } @@ -61,6 +59,7 @@ export default class FileBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -87,20 +86,21 @@ export default class FileBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onFileUpdate() { this.settingsObserver(); + this.requestUpdate(); } + render() { - if (!this.opencgaSession || !this._config) { - return ""; + if (!this.opencgaSession) { + return nothing; } return html` @@ -117,8 +117,6 @@ export default class FileBrowser extends LitElement { getDefaultConfig() { return { title: "File Browser", - icon: "fa-file", - description: "", views: [ { id: "table-tab-file", From 4422fe887e5cf2b46b9204c07b48aaea4fa62854 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:56:05 +0100 Subject: [PATCH 07/13] wc: Remove tool icon and minor code fixes in individual browser #TASK-7216 #TASK-7100 --- src/webcomponents/individual/individual-browser.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/webcomponents/individual/individual-browser.js b/src/webcomponents/individual/individual-browser.js index 6b8f22a28..00316e515 100644 --- a/src/webcomponents/individual/individual-browser.js +++ b/src/webcomponents/individual/individual-browser.js @@ -32,9 +32,7 @@ export default class IndividualBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -55,7 +53,7 @@ export default class IndividualBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "individual-browser"; this._config = this.getDefaultConfig(); } @@ -64,6 +62,7 @@ export default class IndividualBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -90,21 +89,21 @@ export default class IndividualBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onIndividualUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { if (!this.opencgaSession) { - return html`
Not valid session
`; + return nothing; } return html` @@ -121,7 +120,6 @@ export default class IndividualBrowser extends LitElement { getDefaultConfig() { return { title: "Individual Browser", - icon: "fa-user", views: [ { id: "table-tab", From 727eb1c4823caa028db67d0b6cf2a2e5352819a7 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:56:54 +0100 Subject: [PATCH 08/13] wc: Remove tool icon and minor code fixes in job browser #TASK-7216 #TASK-7100 --- src/webcomponents/job/job-browser.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/webcomponents/job/job-browser.js b/src/webcomponents/job/job-browser.js index fa719e427..e6078e031 100644 --- a/src/webcomponents/job/job-browser.js +++ b/src/webcomponents/job/job-browser.js @@ -30,9 +30,7 @@ export default class JobBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -53,7 +51,7 @@ export default class JobBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "job-browser"; this._config = this.getDefaultConfig(); } @@ -62,6 +60,7 @@ export default class JobBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -88,22 +87,21 @@ export default class JobBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onJobUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { - // No openCGA session available if (!this.opencgaSession) { - return guardPage(); + return nothing; } return html` @@ -120,7 +118,6 @@ export default class JobBrowser extends LitElement { getDefaultConfig() { return { title: "Jobs Browser", - icon: "fa-rocket", description: "", views: [ { From 00c1b1930006b8cb825e845d9d8779e4d4d09fb9 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:57:49 +0100 Subject: [PATCH 09/13] wc: Remove tool icon and minor code fixes in note browser #TASK-7216 #TASK-7100 --- src/webcomponents/note/note-browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webcomponents/note/note-browser.js b/src/webcomponents/note/note-browser.js index 8d3edf7ad..07069f918 100644 --- a/src/webcomponents/note/note-browser.js +++ b/src/webcomponents/note/note-browser.js @@ -27,7 +27,6 @@ export default class NoteBrowser extends LitElement { constructor() { super(); - // Set status and init private properties this.#init(); } @@ -58,6 +57,7 @@ export default class NoteBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -100,8 +100,9 @@ export default class NoteBrowser extends LitElement { render() { if (!this.opencgaSession) { - return html`
Not valid session
`; + return nothing; } + return html` Date: Fri, 20 Dec 2024 12:58:35 +0100 Subject: [PATCH 10/13] wc: Remove tool icon and minor code fixes in sample browser #TASK-7216 #TASK-7100 --- src/webcomponents/sample/sample-browser.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/webcomponents/sample/sample-browser.js b/src/webcomponents/sample/sample-browser.js index 0c928c9c5..e8033681b 100644 --- a/src/webcomponents/sample/sample-browser.js +++ b/src/webcomponents/sample/sample-browser.js @@ -26,9 +26,7 @@ export default class SampleBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties - this._init(); + this.#init(); } createRenderRoot() { @@ -49,7 +47,7 @@ export default class SampleBrowser extends LitElement { }; } - _init() { + #init() { this.COMPONENT_ID = "sample-browser"; this._config = this.getDefaultConfig(); } @@ -58,6 +56,7 @@ export default class SampleBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -85,21 +84,21 @@ export default class SampleBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onSampleUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { if (!this.opencgaSession) { - return html`
Not valid session
`; + return nothing; } return html` @@ -116,7 +115,6 @@ export default class SampleBrowser extends LitElement { getDefaultConfig() { return { title: "Sample Browser", - icon: "fa-vial", views: [ { id: "table-tab", From 9117bb52cf3b1d1b995e2921a63f36bb209c96dc Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:59:14 +0100 Subject: [PATCH 11/13] wc: Remove tool icon and minor code fixes in workflow browser #TASK-7216 #TASK-7100 --- src/webcomponents/workflow/workflow-browser.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/webcomponents/workflow/workflow-browser.js b/src/webcomponents/workflow/workflow-browser.js index 486157360..861119df4 100644 --- a/src/webcomponents/workflow/workflow-browser.js +++ b/src/webcomponents/workflow/workflow-browser.js @@ -31,8 +31,6 @@ export default class WorkflowBrowser extends LitElement { constructor() { super(); - - // Set status and init private properties this.#init(); } @@ -63,6 +61,7 @@ export default class WorkflowBrowser extends LitElement { if (changedProperties.has("settings")) { this.settingsObserver(); } + super.update(changedProperties); } @@ -89,21 +88,21 @@ export default class WorkflowBrowser extends LitElement { ...this._config.filter?.result?.grid, ...this.opencgaSession.user?.configs?.IVA?.settings?.[this.COMPONENT_ID]?.grid }); - - this.requestUpdate(); } onSettingsUpdate() { this.settingsObserver(); + this.requestUpdate(); } onWorkflowUpdate() { this.settingsObserver(); + this.requestUpdate(); } render() { if (!this.opencgaSession) { - return html`
Not valid session
`; + return nothing; } return html` @@ -120,7 +119,6 @@ export default class WorkflowBrowser extends LitElement { getDefaultConfig() { return { title: "Workflow Browser", - icon: "fab fa-searchengin", views: [ { id: "table-tab", From a40a8f253568229c396a96b9f9120dfd0af3e6a5 Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 12:59:42 +0100 Subject: [PATCH 12/13] iva-app: Remove icon of workflow manager header #TASK-7216 #TASK-7100 --- src/sites/iva/iva-app.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/sites/iva/iva-app.js b/src/sites/iva/iva-app.js index d1f0a38db..a0990675b 100644 --- a/src/sites/iva/iva-app.js +++ b/src/sites/iva/iva-app.js @@ -1349,15 +1349,10 @@ class IvaApp extends LitElement { break; case "workflow-manager": content = html` - - -
- - -
+ + + `; break; case "cat-browser": From 25811ca1eb07fffbaf8ef5d42a6a4d8c5952e74e Mon Sep 17 00:00:00 2001 From: Josemi Date: Fri, 20 Dec 2024 13:18:12 +0100 Subject: [PATCH 13/13] wc: Minor style fixes in login form #TASK-7216 #TASK-7100 --- src/webcomponents/user/user-login.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webcomponents/user/user-login.js b/src/webcomponents/user/user-login.js index e6a7fe3aa..44d574760 100644 --- a/src/webcomponents/user/user-login.js +++ b/src/webcomponents/user/user-login.js @@ -142,16 +142,16 @@ export default class UserLogin extends LitElement { return html`
- + - +
- + - +
${(this.opencgaSession?.opencgaClient?._config?.organizations?.length > 1) ? html`