Utilisation de PlatformProjectResponse pour avoir plus de detail sur la réponse

This commit is contained in:
Nicolas Héron 2019-01-22 10:40:52 +01:00
commit c0387becb7
5 changed files with 24 additions and 12 deletions

View file

@ -1,6 +1,6 @@
package org.chtijbug.drools.console.service.model;
import org.guvnor.rest.client.ProjectResponse;
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import java.util.ArrayList;
import java.util.List;
@ -10,7 +10,7 @@ public class UserConnected {
private String userPassword;
private List<ProjectResponse> projectResponses = new ArrayList<>();
private List<PlatformProjectResponse> projectResponses = new ArrayList<>();
private List<String> roles = new ArrayList<>();
@ -41,11 +41,11 @@ public class UserConnected {
}
public List<ProjectResponse> getProjectResponses() {
public List<PlatformProjectResponse> getProjectResponses() {
return projectResponses;
}
public void setProjectResponses(List<ProjectResponse> projectResponses) {
public void setProjectResponses(List<PlatformProjectResponse> projectResponses) {
this.projectResponses = projectResponses;
}

View file

@ -15,6 +15,7 @@ import org.chtijbug.drools.console.service.UserConnectedService;
import org.chtijbug.drools.console.service.model.UserConnected;
import org.chtijbug.drools.console.service.model.kie.*;
import org.chtijbug.drools.console.service.util.AppContext;
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import org.guvnor.rest.client.ProjectResponse;
import org.kie.server.api.model.KieContainerResource;
import org.kie.server.api.model.ReleaseId;
@ -30,7 +31,7 @@ public class DeploymentView extends DroolsAdminConsoleMainView implements AddLog
final private Grid<List<String>> gridLogging = new Grid();
final private Button buttonDeployProject = new Button("Deploy project");
private KieConfigurationData config;
private ComboBox<ProjectResponse> spaceSelection;
private ComboBox<PlatformProjectResponse> spaceSelection;
final private TextField projectArtifactIDTextField = new TextField("Project Artifact ID");
final private TextField projectGroupIDTextField = new TextField("Project Group ID");
@ -73,8 +74,8 @@ public class DeploymentView extends DroolsAdminConsoleMainView implements AddLog
spaceSelection = new ComboBox("Project", userConnected.getProjectResponses());
spaceSelection.setItemLabelGenerator(ProjectResponse::getName);
spaceSelection.addValueChangeListener(valueChangeEvent -> {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue();
projectArtifactIDTextField.setValue(response.getName());
PlatformProjectResponse response = spaceSelection.getValue();
projectArtifactIDTextField.setValue(response.getArtifactId());
projectGroupIDTextField.setValue(response.getGroupId());
projectVersionTextField.setValue(response.getVersion());
refreshList();

View file

@ -15,7 +15,7 @@ import org.chtijbug.drools.console.service.model.UserConnected;
import org.chtijbug.drools.console.service.model.kie.KieConfigurationData;
import org.chtijbug.drools.console.service.util.AppContext;
import org.chtijbug.guvnor.server.jaxrs.jaxb.Asset;
import org.guvnor.rest.client.ProjectResponse;
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import javax.annotation.PostConstruct;
import java.util.*;
@ -36,7 +36,7 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
private Grid<Map<String, String>> assetListGrid;
private ComboBox<ProjectResponse> spaceSelection;
private ComboBox<PlatformProjectResponse> spaceSelection;
private Button deleteRow;
private Button editRow;
@ -61,9 +61,9 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
});
verticalLayout.add(button);
spaceSelection = new ComboBox("Project", userConnected.getProjectResponses());
spaceSelection.setItemLabelGenerator(ProjectResponse::getName);
spaceSelection.setItemLabelGenerator(PlatformProjectResponse::getName);
spaceSelection.addValueChangeListener(valueChangeEvent -> {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue();
PlatformProjectResponse response = (PlatformProjectResponse) spaceSelection.getValue();
//spaceSelection.setSelectedItem(response);
assetListGrid.addColumn(hashmap -> hashmap.get("title"));
List<Asset> assets = kieRepositoryService.getListAssets(config.getKiewbUrl(), userConnected.getUserName(), userConnected.getUserPassword(), response.getSpaceName(), response.getName());
@ -101,7 +101,7 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
if (selectedElements.toArray().length > 0) {
String assetName = ((Map<String, String>) selectedElements.toArray()[0]).get("title");
if (assetName != null) {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue();
PlatformProjectResponse response = spaceSelection.getValue();
userConnectedService.addAssetToSession(assetName);
userConnectedService.addProjectToSession(response.getName());
userConnectedService.addSpaceToSession(response.getSpaceName());