nheron/kie-platform
nheron/kie-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug on select target kie-server

Browse source
This commit is contained in:
nheron 2020-11-12 14:13:10 +01:00
commit cbf24921a1
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drools-framework-admin-console-parent/drools-framework-admin-console/pom.xml
View file

@ -12,7 +12,7 @@
<artifactId>drools-framework-admin-console</artifactId> <artifactId>drools-framework-admin-console</artifactId>
<properties> <properties>
<vaadin.version>12.0.5</vaadin.version> <vaadin.version>12.0.7</vaadin.version>
<spring-boot.version>${spring.boot.version}</spring-boot.version> <spring-boot.version>${spring.boot.version}</spring-boot.version>
<spring-version>${spring.version}</spring-version> <spring-version>${spring.version}</spring-version>
<webapp.directory>src/main/webapp</webapp.directory> <webapp.directory>src/main/webapp</webapp.directory>

23
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadincomponent/componentview/GridRuntime.java
View file

@ -1,7 +1,9 @@
package org.chtijbug.drools.console.vaadincomponent.componentview; package org.chtijbug.drools.console.vaadincomponent.componentview;
import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.grid.GridSelectionModel;
import com.vaadin.flow.component.html.Label; import com.vaadin.flow.component.html.Label;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.provider.ConfigurableFilterDataProvider; import com.vaadin.flow.data.provider.ConfigurableFilterDataProvider;
import com.vaadin.flow.data.provider.ListDataProvider; import com.vaadin.flow.data.provider.ListDataProvider;
@ -25,7 +27,7 @@ public class GridRuntime extends Grid<RuntimePersist> {
private TextField hostName; private TextField hostName;
private TextField branch ; private TextField branch;
private TextField version; private TextField version;
@ -48,6 +50,7 @@ public class GridRuntime extends Grid<RuntimePersist> {
private ConfigurableFilterDataProvider<RuntimePersist, Void, SerializablePredicate<RuntimePersist>> filterDataProvider; private ConfigurableFilterDataProvider<RuntimePersist, Void, SerializablePredicate<RuntimePersist>> filterDataProvider;
private ProjectPersist projectPersist = null; private ProjectPersist projectPersist = null;
private GridSelectionModel<RuntimePersist> selectionModel;
public GridRuntime(ProjectPersist projectPersist) { public GridRuntime(ProjectPersist projectPersist) {
this.projectPersist = projectPersist; this.projectPersist = projectPersist;
@ -66,8 +69,8 @@ public class GridRuntime extends Grid<RuntimePersist> {
runtimeService = AppContext.getApplicationContext().getBean(RuntimeService.class); runtimeService = AppContext.getApplicationContext().getBean(RuntimeService.class);
setClassName("deployment-grid-perso"); setClassName("deployment-grid-perso");
setSelectionMode(Grid.SelectionMode.MULTI); selectionModel = setSelectionMode(SelectionMode.MULTI);
selectionModel.deselectAll();
Grid.Column<RuntimePersist> runtimeNameCo = addColumn(runtimePersist -> runtimePersist.getServerName()); Grid.Column<RuntimePersist> runtimeNameCo = addColumn(runtimePersist -> runtimePersist.getServerName());
runtimeName = new TextField(strRuntimeName); runtimeName = new TextField(strRuntimeName);
runtimeName.setValueChangeMode(ValueChangeMode.EAGER); runtimeName.setValueChangeMode(ValueChangeMode.EAGER);
@ -116,7 +119,6 @@ public class GridRuntime extends Grid<RuntimePersist> {
return label; return label;
})).setHeader("associated projects"); })).setHeader("associated projects");
setDataProvider(); setDataProvider();
} }
@ -158,9 +160,9 @@ public class GridRuntime extends Grid<RuntimePersist> {
if (projectPersist != null) { if (projectPersist != null) {
runtimeToShow.add(runtimePersist1); runtimeToShow.add(runtimePersist1);
if (projectPersist.getServerNames().contains(runtimePersist1.getServerName())) { if (projectPersist.getServerNames().contains(runtimePersist1.getServerName())) {
getSelectionModel().select(runtimePersist1); selectionModel.select(runtimePersist1);
} }
}else{ } else {
runtimeToShow.add(runtimePersist1); runtimeToShow.add(runtimePersist1);
} }
} }
@ -169,11 +171,18 @@ public class GridRuntime extends Grid<RuntimePersist> {
dataProvider = new ListDataProvider<>(runtimeToShow); dataProvider = new ListDataProvider<>(runtimeToShow);
filterDataProvider = dataProvider.withConfigurableFilter(); filterDataProvider = dataProvider.withConfigurableFilter();
setDataProvider(filterDataProvider); setDataProvider(filterDataProvider);
for (RuntimePersist runtimePersist : dataProvider.getItems()) {
if (projectPersist.getServerNames().contains(runtimePersist.getServerName())) {
selectionModel.select(runtimePersist);
}
}
reinitFilter(); reinitFilter();
} }
}
}
public void reinitFilter() { public void reinitFilter() {
hostName.setValue(""); hostName.setValue("");

2
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadincomponent/leftMenu/Action/DeploymentAction.java
View file

@ -61,7 +61,7 @@ public class DeploymentAction extends VerticalLayout {
} }
}); });
deployer =new Button("Déployer", VaadinIcon.EXTERNAL_LINK.create()); deployer =new Button("Deploy", VaadinIcon.EXTERNAL_LINK.create());
deployer.setClassName("leftMenu-global-button"); deployer.setClassName("leftMenu-global-button");
deployer.setEnabled(false); deployer.setEnabled(false);
add(deployer); add(deployer);

2
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/service/UpdateService.java
View file

@ -63,7 +63,7 @@ public class UpdateService {
} }
if (!found) { if (!found) {
MappingProperties newMappingProperties = new MappingProperties(); MappingProperties newMappingProperties = new MappingProperties();
newMappingProperties.setPath(update.getPath()); newMappingProperties.setPath(UpdateService.removeSlach(update.getPath()));
logger.info("Creating path {}",update.getPath()); logger.info("Creating path {}",update.getPath());
for (String destination : update.getServerNames()) { for (String destination : update.getServerNames()) {
newMappingProperties.getDestinations().add(destination); newMappingProperties.getDestinations().add(destination);