From 26742f5eac3b2d6da8373d2e8b3f2e68249abe7d Mon Sep 17 00:00:00 2001 From: "Sven F." <9976560+sven1103@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:09:09 +0200 Subject: [PATCH] Change user search input text placeholder (#773) Rename ORCiD to ORCID Co-authored-by: Sven F. --------- Co-authored-by: Tobias Koch --- .../java/life/qbic/datamanager/views/login/LoginLayout.java | 2 +- .../project/access/AddCollaboratorToProjectDialog.java | 4 ++-- .../datamanager/views/register/RegistrationOrcIdMain.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user-interface/src/main/java/life/qbic/datamanager/views/login/LoginLayout.java b/user-interface/src/main/java/life/qbic/datamanager/views/login/LoginLayout.java index fdfa61de6..3faf0a896 100644 --- a/user-interface/src/main/java/life/qbic/datamanager/views/login/LoginLayout.java +++ b/user-interface/src/main/java/life/qbic/datamanager/views/login/LoginLayout.java @@ -130,7 +130,7 @@ private Div initRegistrationSection(String contextPath) { Span spacer = new Span("OR"); spacer.addClassName("spacer"); OidcLogo oidcLogo = new OidcLogo(OidcType.ORCID); - LoginCard orcidCard = new LoginCard(oidcLogo, "Login with ORCiD", + LoginCard orcidCard = new LoginCard(oidcLogo, "Login with ORCID", contextPath + "/oauth2/authorization/orcid"); return new Div(registrationLink, spacer, orcidCard); } diff --git a/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/access/AddCollaboratorToProjectDialog.java b/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/access/AddCollaboratorToProjectDialog.java index 44b527771..4a152f06b 100644 --- a/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/access/AddCollaboratorToProjectDialog.java +++ b/user-interface/src/main/java/life/qbic/datamanager/views/projects/project/access/AddCollaboratorToProjectDialog.java @@ -82,7 +82,7 @@ private void initPersonSelection(UserInformationService userInformationService, Span title = new Span("Select the person"); title.addClassNames("section-title"); Span description = new Span( - "Please select the username of the person you want to grant access to"); + "Please select the person you want to grant access to"); description.addClassName("secondary"); personSelection.setItems(query -> { List sortOrders = query.getSortOrders().stream().map( @@ -104,7 +104,7 @@ private void initPersonSelection(UserInformationService userInformationService, new ComponentRenderer<>(AddCollaboratorToProjectDialog::renderUserInfo)); personSelection.setRequired(true); personSelection.setErrorMessage("Please specify the collaborator to be added to the project"); - personSelection.setPlaceholder("Please select a username"); + personSelection.setPlaceholder("Please search for username or full name or ORCID identifier"); personSelection.setRenderer(new ComponentRenderer<>( AddCollaboratorToProjectDialog::renderUserInfo )); diff --git a/user-interface/src/main/java/life/qbic/datamanager/views/register/RegistrationOrcIdMain.java b/user-interface/src/main/java/life/qbic/datamanager/views/register/RegistrationOrcIdMain.java index cd46da4cd..fb491ec22 100644 --- a/user-interface/src/main/java/life/qbic/datamanager/views/register/RegistrationOrcIdMain.java +++ b/user-interface/src/main/java/life/qbic/datamanager/views/register/RegistrationOrcIdMain.java @@ -127,7 +127,7 @@ public void beforeEnter(BeforeEnterEvent event) { return; } if (authentication.getPrincipal() instanceof OidcUser oidcUser) { - //note: for ORCiD, only given name and family name are supported https://orcid.org/.well-known/openid-configuration. + //note: for ORCID, only given name and family name are supported https://orcid.org/.well-known/openid-configuration. userRegistrationOrcIdComponent.setFullName( buildFullName(oidcUser.getGivenName(), oidcUser.getMiddleName(), oidcUser.getFamilyName()));