Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
KochTobi committed Oct 28, 2024
2 parents f1366d2 + 7cc1aa8 commit e84d149
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<properties>
<java.version>17</java.version>
<vaadin.version>24.5.2</vaadin.version>
<vaadin.version>24.4.13</vaadin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
Expand Down
Binary file modified user-interface/src/main/bundles/dev.bundle
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public AddPersonalAccessTokenDialog() {
});
expirationDate.addClassName("expiration-date");
expirationDate.setValue(selectableExpirationDates.get(0));
personalAccessTokenDTOBinder = new Binder<>();
personalAccessTokenDTOBinder = new Binder<>(PersonalAccessTokenFrontendBean.class);
personalAccessTokenDTOBinder.forField(tokenDescription)
.asRequired("Please provide a token description")
.bind((PersonalAccessTokenFrontendBean::tokenDescription),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ResetPasswordComponent extends Div {
private final TextField emailField = new TextField("Email");
private final Button confirmButton = new Button("Send");
private final Div notificationLayout = new Div();
private final Binder<String> emailBinder = new Binder<>();
private final Binder<String> emailBinder = new Binder<>(String.class);
private final transient UserInformationService userInformationService;

public ResetPasswordComponent(UserInformationService userInformationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class SetNewPasswordComponent extends Div {

private final Div notificationLayout = new Div();

private final Binder<String> passwordResetBinder = new Binder<>();
private final Binder<String> passwordResetBinder = new Binder<>(String.class);

public SetNewPasswordComponent() {
addClassName("set-new-password-component");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class CollaboratorsLayout extends Div implements HasBinderValidation<Proj

public CollaboratorsLayout() {

collaboratorsBinder = new Binder<>();
collaboratorsBinder = new Binder<>(ProjectCollaborators.class);
collaboratorsBinder.setValidatorsDisabled(true);
collaboratorsBinder.setBean(new ProjectCollaborators());
collaboratorsBinder.setFieldsValidationStatusChangeListenerEnabled(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public ExperimentalInformationLayout(
MultiSelectComboBox<OntologyTerm> analyteBox = ontologyComboboxFactory.analyteBox();
TextField nameField = nameField();

experimentalInformationBinder = new Binder<>();
experimentalInformationBinder = new Binder<>(ExperimentalInformation.class);

ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIES,
"Species icon");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public class FundingInformationLayout extends Div implements
HasBinderValidation<FundingInformationContainer> {

private final FundingField fundingField = new FundingField("");
private final Binder<FundingInformationContainer> fundingEntryBinder = new Binder<>();
private final Binder<FundingInformationContainer> fundingEntryBinder = new Binder<>(
FundingInformationContainer.class);
private static final String TITLE = "Funding Information";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class ProjectDesignLayout extends Div implements HasBinderValidation<Proj
private final TextField titleField = new TextField("Title");
private final TextArea projectDescription = new TextArea("Description");
private final Button generateCodeButton = new Button(new Icon(VaadinIcon.REFRESH));
private final Binder<ProjectDesign> projectDesignBinder = new Binder<>();
private final Binder<ProjectDesign> projectDesignBinder = new Binder<>(ProjectDesign.class);
private final transient ProjectInformationService projectInformationService;
private final transient FinanceService financeService;
private final Span projectDesignDescription = new Span(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private void showControls(boolean isVisible) {
private Grid<ProjectUser> createProjectUserGrid() {
Grid<ProjectUser> pUserGrid = new Grid<>(ProjectUser.class, false);
Editor<ProjectUser> editor = pUserGrid.getEditor();
Binder<ProjectUser> binder = new Binder<>();
Binder<ProjectUser> binder = new Binder<>(ProjectUser.class);
editor.setBinder(binder);
var projectUserInfoColumn = pUserGrid.addComponentColumn(
ProjectAccessComponent::renderUserInfo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public class UserRegistrationComponent extends Div {

private final H2 titleSpan = new H2("Register");

private final Binder<UserRegistrationInformation> registrationInformationBinder = new Binder<>();
private final Binder<UserRegistrationInformation> registrationInformationBinder = new Binder<>(
UserRegistrationInformation.class);

private final transient UserInformationService userInformationService;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ public class UserRegistrationOrcIdComponent extends Div {

private final Div description = new Div();

private final Binder<UserRegistrationOrcIdInformation> registrationInformationBinder = new Binder<>();
private final Binder<UserRegistrationOrcIdInformation> registrationInformationBinder = new Binder<>(
UserRegistrationOrcIdInformation.class);

private final transient UserInformationService userInformationService;

Expand Down

0 comments on commit e84d149

Please sign in to comment.