From 6e6c196738482a34b6ba0e7b5d9d31b201873583 Mon Sep 17 00:00:00 2001 From: EstelleDa Date: Thu, 5 Sep 2024 15:08:52 +1000 Subject: [PATCH 1/7] Remove duplicate function. --- src/components/screens/ScoreSetCreator.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/screens/ScoreSetCreator.vue b/src/components/screens/ScoreSetCreator.vue index 3209dbee..431b6f7d 100644 --- a/src/components/screens/ScoreSetCreator.vue +++ b/src/components/screens/ScoreSetCreator.vue @@ -1258,15 +1258,6 @@ export default { } }, - suggestionsForAutocomplete: function (suggestions) { - // The PrimeVue AutoComplete doesn't seem to like it if we set the suggestion list to []. - // This causes the drop-down to stop appearing when we later populate the list. - if (!suggestions || suggestions.length == 0) { - return [{}] - } - return suggestions - }, - validateWizardStep: function(step) { // Later, this may depend on server-side validation. switch (step) { From 1e19936e50efb758aed1fd0fb935ec3a65d72c15 Mon Sep 17 00:00:00 2001 From: Sally Grindstaff Date: Thu, 12 Sep 2024 16:04:30 -0700 Subject: [PATCH 2/7] Add mapping status to score set view before publishing --- src/components/screens/ScoreSetView.vue | 26 ++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/components/screens/ScoreSetView.vue b/src/components/screens/ScoreSetView.vue index e462ddb3..158e1767 100644 --- a/src/components/screens/ScoreSetView.vue +++ b/src/components/screens/ScoreSetView.vue @@ -3,7 +3,7 @@
-
+
Scores and/or counts have been successfully processed. This score set is ready to be published. @@ -13,6 +13,11 @@ Scores and/or counts are being processed. Refresh this page in a few minutes to check on their status.
+
+ + Variants are being mapped to a reference. Refresh this page in a few minutes to check on their status. + +
Failed to process score and/or count data: {{ item.processingErrors.exception }}. If there were issues with validation of individual variants, they will appear in the `Variants` section of this page. @@ -24,6 +29,25 @@
+
+
+
+ + All variants mapped successfully to reference. + +
+
+ + Variant mapping completed, but some variants did not map successfully. The mapped variants file available on this page includes specific error messages for each failed variant mapping. Score set is still publishable. + +
+
+ + Variants could not be mapped to reference: {{ item.mappingErrors.error_message }}. This score set is still publishable. + +
+
+
{{ item.title || 'Untitled score set' }}
From af552a0a99e43a319860fa52b67538f82d42be1c Mon Sep 17 00:00:00 2001 From: Sally Grindstaff Date: Thu, 12 Sep 2024 16:29:25 -0700 Subject: [PATCH 3/7] fix ui changes for vrs map integration --- src/components/screens/ScoreSetView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/screens/ScoreSetView.vue b/src/components/screens/ScoreSetView.vue index 158e1767..9d06c41c 100644 --- a/src/components/screens/ScoreSetView.vue +++ b/src/components/screens/ScoreSetView.vue @@ -13,7 +13,7 @@ Scores and/or counts are being processed. Refresh this page in a few minutes to check on their status.
-
+
Variants are being mapped to a reference. Refresh this page in a few minutes to check on their status. @@ -30,7 +30,7 @@
-
+
All variants mapped successfully to reference. From 60c773564b5560fed9418f48d700738bf584cd98 Mon Sep 17 00:00:00 2001 From: Sally Grindstaff Date: Thu, 12 Sep 2024 16:43:53 -0700 Subject: [PATCH 4/7] fix typo in vrs map integration score set view --- src/components/screens/ScoreSetView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/screens/ScoreSetView.vue b/src/components/screens/ScoreSetView.vue index 9d06c41c..3c3b79fa 100644 --- a/src/components/screens/ScoreSetView.vue +++ b/src/components/screens/ScoreSetView.vue @@ -41,7 +41,7 @@ Variant mapping completed, but some variants did not map successfully. The mapped variants file available on this page includes specific error messages for each failed variant mapping. Score set is still publishable.
-
+
Variants could not be mapped to reference: {{ item.mappingErrors.error_message }}. This score set is still publishable. From f8d5601005618abf29095a84b780b6f0edf4973b Mon Sep 17 00:00:00 2001 From: Sally Grindstaff Date: Thu, 12 Sep 2024 16:52:46 -0700 Subject: [PATCH 5/7] Show that variants are being mapped on score set view --- src/components/screens/ScoreSetView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/screens/ScoreSetView.vue b/src/components/screens/ScoreSetView.vue index 3c3b79fa..5c7f2451 100644 --- a/src/components/screens/ScoreSetView.vue +++ b/src/components/screens/ScoreSetView.vue @@ -3,7 +3,7 @@
-
+
Scores and/or counts have been successfully processed. This score set is ready to be published. From 725692f29357f2a958fe0a130fa642bacb97e281 Mon Sep 17 00:00:00 2001 From: Sally Grindstaff Date: Fri, 13 Sep 2024 14:59:56 -0700 Subject: [PATCH 6/7] Incorporate queued mapping state into score set view --- src/components/screens/ScoreSetView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/screens/ScoreSetView.vue b/src/components/screens/ScoreSetView.vue index 5c7f2451..517e6f70 100644 --- a/src/components/screens/ScoreSetView.vue +++ b/src/components/screens/ScoreSetView.vue @@ -3,7 +3,7 @@
-
+
Scores and/or counts have been successfully processed. This score set is ready to be published. @@ -13,7 +13,7 @@ Scores and/or counts are being processed. Refresh this page in a few minutes to check on their status.
-
+
Variants are being mapped to a reference. Refresh this page in a few minutes to check on their status. @@ -30,7 +30,7 @@
-
+
All variants mapped successfully to reference. From 80de363d16bd57c59337a1f362324b12153b649c Mon Sep 17 00:00:00 2001 From: Ben Capodanno Date: Fri, 13 Sep 2024 16:18:49 -0700 Subject: [PATCH 7/7] Bump version number --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9e57dc4..e4b75d25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mavedb-ui", - "version": "2024.3.0", + "version": "2024.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mavedb-ui", - "version": "2024.3.0", + "version": "2024.4.0", "dependencies": { "@fontsource/raleway": "^5.0.16", "axios": "^1.6.2", diff --git a/package.json b/package.json index 4d148e1c..5ccf6c07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mavedb-ui", - "version": "2024.3.0", + "version": "2024.4.0", "private": true, "scripts": { "build": "vite build --mode=${MODE=live}",