From 74d735367c83eb49714a72b045c10bde454d52eb Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Tue, 25 Feb 2025 12:40:59 -0500 Subject: [PATCH 001/105] [BI-2539] - added Sign In with GitHub support --- .env.development | 1 + src/assets/scss/main.scss | 8 ++- src/components/layouts/InfoSideBarLayout.vue | 34 ++++++++++ src/views/account/AccountSignUp.vue | 69 +++++++++++++++----- vue.config.js | 1 + 5 files changed, 95 insertions(+), 18 deletions(-) diff --git a/.env.development b/.env.development index 60d1d1189..0f1ee0ecf 100644 --- a/.env.development +++ b/.env.development @@ -18,3 +18,4 @@ VUE_APP_BI_REFERENCE_SOURCE=${BRAPI_REFERENCE_SOURCE} # feature flags VUE_APP_BRAPI_VENDOR_SUBMISSION_ENABLED=${BRAPI_VENDOR_SUBMISSION_ENABLED} +VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED=${VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED} \ No newline at end of file diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 66397d521..4ccf9e0a3 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -579,6 +579,10 @@ table tr.is-edited + .detail { margin-bottom: 7em; } +.githubBtn { + margin: 1em auto; +} + .program-selection-level { .level-item:not(:last-child) { margin-right:0.5em !important; @@ -621,7 +625,7 @@ a.is-underlined { text-decoration: underline; } -#connect-orcid-button{ +#connect-orcid-button #connect-github-button { border: 1px solid #D3D3D3; padding: .3em; background-color: #fff; @@ -635,7 +639,7 @@ a.is-underlined { vertical-align: middle; } -#connect-orcid-button:hover{ +#connect-orcid-button:hover #connect-github-button:hover { border: 1px solid #338caf; color: #338caf; } diff --git a/src/components/layouts/InfoSideBarLayout.vue b/src/components/layouts/InfoSideBarLayout.vue index 6b1442f09..147a4bee7 100644 --- a/src/components/layouts/InfoSideBarLayout.vue +++ b/src/components/layouts/InfoSideBarLayout.vue @@ -128,6 +128,19 @@

To access to your breeding program, please log in.

+
+ +
+
+

To acknowledge that you have used your iD and that it has been authenticated, we display the ORCID iD icon @@ -188,6 +202,7 @@ public isLoginModalActive: boolean = false; public isLoginServerErrorModalActive: boolean = false; public loginProcessing: boolean = false; + public githubLoginProcessing: boolean = false; private orcidLogoUrl: string = 'https://orcid.org/sites/default/files/images/orcid_24x24.png'; @Prop() public loginRedirect!: boolean; @@ -231,9 +246,28 @@ window.location.href = process.env.VUE_APP_BI_API_ROOT+'/sso/start'; } + async githubLogin() { + // Check the server can be contacted + this.githubLoginProcessing = true; + try { + await ServerManagementService.checkHealth(); + } catch (error) { + this.isLoginServerErrorModalActive = true; + this.githubLoginProcessing = false; + return; + } + + // Start login process + window.location.href = process.env.VUE_APP_BI_API_ROOT+'/sso/start/github'; + } + get sandboxConfig() { return process.env.VUE_APP_SANDBOX; } + alternateAuthenticationEnabled() { + return process.env.VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED === 'true'; } + + } diff --git a/src/views/account/AccountSignUp.vue b/src/views/account/AccountSignUp.vue index 8b2f77a94..8ae5fbf88 100644 --- a/src/views/account/AccountSignUp.vue +++ b/src/views/account/AccountSignUp.vue @@ -27,23 +27,37 @@

To activate your account, please log in.

- + +
+ + SIGN IN with ORCID + ORCID iD icon + +

To acknowledge that you have used your iD and that it has been authenticated, we display the ORCID iD icon @@ -79,6 +93,7 @@ }) export default class AccountSignUp extends Vue { public loginProcessing: boolean = false; + public loginGithubProcessing: boolean = false; public accountTokenCookieName: string = Vue.prototype.$cookieNames.accountToken; public isLoginServerErrorModalActive: boolean = false; @Prop() @@ -110,6 +125,28 @@ // Start login process window.location.href = process.env.VUE_APP_BI_API_ROOT+'/sso/start'; } + + async githubLogin() { + // Check the server can be contacted + this.loginGithubProcessing = true; + try { + await ServerManagementService.checkHealth(); + } catch (error) { + this.isLoginServerErrorModalActive = true; + this.loginGithubProcessing = false; + return; + } + + // Set the cookie to pass back their account token. Timeout is an hour + Vue.$cookies.set(this.accountTokenCookieName, this.accountToken, 60*60); + + // Start login process + window.location.href = process.env.VUE_APP_BI_API_ROOT+'/sso/start/github'; + } + + alternateAuthenticationEnabled() { + return process.env.VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED === 'true'; + } } diff --git a/vue.config.js b/vue.config.js index ae4b5810d..eed14c1ff 100644 --- a/vue.config.js +++ b/vue.config.js @@ -28,6 +28,7 @@ process.env.VUE_APP_BI_API_V1_PATH = process.env.VUE_APP_BI_API_ROOT + "/v1"; process.env.VUE_APP_LOG_LEVEL = process.env.VUE_APP_LOG_LEVEL || 'error'; process.env.VUE_APP_BI_REFERENCE_SOURCE = process.env.VUE_APP_BI_REFERENCE_SOURCE || 'breedinginsight.org'; process.env.VUE_APP_BRAPI_VENDOR_SUBMISSION_ENABLED = ('true' === process.env.VUE_APP_BRAPI_VENDOR_SUBMISSION_ENABLED); +process.env.VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED = ('true' === process.env.VUE_APP_ALTERNATE_AUTHENTICATION_ENABLED); module.exports = { devServer: { From 8388d9bfe91f333266c8e7f04d5f48fca6397013 Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Wed, 9 Apr 2025 12:44:03 -0400 Subject: [PATCH 002/105] [BI-2581] remove unneeded text --- .../ImportInfoTemplateMessageBox.vue | 1 - .../trait/TraitImportTemplateMessageBox.vue | 59 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 src/components/trait/TraitImportTemplateMessageBox.vue diff --git a/src/components/file-import/ImportInfoTemplateMessageBox.vue b/src/components/file-import/ImportInfoTemplateMessageBox.vue index 5f4ad3a44..e3bb826ee 100644 --- a/src/components/file-import/ImportInfoTemplateMessageBox.vue +++ b/src/components/file-import/ImportInfoTemplateMessageBox.vue @@ -30,7 +30,6 @@ Download the {{toTitleCase(importTypeName)}} Import Template -
Template version placeholder diff --git a/src/components/trait/TraitImportTemplateMessageBox.vue b/src/components/trait/TraitImportTemplateMessageBox.vue deleted file mode 100644 index 40536a6a6..000000000 --- a/src/components/trait/TraitImportTemplateMessageBox.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - - From ab16b727c6c7ee8cfc28f72cd8ceffe22df3e058 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Tue, 15 Apr 2025 13:08:57 +0000 Subject: [PATCH 003/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d82122bad..ba9bfe478 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.0.0+813", + "version": "v1.0.0+819", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/4a0d66371eaa79c2190b1537f60c53689a82671b" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/87ec975f1bba827c05aeb42276c4dbbe0a8b5e57" } From d808269c5a7d86715159a05b03cc18b211167117 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Mon, 21 Apr 2025 13:44:12 +0000 Subject: [PATCH 004/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ba9bfe478..9857abca8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.0.0+819", + "version": "v1.0.0+825", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/87ec975f1bba827c05aeb42276c4dbbe0a8b5e57" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/67ff8c9a88fdabfa6fde4325e2cee1e2bc0d6fbd" } From 3408ae44a9378f6927ca6cface006495b90e060f Mon Sep 17 00:00:00 2001 From: HMS17 Date: Mon, 21 Apr 2025 16:15:01 -0400 Subject: [PATCH 005/105] [BI-2009] - Dynamic Concatenation of Entity + ObsUnitID (Exp UI) --- src/views/import/Dataset.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/import/Dataset.vue b/src/views/import/Dataset.vue index 6ef10f365..f1e516957 100644 --- a/src/views/import/Dataset.vue +++ b/src/views/import/Dataset.vue @@ -230,7 +230,7 @@ Date: Mon, 28 Apr 2025 16:13:39 -0400 Subject: [PATCH 006/105] [BI-2009] - Cleanup --- src/views/import/Dataset.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/import/Dataset.vue b/src/views/import/Dataset.vue index f1e516957..a0a1ce16a 100644 --- a/src/views/import/Dataset.vue +++ b/src/views/import/Dataset.vue @@ -554,7 +554,6 @@ export default class Dataset extends ProgramsBase { } setObsUnitIDLabel(){ - //todo add NA case? what if there is a genuine NA obs lvl this.obsUnitIDLabel = this.observationUnit + " ObsUnitID" } From 54b3ccc632e011e193dbd5aa0166da794ec7e3d7 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Thu, 1 May 2025 13:10:42 -0400 Subject: [PATCH 007/105] pinned dependency version --- task/serve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/serve.js b/task/serve.js index 08f071e5d..1579e94d4 100755 --- a/task/serve.js +++ b/task/serve.js @@ -26,7 +26,7 @@ const port = process.env.PORT || JSON.parse(fs.readFileSync('package.json', 'utf let spinner = ora({prefixText: ' ', color: 'yellow'}); try { spinner = spinner.start('sort package.json'); - await execa('npx', ['sort-package-json'], {preferLocal: true}); + await execa('npx', ['sort-package-json@3.0.0'], {preferLocal: true}); spinner = spinner.clear() .succeed('package.json sorted'); From 1f02df09063b3eeeea302ba0724f30c4e6aa9aa8 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Thu, 1 May 2025 17:12:24 +0000 Subject: [PATCH 008/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9857abca8..6b947b27a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.0.0+825", + "version": "v1.0.0+835", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/67ff8c9a88fdabfa6fde4325e2cee1e2bc0d6fbd" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/ca1c0617a9c8d262e1d1bfe644b5a6d9891cdefe" } From 36e06c0c4d59277d7ae49757ad70ba3b10d9b2cc Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Tue, 6 May 2025 17:28:00 +0000 Subject: [PATCH 009/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8609016e8..9a55b0ab3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bi-web", - "version": "v1.1.0+837", + "version": "v1.1.0+841", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -97,5 +97,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/4ad47816b34ac8e11139d7c2c27ae7a480fc39d4" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/63dd9e2a75f7cfb5e78971cb872082a44b788ffc" } From 5c51a0ec69558c816c472580ddf1d095705e2396 Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Tue, 6 May 2025 13:57:45 -0400 Subject: [PATCH 010/105] [BI-2009] - fix serve.js changes for some reason not on branch --- task/serve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/serve.js b/task/serve.js index 08f071e5d..1579e94d4 100755 --- a/task/serve.js +++ b/task/serve.js @@ -26,7 +26,7 @@ const port = process.env.PORT || JSON.parse(fs.readFileSync('package.json', 'utf let spinner = ora({prefixText: ' ', color: 'yellow'}); try { spinner = spinner.start('sort package.json'); - await execa('npx', ['sort-package-json'], {preferLocal: true}); + await execa('npx', ['sort-package-json@3.0.0'], {preferLocal: true}); spinner = spinner.clear() .succeed('package.json sorted'); From 374d8d114b30af6dc3a900f31dbae093a67de893 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Wed, 7 May 2025 18:06:45 +0000 Subject: [PATCH 011/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9a55b0ab3..6f71ee7c8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bi-web", - "version": "v1.1.0+841", + "version": "v1.1.0+843", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -97,5 +97,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/63dd9e2a75f7cfb5e78971cb872082a44b788ffc" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f01005ba520cbdd799b8a16445d3af4cb459dc06" } From 6cc31683747533e46ab62da89dc199c368769a82 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Mon, 19 May 2025 19:03:13 +0000 Subject: [PATCH 012/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 17b86d830..481dec52b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.1.0+843", + "version": "v1.1.0+847", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f01005ba520cbdd799b8a16445d3af4cb459dc06" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/6cf7b4bf0df41ed0fb713369be16fab153315f9a" } From 6a430849a89c0c480ccd922055db9f7c80e60c38 Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Mon, 19 May 2025 15:38:11 -0400 Subject: [PATCH 013/105] Update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 481dec52b..71bf8d8bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.1.0+847", + "version": "v1.2.0+847", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", From dc65652700e92790c553fe9d96045963fab43eff Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Mon, 19 May 2025 19:38:26 +0000 Subject: [PATCH 014/105] [autocommit] bumping build number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 71bf8d8bc..39d750657 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.2.0+847", + "version": "v1.2.0+851", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/6cf7b4bf0df41ed0fb713369be16fab153315f9a" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/6a430849a89c0c480ccd922055db9f7c80e60c38" } From 0495dc1fc70d47042f3e212b4fa2e66cc6f8f0d4 Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Tue, 6 May 2025 13:54:42 -0400 Subject: [PATCH 015/105] [BI-2218] log-in button is always visable --- src/components/layouts/InfoSideBarLayout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/layouts/InfoSideBarLayout.vue b/src/components/layouts/InfoSideBarLayout.vue index 6b1442f09..acc6c6966 100644 --- a/src/components/layouts/InfoSideBarLayout.vue +++ b/src/components/layouts/InfoSideBarLayout.vue @@ -59,7 +59,7 @@

Use these credentials to explore sample data and currently available features.

-
+
From 7ac731dc6ec4003a7aaccf975b9fd3a5ce69200f Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Wed, 21 May 2025 13:33:08 -0400 Subject: [PATCH 016/105] [BI-2218] WIP --- package.json | 1 - src/assets/scss/main.scss | 6 ++++++ src/components/layouts/BaseSideBarLayout.vue | 10 ++++++---- src/components/layouts/InfoSideBarLayout.vue | 2 ++ .../notifications/SandboxPublicNotification.vue | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6f71ee7c8..17b86d830 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "bi-web", - "version": "v1.1.0+843", "private": true, "scripts": { diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 66397d521..7353f661e 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -1088,5 +1088,11 @@ article.message.is-success *:not(button) { color: mix(black, $success, 70%); } +//@media screen and (max-width: 600px) { +// .hide_when_small{ +// display: none; +// } +//} + diff --git a/src/components/layouts/BaseSideBarLayout.vue b/src/components/layouts/BaseSideBarLayout.vue index f2229074f..ee1e867e7 100644 --- a/src/components/layouts/BaseSideBarLayout.vue +++ b/src/components/layouts/BaseSideBarLayout.vue @@ -17,7 +17,6 @@